diff --git a/account_invoice_commission/README.rst b/account_invoice_commission/README.rst
index 6ddd7a6c..e138c179 100644
--- a/account_invoice_commission/README.rst
+++ b/account_invoice_commission/README.rst
@@ -22,22 +22,23 @@ TODO
Para mejora de performance, cuando se buscan facturas a agregar, no deberiamos mandar en el contexto el "commissioned_partner_id" así no calcula hasta que se agregaron las facturas.
Some other similar modules and some ideas:
- * agregar campo "commission" en lineas de factura y factura que se calcule en función a otros campos a
- * agregar en productos y partners para definir las comisiones
- * el campo commission de facturas no debería re calcularse
- * también debería setarse si se paga comisiones sobre valores netos o no (o tal vez no lo hacemos opción y listo, que vaya sobre neto).
- * Y tal vez puede ser parametro si debe estar pagada o no (así calculamos el campo en ese momento o no)
- * alguna clase padre para gestionar y disparar todas las comisiones? Desde usuarios? desde partners? También podría servir para re-calcular ya que no serían campos calculados
- * https://github.com/OCA/commission/blob/9.0/sale_commission
- * https://www.odoo.com/apps/modules/10.0/sales_commission_multi_level/
- * https://www.odoo.com/apps/modules/10.0/sales_commission_calculation/
- * https://www.odoo.com/apps/modules/10.0/sale_commission_gt/
- * https://www.odoo.com/apps/modules/10.0/sales_commission_generic/
- * https://www.odoo.com/apps/modules/10.0/sales_commission_external_user/
- * https://www.odoo.com/apps/modules/10.0/aspl_sales_commission/
- * https://github.com/Vauxoo/addons-vauxoo/blob/9.0/commission_payment/
- * https://github.com/Vauxoo/addons-vauxoo/blob/9.0/hr_salesman_commission
- * https://github.com/Vauxoo/addons-vauxoo/tree/9.0/invoice_commission
+
+* agregar campo "commission" en lineas de factura y factura que se calcule en función a otros campos a
+* agregar en productos y partners para definir las comisiones
+* el campo commission de facturas no debería re calcularse
+* también debería setarse si se paga comisiones sobre valores netos o no (o tal vez no lo hacemos opción y listo, que vaya sobre neto).
+* Y tal vez puede ser parametro si debe estar pagada o no (así calculamos el campo en ese momento o no)
+* alguna clase padre para gestionar y disparar todas las comisiones? Desde usuarios? desde partners? También podría servir para re-calcular ya que no serían campos calculados
+* https://github.com/OCA/commission/blob/9.0/sale_commission
+* https://www.odoo.com/apps/modules/10.0/sales_commission_multi_level/
+* https://www.odoo.com/apps/modules/10.0/sales_commission_calculation/
+* https://www.odoo.com/apps/modules/10.0/sale_commission_gt/
+* https://www.odoo.com/apps/modules/10.0/sales_commission_generic/
+* https://www.odoo.com/apps/modules/10.0/sales_commission_external_user/
+* https://www.odoo.com/apps/modules/10.0/aspl_sales_commission/
+* https://github.com/Vauxoo/addons-vauxoo/blob/9.0/commission_payment/
+* https://github.com/Vauxoo/addons-vauxoo/blob/9.0/hr_salesman_commission
+* https://github.com/Vauxoo/addons-vauxoo/tree/9.0/invoice_commission
Installation
diff --git a/account_invoice_commission/__manifest__.py b/account_invoice_commission/__manifest__.py
index fcd878b5..6605f3bb 100644
--- a/account_invoice_commission/__manifest__.py
+++ b/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,
}
diff --git a/account_invoice_commission/i18n/de.po b/account_invoice_commission/i18n/de.po
index ab023256..d71aca8c 100644
--- a/account_invoice_commission/i18n/de.po
+++ b/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"
diff --git a/account_invoice_commission/i18n/es.po b/account_invoice_commission/i18n/es.po
index 4585ae5a..eb65eb9b 100644
--- a/account_invoice_commission/i18n/es.po
+++ b/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
diff --git a/account_invoice_commission/i18n/pt_BR.po b/account_invoice_commission/i18n/pt_BR.po
index ac372802..033d0705 100644
--- a/account_invoice_commission/i18n/pt_BR.po
+++ b/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"
diff --git a/account_invoice_commission/i18n/ru.po b/account_invoice_commission/i18n/ru.po
index f22ef125..e78ad8a1 100644
--- a/account_invoice_commission/i18n/ru.po
+++ b/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"
diff --git a/account_invoice_commission/models/account_commission_rule.py b/account_invoice_commission/models/account_commission_rule.py
index b8959680..858500e8 100644
--- a/account_invoice_commission/models/account_commission_rule.py
+++ b/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:
diff --git a/account_invoice_commission/models/account_move_line.py b/account_invoice_commission/models/account_move_line.py
index b783ce23..84ece046 100644
--- a/account_invoice_commission/models/account_move_line.py
+++ b/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
diff --git a/account_invoice_commission/views/account_commission_rule_view.xml b/account_invoice_commission/views/account_commission_rule_view.xml
index ab362741..64a54a3a 100644
--- a/account_invoice_commission/views/account_commission_rule_view.xml
+++ b/account_invoice_commission/views/account_commission_rule_view.xml
@@ -12,7 +12,6 @@
-
diff --git a/account_invoice_commission/views/account_move_view.xml b/account_invoice_commission/views/account_move_view.xml
index 6b4b62b4..5bd8a1a5 100644
--- a/account_invoice_commission/views/account_move_view.xml
+++ b/account_invoice_commission/views/account_move_view.xml
@@ -6,10 +6,10 @@
account.move
-
+
-
+