pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REM] dynamic domain from hr_timesheet

Browse Source 
closes odoo/odoo#40952

Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
This commit is contained in:
Xavier Morel
2019-11-29 09:10:07 +00:00
parent 3895ecfb3a
commit 2c123005a7
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_expense/wizard/hr_expense_sheet_register_payment.py
+6 -6
View File
@@ -32,7 +32,11 @@ class HrExpenseSheetRegisterPaymentWizard(models.TransientModel):
partner_bank_account_id = fields.Many2one('res.partner.bank', string="Recipient Bank Account", domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]")
journal_id = fields.Many2one('account.journal', string='Payment Method', required=True, domain="[('type', 'in', ('bank', 'cash')), ('company_id', '=', company_id)]")
company_id = fields.Many2one('res.company', related='expense_sheet_id.company_id', string='Company', readonly=True)
payment_method_id = fields.Many2one('account.payment.method', string='Payment Type', required=True)
payment_method_id = fields.Many2one('account.payment.method', string='Payment Type', required=True, domain="""[
('payment_type', '=', 'outbound'),
('id', 'in', available_payment_methods),
]""")
available_payment_methods = fields.Many2many(related='journal_id.outbound_payment_method_ids')
amount = fields.Monetary(string='Payment Amount', required=True)
currency_id = fields.Many2one('res.currency', string='Currency', required=True, default=lambda self: self.env.company.currency_id)
payment_date = fields.Date(string='Payment Date', default=fields.Date.context_today, required=True)
@@ -80,11 +84,7 @@ class HrExpenseSheetRegisterPaymentWizard(models.TransientModel):
def _onchange_journal(self):
if self.journal_id:
# Set default payment method (we consider the first to be the default one)
payment_methods = self.journal_id.outbound_payment_method_ids
self.payment_method_id = payment_methods and payment_methods[0] or False
# Set payment method domain (restrict to methods enabled for the journal and to selected payment type)
return {'domain': {'payment_method_id': [('payment_type', '=', 'outbound'), ('id', 'in', payment_methods.ids)]}}
return {}
self.payment_method_id = self.journal_id.outbound_payment_method_ids[:1]
def _get_payment_vals(self):
""" Hook for extension """
addons/hr_expense/wizard/hr_expense_sheet_register_payment.xml
+1
View File
@@ -16,6 +16,7 @@
<field name="partner_id" required="1" context="{'default_is_company': True}"/>
<field name="journal_id" widget="selection"/>
<field name="hide_payment_method" invisible="1"/>
<field name="available_payment_methods" invisible="1"/>
<field name="payment_method_id" widget="radio" attrs="{'invisible': [('hide_payment_method', '=', True)]}"/>
<field name="show_partner_bank_account" invisible="1"/>
<field name="require_partner_bank_account" invisible="1"/>