diff --git a/addons/purchase/invoice_view.xml b/addons/purchase/invoice_view.xml index 5fb49afb35a6f02547516332008824d781e6575d..6bd8ae91225eab072de7fe5ddcbc60d4bf985136 100644 --- a/addons/purchase/invoice_view.xml +++ b/addons/purchase/invoice_view.xml @@ -58,7 +58,7 @@ <field name="inherit_id" ref="account.invoice_supplier_form"/> <field name="arch" type="xml"> <field name="reference" position="after" > - <field name="purchase_id" attrs="{'invisible': [('state', '<>', 'draft')]}" class="oe_edit_only" + <field name="purchase_id" attrs="{'invisible': [('state', '=', 'purchase')]}" class="oe_edit_only" options="{'no_create': True}"/> </field> <xpath expr="//field[@name='invoice_line_ids']/tree/field[@name='company_id']" position="after"> diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index d6159da512de081d865af798e1ba3100c66c9dd8..1f4654bf4db697637ba6ee52c98a949d8c69bac8 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -9,6 +9,7 @@ from openerp.tools.translate import _ from openerp.tools.float_utils import float_is_zero, float_compare import openerp.addons.decimal_precision as dp from openerp.exceptions import UserError, AccessError +from openerp.tools.misc import formatLang from openerp.addons.base.res.res_partner import WARNING_MESSAGE, WARNING_HELP class PurchaseOrder(models.Model): @@ -178,6 +179,8 @@ class PurchaseOrder(models.Model): name = po.name if po.partner_ref: name += ' ('+po.partner_ref+')' + if po.amount_total: + name += ': ' + formatLang(self.env, po.amount_total, currency_obj=po.currency_id) result.append((po.id, name)) return result