From 781af48af60aa2b683abe531cebed7b13a67001b Mon Sep 17 00:00:00 2001 From: Raimon Esteve Date: Mon, 12 Apr 2021 12:07:53 +0200 Subject: [PATCH] Add issue10271.diff - sale The label total_amount_cache field in sale.sale is Total Tax --- issue10271.diff | 43 +++++++++++++++++++++++++++++++++++++++++++ series | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 issue10271.diff diff --git a/issue10271.diff b/issue10271.diff new file mode 100644 index 0000000..cb1217a --- /dev/null +++ b/issue10271.diff @@ -0,0 +1,43 @@ +diff --git a/trytond/trytond/modules/sale/locale/ca.po b/trytond/trytond/modules/sale/locale/ca.po +index 3b110ce..e4a79f6 100644 +--- a/trytond/trytond/modules/sale/locale/ca.po ++++ b/trytond/trytond/modules/sale/locale/ca.po +@@ -684,8 +684,8 @@ msgid "Total" + msgstr "Total" + + msgctxt "field:sale.sale,total_amount_cache:" +-msgid "Total Tax" +-msgstr "Total impostos" ++msgid "Total Cache" ++msgstr "Total precalculats" + + msgctxt "field:sale.sale,untaxed_amount:" + msgid "Untaxed" +diff --git a/trytond/trytond/modules/sale/locale/es.po b/trytond/trytond/modules/sale/locale/es.po +index 7229496..aee4002 100644 +--- a/trytond/trytond/modules/sale/locale/es.po ++++ b/trytond/trytond/modules/sale/locale/es.po +@@ -684,8 +684,8 @@ msgid "Total" + msgstr "Total" + + msgctxt "field:sale.sale,total_amount_cache:" +-msgid "Total Tax" +-msgstr "Total impuestos" ++msgid "Total Cache" ++msgstr "Total precalculado" + + msgctxt "field:sale.sale,untaxed_amount:" + msgid "Untaxed" +diff --git a/trytond/trytond/modules/sale/sale.py b/trytond/trytond/modules/sale/sale.py +index b1096c2..b3699ee 100644 +--- a/trytond/trytond/modules/sale/sale.py ++++ b/trytond/trytond/modules/sale/sale.py +@@ -167,7 +167,7 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin): + total_amount = fields.Function(fields.Numeric('Total', + digits=(16, Eval('currency_digits', 2)), + depends=['currency_digits']), 'get_amount') +- total_amount_cache = fields.Numeric('Total Tax', ++ total_amount_cache = fields.Numeric('Total Cache', + digits=(16, Eval('currency_digits', 2)), + readonly=True, + depends=['currency_digits']) diff --git a/series b/series index 546d55e..5871f9e 100644 --- a/series +++ b/series @@ -87,3 +87,5 @@ stock-Enforce-filling-cost-price-of-move.patch # # End Cost and Recompute Cost issues issue3209.diff # [production] Not validate cost inputs and outputs 043523 (not merge to 6.x) + +issue10271.diff # [sale] The label total_amount_cache field in sale.sale is "Total Tax"