Add issue8751.diff [commission] Not create agent without plan

This commit is contained in:
Raimon Esteve 2019-10-24 15:41:38 +02:00
parent 0f89795c63
commit 95a2eb85ca
2 changed files with 35 additions and 0 deletions

33
issue8751.diff Normal file
View File

@ -0,0 +1,33 @@
diff -r e4d3be431517 trytond/trytond/modules/commission/commission.py
--- a/trytond/trytond/modules/commission/commission.py Mon May 06 15:01:46 2019 +0200
+++ b/trytond/trytond/modules/commission/commission.py Thu Oct 24 15:38:16 2019 +0200
@@ -37,13 +37,8 @@
('principal', 'Principal Of'),
], 'Type')
company = fields.Many2One('company.company', 'Company', required=True)
- plan = fields.Many2One('commission.plan', 'Plan')
- currency = fields.Many2One('currency.currency', 'Currency',
- states={
- 'required': Bool(Eval('plan')),
- 'invisible': ~Eval('plan'),
- },
- depends=['plan'])
+ plan = fields.Many2One('commission.plan', 'Plan', required=True)
+ currency = fields.Many2One('currency.currency', 'Currency', required=True)
pending_amount = fields.Function(fields.Numeric('Pending Amount',
digits=price_digits), 'get_pending_amount')
@@ -55,6 +50,13 @@
def default_type_():
return 'agent'
+ @staticmethod
+ def default_currency():
+ Company = Pool().get('company.company')
+ company = Transaction().context.get('company')
+ if company:
+ return Company(company).currency.id
+
@fields.depends('company', 'currency')
def on_change_company(self):
if self.company and not self.currency:

2
series
View File

@ -23,6 +23,8 @@ issue8252.diff # [account_tax_rule_country] Add subdivisiions to match account t
issue4030.diff # [analytic_account] Not selected root accounts in analytic account lines
analitic_line_company_rules.diff # [analytic_account] Not selected root accounts in analytic account lines
issue8751.diff # [commission] Not create agent without plan
sale_list_price.diff # [sale] Can't convert to currency with list price is null (multicompany)
sale_supply_supply_on_sale_multivalue.diff # [sale_supply] supply_on_sale field multvalue #035100
sale_remove_multiselection.diff # [sale] remove multiselection handling exceptions