diff --git a/addons/account/__manifest__.py b/addons/account/__manifest__.py index 8336c8c7dd5..3a6e2b11d88 100644 --- a/addons/account/__manifest__.py +++ b/addons/account/__manifest__.py @@ -59,7 +59,6 @@ You could use this simplified accounting in case you work with an (external) acc 'views/account_fiscal_year_view.xml', 'views/account_incoterms_view.xml', 'data/account_incoterms_data.xml', - 'views/res_company_view.xml', 'views/digest_views.xml', 'wizard/account_invoice_send_views.xml', ], diff --git a/addons/account/models/res_config_settings.py b/addons/account/models/res_config_settings.py index 978b85017be..d7fe597dcb5 100644 --- a/addons/account/models/res_config_settings.py +++ b/addons/account/models/res_config_settings.py @@ -89,6 +89,7 @@ class ResConfigSettings(models.TransientModel): qr_code = fields.Boolean(string='Display SEPA QR code', related='company_id.qr_code', readonly=False) invoice_is_print = fields.Boolean(string='Print', related='company_id.invoice_is_print', readonly=False) invoice_is_email = fields.Boolean(string='Send Email', related='company_id.invoice_is_email', readonly=False) + incoterm_id = fields.Many2one('account.incoterms', string='Default incoterm', related='company_id.incoterm_id', help='International Commercial Terms are a series of predefined commercial terms used in international transactions.', readonly=False) @api.multi def set_values(self): diff --git a/addons/account/views/partner_view.xml b/addons/account/views/partner_view.xml index 8ea177c506d..23ba9220ac8 100644 --- a/addons/account/views/partner_view.xml +++ b/addons/account/views/partner_view.xml @@ -156,7 +156,7 @@ @@ -204,12 +204,6 @@ -
diff --git a/addons/payment/views/payment_acquirer_onboarding_templates.xml b/addons/payment/views/payment_acquirer_onboarding_templates.xml index 45b67e57329..76d991aaed7 100644 --- a/addons/payment/views/payment_acquirer_onboarding_templates.xml +++ b/addons/payment/views/payment_acquirer_onboarding_templates.xml @@ -33,7 +33,7 @@
-
+
diff --git a/addons/payment/wizards/payment_acquirer_onboarding_wizard.py b/addons/payment/wizards/payment_acquirer_onboarding_wizard.py index 5913e5821b7..ba7b6ea1c29 100644 --- a/addons/payment/wizards/payment_acquirer_onboarding_wizard.py +++ b/addons/payment/wizards/payment_acquirer_onboarding_wizard.py @@ -30,7 +30,7 @@ class PaymentWizard(models.TransientModel): @api.onchange('journal_name', 'acc_number') def _set_manual_post_msg_value(self): - self.manual_post_msg = _('Please make a payment to
  • Bank: %s
  • Account Number: %s
  • Account Holder: %s
') %\ + self.manual_post_msg = _('

Please make a payment to:

  • Bank: %s
  • Account Number: %s
  • Account Holder: %s
') %\ (self.journal_name or _("Bank") , self.acc_number or _("Account"), self.env.user.company_id.name) _payment_acquirer_onboarding_cache = {} diff --git a/addons/point_of_sale/views/product_view.xml b/addons/point_of_sale/views/product_view.xml index 3f14c6e4274..0c46c808003 100644 --- a/addons/point_of_sale/views/product_view.xml +++ b/addons/point_of_sale/views/product_view.xml @@ -54,7 +54,7 @@ - + diff --git a/addons/portal/static/src/scss/portal.scss b/addons/portal/static/src/scss/portal.scss index 2f344baebf5..a02e765f6a3 100644 --- a/addons/portal/static/src/scss/portal.scss +++ b/addons/portal/static/src/scss/portal.scss @@ -363,7 +363,6 @@ img.o_we_custom_image { address { span[itemprop="name"] { - font-weight: bold; margin-bottom: 0.3em; } diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml index 95d3669e34a..6827424deea 100644 --- a/addons/portal/views/portal_templates.xml +++ b/addons/portal/views/portal_templates.xml @@ -370,10 +370,6 @@
-
- - -
@@ -385,6 +381,10 @@
+
+ + +
diff --git a/addons/sale/controllers/portal.py b/addons/sale/controllers/portal.py index 0796b65dead..117a0598c08 100644 --- a/addons/sale/controllers/portal.py +++ b/addons/sale/controllers/portal.py @@ -198,7 +198,7 @@ class CustomerPortal(CustomerPortal): return {'error': _('Invalid order')} if not order_sudo.has_to_be_signed(): - return {'error': _('Order is not in a state requiring customer signature.')} + return {'error': _('The order is not in a state requiring customer signature.')} if not signature: return {'error': _('Signature is missing.')} diff --git a/addons/sale/data/mail_data.xml b/addons/sale/data/mail_data.xml index 5f85067b19f..5edabafb06b 100644 --- a/addons/sale/data/mail_data.xml +++ b/addons/sale/data/mail_data.xml @@ -84,6 +84,7 @@ % if object.partner_id.parent_id: (${object.partner_id.parent_id.name}) % endif + ,

Here is % if ctx.get('proforma') diff --git a/addons/sale/models/product_template.py b/addons/sale/models/product_template.py index cbcb9526287..3f380d4b3b5 100644 --- a/addons/sale/models/product_template.py +++ b/addons/sale/models/product_template.py @@ -19,7 +19,7 @@ class ProductTemplate(models.Model): sale_line_warn_msg = fields.Text('Message for Sales Order Line') expense_policy = fields.Selection( [('no', 'No'), ('cost', 'At cost'), ('sales_price', 'Sales price')], - string='Re-Invoice Policy', + string='Re-Invoice Expenses', default='no', help="Expenses and vendor bills can be re-invoiced to a customer." "With this option, a validated expense can be re-invoice to a customer at its cost or sales price.") @@ -33,6 +33,7 @@ class ProductTemplate(models.Model): default='order') @api.multi + @api.depends('name') def _compute_hide_expense_policy(self): hide_expense_policy = self.user_has_groups('!analytic.group_analytic_accounting,!project.group_project_user,!hr_expense.group_hr_expense_user') for template in self: diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py index a09fa8711e8..d011553ee7b 100644 --- a/addons/sale/models/sale.py +++ b/addons/sale/models/sale.py @@ -20,7 +20,7 @@ from werkzeug.urls import url_encode class SaleOrder(models.Model): _name = "sale.order" _inherit = ['portal.mixin', 'mail.thread', 'mail.activity.mixin'] - _description = "Sale Order" + _description = "Sales Order" _order = 'date_order desc, id desc' def _default_validity_date(self): diff --git a/addons/sale/static/src/js/tour.js b/addons/sale/static/src/js/tour.js index 9992cbb3a42..f14c7d9f88b 100644 --- a/addons/sale/static/src/js/tour.js +++ b/addons/sale/static/src/js/tour.js @@ -67,7 +67,7 @@ tour.register('sale_tour', { }, { trigger: ".o_sale_print", extra_trigger: ".o_sale_order.o_form_readonly", - content: _t("Print this quotation to preview it."), + content: _t("Print this quotation to preview it."), position: "bottom" }, { trigger: ".breadcrumb-item:not(.active):last", diff --git a/addons/sale/views/sale_onboarding_views.xml b/addons/sale/views/sale_onboarding_views.xml index d25a9f7df4f..68279fa7fba 100644 --- a/addons/sale/views/sale_onboarding_views.xml +++ b/addons/sale/views/sale_onboarding_views.xml @@ -61,7 +61,7 @@ - How your customers can confirm an order + Choose how to confirm quotations ir.actions.act_window sale.payment.acquirer.onboarding.wizard form @@ -77,6 +77,9 @@ primary 1000 + +
-
- - This is a draft quotation. Contact us to get the final version. -
-