Reviewers: ,
Please review this at http://codereview.tryton.org/57001/
Affected files:
M invoice.py
Index: invoice.py
===================================================================
--- a/invoice.py
+++ b/invoice.py
@@ -72,7 +72,10 @@
party_lang = fields.Function(fields.Char('Party Language',
on_change_with=['party']), 'get_party_language')
invoice_address = fields.Many2One('party.address', 'Invoice Address',
- required=True, states=_STATES, domain=[('party', '=',
Eval('party'))])
+ required=True, states=_STATES, domain=[
+ ('party', '=', Eval('party')),
+ ('invoice', '=', True),
+ ])
currency = fields.Many2One('currency.currency', 'Currency',
required=True,
states={
'readonly': Or(Not(Equal(Eval('state'), 'draft')),
@@ -233,8 +236,12 @@
}
if vals.get('party'):
party = party_obj.browse(vals['party'])
- res['invoice_address'] = party_obj.address_get(party.id,
- type='invoice')
+ party_addresses = address_obj.search([
+ ('party', '=', party.id),
+ ('invoice', '=', True),
+ ])
+ if len(party_addresses) == 1:
+ res['invoice_address'] = party_addresses[0]
if vals.get('type') in ('out_invoice', 'out_credit_note'):
res['account'] = party.account_receivable.id
if vals['type'] == 'out_invoice' and party.payment_term:
--
[email protected] mailing list
