From e8f1c5dbc66afe0a1185c49e06f78dd7e17ebac7 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 14 Feb 2017 11:36:47 +0100 Subject: [PATCH 1/4] [FIX] account: untranslated popup The content of the popup message was not translated. opw-708345 --- addons/account/i18n/account.pot | 18 ++++++++++++++++-- .../static/src/xml/account_reconciliation.xml | 10 ++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 0c429692167cf..05fef8feb3eaf 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-03 14:29+0000\n" -"PO-Revision-Date: 2017-02-03 14:29+0000\n" +"POT-Creation-Date: 2017-02-14 10:20+0000\n" +"PO-Revision-Date: 2017-02-14 10:20+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -8655,6 +8655,13 @@ msgstr "" msgid "This label will be displayed on report to show the balance computed for the given comparison filter." msgstr "" +#. module: account +#. openerp-web +#: code:addons/account/static/src/xml/account_reconciliation.xml:273 +#, python-format +msgid "This move's amount is higher than the transaction's amount. Click to register a partial payment and keep the payment balance open." +msgstr "" + #. module: account #: model:ir.model.fields,help:account.field_accounting_report_debit_credit msgid "This option allows you to get more details about the way your balances are computed. Because it is space consuming, we do not allow to use it while doing a comparison." @@ -8944,6 +8951,13 @@ msgstr "" msgid "Undistributed Profits/Losses" msgstr "" +#. module: account +#. openerp-web +#: code:addons/account/static/src/xml/account_reconciliation.xml:278 +#, python-format +msgid "Undo the partial reconciliation." +msgstr "" + #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_line_price_unit #: model:ir.ui.view,arch_db:account.report_invoice_document diff --git a/addons/account/static/src/xml/account_reconciliation.xml b/addons/account/static/src/xml/account_reconciliation.xml index 5a60e1c17a8a0..00673d149e528 100644 --- a/addons/account/static/src/xml/account_reconciliation.xml +++ b/addons/account/static/src/xml/account_reconciliation.xml @@ -269,9 +269,15 @@ - + + This move's amount is higher than the transaction's amount. Click to register a partial payment and keep the payment balance open. + + - + + Undo the partial reconciliation. + + From 7a03f9ce934814aaf7e8b57a0a16fff487b9e1b8 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Tue, 14 Feb 2017 12:14:11 +0100 Subject: [PATCH 2/4] [FIX] web, sale, account: company logo The notification mail template of a SO and an Invoice displays the logo of the company. However, the logo is always the logo of the superuser's company. When accessing the logo from an email client, the UID is not defined. Therefore, we fall back on the superuser, and display the logo of his company. We add the support of a `company` key in the kwargs, so we can force the company from which we retrieve the logo. Note that this key was used elsewhere, such as: addons/web/static/src/js/web_client.js opw-705420 --- addons/account/data/invoice_action_data.xml | 2 +- addons/sale/data/mail_template_data.xml | 2 +- addons/web/controllers/main.py | 19 +++++++++++++------ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/addons/account/data/invoice_action_data.xml b/addons/account/data/invoice_action_data.xml index cdbcec64e0c1a..4752247b98882 100644 --- a/addons/account/data/invoice_action_data.xml +++ b/addons/account/data/invoice_action_data.xml @@ -79,7 +79,7 @@ from ${object.company_id.name}. - ${company.name} + ${company.name} diff --git a/addons/sale/data/mail_template_data.xml b/addons/sale/data/mail_template_data.xml index 72e948d375f46..29da823b2814a 100644 --- a/addons/sale/data/mail_template_data.xml +++ b/addons/sale/data/mail_template_data.xml @@ -80,7 +80,7 @@ from ${object.company_id.name}. - ${company.name} + ${company.name} diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 496f234f7e0c3..cd7b93a549ff9 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1091,12 +1091,19 @@ def company_logo(self, dbname=None, **kw): # create an empty registry registry = odoo.modules.registry.Registry(dbname) with registry.cursor() as cr: - cr.execute("""SELECT c.logo_web, c.write_date - FROM res_users u - LEFT JOIN res_company c - ON c.id = u.company_id - WHERE u.id = %s - """, (uid,)) + company = int(kw['company']) if kw and kw.get('company') else False + if company: + cr.execute("""SELECT logo_web, write_date + FROM res_company + WHERE id = %s + """, (company,)) + else: + cr.execute("""SELECT c.logo_web, c.write_date + FROM res_users u + LEFT JOIN res_company c + ON c.id = u.company_id + WHERE u.id = %s + """, (uid,)) row = cr.fetchone() if row and row[0]: image_base64 = str(row[0]).decode('base64') From 6d9bf4e5f2f2cdc5a5ede9b39fac9926158c5bc0 Mon Sep 17 00:00:00 2001 From: Miku Laitinen Date: Tue, 14 Feb 2017 17:42:13 +0200 Subject: [PATCH 3/4] [FIX] sale: display discount field On the customer invoice lines if sale module is installed. 4977bced replaced 4 groups in account and only 3 xpath in sale. Closes #15493 --- addons/sale/views/sale_views.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml index 6f5dab1225d20..2405cf6c8fcf5 100644 --- a/addons/sale/views/sale_views.xml +++ b/addons/sale/views/sale_views.xml @@ -664,6 +664,9 @@ + + sale.group_discount_per_so_line + From c1c519a05618ae6b2bdc6e189cfd0a01fab596a4 Mon Sep 17 00:00:00 2001 From: Pratima Gupta Date: Tue, 14 Feb 2017 11:29:34 +0530 Subject: [PATCH 4/4] [FIX] mrp: attrs lot_id required in produce wizard Commit b2cf955e made the lot_id always required in the produce wizard of the manufacturing order (without work orders). It should only be required when the finished product is tracked by lot. --- addons/mrp/wizard/mrp_product_produce_views.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mrp/wizard/mrp_product_produce_views.xml b/addons/mrp/wizard/mrp_product_produce_views.xml index 6650449dd1631..805d05b754978 100644 --- a/addons/mrp/wizard/mrp_product_produce_views.xml +++ b/addons/mrp/wizard/mrp_product_produce_views.xml @@ -17,7 +17,7 @@ - +