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

Feedback 1584, 1590

develop
Ahmed Aly 2018-04-05 12:03:26 +02:00
parent 8ba4bf7278
commit 1bd867014e
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ext/custom-addons/dp_custom/models/sale.py
View File

@ -453,6 +453,7 @@ class SaleOrderLine(models.Model):
'name': 'Händlerrabatt {}%'.format(discount), 'name': 'Händlerrabatt {}%'.format(discount),
'intrastat_id': False 'intrastat_id': False
}) })
del vals['discount']
invoice_lines |= self.env['account.invoice.line'].create(vals) invoice_lines |= self.env['account.invoice.line'].create(vals)
return invoice_lines return invoice_lines

27
ext/custom-addons/dp_reports_account/reports/invoice.xml
View File

@ -104,7 +104,12 @@
<tr t-if="layout_category['name'] != 'Uncategorized'"> <tr t-if="layout_category['name'] != 'Uncategorized'">
<td colspan="6"> <td colspan="6">
<strong> <strong>
<t t-esc="layout_category['name']"/> - <t t-esc="o.partner_id.name"/><t t-if="layout_category['confirmation_nr']"> - <t t-esc="layout_category['confirmation_nr']"/></t> <t t-esc="layout_category['name']"/>
-
<t t-esc="o.partner_id.name"/>
<t t-if="layout_category['confirmation_nr']">-
<t t-esc="layout_category['confirmation_nr']"/>
</t>
</strong> </strong>
</td> </td>
<td class="text-right" t-if="discount_is_set"/> <td class="text-right" t-if="discount_is_set"/>
@ -128,9 +133,8 @@
<span t-field="invoice_line.weight"/> <span t-field="invoice_line.weight"/>
kg kg
</td> </td>
<td class="text-right"> <td class="text-right"/>
</td> <td class="text-left">
<td rowspan="2" class="text-left">
<t t-if="invoice_line.product_id.default_code"> <t t-if="invoice_line.product_id.default_code">
<strong> <strong>
<span t-field="invoice_line.product_id.default_code"/> <span t-field="invoice_line.product_id.default_code"/>
@ -144,25 +148,16 @@
</span> </span>
<span t-field="invoice_line.name"/> <span t-field="invoice_line.name"/>
</td> </td>
<td rowspan="2" class="text-right"> <td class="text-right">
<span t-field="invoice_line.price_unit"/> <span t-field="invoice_line.price_unit"/>
</td> </td>
<td rowspan="2" class="text-right" t-if="discount_is_set"> <td class="text-right" t-if="discount_is_set">
<span t-field="invoice_line.discount"/> <span t-field="invoice_line.discount"/>
</td> </td>
<td rowspan="2" class="text-right"> <td class="text-right">
<span t-field="invoice_line.price_subtotal"/> <span t-field="invoice_line.price_subtotal"/>
</td> </td>
</tr> </tr>
<tr>
<td colspan="4" style="border: 0;text-align: center;">
<!-- Fall 5078, Rechnung - keine Bilder mehr
<img t-if="invoice_line.product_id.image_medium"
t-att-src="'data:image/png;base64,%s' % invoice_line.product_id.image_medium.decode()"/>
-->
</td>
</tr>
</t> </t>
</t> </t>
</tbody> </tbody>

4
setup/odoo-playboook/roles/odoo/defaults/main.yml
View File

@ -67,8 +67,8 @@ odoo_config_geoip_database: /usr/share/GeoIP/GeoLiteCity.dat
odoo_config_http_enable: True # >= 11.0 odoo_config_http_enable: True # >= 11.0
odoo_config_http_interface: '' # >= 11.0 odoo_config_http_interface: '' # >= 11.0
odoo_config_http_port: 8069 # >= 11.0 odoo_config_http_port: 8069 # >= 11.0
odoo_config_limit_memory_hard: 805306368 odoo_config_limit_memory_hard: 2684354560
odoo_config_limit_memory_soft: 671088640 odoo_config_limit_memory_soft: 2147483648
odoo_config_limit_time_cpu: 60 odoo_config_limit_time_cpu: 60
odoo_config_limit_time_real: 120 odoo_config_limit_time_real: 120
odoo_config_limit_time_real_cron: -1 # >= 10.0 odoo_config_limit_time_real_cron: -1 # >= 10.0