[MERGE] forward port branch 11.0 up to 0b2dbbb

odoo · Apr 15, 2019 · 44aedc9 · 44aedc9
2 parents 372ecf4 + 0b2dbbb
commit 44aedc9
Show file tree

Hide file tree

Showing 16 changed files with 529 additions and 107 deletions.
diff --git a/addons/account/__init__.py b/addons/account/__init__.py
@@ -45,6 +45,8 @@ def _auto_install_l10n(cr, registry):
             'PL', 'PT', 'RO', 'SI', 'TR', 'UK', 'VE', 'VN'
             ]:
             module_list.append('base_vat')
+        if country_code == 'MX':
+            module_list.append('l10n_mx_edi')
 
         # European countries will be using SEPA
         europe = env.ref('base.europe', raise_if_not_found=False)

diff --git a/addons/account/models/account_payment.py b/addons/account/models/account_payment.py
@@ -257,11 +257,13 @@ def _prepare_payment_vals(self, invoices):
         '''
         amount = self._compute_payment_amount(invoices=invoices) if self.multi else self.amount
         payment_type = ('inbound' if amount > 0 else 'outbound') if self.multi else self.payment_type
+        communication = (' '.join([inv.reference or inv.number for inv in invoices])
+                         if self.multi else self.communication)
         return {
             'journal_id': self.journal_id.id,
             'payment_method_id': self.payment_method_id.id,
             'payment_date': self.payment_date,
-            'communication': self.communication,
+            'communication': communication,  # DO NOT FORWARD PORT TO V12 OR ABOVE
             'invoice_ids': [(6, 0, invoices.ids)],
             'payment_type': payment_type,
             'amount': abs(amount),

diff --git a/addons/delivery/models/sale_order.py b/addons/delivery/models/sale_order.py
@@ -99,9 +99,15 @@ def _create_delivery_line(self, carrier, price_unit):
             taxes_ids = self.fiscal_position_id.map_tax(taxes, carrier.product_id, self.partner_id).ids
 
         # Create the sales order line
+        carrier_with_partner_lang = carrier.with_context(lang=self.partner_id.lang)
+        if carrier_with_partner_lang.product_id.description_sale:
+            so_description = '%s: %s' % (carrier_with_partner_lang.name,
+                                        carrier_with_partner_lang.product_id.description_sale)
+        else:
+            so_description = carrier_with_partner_lang.name
         values = {
             'order_id': self.id,
-            'name': carrier.with_context(lang=self.partner_id.lang).name,
+            'name': so_description,
             'product_uom_qty': 1,
             'product_uom': carrier.product_id.uom_id.id,
             'product_id': carrier.product_id.id,

diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
@@ -93,7 +93,7 @@
                                     <label for="free_over"/>
                                 </div>
                                 <field nolabel="1" name="amount" attrs="{'required':[('free_over','!=', False)], 'invisible':[('free_over','=', False)]}"/>
-                                <field name="product_id" context="{'default_type': 'service', 'sale_ok': False, 'purchase_ok': False}" />
+                                <field name="product_id" context="{'default_type': 'service', 'default_sale_ok': False, 'default_purchase_ok': False}" />
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </group>
                         </group>

diff --git a/addons/l10n_ca/data/account_tax_data.xml b/addons/l10n_ca/data/account_tax_data.xml
@@ -112,7 +112,7 @@
         <field name="type_tax_use">sale</field>
         <field name="amount">100</field>
         <field name="amount_type">group</field>
-        <field name="children_tax_ids" eval="[(6,0,[ref('pst_bc_sale_en')])]"/>
+        <field name="children_tax_ids" eval="[(6,0,[ref('pst_bc_sale_en'), ref('gstpst_sale_bc_gst_en')])]"/>
         <field name="tag_ids" eval="[(6,0,[ref('tag_gstpst_bc_sale')])]"/>
         <field name="tax_group_id" ref="tax_group_fix"/>
     </record>

diff --git a/addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml b/addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml
diff --git a/addons/l10n_de_skr03/data/l10n_de_skr03_chart_data.xml b/addons/l10n_de_skr03/data/l10n_de_skr03_chart_data.xml
@@ -4109,7 +4109,7 @@
         <record id="account_1788" model="account.account.template">
             <field name="code">1788</field>
             <field name="name">Aufgeschobene Einfuhr-Umsatzsteuer</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="tag_ids" eval="[(6,0, [ref('l10n_de.tag_de_liabilities_bs_D_8')])]"/>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -6786,7 +6786,7 @@
         </record>
         <record id="account_3551" model="account.account.template">
             <field name="code">3551</field>
-            <field name="name">Wareneingang, im Drittland steuerbar</field>
+            <field name="name">Wareneingang, im Drittland steuerbar (19%)</field>
             <field name="reconcile" eval="False"/>
             <field name="tag_ids" eval="[(6,0, [ref('l10n_de.tag_de_pl_05')])]"/>
             <field name="user_type_id" ref="account.data_account_type_expenses"/>
@@ -6808,6 +6808,14 @@
             <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
+        <record id="account_3557" model="account.account.template">
+            <field name="code">3557</field>
+            <field name="name">Wareneingang, im Drittland steuerbar (7%)</field>
+            <field name="reconcile" eval="False"/>
+            <field name="tag_ids" eval="[(6,0, [ref('l10n_de.tag_de_pl_05')])]"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+        </record>
         <record id="account_3558" model="account.account.template">
             <field name="code">3558</field>
             <field name="name">Wareneingang, im anderen EG-Land stb.</field>
@@ -9739,7 +9747,7 @@
         </record>
         <record id="account_8738" model="account.account.template">
             <field name="code">8738</field>
-            <field name="name">Gewährte Skonti aus Lieferungen von Mobilfunkgeräten/Schaltkreisen, für die der Leistungsempfänger die Umsatzsteuer nach § 13b UStG schuldet</field>
+            <field name="name">Gewährte Skonti aus Lieferungen von Mobilfunkgeräten/Schaltkreisen, für die der Leistungsempfänger die Umsatzsteuer nach § 13b Abs. 2 Nr. 10 UStG schuldet</field>
             <field name="reconcile" eval="False"/>
             <field name="tag_ids" eval="[(6,0, [ref('l10n_de.tag_de_pl_01')])]"/>
             <field name="user_type_id" ref="account.data_account_type_revenue"/>
@@ -10268,6 +10276,13 @@
             <field name="user_type_id" ref="account.data_account_type_other_income"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
+        <record id="account_9089" model="account.account.template">
+            <field name="code">9089</field>
+            <field name="name">Offene Posten aus 2019</field>
+            <field name="reconcile" eval="False"/>
+            <field name="user_type_id" ref="account.data_account_type_other_income"/>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+        </record>
         <record id="l10n_de_chart_template" model="account.chart.template">
                 <field name="code_digits">4</field>
                 <field name="property_account_receivable_id" ref="account_1410"/>
@@ -10281,4 +10296,4 @@
                 <field name="expense_currency_exchange_account_id" ref="account_2150"/>
         </record>
     </data>
-</odoo>
+</odoo>