diff --git a/ext/custom-addons/dp_reports_sale/i18n/de.po b/ext/custom-addons/dp_reports_sale/i18n/de.po index 1654f4c6..87c545bc 100644 --- a/ext/custom-addons/dp_reports_sale/i18n/de.po +++ b/ext/custom-addons/dp_reports_sale/i18n/de.po @@ -40,3 +40,9 @@ msgstr "Bitte prüfen Sie bei Anlieferung sofort die Verpackung bzw. Ware auf Be #: model:ir.ui.view,arch_db:dp_reports_sale.report_saleorder_document msgid "If the damaged goods are accepted, there is no entitlement to reimbursement or replacement." msgstr "Falls die beschädigte Ware angenommen wird, besteht kein Anspruch auf Kostenerstattung bzw. Austausch." + +#. module: dp_reports_sale +#: model:ir.ui.view,arch_db:dp_reports_sale.report_saleorder_document +msgid " on " +msgstr " von " + diff --git a/ext/custom-addons/dp_sale_hide_discount/models/sale.py b/ext/custom-addons/dp_sale_hide_discount/models/sale.py index f5a72d13..4999c918 100644 --- a/ext/custom-addons/dp_sale_hide_discount/models/sale.py +++ b/ext/custom-addons/dp_sale_hide_discount/models/sale.py @@ -76,3 +76,29 @@ class SaleOrderLine(models.Model): res['hide_discount'] = self.hide_discount return res + +# class SaleOrder(models.Model): +# _inherit = 'sale.order' +# +# @api.multi +# def _get_tax_amount_by_group(self): +# self.ensure_one() +# res = {} +# for line in self.order_line: +# base_tax = 0 +# for tax in line.tax_id: +# group = tax.tax_group_id +# res.setdefault(group, {'amount': 0.0, 'base': 0.0}) +# # FORWARD-PORT UP TO SAAS-17 +# taxes = tax.compute_all(line.price_reduce + base_tax, quantity=line.product_uom_qty, +# product=line.product_id, partner=self.partner_shipping_id)['taxes'] +# for t in taxes: +# res[group]['amount'] += t['amount'] +# res[group]['base'] += t['base'] +# if tax.include_base_amount: +# base_tax += tax.compute_all(line.price_reduce + base_tax, quantity=1, product=line.product_id, +# partner=self.partner_shipping_id)['taxes'][0]['amount'] +# res = sorted(res.items(), key=lambda l: l[0].sequence) +# res = [(l[0].name, l[1]['amount'], l[1]['base'], len(res)) for l in res] +# return res +#