tzaustria
/
odoo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sale_report_fix' into develop

develop
Ahmed Aly 2018-09-05 12:15:24 +02:00
parent c5c3ed3b72 aacf4c2653
commit 2542eb56b0
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dev/pylint/setup_pylint_hook
View File

@ -1,21 +1,14 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if ! $(python -c "import pylint" &> /dev/null); then
echo 'Pylint is not installed and is going to be installed now!'
sudo pip install pylint
else
echo 'Pylint is already installed. Continue ...'
fi
if ! $(python -c "import pylint_odoo" &> /dev/null); then if ! $(python -c "import pylint_odoo" &> /dev/null); then
echo 'The pylint module "pylint-odoo" is not installed and is going to be installed now!' echo 'The pylint module "pylint-odoo" is not installed and is going to be installed now!'
sudo pip install --upgrade git+https://github.com/oca/pylint-odoo.git sudo pip3 install --upgrade git+https://github.com/oca/pylint-odoo.git
else else
echo 'The pylint module "pylint-odoo" is already installed. Continue ...' echo 'The pylint module "pylint-odoo" is already installed. Continue ...'
fi fi
if ! $(python -c "import git_pylint_commit_hook" &> /dev/null); then if ! $(python -c "import git_pylint_commit_hook" &> /dev/null); then
echo 'git-pylint-commit-hook is not insalled and is going to be isntalled now!' echo 'git-pylint-commit-hook is not insalled and is going to be isntalled now!'
sudo pip install git-pylint-commit-hook sudo pip3 install git-pylint-commit-hook
else else
echo 'git-pylint-commit-hook is already installed. Continue ...' echo 'git-pylint-commit-hook is already installed. Continue ...'
fi fi

5
ext/custom-addons/dp_reports_sale/reports/sale.xml
View File

@ -110,7 +110,7 @@
<p t-if="o.note1"> <p t-if="o.note1">
<span t-field="o.note1"/> <span t-field="o.note1"/>
</p> </p>
<table class="table table-condensed"> <table class="table table-condensed" style="background-color: #E6E7E9;">
<t t-set="discount_is_set" t-value="field_set_in_lines(o.order_line, 'discount')"/> <t t-set="discount_is_set" t-value="field_set_in_lines(o.order_line, 'discount')"/>
<thead class="table-header"> <thead class="table-header">
<tr> <tr>
@ -143,8 +143,7 @@
kg kg
</t> </t>
</td> </td>
<td class="text-right"> <td class="text-right"/>
</td>
<td rowspan="2" class="text-left"> <td rowspan="2" class="text-left">
<t t-if="order_line.product_id.default_code and order_line.product_id.material_type_id.print_default_code"> <t t-if="order_line.product_id.default_code and order_line.product_id.material_type_id.print_default_code">
<strong> <strong>