From a3a4cd79fe3a85b50f58c272055e23abebe433aa Mon Sep 17 00:00:00 2001 From: "Purnendu Singh (OpenERP)" Date: Tue, 3 Apr 2012 12:03:12 +0530 Subject: [PATCH 01/56] [IMP] account_voucher: Get the changes from QDP branch to fix this bug bzr revid: psi@tinyerp.com-20120403063312-i0lws3ibxsxtfleb --- addons/account_voucher/account_voucher.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 54226166508..913968010a0 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -227,17 +227,18 @@ class account_voucher(osv.osv): def _paid_amount_in_company_currency(self, cr, uid, ids, name, args, context=None): if not ids: return {} res = {} - voucher_rate = company_currency_rate = 1.0 + rate = 1.0 for voucher in self.browse(cr, uid, ids, context=context): if voucher.currency_id: - ctx = context.copy() - ctx.update({'date': voucher.date}) - voucher_rate = self.browse(cr, uid, voucher.id, context=ctx).currency_id.rate if voucher.company_id.currency_id.id == voucher.payment_rate_currency_id.id: - company_currency_rate = voucher.payment_rate + rate = 1 / voucher.payment_rate else: + ctx = context.copy() + ctx.update({'date': voucher.date}) + voucher_rate = self.browse(cr, uid, voucher.id, context=ctx).currency_id.rate company_currency_rate = voucher.company_id.currency_id.rate - res[voucher.id] = voucher.amount / voucher_rate * company_currency_rate + rate = voucher_rate * company_currency_rate + res[voucher.id] = voucher.amount / rate return res _name = 'account.voucher' @@ -993,9 +994,7 @@ class account_voucher(osv.osv): res = amount if voucher.payment_rate_currency_id.id == voucher.company_id.currency_id.id: # the rate specified on the voucher is for the company currency - rate_between_voucher_and_base = voucher.currency_id.rate or 1.0 - rate_between_base_and_company = voucher.payment_rate or 1.0 - res = currency_obj.round(cr, uid, voucher.company_id.currency_id, (amount / rate_between_voucher_and_base * rate_between_base_and_company)) + res = currency_obj.round(cr, uid, voucher.company_id.currency_id, (amount * voucher.payment_rate)) else: # the rate specified on the voucher is not relevant, we use all the rates in the system res = currency_obj.compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, amount, context=context) From 9346a7e8ecc4b3a042af0dcd597945c987bbc92f Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 4 Apr 2012 16:52:15 +0530 Subject: [PATCH 02/56] [IMP]stock: added a yml case for the multi-currency (lp-954155) bzr revid: mma@tinyerp.com-20120404112215-i2oh9zme32u7vv4z --- addons/account_voucher/__openerp__.py | 1 + addons/account_voucher/test/case_eur_usd.yml | 143 +++++++++++++++++++ 2 files changed, 144 insertions(+) create mode 100644 addons/account_voucher/test/case_eur_usd.yml diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index 8808c451878..1c4005b7be0 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -66,6 +66,7 @@ Account Voucher module includes all the basic requirements of Voucher Entries fo "test/case2_usd_eur_debtor_in_usd.yml", "test/case3_eur_eur.yml", "test/case4_cad_chf.yml", + "test/case_eur_usd.yml", ], 'certificate': '0037580727101', "auto_install": False, diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml new file mode 100644 index 00000000000..ba0ce03872e --- /dev/null +++ b/addons/account_voucher/test/case_eur_usd.yml @@ -0,0 +1,143 @@ +- + In order to check the payment with multi-currency in OpenERP, + I create Invoices in EUR and make Payment in USD based on the currency rating. +- + I create currency rate for USD +- + !record {model: res.currency.rate, id: usd_rate}: + currency_id: base.USD + name: !eval "'%s-05-01' %(datetime.now().year)" + rate: 1.400000 +- + I create a asset account with currency USD +- + !record {model: account.account, id: account_eur_usd_id}: + currency_id: base.USD + name: "Bank usd" + code: "BUSD" + type: 'liquidity' + user_type: account.data_account_type_asset +- + I create a bank journal with USD as currency +- + !record {model: account.journal, id: bank_journal_USD1}: + name: Bank Journal Test(USD) + code: BEUSD + type: bank + analytic_journal_id: account.sit + sequence_id: account.sequence_bank_journal + default_debit_account_id: account_eur_usd_id + default_credit_account_id: account_eur_usd_id + currency: base.USD + company_id: base.main_company + view_id: account.account_journal_bank_view +- + I create a invoice +- + !record {model: account.invoice, id: account_invoice_eur_usd}: + account_id: account.a_recv + company_id: base.main_company + currency_id: base.EUR + date_invoice: !eval "'%s-01-01' %(datetime.now().year)" + period_id: account.period_1 + invoice_line: + - account_id: account.a_sale + name: '[PC1] Basic PC' + price_unit: 1000.0 + quantity: 1.0 + product_id: product.product_product_pc1 + uos_id: product.product_uom_unit + journal_id: account.sales_journal + partner_id: base.res_partner_seagate +- + I perform action to validate this invoice +- + !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_eur_usd} +- + I check invoice move is correct +- + !python {model: account.invoice}: | + invoice = self.browse(cr, uid, ref("account_invoice_eur_usd")) + assert invoice.state == 'open', "invoice state is not open" + assert invoice.period_id, "Period is not created for open invoice" + assert invoice.move_id, "Move not created for open invoice" + assert invoice.move_id.state == 'posted', "Move state is not posted" + for move_line in invoice.move_id.line_id: + assert move_line.state == 'valid', "Move line state is not valid" +- + I set the context that will be used for the encoding of all the vouchers of this file +- + !context + 'type': 'receipt' +- + I create voucher for payment +- + !record {model: account.voucher, id: account_voucher_eur_usd_case, view: view_vendor_receipt_form}: + account_id: account.cash + amount: 1350.0 + company_id: base.main_company + journal_id: bank_journal_USD1 + name: 'payment: Case EUR/USD' + partner_id: base.res_partner_seagate + period_id: account.period_5 + date: !eval time.strftime("%Y-05-01") + payment_option: 'with_writeoff' + writeoff_acc_id: account.a_expense + comment: 'Write Off' +- + I fill the full amount to the voucher +- + !python {model: account.voucher}: | + data = [] + voucher = self.browse(cr, uid, ref('account_voucher_eur_usd_case')) + for item in voucher.line_cr_ids: + if item.amount_unreconciled == item.amount_original: + data += [(item.id, item.amount_original)] + for line_id, amount in data: + self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount}) + assert (voucher.state=='draft'), "Voucher is not in draft state" +- + I check that writeoff amount computed is 50.0 +- + !python {model: account.voucher}: | + voucher = self.browse(cr, uid, ref('account_voucher_eur_usd_case')) + assert (voucher.writeoff_amount == 50.0), "Writeoff amount is not 50.0" +- + I confirm the voucher +- + !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_eur_usd_case} +- + I check that the voucher state is "Posted" +- + !assert {model: account.voucher, id: account_voucher_eur_usd_case}: + - state == 'posted' +- + I check a payment is created with proper data in voucher +- + !python {model: account.voucher}: | + inv_obj = self.pool.get('account.invoice') + invoice = inv_obj.browse(cr, uid, ref('account_invoice_eur_usd')) + voucher = self.browse(cr, uid, ref('account_voucher_eur_usd_case')) + prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account') + assert voucher.move_ids, "Move line is not created for this voucher" + assert (voucher.number == voucher.move_ids[0].move_id.name), "referance number is not created" + assert voucher.period_id, "period is not created" + for move_line in voucher.move_ids: + assert move_line.state == 'valid', "Voucher move is not valid" + + rate = voucher.journal_id.currency.rate_ids[0].rate + assert (round(voucher.amount/rate, prec) == voucher.move_ids[2].debit),"debtor account is not correct" + assert (round(voucher.writeoff_amount/rate, prec) == voucher.move_ids[0].debit),"write off bank account is not correct" + assert (invoice.amount_total == voucher.move_ids[1].credit), " total reconcile is not correct of invoice" +- + I check that the payment amount is created with proper data in customer invoice +- + !python {model: account.invoice}: | + invoice = self.browse(cr, uid, ref("account_invoice_eur_usd")) + assert invoice.state == 'paid', "invoice is not paid" + payment_line = invoice.payment_ids[0] + assert payment_line, "payment line not created for paid invoice" + assert payment_line.state == 'valid', "payment move line state is not valid" + assert payment_line.debit == 0.0 and payment_line.credit == invoice.amount_total, "proper amount is not debit to payment account " + assert payment_line.reconcile_id, "reconcile is not created for paid invoice" + From 5d04ea99528328d3d5cfaabc59c02078f52f35c9 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 11 Apr 2012 12:09:15 +0530 Subject: [PATCH 03/56] [IMP]account_voucher: Improve comments of yml bzr revid: mma@tinyerp.com-20120411063915-3dl2tq60pfd3vwvo --- addons/account_voucher/test/case_eur_usd.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml index 9cef9366e9a..3c4f2dfc1f5 100644 --- a/addons/account_voucher/test/case_eur_usd.yml +++ b/addons/account_voucher/test/case_eur_usd.yml @@ -2,7 +2,7 @@ - In order to check the payment with multi-currency in OpenERP, - I create a Invoice in EUR and make Payment in USD based on the currency rating. + I create an invoice in EUR and make payment in USD based on the currency rating. - I create currency USD in OpenERP for May of 1.400000 Rate - @@ -11,7 +11,7 @@ name: !eval "'%s-05-01' %(datetime.now().year)" rate: 1.400000 - - I create a asset account with currency USD + I create a bank account with USD as currency - !record {model: account.account, id: account_eur_usd_id}: currency_id: base.USD @@ -34,7 +34,7 @@ company_id: base.main_company view_id: account.account_journal_bank_view - - I create a invoice + I create an invoice - !record {model: account.invoice, id: account_invoice_eur_usd}: account_id: account.a_recv @@ -52,11 +52,11 @@ journal_id: account.sales_journal partner_id: base.res_partner_seagate - - I perform action to validate this invoice + I Validate invoice by clicking on Validate button - !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_eur_usd} - - I check invoice move is correct + I check that invoice move is correct - !python {model: account.invoice}: | invoice = self.browse(cr, uid, ref("account_invoice_eur_usd")) @@ -67,7 +67,7 @@ for move_line in invoice.move_id.line_id: assert move_line.state == 'valid', "Move line state is not valid" - - I set the context that will be used for the encoding of all the vouchers of this file + I set the type receipt for this voucher - !context 'type': 'receipt' From e5d63af289b89f1d7e7b02d0a94323266eb34df4 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 11 Apr 2012 18:56:54 +0530 Subject: [PATCH 04/56] [IMP]account_voucher: Improve test case and added comments bzr revid: mma@tinyerp.com-20120411132654-ehsjy9fdh3fxpemw --- addons/account_voucher/test/case_eur_usd.yml | 48 ++++++++++++++------ 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml index 3c4f2dfc1f5..4b1572fe48b 100644 --- a/addons/account_voucher/test/case_eur_usd.yml +++ b/addons/account_voucher/test/case_eur_usd.yml @@ -114,32 +114,50 @@ !assert {model: account.voucher, id: account_voucher_eur_usd_case}: - state == 'posted' - - I check a payment is created with proper data in voucher + I check that the move of voucher is valid - !python {model: account.voucher}: | - inv_obj = self.pool.get('account.invoice') - invoice = inv_obj.browse(cr, uid, ref('account_invoice_eur_usd')) voucher = self.browse(cr, uid, ref('account_voucher_eur_usd_case')) - prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account') assert voucher.move_ids, "Move line is not created for this voucher" assert (voucher.number == voucher.move_ids[0].move_id.name), "referance number is not created" assert voucher.period_id, "period is not created" for move_line in voucher.move_ids: assert move_line.state == 'valid', "Voucher move is not valid" - rate = voucher.journal_id.currency.rate_ids[0].rate - assert (round(voucher.amount/rate, prec) == voucher.move_ids[2].debit),"debtor account is not correct" - assert (round(voucher.writeoff_amount/rate, prec) == voucher.move_ids[0].debit),"write off bank account is not correct" - assert (invoice.amount_total == voucher.move_ids[1].credit), " total reconcile is not correct of invoice" - - I check that the payment amount is created with proper data in customer invoice + I check that my debtor account is correct +- + I check that my currency rate difference is correct. 1000 in credit with no amount_currency +- + I check that the total reconcilation created entries as expected +- + I check that my writeoff is correct. 35.71 debit and 50 amount_currency +- + I check that my bank account is correct. 964.29 debit and 1350 amount_currency +- + !python {model: account.voucher}: | + voucher = self.browse(cr, uid, ref('account_voucher_eur_usd_case')) + for move_line in voucher.move_ids: + if move_line.amount_currency == 1350: + assert move_line.debit == 964.29,"debtor account is not correct" + if move_line.amount_currency == 50: + assert move_line.debit == 35.71,"write off bank account is not correct" + if move_line.amount_currency == 0.0: + assert move_line.credit == 1000,"total reconcile is not correct of invoice" +- + I check that the move of payment in invoice is valid - !python {model: account.invoice}: | invoice = self.browse(cr, uid, ref("account_invoice_eur_usd")) - assert invoice.state == 'paid', "invoice is not paid" - payment_line = invoice.payment_ids[0] - assert payment_line, "payment line not created for paid invoice" - assert payment_line.state == 'valid', "payment move line state is not valid" - assert payment_line.debit == 0.0 and payment_line.credit == invoice.amount_total, "proper amount is not debit to payment account " - assert payment_line.reconcile_id, "reconcile is not created for paid invoice" + for payment_line in invoice.payment_ids: + assert payment_line.state == 'valid', "payment move line state is not valid" +- + I check the residual amount of Invoice, should be 0 in residual currency and 0 in amount_residual and paid +- + !python {model: account.invoice}: | + invoice_id = self.browse(cr, uid, ref("account_invoice_eur_usd")) + move_line_obj = self.pool.get('account.move.line') + move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)]) + move_line = move_line_obj.browse(cr, uid, move_lines[0]) + assert (move_line.amount_residual_currency == 0.0 and move_line.amount_residual == 0.0 and invoice_id.state == 'paid') , "Residual amount is not correct for Invoice" From 8037ab4c93dcfbadc9b5dfc8a6f381a3019df410 Mon Sep 17 00:00:00 2001 From: "Purnendu Singh (OpenERP)" Date: Mon, 16 Apr 2012 12:48:46 +0530 Subject: [PATCH 05/56] [IMP] improve the sentence bzr revid: psi@tinyerp.com-20120416071846-aney78g3ucw390nw --- addons/account_voucher/test/case_eur_usd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml index 6acced54b29..108cbaeb61e 100644 --- a/addons/account_voucher/test/case_eur_usd.yml +++ b/addons/account_voucher/test/case_eur_usd.yml @@ -60,7 +60,7 @@ journal_id: account.sales_journal partner_id: base.res_partner_seagate - - I validate invoice by clicking on "Validate" button + I validate the invoice. - !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_eur_usd} - From 74b003f101ee9c36e02fd905fd4e1d9e4803888a Mon Sep 17 00:00:00 2001 From: "Purnendu Singh (OpenERP)" Date: Mon, 16 Apr 2012 15:41:28 +0530 Subject: [PATCH 06/56] [IMP] improve the sentance bzr revid: psi@tinyerp.com-20120416101128-0xg907q5yq3i1wlj --- addons/account_voucher/test/case_eur_usd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml index 108cbaeb61e..72f0d22aead 100644 --- a/addons/account_voucher/test/case_eur_usd.yml +++ b/addons/account_voucher/test/case_eur_usd.yml @@ -3,7 +3,7 @@ In order to check the payment with multi-currency in OpenERP, I create an invoice in EUR and make payment in USD based on the currency rating. - - I create currency USD in OpenERP for January of 1.200000 rate + I update the Currency USD in OpenERP for January with rate 1.200000 - !python {model: res.currency.rate}: | from datetime import datetime @@ -12,7 +12,7 @@ ids = self.search(cr, uid, [('currency_id','=',curr_id), ('name', '=', date)]) self.write(cr, uid, ids, {'rate': 1.200000}) - - I create currency USD in OpenERP for February of 1.400000 rate + I update the Currency USD in OpenERP for February with rate 1.400000 - !record {model: res.currency.rate, id: feb_usd}: currency_id: base.USD From 912c7b1c47b606e7074676f45d16b1c4f2327d5b Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 20 Apr 2012 11:20:07 +0200 Subject: [PATCH 07/56] [fix] some problems with the reference field bzr revid: nicolas.vanhoren@openerp.com-20120420092007-mu3fk95ft21ztm78 --- addons/web/static/src/js/view_form.js | 44 ++++++++++++++------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c457554e44b..0e1777894f0 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3471,23 +3471,6 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte template: 'FieldReference', init: function(field_manager, node) { this._super(field_manager, node); - this.fields_view = { - fields: { - selection: { - selection: this.view.fields_view.fields[this.name].selection - }, - m2o: { - relation: null - } - } - }; - this.get_fields_values = this.view.get_fields_values; - this.get_selected_ids = this.view.get_selected_ids; - this.do_onchange = this.on_form_changed = this.do_notify_change = this.on_nop; - this.dataset = this.view.dataset; - this.view_id = 'reference_' + _.uniqueId(); - this.fields = {}; - this.fields_order = []; this.reference_ready = true; }, on_nop: function() { @@ -3512,9 +3495,9 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte }, initialize_content: function() { this.selection = new instance.web.form.FieldSelection(this, { attrs: { - name: 'selection', - widget: 'selection' + name: 'selection' }}); + this.selection.view = this.view; this.selection.set({readonly: this.get('effective_readonly')}); this.selection.on("change:value", this, this.on_selection_changed); this.selection.$element = $(".oe_form_view_reference_selection", this.$element); @@ -3522,9 +3505,9 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte this.selection.start(); this.m2o = new instance.web.form.FieldMany2One(this, { attrs: { - name: 'm2o', - widget: 'many2one' + name: 'm2o' }}); + this.m2o.view = this.view; this.m2o.set({"readonly": this.get("effective_readonly")}); this.m2o.on("change:value", this, this.data_changed); this.m2o.$element = $(".oe_form_view_reference_m2o", this.$element); @@ -3538,6 +3521,11 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte this._super(value_); this.render_value(); }, + get_value: function() { + var tmp = this._super(); + debugger; + return tmp; + }, render_value: function() { this.reference_ready = false; var vals = [], sel_val, m2o_val; @@ -3563,6 +3551,20 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte this.set({'value': false}); } }, + get_field: function(name) { + if (name === "selection") { + return { + selection: this.view.fields_view.fields[this.name].selection, + type: "selection", + }; + } else if (name === "m2o") { + return { + relation: null, + type: "many2one", + }; + } + throw Exception("Should not happen"); + }, })); instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, { From b8deee7a566d63d760d58b91fd73ceb7d96fc9d7 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 20 Apr 2012 11:40:34 +0200 Subject: [PATCH 08/56] [fix] some other bug in references in read only mode bzr revid: nicolas.vanhoren@openerp.com-20120420094034-izgqix5kxh54sm45 --- addons/web/static/src/js/view_form.js | 12 +++--------- addons/web/static/src/xml/base.xml | 21 ++++++++------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 0e1777894f0..fbbd5149470 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3498,7 +3498,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte name: 'selection' }}); this.selection.view = this.view; - this.selection.set({readonly: this.get('effective_readonly')}); + this.selection.set({force_readonly: this.get('effective_readonly')}); this.selection.on("change:value", this, this.on_selection_changed); this.selection.$element = $(".oe_form_view_reference_selection", this.$element); this.selection.renderElement(); @@ -3508,7 +3508,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte name: 'm2o' }}); this.m2o.view = this.view; - this.m2o.set({"readonly": this.get("effective_readonly")}); + this.m2o.set({force_readonly: this.get("effective_readonly")}); this.m2o.on("change:value", this, this.data_changed); this.m2o.$element = $(".oe_form_view_reference_m2o", this.$element); this.m2o.renderElement(); @@ -3521,11 +3521,6 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte this._super(value_); this.render_value(); }, - get_value: function() { - var tmp = this._super(); - debugger; - return tmp; - }, render_value: function() { this.reference_ready = false; var vals = [], sel_val, m2o_val; @@ -3533,13 +3528,12 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte vals = this.get('value').split(','); } sel_val = vals[0] || false; - m2o_val = vals[1] ? parseInt(vals[1], 10) : false; + m2o_val = vals[1] ? parseInt(vals[1], 10) : vals[1]; if (!this.get("effective_readonly")) { this.selection.set_value(sel_val); } this.m2o.field.relation = sel_val; this.m2o.set_value(m2o_val); - this.m2o.$element.toggle(sel_val !== false); this.reference_ready = true; }, data_changed: function() { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 322d06fd6ae..57970c1486e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1040,19 +1040,14 @@ - - - - - - -
- -
- - - - + + + + + +
+ +
From 6463e5d9af213f6823a9db204197abb602865d59 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 20 Apr 2012 15:31:36 +0200 Subject: [PATCH 09/56] [FIX] sale: put back the Advance payment button that was removed by mistake in a previous revision bzr revid: qdp-launchpad@openerp.com-20120420133136-tgurqmazncm1iwfv --- addons/sale/sale_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 6bdbc9ac135..3d597b80dea 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -112,6 +112,7 @@