diff --git a/addons/account/account.py b/addons/account/account.py index 75bfc891980..26af7a5f9bd 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2905,7 +2905,7 @@ class account_fiscal_position_template(osv.osv): obj_fiscal_position = self.pool.get('account.fiscal.position') fp_ids = self.search(cr, uid, [('chart_template_id', '=', chart_temp_id)]) for position in self.browse(cr, uid, fp_ids, context=context): - new_fp = obj_fiscal_position.create(cr, uid, {'company_id': company_id, 'name': position.name}) + new_fp = obj_fiscal_position.create(cr, uid, {'company_id': company_id, 'name': position.name, 'note': position.note}) for tax in position.tax_ids: obj_tax_fp.create(cr, uid, { 'tax_src_id': tax_template_ref[tax.tax_src_id.id], diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index a163d4a645a..6dc7afeb477 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -201,11 +201,11 @@ class account_invoice(osv.osv): 'state': fields.selection([ ('draft','Draft'), + ('cancel','Cancelled'), ('proforma','Pro-forma'), ('proforma2','Pro-forma'), ('open','Open'), - ('paid','Paid'), - ('cancel','Cancelled') + ('paid','Paid') ],'State', select=True, readonly=True, help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Invoice. \ \n* The \'Pro-forma\' when invoice is in Pro-forma state,invoice does not have an invoice number. \ diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 7ff4e816af3..2fca5cf68ee 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -144,8 +144,20 @@ form 2 -
- + +
+