[MIG] account_invoice_commission: Migration to 16.0

Part-of: #151

account_invoice_commission/__manifest__.py

@@ -19,7 +19,7 @@
 ##############################################################################
 {
     'name': 'Commission Invoices',
-    'version': "15.0.1.0.0",
+    'version': "16.0.1.0.0",
     'category': 'Accounting',
     'sequence': 14,
     'summary': '',
@@ -40,7 +40,7 @@
     ],
     'test': [
     ],
-    'installable': False,
+    'installable': True,
     'auto_install': False,
     'application': False,
 }

account_invoice_commission/i18n/de.po

@@ -24,11 +24,6 @@ msgstr ""
 msgid "Account Commission Rule"
 msgstr ""
 
-#. module: account_invoice_commission
-#: model:ir.model.fields,field_description:account_invoice_commission.field_account_commission_rule__analytic_account_id
-msgid "Analytic Account"
-msgstr ""
-
 #. module: account_invoice_commission
 #: model:ir.model.fields,help:account_invoice_commission.field_account_move__commission_invoice_ids
 msgid "Commision invoices where this invoice is commissioned"

account_invoice_commission/i18n/es.po

@@ -24,11 +24,6 @@ msgstr ""
 msgid "Account Commission Rule"
 msgstr "Regla de Comisión de Cuenta"
 
-#. module: account_invoice_commission
-#: model:ir.model.fields,field_description:account_invoice_commission.field_account_commission_rule__analytic_account_id
-msgid "Analytic Account"
-msgstr "Cuenta Analítica"
-
 #. module: account_invoice_commission
 #: model:ir.model.fields,help:account_invoice_commission.field_account_bank_statement_line__commission_invoice_ids
 #: model:ir.model.fields,help:account_invoice_commission.field_account_move__commission_invoice_ids

account_invoice_commission/i18n/pt_BR.po

@@ -19,11 +19,6 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. module: account_invoice_commission
-#: model:ir.model.fields,field_description:account_invoice_commission.field_account_commission_rule_analytic_account_id
-msgid "Analytic Account"
-msgstr ""
-
 #. module: account_invoice_commission
 #: model:ir.model.fields,help:account_invoice_commission.field_account_invoice_commission_invoice_ids
 msgid "Commision invoices where this invoice is commissioned"

account_invoice_commission/i18n/ru.po

@@ -24,11 +24,6 @@ msgstr ""
 msgid "Account Commission Rule"
 msgstr ""
 
-#. module: account_invoice_commission
-#: model:ir.model.fields,field_description:account_invoice_commission.field_account_commission_rule__analytic_account_id
-msgid "Analytic Account"
-msgstr ""
-
 #. module: account_invoice_commission
 #: model:ir.model.fields,help:account_invoice_commission.field_account_move__commission_invoice_ids
 msgid "Commision invoices where this invoice is commissioned"

account_invoice_commission/models/account_commission_rule.py

@@ -65,21 +65,13 @@ class AccountCommissionRule(models.Model):
     percent_commission = fields.Float(
         'Percentage Commission'
     )
-    analytic_account_id = fields.Many2one(
-        'account.analytic.account',
-        'Analytic Account',
-    )
 
-    def _get_rule_domain(self, date, product, partner_id, customer, amount,
-                         analytic_acc):
+    def _get_rule_domain(self, date, product, partner_id, customer, amount):
         domain = [
             '|',
             ('date_start', '=', False),
             ('date_start', '<=', date),
             '|',
-            ('analytic_account_id', '=', False),
-            ('analytic_account_id', '=', analytic_acc.id),
-            '|',
             ('date_end', '=', False),
             ('date_end', '>=', date),
             '|',
@@ -101,10 +93,9 @@ def _get_rule_domain(self, date, product, partner_id, customer, amount,
             ]
         return domain
 
-    def _get_rule(self, date, product, partner_id, customer, amount,
-                  analytic_acc):
+    def _get_rule(self, date, product, partner_id, customer, amount):
         domain = self._get_rule_domain(
-            date, product, partner_id, customer, amount, analytic_acc)
+            date, product, partner_id, customer, amount)
         res = self.search(domain, limit=1)
         if not res:
             if product:

account_invoice_commission/models/account_move_line.py

@@ -29,7 +29,6 @@ def _compute_commission_amount(self):
                     date, rec.product_id, commissioned_partner_id,
                     rec.move_id.commercial_partner_id,
                     -rec.balance,
-                    rec.analytic_account_id,
                 ).percent_commission * -rec.balance / 100.0
         else:
             self.commission_amount = 0.0

account_invoice_commission/views/account_commission_rule_view.xml

@@ -12,7 +12,6 @@
                 <field name="customer_id"/>
                 <field name="product_tmpl_id"/>
                 <field name="categ_id"/>
-                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                 <field name="min_amount"/>
                 <field name="percent_commission"/>
             </tree>

account_invoice_commission/views/account_move_view.xml

@@ -6,10 +6,10 @@
         <field name="model">account.move</field>
         <field name="inherit_id" ref="account.view_move_form"/>
         <field name="arch" type="xml">
-            <field name="date" position="after">
+            <xpath expr="//sheet//field[@name='date']" position="after">
                 <field name="partner_user_id" attrs="{'invisible': [('move_type', 'not in', ('in_invoice', 'in_refund', 'in_receipt'))]}"/>
                 <field name="date_last_payment" states="open,paid"/>
-            </field>
+            </xpath>
             <notebook>
                 <page string="Commissions" attrs="{'invisible': [('move_type', 'in', ('in_invoice', 'in_refund', 'in_receipt'))]}">
                     <field name="commission_invoice_ids"/>