From 1a04f8f0d4c6e9b56e0721214a1d991c49da6e3d Mon Sep 17 00:00:00 2001 From: "Anup (OpenERP)" Date: Thu, 23 Sep 2010 17:07:39 +0530 Subject: [PATCH 1/4] [FIX] stock,mrp : Demo data corrected bzr revid: ach@tinyerp.com-20100923113739-uzo38vqvv8dbl8g8 --- addons/mrp/mrp_demo.xml | 7 ++++++- addons/stock/stock_demo.xml | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml index f454a8d14a8..e303ceb3378 100644 --- a/addons/mrp/mrp_demo.xml +++ b/addons/mrp/mrp_demo.xml @@ -14,7 +14,12 @@ Repairs workshop - + + + + diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml index 03a29838981..91acb5c6406 100644 --- a/addons/stock/stock_demo.xml +++ b/addons/stock/stock_demo.xml @@ -217,7 +217,6 @@ - From d942be95d4c66714e4a26ac965c4e95257f74865 Mon Sep 17 00:00:00 2001 From: "Anup (OpenERP)" Date: Thu, 23 Sep 2010 17:59:34 +0530 Subject: [PATCH 2/4] [FIx] purchase : Demo data Corrected bzr revid: ach@tinyerp.com-20100923122934-h9gzm5p2zk64lu62 --- addons/purchase/purchase_demo.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml index f6c2931a626..ebd0b0becaf 100644 --- a/addons/purchase/purchase_demo.xml +++ b/addons/purchase/purchase_demo.xml @@ -41,9 +41,6 @@ 450 2 - 3 - 3 - make_to_stock @@ -54,7 +51,6 @@ 900 1 - make_to_stock From cc84c31d1bedf3b4a18827fd4b3f2fd0799b86a3 Mon Sep 17 00:00:00 2001 From: "Anup (OpenERP)" Date: Thu, 23 Sep 2010 18:01:07 +0530 Subject: [PATCH 3/4] [FIX] account : YML test of currency Corrected bzr revid: ach@tinyerp.com-20100923123107-cln1mtwionpkj56j --- .../account/test/account_change_currency.yml | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/addons/account/test/account_change_currency.yml b/addons/account/test/account_change_currency.yml index d68b5fb90b5..4fe89534ce5 100644 --- a/addons/account/test/account_change_currency.yml +++ b/addons/account/test/account_change_currency.yml @@ -23,15 +23,6 @@ - !assert {model: account.invoice, id: account_invoice_currency, string: Customer Invoice is in Draft state}: - state == 'draft' -- - I change the state of invoice to proforma2 by clicking PRO-FORMA button -- - !workflow {model: account.invoice, action: invoice_proforma2, ref: account_invoice_currency} -- - I check that now customer invoice is in the "proforma2" state -- - !assert {model: account.invoice, id: account_invoice_currency}: - - state == 'proforma2' - Now I select USD as new currency - @@ -41,17 +32,23 @@ I clicked on Change Currency button to change the currency - !python {model: account.change.currency}: | - try: - self.view_init(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US', - "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids": - [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"), - }) - self.change_currency(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US', - "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids": - [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"), - }) - except: - print "Error: You can change currency only for Draft Invoice !" + self.view_init(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US', + "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids": + [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"), + }) + self.change_currency(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US', + "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids": + [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"), + }) +- + I change the state of invoice to proforma2 by clicking PRO-FORMA button +- + !workflow {model: account.invoice, action: invoice_proforma2, ref: account_invoice_currency} +- + I check that now customer invoice is in the "proforma2" state +- + !assert {model: account.invoice, id: account_invoice_currency}: + - state == 'proforma2' - I can't change the currency of invoice when it is not in draft state so i change the state to cancel - From c3de35eb8d35cc681fb83c55bec73cb4012c17e7 Mon Sep 17 00:00:00 2001 From: "Anup (OpenERP)" Date: Thu, 23 Sep 2010 18:42:04 +0530 Subject: [PATCH 4/4] [FIX] account_reporting : Balance Sheet Report RML Corrected bzr revid: ach@tinyerp.com-20100923131204-qjijtuuotbpb4f3j --- addons/account_reporting/report/account_report_bs.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_reporting/report/account_report_bs.rml b/addons/account_reporting/report/account_report_bs.rml index b33ebb4bcc8..c0fa4f1e2d2 100644 --- a/addons/account_reporting/report/account_report_bs.rml +++ b/addons/account_reporting/report/account_report_bs.rml @@ -155,7 +155,7 @@ [[ company.currency_id.name ]] - [[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[o.name]] + [[ setTag('font','font',{'face':o.font_style or "Helvetica",'color':o.color_font.name or "black",'backColor':o.color_back.name or "white"}) ]] [[o.name]]