Add issue6845-issue5613 (commission)

This commit is contained in:
Raimon Esteve 2017-12-04 12:50:17 +01:00
parent d2ff725732
commit d7fb9eafe4
2 changed files with 32 additions and 0 deletions

31
issue6845-issue5613.diff Normal file
View File

@ -0,0 +1,31 @@
diff -r 9770ab917e02 trytond/trytond/modules/commission/invoice.py
--- a/trytond/trytond/modules/commission/invoice.py Mon Dec 04 12:05:39 2017 +0100
+++ b/trytond/trytond/modules/commission/invoice.py Mon Dec 04 12:13:31 2017 +0100
@@ -17,6 +17,7 @@
__name__ = 'account.invoice'
agent = fields.Many2One('commission.agent', 'Commission Agent',
domain=[
+ ('type_', '=', 'agent'),
('company', '=', Eval('company', -1)),
],
states={
@@ -156,8 +157,6 @@
with Transaction().set_context(date=self.invoice.currency_date):
amount = Currency.compute(self.invoice.currency,
self.amount, agent.currency, round=False)
- if self.invoice.type == 'out_credit_note':
- amount *= -1
amount = self._get_commission_amount(amount, plan)
if amount:
digits = Commission.amount.digits
diff -r 9770ab917e02 trytond/trytond/modules/commission/sale.py
--- a/trytond/trytond/modules/commission/sale.py Mon Dec 04 12:05:39 2017 +0100
+++ b/trytond/trytond/modules/commission/sale.py Mon Dec 04 12:13:31 2017 +0100
@@ -15,6 +15,7 @@
__name__ = 'sale.sale'
agent = fields.Many2One('commission.agent', 'Commission Agent',
domain=[
+ ('type_', '=', 'agent'),
('company', '=', Eval('company', -1)),
],
states={

1
series
View File

@ -67,3 +67,4 @@ support_dict_one2many_functional_fields.diff
issue6836.diff # [sale] [sale_price_list] [purchase] - Recompute unit price when change taxes and price list is tax included
issue6896.diff # [sale_credit_limit] - Use quantity sold and invoiced to compute credit amount
issue6931.diff # [stock] - Complete Inventory discards inactive products on update
issue6845-issue5613.diff # [commission] Missing agent type domain on sale and invoice + Remove old usage of out_credit_note