From e79a418f9329015d9e0d8886edae47b2b2e7e1b7 Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Mon, 13 Aug 2012 16:22:37 +0530 Subject: [PATCH 01/31] [IMP,ADD]: crm: Improved and added mail messages for leads/opportunities bzr revid: rpa@tinyerp.com-20120813105237-14cnt886cgyqlncv --- addons/crm/crm_lead_demo.xml | 120 ++++++++++++++++++++++------------- 1 file changed, 76 insertions(+), 44 deletions(-) diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml index ea26a24cad8..a274dadfe01 100644 --- a/addons/crm/crm_lead_demo.xml +++ b/addons/crm/crm_lead_demo.xml @@ -49,7 +49,6 @@ Can you send details, - Want to know features and benifits to use the new software. @@ -550,53 +549,86 @@ Andrew - Kitchen design + Plan to buy a Laptop crm.lead - html - - email - sent - - - - Reply - crm.lead - - html - - comment - - - - Reply - crm.lead - - html - - - comment - - - - Reply - crm.lead - - html - - - comment - - - - Your inquiry - crm.lead - - html - + html + <![CDATA[Email0 inquiry]]><div><font size="2">Hello,</font></div><div><font size="2"><br></font></div><div><font size="2">I am interested in your company's product and I plan to buy a new laptop having latest technologies and affordable price.</font></div><div><font size="2">Can you please send me product catalogue?</font></div> email received - + + + + Re: Plan to buy a Laptop + crm.lead + + + plain + Dear Customer, +Thanks for showing interest in our products. +We have attached the catalogue, +We would like to know your interests, Let us know if we can call you for more details. + +Thanks + email + + sent + + + Re: Plan to buy a Laptop + crm.lead + + html + <div>Thanks for the information,</div><div>I will visit the store soon.</div> + + email + + received + + + Re: Plan to buy a Laptop + crm.lead + + html + <font color="#1f1f1f">Can you tell me if the store is open at 9:00 PM?</b></font> + + email + received + + + + Re: Plan to buy a Laptop + crm.lead + + plain + Yes, its open till 10:00 PM, you are welcome! + email + sent + + + + + Inquiry + crm.lead + + plain + Hello, +I am Jason from Le Club SARL, +I am intertested to attend Training organized in your company, +Can you send details, + email + received + + + + + Need Details + crm.lead + + plain + Want to know features and benifits to use the new software. + comment + From ac74a882f008ea910628bdff269188b93d68bef8 Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Tue, 14 Aug 2012 12:41:59 +0530 Subject: [PATCH 02/31] [FIX]: crm(base_calendar): Added removed category as some meetings have reference of that categories bzr revid: rpa@tinyerp.com-20120814071159-lfgbno216l69ixk4 --- addons/base_calendar/crm_meeting_data.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml index 44838514935..d1cffddc403 100644 --- a/addons/base_calendar/crm_meeting_data.xml +++ b/addons/base_calendar/crm_meeting_data.xml @@ -16,6 +16,14 @@ Off-site Meeting + + Open Discussion + + + + Feedback Meeting + + Meeting crm.meeting From 94b94e6a58c2307ca97c58b479c37a7484dad1ef Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Tue, 14 Aug 2012 17:14:57 +0530 Subject: [PATCH 03/31] [ADD]: sale, project: Added internal messages for task and quotation bzr revid: rpa@tinyerp.com-20120814114457-o4e2ieemx8n0o3dw --- addons/project/project_demo.xml | 35 +++++++++++++++++++++++++++++++++ addons/sale/sale_demo.xml | 34 ++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml index 0ead9f4443c..aaad6b167a0 100644 --- a/addons/project/project_demo.xml +++ b/addons/project/project_demo.xml @@ -438,5 +438,40 @@ + + project.task + + plain + Hello Quentin, +There is a change in customer requirement. +Can you check the document from customer again. +Thanks, + comment + + + + + project.task + + + plain + Ok, I have checked the mail, +I will update the document and let you know. + comment + + + + + + project.task + + + plain + Fine! +Send it ASAP, its urgent. + comment + + + diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml index 813c7e9af03..192d73472c4 100644 --- a/addons/sale/sale_demo.xml +++ b/addons/sale/sale_demo.xml @@ -301,6 +301,40 @@ + + sale.order + + plain + Hi, +I have a confusion for pricing of Services, I have heard there is a discount above 25 hours. +Can you clarify please? + comment + + + + + sale.order + + + plain + Hello, +Sorry but that scheme is not available for now, +We would like to know if you confirm the quotation with pricing we sent to you. +Thanks, +Sales Department + comment + + + + + sale.order + + + plain + Ok, fine, we will intimate you after discussing with our team. + comment + + From 7a24bdb1f7b408bda4cb3674691e5dd53a5e8766 Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Thu, 16 Aug 2012 14:12:24 +0530 Subject: [PATCH 04/31] [FIX]: Improved old product names with new bzr revid: rpa@tinyerp.com-20120816084224-t12wf5vipd8u90a7 --- .../account/test/account_change_currency.yml | 2 +- addons/account/test/account_invoice_state.yml | 2 +- addons/account/test/account_sequence_test.yml | 2 +- .../account/test/account_supplier_invoice.yml | 2 +- addons/account/test/test_edi_invoice.yml | 14 +++++++------- .../account_voucher/test/account_voucher.yml | 2 +- .../test/account_voucher_report.yml | 2 +- addons/account_voucher/test/case1_usd_usd.yml | 4 ++-- .../test/case2_suppl_usd_eur.yml | 4 ++-- .../test/case2_usd_eur_debtor_in_eur.yml | 4 ++-- .../test/case2_usd_eur_debtor_in_usd.yml | 4 ++-- addons/account_voucher/test/case3_eur_eur.yml | 4 ++-- addons/account_voucher/test/case4_cad_chf.yml | 2 +- addons/account_voucher/test/case_eur_usd.yml | 2 +- addons/account_voucher/test/sales_payment.yml | 2 +- addons/l10n_ch/test/l10n_ch_dta.yml | 2 +- addons/l10n_ch/test/l10n_ch_v11.yml | 2 +- addons/l10n_ch/test/l10n_ch_v11_part.yml | 2 +- addons/mrp_repair/mrp_repair_demo.yml | 18 +++++++++--------- .../mrp_repair/test/test_mrp_repair_cancel.yml | 2 +- .../point_of_sale/test/01_order_to_payment.yml | 6 +++--- .../point_of_sale/test/02_order_to_invoice.yml | 2 +- addons/product_margin/test/product_margin.yml | 2 +- .../test/process/edi_purchase_order.yml | 12 ++++++------ .../purchase_requisition_demo.xml | 4 ++-- addons/sale/sale_unit_test.xml | 4 ++-- addons/sale/test/edi_sale_order.yml | 16 ++++++++-------- addons/sale_margin/test/sale_margin.yml | 2 +- 28 files changed, 63 insertions(+), 63 deletions(-) diff --git a/addons/account/test/account_change_currency.yml b/addons/account/test/account_change_currency.yml index 1f1a412c19e..5f06a20b1ab 100644 --- a/addons/account/test/account_change_currency.yml +++ b/addons/account/test/account_change_currency.yml @@ -7,7 +7,7 @@ currency_id: base.EUR invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 450.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account/test/account_invoice_state.yml b/addons/account/test/account_invoice_state.yml index 6553635a781..7b995150af0 100644 --- a/addons/account/test/account_invoice_state.yml +++ b/addons/account/test/account_invoice_state.yml @@ -7,7 +7,7 @@ currency_id: base.EUR invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 450.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account/test/account_sequence_test.yml b/addons/account/test/account_sequence_test.yml index 3bc4a778794..74dcbce56ba 100644 --- a/addons/account/test/account_sequence_test.yml +++ b/addons/account/test/account_sequence_test.yml @@ -20,7 +20,7 @@ currency_id: base.EUR invoice_line: - account_id: account.a_sale - name: '[PC3] Medium PC' + name: '[PC-DEM] PC on Demand' price_unit: 900.0 quantity: 10.0 product_id: product.product_product_5 diff --git a/addons/account/test/account_supplier_invoice.yml b/addons/account/test/account_supplier_invoice.yml index ccebd2ea90c..9c5ce2dea3e 100644 --- a/addons/account/test/account_supplier_invoice.yml +++ b/addons/account/test/account_supplier_invoice.yml @@ -28,7 +28,7 @@ currency_id: base.EUR invoice_line: - account_id: account.a_expense - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 300.0 product_id: product.product_product_3 quantity: 10.0 diff --git a/addons/account/test/test_edi_invoice.yml b/addons/account/test/test_edi_invoice.yml index 516be311cf8..80dc098e770 100644 --- a/addons/account/test/test_edi_invoice.yml +++ b/addons/account/test/test_edi_invoice.yml @@ -24,7 +24,7 @@ uos_id: 1 quantity: 5.0 price_unit: 100.0 - name: 'Medium PC' + name: 'PC on Demand' account_id: account.a_pay tax_line: - name: sale tax @@ -104,9 +104,9 @@ "__model": "account.invoice.line", "__id": "account:b22acf7a-ddcd-11e0-a4db-701a04e25543.account_invoice_line-1RP3so", "uos_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_uom_unit", "Unit"], - "name": "Basic PC", + "name": "PC Assemble SC234", "price_unit": 10.0, - "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_3", "[PC1] Basic PC"], + "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_3", "[PCSC234] PC Assemble SC234"], "quantity": 1.0 }, { @@ -114,9 +114,9 @@ "__model": "account.invoice.line", "__id": "account:b22acf7a-ddcd-11e0-a4db-701a04e25543.account_invoice_line-u2XV5", "uos_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_uom_unit", "Unit"], - "name": "Medium PC", + "name": "PC on Demand", "price_unit": 100.0, - "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_5", "[PC3] Medium PC"], + "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_5", "[PC-DEM] PC on Demand"], "quantity": 5.0 }] } @@ -137,12 +137,12 @@ assert invoice_new.type == 'in_invoice', "Invoice type was not set properly" assert len(invoice_new.invoice_line) == 2, "invoice lines are not same" for inv_line in invoice_new.invoice_line: - if inv_line.name == 'Basic PC': + if inv_line.name == 'PC Assemble SC234': assert inv_line.uos_id.name == "Unit" , "uom is not same" assert inv_line.price_unit == 10 , "price unit is not same" assert inv_line.quantity == 1 , "product qty is not same" assert inv_line.price_subtotal == 10, "price sub total is not same" - elif inv_line.name == 'Medium PC': + elif inv_line.name == 'PC on Demand': assert inv_line.uos_id.name == "Unit" , "uom is not same" assert inv_line.price_unit == 100 , "price unit is not same" assert inv_line.quantity == 5 , "product qty is not same" diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml index 9cfb9d61229..2ea6c0b7890 100644 --- a/addons/account_voucher/test/account_voucher.yml +++ b/addons/account_voucher/test/account_voucher.yml @@ -54,7 +54,7 @@ currency_id: base.EUR journal_id: account.bank_journal name: Voucher Axelor - narration: Basic PC + narration: PC Assemble SC234 line_dr_ids: - account_id: account.cash amount: 1000.0 diff --git a/addons/account_voucher/test/account_voucher_report.yml b/addons/account_voucher/test/account_voucher_report.yml index 85432f747aa..3996e0c27e4 100644 --- a/addons/account_voucher/test/account_voucher_report.yml +++ b/addons/account_voucher/test/account_voucher_report.yml @@ -6,7 +6,7 @@ company_id: base.main_company journal_id: account.bank_journal name: Voucher Axelor - narration: Basic PC + narration: PC Assemble SC234 amount: 1000.0 line_ids: - account_id: account.cash diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml index 45c352955f4..b706e6f0644 100644 --- a/addons/account_voucher/test/case1_usd_usd.yml +++ b/addons/account_voucher/test/case1_usd_usd.yml @@ -79,7 +79,7 @@ period_id: account.period_1 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 200.0 quantity: 1.0 product_id: product.product_product_3 @@ -112,7 +112,7 @@ period_id: account.period_2 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 100.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account_voucher/test/case2_suppl_usd_eur.yml b/addons/account_voucher/test/case2_suppl_usd_eur.yml index cc4c238aaaf..1a0c250395e 100644 --- a/addons/account_voucher/test/case2_suppl_usd_eur.yml +++ b/addons/account_voucher/test/case2_suppl_usd_eur.yml @@ -50,7 +50,7 @@ period_id: account.period_1 invoice_line: - account_id: account.a_expense - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 200.0 quantity: 1.0 product_id: product.product_product_3 @@ -85,7 +85,7 @@ type : in_invoice invoice_line: - account_id: account.a_expense - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 100.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml index c37783247db..91f8a629cbb 100644 --- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml +++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml @@ -85,7 +85,7 @@ period_id: account.period_1 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 200.0 quantity: 1.0 product_id: product.product_product_3 @@ -118,7 +118,7 @@ period_id: account.period_2 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 100.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml index 36593a2b9cd..cc5e819af30 100644 --- a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml +++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml @@ -85,7 +85,7 @@ period_id: account.period_1 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 200.0 quantity: 1.0 product_id: product.product_product_3 @@ -118,7 +118,7 @@ period_id: account.period_2 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 100.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account_voucher/test/case3_eur_eur.yml b/addons/account_voucher/test/case3_eur_eur.yml index d70bd41a2ff..37ea7ea981a 100644 --- a/addons/account_voucher/test/case3_eur_eur.yml +++ b/addons/account_voucher/test/case3_eur_eur.yml @@ -39,7 +39,7 @@ period_id: account.period_1 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 150.0 quantity: 1.0 product_id: product.product_product_3 @@ -72,7 +72,7 @@ period_id: account.period_1 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 80.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml index 5ca901cdbca..a78669c95ef 100644 --- a/addons/account_voucher/test/case4_cad_chf.yml +++ b/addons/account_voucher/test/case4_cad_chf.yml @@ -73,7 +73,7 @@ period_id: account.period_1 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 200.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml index 2ca2ded1a72..125277191cb 100644 --- a/addons/account_voucher/test/case_eur_usd.yml +++ b/addons/account_voucher/test/case_eur_usd.yml @@ -52,7 +52,7 @@ period_id: account.period_1 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 1000.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account_voucher/test/sales_payment.yml b/addons/account_voucher/test/sales_payment.yml index 585ce23aace..88f10e55918 100644 --- a/addons/account_voucher/test/sales_payment.yml +++ b/addons/account_voucher/test/sales_payment.yml @@ -7,7 +7,7 @@ currency_id: base.EUR invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 450.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/l10n_ch/test/l10n_ch_dta.yml b/addons/l10n_ch/test/l10n_ch_dta.yml index 06c15d524b2..8867c46df75 100644 --- a/addons/l10n_ch/test/l10n_ch_dta.yml +++ b/addons/l10n_ch/test/l10n_ch_dta.yml @@ -25,7 +25,7 @@ - !record {model: account.invoice.line, id: dta_invoice_line, view: False}: account_id: account.a_expense - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 700.0 quantity: 10.0 product_id: product.product_product_3 diff --git a/addons/l10n_ch/test/l10n_ch_v11.yml b/addons/l10n_ch/test/l10n_ch_v11.yml index 4bacbf730f8..975e3569eb4 100644 --- a/addons/l10n_ch/test/l10n_ch_v11.yml +++ b/addons/l10n_ch/test/l10n_ch_v11.yml @@ -26,7 +26,7 @@ - !record {model: account.invoice.line, id: v11_test_invoice_line, view: False}: account_id: account.a_expense - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 888.00 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/l10n_ch/test/l10n_ch_v11_part.yml b/addons/l10n_ch/test/l10n_ch_v11_part.yml index 811ee77bc4a..01e3a9624ea 100644 --- a/addons/l10n_ch/test/l10n_ch_v11_part.yml +++ b/addons/l10n_ch/test/l10n_ch_v11_part.yml @@ -27,7 +27,7 @@ - !record {model: account.invoice.line, id: v11_part_test_invoice_line, view: False}: account_id: account.a_expense - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 250.00 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/mrp_repair/mrp_repair_demo.yml b/addons/mrp_repair/mrp_repair_demo.yml index 5421b376348..1e296573876 100644 --- a/addons/mrp_repair/mrp_repair_demo.yml +++ b/addons/mrp_repair/mrp_repair_demo.yml @@ -5,7 +5,7 @@ date_expected: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S") location_dest_id: stock.stock_location_14 location_id: stock.stock_location_stock - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' product_id: product.product_product_3 product_qty: 1.0 product_uom: product.product_uom_unit @@ -23,7 +23,7 @@ operations: - location_dest_id: stock.location_production location_id: stock.stock_location_stock - name: '[HDD1] HDD Seagate 7200.8 80GB' + name: '[M-Las] Mouse, Laser' price_unit: 50.0 product_id: product.product_product_11 product_uom: product.product_uom_unit @@ -32,7 +32,7 @@ to_invoice: 1 type: add fees_lines: - - name: 'HDD1 Seagate repair fees' + - name: 'Mouse repair fees' product_id: product.product_product_11 product_uom_qty: 1.0 product_uom: product.product_uom_unit @@ -46,7 +46,7 @@ date_expected: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S") location_dest_id: stock.stock_location_14 location_id: stock.stock_location_stock - name: '[PC3] Medium PC' + name: '[PC-DEM] PC on Demand' product_id: product.product_product_5 product_qty: 1.0 product_uom: product.product_uom_unit @@ -64,7 +64,7 @@ operations: - location_dest_id: stock.location_production location_id: stock.stock_location_stock - name: '[HDD2] HDD Seagate 7200.8 120GB' + name: '[M-Wir] Mouse, Wireless' price_unit: 50.0 product_id: product.product_product_12 product_uom: product.product_uom_unit @@ -73,7 +73,7 @@ to_invoice: 1 type: add fees_lines: - - name: 'HDD2 Seagate repair fees' + - name: 'Mouse Seagate repair fees' product_id: product.product_product_12 product_uom_qty: 1.0 product_uom: product.product_uom_unit @@ -87,7 +87,7 @@ date_expected: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S") location_dest_id: stock.stock_location_14 location_id: stock.stock_location_stock - name: '[PC4] Customizable PC' + name: '[LCD15] 15” LCD Monitor' product_id: product.product_product_6 product_qty: 1.0 product_uom: product.product_uom_unit @@ -105,7 +105,7 @@ operations: - location_dest_id: stock.location_production location_id: stock.stock_location_stock - name: '[HDD3] HDD Seagate 7200.8 160GB' + name: '[RAM-SR5] RAM DDR SR5' price_unit: 50.0 product_id: product.product_product_13 product_uom: product.product_uom_unit @@ -114,7 +114,7 @@ to_invoice: 1 type: add fees_lines: - - name: 'HDD3 Seagate repair fees' + - name: 'RAM fees' product_id: product.product_product_13 product_uom_qty: 1.0 product_uom: product.product_uom_unit diff --git a/addons/mrp_repair/test/test_mrp_repair_cancel.yml b/addons/mrp_repair/test/test_mrp_repair_cancel.yml index 6a355f35b41..ee0e9c379e7 100644 --- a/addons/mrp_repair/test/test_mrp_repair_cancel.yml +++ b/addons/mrp_repair/test/test_mrp_repair_cancel.yml @@ -1,6 +1,6 @@ - In order to test the cancel flow of mrp_repair module, - I start by creating new copy Repair order for "Basic PC" product. + I start by creating new copy Repair order for "PC Assemble SC234" product. - !python {model: mrp.repair}: | copy_id = self.copy(cr, uid, ref("mrp_repair_rmrp1")) diff --git a/addons/point_of_sale/test/01_order_to_payment.yml b/addons/point_of_sale/test/01_order_to_payment.yml index 3265a4b133c..9534e79095f 100644 --- a/addons/point_of_sale/test/01_order_to_payment.yml +++ b/addons/point_of_sale/test/01_order_to_payment.yml @@ -12,7 +12,7 @@ account_collected_id: account.iva price_include: 1 - - I assign this 10 percent tax on the PC1 product as a sale tax + I assign this 10 percent tax on the [PCSC234] PC Assemble SC234 product as a sale tax - !record {model: product.product, id: product.product_product_3}: taxes_id: [account_tax_10_incl] @@ -27,7 +27,7 @@ account_collected_id: account.iva price_include: 0 - - I assign this 5 percent tax on the PC2 product as a sale tax + I assign this 5 percent tax on the PCSC349 product as a sale tax - !record {model: product.product, id: product.product_product_4}: taxes_id: [account_tax_05_incl] @@ -52,7 +52,7 @@ - !workflow {model: pos.session, action: open, ref: pos_order_session0} - - I create a PoS order with 2 units of PC1 at 450 EUR (Tax Incl) and 3 units of PC2 at 300 EUR. (Tax Excl) + I create a PoS order with 2 units of PCSC234 at 450 EUR (Tax Incl) and 3 units of PCSC349 at 300 EUR. (Tax Excl) - !record {model: pos.order, id: pos_order_pos0}: company_id: base.main_company diff --git a/addons/point_of_sale/test/02_order_to_invoice.yml b/addons/point_of_sale/test/02_order_to_invoice.yml index 2280f15ca48..bd76eb08a9c 100644 --- a/addons/point_of_sale/test/02_order_to_invoice.yml +++ b/addons/point_of_sale/test/02_order_to_invoice.yml @@ -1,5 +1,5 @@ - - I create a new PoS order with 2 units of PC1 at 450 EUR (Tax Incl) and 3 units of PC2 at 300 EUR. (Tax Excl) + I create a new PoS order with 2 units of PC1 at 450 EUR (Tax Incl) and 3 units of PCSC349 at 300 EUR. (Tax Excl) - !record {model: pos.order, id: pos_order_pos1}: company_id: base.main_company diff --git a/addons/product_margin/test/product_margin.yml b/addons/product_margin/test/product_margin.yml index b1dee4a423d..9252fdd52b8 100644 --- a/addons/product_margin/test/product_margin.yml +++ b/addons/product_margin/test/product_margin.yml @@ -6,7 +6,7 @@ to_date: !eval "'%s-12-31' %(datetime.now().year)" invoice_state: open_paid - - I open margin for PC3 + I open margin for PC-DEM - !python {model: product.margin}: | self.action_open_window(cr, uid, [ref("product_margin_wiz0")], {"lang": 'en_US', diff --git a/addons/purchase/test/process/edi_purchase_order.yml b/addons/purchase/test/process/edi_purchase_order.yml index 02756959848..d0e90f3788d 100644 --- a/addons/purchase/test/process/edi_purchase_order.yml +++ b/addons/purchase/test/process/edi_purchase_order.yml @@ -86,13 +86,13 @@ "__model": "sale.order.line", "__import_module": "purchase", "__import_model": "purchase.order.line", - "name": "Basic PC", + "name": "PC Assemble SC234", "product_uom": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_uom_unit", "Unit"], "product_qty": 1.0, "date_planned": "2011-09-30", "sequence": 10, "price_unit": 150.0, - "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_3", "[PC1] Basic PC"], + "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_3", "[PCSC234] PC Assemble SC234"], }, { "__id": "sale:724f93ec-ddd0-11e0-88ec-701a04e25543.sale_order_line-LXEqeadasdad", @@ -100,13 +100,13 @@ "__model": "sale.order.line", "__import_module": "purchase", "__import_model": "purchase.order.line", - "name": "Medium PC", + "name": "PC on Demand", "product_uom": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_uom_unit", "Unit"], "product_qty": 10.0, "sequence": 11, "date_planned": "2011-09-15", "price_unit": 20.0, - "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_5", "[PC3] Medium PC"], + "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_5", "[PC-DEM] PC on Demand"], }], } new_purchase_order_id = purchase_order_pool.edi_import(cr, uid, edi_document, context=context) @@ -123,11 +123,11 @@ assert order_new.amount_untaxed == 350, "untaxed amount is not same" assert len(order_new.order_line) == 2, "Purchase order lines number mismatch" for purchase_line in order_new.order_line: - if purchase_line.name == 'Basic PC': + if purchase_line.name == 'PC Assemble SC234': assert purchase_line.product_uom.name == "Unit" , "uom is not same" assert purchase_line.price_unit == 150 , "unit price is not same, got %s, expected 150"%(purchase_line.price_unit,) assert purchase_line.product_qty == 1 , "product qty is not same" - elif purchase_line.name == 'Medium PC': + elif purchase_line.name == 'PC on Demand': assert purchase_line.product_uom.name == "Unit" , "uom is not same" assert purchase_line.price_unit == 20 , "unit price is not same, got %s, expected 20"%(purchase_line.price_unit,) assert purchase_line.product_qty == 10 , "product qty is not same" diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml index 3d68a8b612f..21d348c2f0e 100644 --- a/addons/purchase_requisition/purchase_requisition_demo.xml +++ b/addons/purchase_requisition/purchase_requisition_demo.xml @@ -37,7 +37,7 @@ - [HDD3] HDD Seagate 7200.8 160GB + [RAM-SR5] RAM DDR SR5 @@ -54,7 +54,7 @@ - [HDD3] HDD Seagate 7200.8 160GB + [RAM-SR5] RAM DDR SR5 diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml index e2a930146a7..18a59320d9c 100644 --- a/addons/sale/sale_unit_test.xml +++ b/addons/sale/sale_unit_test.xml @@ -13,7 +13,7 @@ - [PC1] Basic PC + [PCSC234] PC Assemble SC234 450 @@ -23,7 +23,7 @@ - [RAM512] DDR 512MB PC400 + [HDD-SH2] HDD SH-2 90 diff --git a/addons/sale/test/edi_sale_order.yml b/addons/sale/test/edi_sale_order.yml index 148eed4f18f..a84c66c1468 100644 --- a/addons/sale/test/edi_sale_order.yml +++ b/addons/sale/test/edi_sale_order.yml @@ -11,13 +11,13 @@ product_uom_qty: 1.0 product_uom: 1 price_unit: 150.0 - name: 'Basic pc' + name: 'PC Assemble SC234' order_line: - product_id: product.product_product_5 product_uom_qty: 10.0 product_uom: 1 price_unit: 200.0 - name: 'Medium pc' + name: 'PC Assemble + Custom (PC on Demand)' - I confirm the sale order - @@ -72,10 +72,10 @@ "__model": "purchase.order.line", "__import_module": "sale", "__import_model": "sale.order.line", - "name": "Basic PC", + "name": "PC Assemble SC234", "date_planned": "2011-09-30", "price_unit": 150.0, - "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_3", "[PC1] Basic PC"], + "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_3", "[PCSC234] PC Assemble SC234"], "product_qty": 1.0, "product_uom": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_uom_unit", "Unit"], }, @@ -85,10 +85,10 @@ "__model": "purchase.order.line", "__import_module": "sale", "__import_model": "sale.order.line", - "name": "Medium PC", + "name": "PC on Demand", "date_planned": "2011-09-15", "price_unit": 100.0, - "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_5", "[PC3] Medium PC"], + "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_5", "[PC-DEM] PC on Demand"], "product_qty": 2.0, "product_uom": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_uom_unit", "Unit"], }], @@ -107,12 +107,12 @@ assert order_new.amount_untaxed == 350, "Untaxed amount is wrong" assert len(order_new.order_line) == 2, "Sale order lines mismatch" for sale_line in order_new.order_line: - if sale_line.name == 'Basic PC': + if sale_line.name == 'PC Assemble SC234': assert sale_line.delay == 18 , "incorrect delay: got %s, expected 18"%(sale_line.delay,) assert sale_line.product_uom.name == "Unit" , "uom is not same" assert sale_line.price_unit == 150 , "unit price is not same, got %s, expected 150"%(sale_line.price_unit,) assert sale_line.product_uom_qty == 1 , "product qty is not same" - elif sale_line.name == 'Medium PC': + elif sale_line.name == 'PC on Demand': assert sale_line.delay == 3 , "incorrect delay: got %s, expected 3"%(sale_line.delay,) assert sale_line.product_uom.name == "Unit" , "uom is not same" assert sale_line.price_unit == 100 , "unit price is not same, got %s, expected 100"%(sale_line.price_unit,) diff --git a/addons/sale_margin/test/sale_margin.yml b/addons/sale_margin/test/sale_margin.yml index 17f71807074..8038ea1aa5f 100644 --- a/addons/sale_margin/test/sale_margin.yml +++ b/addons/sale_margin/test/sale_margin.yml @@ -9,7 +9,7 @@ invoice_quantity: order name: Test_SO011 order_line: - - name: '[KEYA] Keyboard - AZERTY' + - name: '[CARD] Graphics Card' price_unit: 7.0 product_uom: product.product_uom_unit product_uom_qty: 100.0 From a638b09c13c0b8cdb848287d5c2d0c5e301f7b25 Mon Sep 17 00:00:00 2001 From: "Bharat Devnani (OpenERP)" Date: Fri, 17 Aug 2012 12:49:50 +0530 Subject: [PATCH 05/31] [IMP] allowed purchase user to read the products and create and confirm purchase order bzr revid: bde@tinyerp.com-20120817071950-3h1c0x2yxun8kd68 --- addons/purchase/security/ir.model.access.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv index c45b8a9b070..317f8661b71 100644 --- a/addons/purchase/security/ir.model.access.csv +++ b/addons/purchase/security/ir.model.access.csv @@ -6,7 +6,7 @@ access_purchase_order_line_manager,purchase.order.line manager,model_purchase_or access_stock_location_purchase_user,stock.location,stock.model_stock_location,group_purchase_user,1,0,0,0 access_stock_warehouse_purchase_user,stock.warehouse,stock.model_stock_warehouse,group_purchase_user,1,0,0,0 access_stock_picking_purchase_user,stock.picking,stock.model_stock_picking,group_purchase_user,1,1,1,1 -access_stock_move_purchase_user,stock.move,stock.model_stock_move,group_purchase_user,1,0,0,0 +access_stock_move_purchase_user,stock.move,stock.model_stock_move,group_purchase_user,1,1,1,0 access_purchase_order_stock_worker,purchase.order,model_purchase_order,stock.group_stock_user,1,0,0,0 access_purchase_order_line_stock_worker,purchase.order.line,model_purchase_order_line,stock.group_stock_user,1,0,0,0 access_account_tax_purchase_user,account.tax,account.model_account_tax,group_purchase_user,1,0,0,0 @@ -65,3 +65,4 @@ access_account_journal_purchase_manager,account.journal purchase manager,account access_stock_tracking_purchase_user,stock.tracking purchase.user,stock.model_stock_tracking,purchase.group_purchase_user,1,1,1,0 access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0 access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0 +access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,group_purchase_user,1,0,0,0 From b040d2706d6921a22b13f70e6f0689dba8399193 Mon Sep 17 00:00:00 2001 From: Hardik Date: Fri, 17 Aug 2012 16:45:40 +0530 Subject: [PATCH 06/31] [IMP]update __openerp__.py in all modules bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g --- addons/account/__openerp__.py | 26 +- addons/account_accountant/__openerp__.py | 22 +- .../account_analytic_analysis/__openerp__.py | 22 +- .../account_analytic_default/__openerp__.py | 8 +- addons/account_analytic_plans/__openerp__.py | 6 +- addons/account_anglo_saxon/__openerp__.py | 28 +- addons/account_asset/__openerp__.py | 42 +-- .../__openerp__.py | 6 +- addons/account_budget/__openerp__.py | 6 +- addons/account_cancel/__openerp__.py | 22 +- addons/account_chart/__openerp__.py | 8 +- addons/account_check_writing/__openerp__.py | 20 +- addons/account_coda/__openerp__.py | 28 +- addons/account_followup/__openerp__.py | 6 +- addons/account_payment/__openerp__.py | 16 +- addons/account_sequence/__openerp__.py | 8 +- addons/account_voucher/__openerp__.py | 80 ++--- addons/analytic/__openerp__.py | 28 +- .../__openerp__.py | 16 +- .../__openerp__.py | 16 +- .../analytic_contract_project/__openerp__.py | 16 +- addons/analytic_user_function/__openerp__.py | 6 +- addons/anonymization/__openerp__.py | 6 +- addons/anonymization/anonymization_view.xml | 2 +- addons/association/__openerp__.py | 4 +- addons/audittrail/__openerp__.py | 6 +- addons/auth_ldap/__openerp__.py | 32 +- addons/base_action_rule/__openerp__.py | 6 +- addons/base_calendar/__openerp__.py | 22 +- addons/base_crypt/__openerp__.py | 24 +- addons/base_iban/__openerp__.py | 6 +- addons/base_iban/base_iban_data.xml | 2 +- addons/base_module_doc_rst/__openerp__.py | 6 +- addons/base_module_record/__openerp__.py | 6 +- addons/base_report_designer/__openerp__.py | 6 +- .../wizard/base_report_design_view.xml | 2 +- addons/base_status/__openerp__.py | 6 +- addons/base_tools/__openerp__.py | 18 +- addons/base_vat/__openerp__.py | 4 +- addons/board/__openerp__.py | 8 +- addons/caldav/__openerp__.py | 24 +- addons/claim_from_delivery/__openerp__.py | 26 +- addons/crm/__openerp__.py | 10 +- addons/crm_caldav/__openerp__.py | 6 +- addons/crm_claim/__openerp__.py | 6 +- addons/crm_helpdesk/__openerp__.py | 6 +- addons/crm_partner_assign/__openerp__.py | 4 +- addons/crm_profiling/__openerp__.py | 6 +- addons/crm_todo/__openerp__.py | 4 +- addons/decimal_precision/__openerp__.py | 22 +- addons/delivery/__openerp__.py | 6 +- addons/delivery/delivery_data.xml | 2 +- addons/document/__openerp__.py | 6 +- addons/document_ftp/__openerp__.py | 6 +- addons/document_page/__openerp__.py | 8 +- addons/document_webdav/__openerp__.py | 32 +- addons/edi/__openerp__.py | 6 +- addons/email_template/__openerp__.py | 24 +- addons/event/__openerp__.py | 6 +- addons/event_moodle/__openerp__.py | 4 +- addons/event_project/__openerp__.py | 6 +- addons/event_sale/__openerp__.py | 4 +- addons/fetchmail/__openerp__.py | 22 +- addons/google_base_account/__openerp__.py | 6 +- addons/google_docs/__openerp__.py | 2 +- addons/google_map/__openerp__.py | 6 +- addons/hr/__openerp__.py | 24 +- addons/hr_attendance/__openerp__.py | 4 +- addons/hr_contract/__openerp__.py | 8 +- addons/hr_evaluation/__openerp__.py | 46 +-- addons/hr_expense/__openerp__.py | 10 +- addons/hr_holidays/__openerp__.py | 22 +- addons/hr_payroll/__openerp__.py | 8 +- addons/hr_payroll_account/__openerp__.py | 8 +- addons/hr_timesheet/__openerp__.py | 8 +- addons/hr_timesheet_sheet/__openerp__.py | 10 +- addons/idea/__openerp__.py | 8 +- addons/import_base/__openerp__.py | 6 +- addons/import_google/__openerp__.py | 6 +- addons/import_sugarcrm/__openerp__.py | 6 +- addons/knowledge/__openerp__.py | 16 +- addons/l10n_ar/__openerp__.py | 42 ++- addons/l10n_at/__openerp__.py | 22 +- addons/l10n_be/__openerp__.py | 6 +- addons/l10n_be_invoice_bba/__openerp__.py | 6 +- addons/l10n_br/__openerp__.py | 4 +- addons/l10n_br/data/account_tax_template.xml | 2 +- .../data/l10n_br_account_chart_template.xml | 2 +- addons/l10n_ca/__openerp__.py | 24 +- addons/l10n_ch/__openerp__.py | 59 ++-- addons/l10n_ch/sterchi_chart/account.xml | 2 +- .../sterchi_chart/account_journal_rel.xml | 2 +- addons/l10n_cl/__openerp__.py | 42 ++- addons/l10n_cn/__openerp__.py | 34 +- addons/l10n_cn/base_data.xml | 324 +++++++++--------- addons/l10n_cr/__openerp__.py | 6 +- addons/l10n_de/__openerp__.py | 62 ++-- addons/l10n_ec/__openerp__.py | 6 +- addons/l10n_es/__openerp__.py | 40 +-- addons/l10n_es/account_chart.xml | 2 +- addons/l10n_es/account_chart_pymes.xml | 2 +- addons/l10n_es/fiscal_templates.xml | 2 +- addons/l10n_es/fiscal_templates_pymes.xml | 2 +- addons/l10n_es/l10n_es_wizard.xml | 2 +- addons/l10n_es/taxes_data.xml | 2 +- addons/l10n_es/taxes_data_pymes.xml | 2 +- addons/l10n_fr/__openerp__.py | 60 ++-- addons/l10n_fr_hr_payroll/__openerp__.py | 2 +- addons/l10n_fr_rib/__openerp__.py | 18 +- addons/l10n_fr_rib/bank_data.xml | 2 +- addons/l10n_gr/__openerp__.py | 32 +- addons/l10n_gt/__openerp__.py | 6 +- addons/l10n_hn/__openerp__.py | 6 +- addons/l10n_in/__openerp__.py | 38 +- addons/l10n_it/__openerp__.py | 20 +- addons/l10n_lu/__openerp__.py | 6 +- addons/l10n_ma/__openerp__.py | 40 +-- addons/l10n_multilang/__openerp__.py | 20 +- addons/l10n_mx/__openerp__.py | 22 +- addons/l10n_nl/__openerp__.py | 40 +-- addons/l10n_pe/__openerp__.py | 46 +-- addons/l10n_pl/__openerp__.py | 24 +- addons/l10n_ro/__openerp__.py | 24 +- addons/l10n_syscohada/__openerp__.py | 24 +- addons/l10n_th/__openerp__.py | 4 +- addons/l10n_tr/__openerp__.py | 11 +- addons/l10n_uk/__openerp__.py | 6 +- addons/l10n_us/__openerp__.py | 26 +- addons/l10n_uy/__openerp__.py | 40 +-- addons/l10n_ve/__openerp__.py | 26 +- addons/lunch/__openerp__.py | 22 +- addons/mail/__openerp__.py | 4 +- addons/marketing/__openerp__.py | 18 +- addons/marketing_campaign/__openerp__.py | 28 +- .../__openerp__.py | 20 +- addons/membership/__openerp__.py | 6 +- addons/mrp/__openerp__.py | 26 +- addons/mrp_jit/__openerp__.py | 4 +- addons/mrp_operations/__openerp__.py | 12 +- addons/mrp_repair/__openerp__.py | 4 +- addons/mrp_subproduct/__openerp__.py | 6 +- addons/multi_company/__openerp__.py | 6 +- addons/pad/__openerp__.py | 6 +- addons/pad_project/__openerp__.py | 8 +- addons/plugin_outlook/__openerp__.py | 10 +- addons/plugin_thunderbird/__openerp__.py | 26 +- addons/point_of_sale/__openerp__.py | 10 +- addons/portal_crm/__openerp__.py | 2 +- addons/portal_event/__openerp__.py | 2 +- addons/portal_hr_employees/__openerp__.py | 2 +- addons/portal_project/__openerp__.py | 2 +- addons/portal_project_issue/__openerp__.py | 2 +- addons/portal_sale/__openerp__.py | 4 +- addons/process/__openerp__.py | 6 +- addons/procurement/__openerp__.py | 22 +- addons/product/__openerp__.py | 16 +- addons/product_expiry/__openerp__.py | 26 +- addons/product_manufacturer/__openerp__.py | 26 +- addons/product_margin/__openerp__.py | 4 +- .../product_visible_discount/__openerp__.py | 24 +- addons/profile_tools/__openerp__.py | 19 +- addons/project_gtd/__openerp__.py | 10 +- addons/project_issue/__openerp__.py | 14 +- addons/project_issue_sheet/__openerp__.py | 10 +- addons/project_long_term/__openerp__.py | 34 +- addons/project_mailgate/__openerp__.py | 24 +- addons/project_mrp/__openerp__.py | 8 +- addons/project_retro_planning/__openerp__.py | 6 +- addons/project_timesheet/__openerp__.py | 16 +- .../project_timesheet_data.xml | 2 +- addons/purchase/__openerp__.py | 4 +- addons/purchase_analytic_plans/__openerp__.py | 6 +- .../purchase_double_validation/__openerp__.py | 18 +- addons/purchase_requisition/__openerp__.py | 40 +-- addons/report_designer/__openerp__.py | 18 +- addons/report_intrastat/__openerp__.py | 8 +- addons/report_webkit/__openerp__.py | 34 +- addons/report_webkit_sample/__openerp__.py | 22 +- addons/resource/__openerp__.py | 18 +- addons/sale/__openerp__.py | 10 +- addons/sale_analytic_plans/__openerp__.py | 6 +- addons/sale_crm/__openerp__.py | 6 +- addons/sale_journal/__openerp__.py | 6 +- addons/sale_margin/__openerp__.py | 24 +- addons/sale_mrp/__openerp__.py | 6 +- addons/sale_order_dates/__openerp__.py | 13 +- addons/share/__openerp__.py | 16 +- addons/stock/__openerp__.py | 84 ++--- addons/stock_invoice_directly/__openerp__.py | 8 +- addons/stock_location/__openerp__.py | 8 +- addons/stock_no_autopicking/__openerp__.py | 8 +- addons/stock_planning/__openerp__.py | 122 +++---- addons/subscription/__openerp__.py | 6 +- addons/survey/__openerp__.py | 4 +- addons/warning/__openerp__.py | 4 +- addons/web_linkedin/__openerp__.py | 20 +- addons/web_shortcuts/__openerp__.py | 4 +- 197 files changed, 1649 insertions(+), 1665 deletions(-) diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index e1b9078ec3f..3fb186d5965 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -19,11 +19,11 @@ # ############################################################################## { - "name" : "eInvoicing", - "version" : "1.1", - "author" : "OpenERP SA", - "category": 'Accounting & Finance', - "description": """ + 'name' : 'eInvoicing', + 'version' : '1.1', + 'author' : 'OpenERP SA', + 'category' : 'Accounting & Finance', + 'description' : """ Accounting and Financial Management. ==================================== @@ -49,9 +49,9 @@ financial year and for preparation of vouchers there is a module named account_v """, 'website': 'http://www.openerp.com', 'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'], - 'init_xml': [], - "depends" : ["base_setup", "product", "analytic", "process", "board", "edi"], - 'update_xml': [ + 'data': [], + 'depends' : ['base_setup', 'product', 'analytic', 'process', 'board', 'edi'], + 'data': [ 'security/account_security.xml', 'security/ir.model.access.csv', 'account_menuitem.xml', @@ -122,12 +122,12 @@ financial year and for preparation of vouchers there is a module named account_v 'ir_sequence_view.xml', 'company_view.xml', 'board_account_view.xml', - "edi/invoice_action_data.xml", - "account_bank_view.xml", - "res_config_view.xml", - "account_pre_install.yml" + 'edi/invoice_action_data.xml', + 'account_bank_view.xml', + 'res_config_view.xml', + 'account_pre_install.yml' ], - 'demo_xml': [ + 'demo': [ 'demo/account_demo.xml', 'project/project_demo.xml', 'project/analytic_account_demo.xml', diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py index 7c97112b875..558bafe9ff3 100644 --- a/addons/account_accountant/__openerp__.py +++ b/addons/account_accountant/__openerp__.py @@ -19,13 +19,13 @@ # ############################################################################## { - "name" : "Accounting and Finance", - "version" : "1.1", - "author" : "OpenERP SA", - "category": 'Accounting & Finance', - "sequence": 10, - "summary": "Financial and Analytic Accounting", - "description": """ + 'name' : 'Accounting and Finance', + 'version' : '1.1', + 'author' : 'OpenERP SA', + 'category': 'Accounting & Finance', + 'sequence': 10, + 'summary': 'Financial and Analytic Accounting', + 'description': """ Accounting Access Rights. ========================= @@ -36,13 +36,13 @@ It assigns manager and user access rights to the Administrator and only user rights to Demo user. """, 'website': 'http://www.openerp.com', - 'init_xml': [], - "depends" : ["account_voucher"], - 'update_xml': [ + 'data': [], + 'depends' : ['account_voucher'], + 'data': [ 'security/account_security.xml', 'account_accountant_data.xml' ], - 'demo_xml': ['account_accountant_demo.xml'], + 'demo': ['account_accountant_demo.xml'], 'test': [], 'installable': True, 'auto_install': False, diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py index e0bec840467..7ad2b826b94 100644 --- a/addons/account_analytic_analysis/__openerp__.py +++ b/addons/account_analytic_analysis/__openerp__.py @@ -32,18 +32,18 @@ Adds menu to show relevant information to each manager. You can also view the report of account analytic summary user-wise as well as month-wise. """, - "author": "Camptocamp", - "website": "http://www.camptocamp.com/", - "images": ["images/bill_tasks_works.jpeg","images/overpassed_accounts.jpeg"], - "depends": ["hr_timesheet_invoice", "sale"], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application - "init_xml": [], - "update_xml": [ - "security/ir.model.access.csv", - "account_analytic_analysis_view.xml", - "account_analytic_analysis_menu.xml", - "account_analytic_analysis_cron.xml", + 'author': 'Camptocamp', + 'website': 'http://www.camptocamp.com/', + 'images': ['images/bill_tasks_works.jpeg','images/overpassed_accounts.jpeg'], + 'depends': ['hr_timesheet_invoice', 'sale'], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application + 'data': [], + 'data': [ + 'security/ir.model.access.csv', + 'account_analytic_analysis_view.xml', + 'account_analytic_analysis_menu.xml', + 'account_analytic_analysis_cron.xml', ], - 'demo_xml': [], + 'demo': [], 'installable': True, 'auto_install': False, 'certificate': '0042927202589', diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py index 5ec1fc66c73..1bc104d12e1 100644 --- a/addons/account_analytic_default/__openerp__.py +++ b/addons/account_analytic_default/__openerp__.py @@ -22,7 +22,7 @@ { 'name' : 'Account Analytic Defaults', 'version' : '1.0', - "category": 'Accounting & Finance', + 'category': 'Accounting & Finance', 'description': """ Set default values for your analytic accounts. ============================================= @@ -39,13 +39,13 @@ Allows to automatically select analytic accounts based on criterions: 'website' : 'http://www.openerp.com', 'images' : ['images/analytic_defaults.jpeg'], 'depends' : ['sale'], - 'init_xml' : [], - 'update_xml': [ + 'data' : [], + 'data': [ 'security/ir.model.access.csv', 'security/account_analytic_default_security.xml', 'account_analytic_default_view.xml' ], - 'demo_xml' : [], + 'demo' : [], 'installable': True, 'auto_install': False, 'certificate': '0074229833581', diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py index a9000cfa490..51a666a5883 100644 --- a/addons/account_analytic_plans/__openerp__.py +++ b/addons/account_analytic_plans/__openerp__.py @@ -63,8 +63,8 @@ of distribution models. 'website': 'http://www.openerp.com', 'images': ['images/analytic_plan.jpeg'], 'depends': ['account', 'account_analytic_default'], - 'init_xml': [], - 'update_xml': [ + 'data': [], + 'data': [ 'security/account_analytic_plan_security.xml', 'security/ir.model.access.csv', 'account_analytic_plans_view.xml', @@ -72,7 +72,7 @@ of distribution models. 'wizard/analytic_plan_create_model_view.xml', 'wizard/account_crossovered_analytic_view.xml', ], - 'demo_xml': [], + 'demo': [], 'test': ['test/acount_analytic_plans_report.yml'], 'installable': True, 'auto_install': False, diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py index 5073d6522e3..0bbe78bcbf9 100644 --- a/addons/account_anglo_saxon/__openerp__.py +++ b/addons/account_anglo_saxon/__openerp__.py @@ -19,11 +19,11 @@ ############################################################################## { - "name": "Anglo-Saxon Accounting", - "version": "1.2", - "author": "OpenERP SA, Veritos", - "website": "http://openerp.com - http://veritos.nl", - "description": """ + 'name': 'Anglo-Saxon Accounting', + 'version': '1.2', + 'author': 'OpenERP SA, Veritos', + 'website': 'http://openerp.com - http://veritos.nl', + 'description': """ This module supports the Anglo-Saxon accounting methodology by changing the accounting logic with stock transactions. ===================================================================================================================== @@ -36,15 +36,15 @@ This module will add this functionality by using a interim account, to store the shipped goods and will contra book this interim account when the invoice is created to transfer this amount to the debtor or creditor account. Secondly, price differences between actual purchase price and fixed product standard price are booked on a separate account.""", - "images": ["images/account_anglo_saxon.jpeg"], - "depends": ["product", "purchase"], - "category": "Accounting & Finance", - "init_xml": [], - "demo_xml": [], - "update_xml": ["product_view.xml",], - "auto_install": False, - "installable": True, - "certificate":"00557423080410733581", + 'images': ['images/account_anglo_saxon.jpeg'], + 'depends': ['product', 'purchase'], + 'category': 'Accounting & Finance', + 'data': [], + 'demo': [], + 'data': ['product_view.xml',], + 'auto_install': False, + 'installable': True, + 'certificate':'00557423080410733581', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py index 2cf79e9d30d..19465c8703c 100644 --- a/addons/account_asset/__openerp__.py +++ b/addons/account_asset/__openerp__.py @@ -20,11 +20,11 @@ ############################################################################## { - "name" : "Assets Management", - "version" : "1.0", - "depends" : ["account"], - "author" : "OpenERP S.A.", - "description": """ + 'name' : 'Assets Management', + 'version' : '1.0', + 'depends' : ['account'], + 'author' : 'OpenERP S.A.', + 'description': """ Financial and accounting asset management. ========================================== @@ -32,30 +32,30 @@ This Module manages the assets owned by a company or an individual. It will keep And it allows to create Move's of the depreciation lines. """, - "website" : "http://www.openerp.com", - "category" : "Accounting & Finance", - "sequence": 32, - "init_xml" : [ + 'website' : 'http://www.openerp.com', + 'category' : 'Accounting & Finance', + 'sequence': 32, + 'data' : [ ], - "demo_xml" : [ 'account_asset_demo.xml' + 'demo' : [ 'account_asset_demo.xml' ], 'test': [ 'test/account_asset_demo.yml', 'test/account_asset.yml', 'test/account_asset_wizard.yml', ], - "update_xml" : [ - "security/account_asset_security.xml", - "security/ir.model.access.csv", - "wizard/account_asset_change_duration_view.xml", - "wizard/wizard_asset_compute_view.xml", - "account_asset_view.xml", - "account_asset_invoice_view.xml", - "report/account_asset_report_view.xml", + 'data' : [ + 'security/account_asset_security.xml', + 'security/ir.model.access.csv', + 'wizard/account_asset_change_duration_view.xml', + 'wizard/wizard_asset_compute_view.xml', + 'account_asset_view.xml', + 'account_asset_invoice_view.xml', + 'report/account_asset_report_view.xml', ], - "auto_install": False, - "installable": True, - "application": False, + 'auto_install': False, + 'installable': True, + 'application': False, } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_bank_statement_extensions/__openerp__.py b/addons/account_bank_statement_extensions/__openerp__.py index a3765d33622..dd873c803dd 100644 --- a/addons/account_bank_statement_extensions/__openerp__.py +++ b/addons/account_bank_statement_extensions/__openerp__.py @@ -39,10 +39,10 @@ This module adds: - name_search on res.partner.bank enhanced to allow search on bank and iban account numbers ''', 'depends': ['account'], - 'demo_xml': [], - 'init_xml': [ + 'demo': [], + 'data': [ ], - 'update_xml' : [ + 'data' : [ 'security/ir.model.access.csv', 'account_bank_statement_view.xml', 'account_bank_statement_report.xml', diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py index e03c66c2132..64cee70972f 100644 --- a/addons/account_budget/__openerp__.py +++ b/addons/account_budget/__openerp__.py @@ -47,8 +47,8 @@ Three reports are available: 'website': 'http://www.openerp.com', 'images': ['images/budget.jpeg','images/budgetary_position.jpeg'], 'depends': ['account'], - 'init_xml': [], - 'update_xml': [ + 'data': [], + 'data': [ 'security/ir.model.access.csv', 'security/account_budget_security.xml', 'account_budget_view.xml', @@ -59,7 +59,7 @@ Three reports are available: 'wizard/account_budget_crossovered_summary_report_view.xml', 'wizard/account_budget_crossovered_report_view.xml', ], - 'demo_xml': ['account_budget_demo.xml'], + 'demo': ['account_budget_demo.xml'], 'test':[ 'test/account_budget.yml', 'test/account_budget_report.yml', diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py index c616cc9d5e0..198f00b318f 100644 --- a/addons/account_cancel/__openerp__.py +++ b/addons/account_cancel/__openerp__.py @@ -20,11 +20,11 @@ ############################################################################## { - "name" : "Cancel Journal Entries", - "version" : "1.1", - "author" : "OpenERP SA", - "category": 'Accounting & Finance', - "description": """ + 'name' : 'Cancel Journal Entries', + 'version' : '1.1', + 'author' : 'OpenERP SA', + 'category': 'Accounting & Finance', + 'description': """ Allows cancelling accounting entries. ===================================== @@ -32,14 +32,14 @@ This module adds 'Allow Cancelling Entries' field on form view of account journa If set to true it allows user to cancel entries & invoices. """, 'website': 'http://www.openerp.com', - "images" : ["images/account_cancel.jpeg"], - "depends" : ["account"], - 'init_xml': [], - 'update_xml': ['account_cancel_view.xml' ], - 'demo_xml': [], + 'images' : ['images/account_cancel.jpeg'], + 'depends' : ['account'], + 'data': [], + 'data': ['account_cancel_view.xml' ], + 'demo': [], 'installable': True, 'auto_install': False, - "certificate" : "001101250473177981989", + 'certificate' : '001101250473177981989', } diff --git a/addons/account_chart/__openerp__.py b/addons/account_chart/__openerp__.py index c0c9245a477..d5651849290 100644 --- a/addons/account_chart/__openerp__.py +++ b/addons/account_chart/__openerp__.py @@ -23,7 +23,7 @@ { 'name': 'Template of Charts of Accounts', 'version': '1.1', - "category": 'Hidden/Dependency', + 'category': 'Hidden/Dependency', 'description': """ Remove minimal account chart. ============================= @@ -33,9 +33,9 @@ Deactivates minimal chart of accounts. 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['account'], - 'init_xml': [], - 'update_xml': [], - 'demo_xml': [], + 'data': [], + 'data': [], + 'demo': [], 'installable': True, 'certificate': '0073332443901', } diff --git a/addons/account_check_writing/__openerp__.py b/addons/account_check_writing/__openerp__.py index faba82928ed..e78a5ce64e7 100644 --- a/addons/account_check_writing/__openerp__.py +++ b/addons/account_check_writing/__openerp__.py @@ -19,25 +19,25 @@ # ############################################################################## { - "name" : "Check Writing", - "version" : "1.1", - "author" : "OpenERP SA, NovaPoint Group", - "category": "Generic Modules/Accounting", - "description": """ + 'name' : 'Check Writing', + 'version' : '1.1', + 'author' : 'OpenERP SA, NovaPoint Group', + 'category': 'Generic Modules/Accounting', + 'description': """ Module for the Check Writing and Check Printing. """, 'website': 'http://www.openerp.com', - 'init_xml': [], - "depends" : [ - "account_voucher", + 'data': [], + 'depends' : [ + 'account_voucher', ], - 'update_xml': [ + 'data': [ 'account_check_writing_report.xml', 'account_view.xml', 'account_voucher_view.xml', 'account_check_writing_data.xml', ], - 'demo_xml': [ + 'demo': [ 'account_demo.xml', ], 'test': [ diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py index 094ab45acc0..0ee1d90908a 100644 --- a/addons/account_coda/__openerp__.py +++ b/addons/account_coda/__openerp__.py @@ -20,11 +20,11 @@ # ############################################################################## { - "name": 'Belgium - Import Bank CODA Statements', - "version": '2.1', - "author": 'Noviat', - "category": 'Accounting & Finance', - "description": ''' + 'name': 'Belgium - Import Bank CODA Statements', + 'version': '2.1', + 'author': 'Noviat', + 'category': 'Accounting & Finance', + 'description': ''' Module to import CODA bank statements. ====================================== @@ -69,25 +69,25 @@ In some cases a transaction code, transaction category or structured communicati The description provided by the CODA configuration tables is based upon the CODA V2.2 specifications. If required, you can manually adjust the descriptions via the CODA configuration menu. ''', - "images" : ["images/coda_logs.jpeg","images/import_coda_logs.jpeg"], - "depends": ['account_voucher','base_iban', 'l10n_be_invoice_bba', 'account_bank_statement_extensions'], - "demo_xml": [], - "init_xml": [ + 'images' : ['images/coda_logs.jpeg','images/import_coda_logs.jpeg'], + 'depends': ['account_voucher','base_iban', 'l10n_be_invoice_bba', 'account_bank_statement_extensions'], + 'demo': [], + 'data': [ 'account_coda_trans_type.xml', 'account_coda_trans_code.xml', 'account_coda_trans_category.xml', 'account_coda_comm_type.xml', ], - "update_xml" : [ + 'data' : [ 'security/ir.model.access.csv', 'security/account_security.xml', 'account_coda_wizard.xml', 'account_coda_view.xml', ], - "auto_install": False, - "installable": True, - "license": 'AGPL-3', - "certificate" : "001237207321716002029", + 'auto_install': False, + 'installable': True, + 'license': 'AGPL-3', + 'certificate' : '001237207321716002029', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py index e8724b01b4e..74275e36899 100644 --- a/addons/account_followup/__openerp__.py +++ b/addons/account_followup/__openerp__.py @@ -50,8 +50,8 @@ entry, you can do from in the menu: 'website': 'http://www.openerp.com', 'images': ['images/follow_ups.jpeg','images/send_followups.jpeg'], 'depends': ['account_accountant', 'mail'], - 'init_xml': [], - 'update_xml': [ + 'data': [], + 'data': [ 'security/account_followup_security.xml', 'security/ir.model.access.csv', 'wizard/account_followup_print_view.xml', @@ -60,7 +60,7 @@ entry, you can do from in the menu: 'account_followup_view.xml', 'account_followup_data.xml', ], - 'demo_xml': [], + 'demo': [], 'test': [ 'test/account_followup.yml', 'test/account_followup_report.yml', diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py index 9e7209a348e..ff852fbc82f 100644 --- a/addons/account_payment/__openerp__.py +++ b/addons/account_payment/__openerp__.py @@ -20,11 +20,11 @@ ############################################################################## { - "name": "Suppliers Payment Management", - "version": "1.1", - "author": "OpenERP SA", - "category": "Accounting & Finance", - "description": """ + 'name': 'Suppliers Payment Management', + 'version': '1.1', + 'author': 'OpenERP SA', + 'category': 'Accounting & Finance', + 'description': """ Module to manage the payment of your supplier invoices. ======================================================= @@ -38,8 +38,8 @@ The confirmation of a payment order does _not_ create accounting entries, it jus """, 'images': ['images/payment_mode.jpeg','images/payment_order.jpeg'], 'depends': ['account','account_voucher'], - 'init_xml': [], - 'update_xml': [ + 'data': [], + 'data': [ 'security/account_payment_security.xml', 'security/ir.model.access.csv', 'wizard/account_payment_pay_view.xml', @@ -51,7 +51,7 @@ The confirmation of a payment order does _not_ create accounting entries, it jus 'account_invoice_view.xml', 'account_payment_report.xml', ], - 'demo_xml': ['account_payment_demo.xml'], + 'demo': ['account_payment_demo.xml'], 'test': [ 'test/account_payment_demo.yml', 'test/cancel_payment_order.yml', diff --git a/addons/account_sequence/__openerp__.py b/addons/account_sequence/__openerp__.py index 0f860d400e9..e282894640d 100644 --- a/addons/account_sequence/__openerp__.py +++ b/addons/account_sequence/__openerp__.py @@ -22,7 +22,7 @@ { 'name': 'Entries Sequence Numbering', 'version': '1.1', - "category": 'Accounting & Finance', + 'category': 'Accounting & Finance', 'description': """ This module maintains internal sequence number for accounting entries. ====================================================================== @@ -40,13 +40,13 @@ You can customize the following attributes of the sequence: 'website': 'http://www.openerp.com', 'images': ['images/internal_sequence_number.jpeg'], 'depends': ['account'], - 'init_xml': [], - 'update_xml': [ + 'data': [], + 'data': [ 'account_sequence_data.xml', 'account_sequence_installer_view.xml', 'account_sequence.xml' ], - 'demo_xml': [], + 'demo': [], 'installable': True, 'auto_install': False, 'certificate': '00475376442024623469', diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index 16ea771d123..5335e1eed68 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -20,12 +20,12 @@ ############################################################################## { - "name" : "eInvoicing & Payments", - "version" : "1.0", - "author" : 'OpenERP SA', - "summary": 'Send Invoices and Track Payments', - "description": """ -eInvoicing & Payments module manage all Voucher Entries such as "Reconciliation Entries", "Adjustment Entries", "Closing or Opening Entries" for Sales, Purchase, Bank, Cash, Expense, Contra. + 'name' : 'eInvoicing & Payments', + 'version' : '1.0', + 'author' : 'OpenERP SA', + 'summary': 'Send Invoices and Track Payments', + 'description': """ +eInvoicing & Payments module manage all Voucher Entries such as 'Reconciliation Entries', 'Adjustment Entries', 'Closing or Opening Entries' for Sales, Purchase, Bank, Cash, Expense, Contra. ============================================================================================================================================================================================== * Voucher Entry @@ -33,47 +33,47 @@ eInvoicing & Payments module manage all Voucher Entries such as "Reconciliation * Voucher Payment [Customer & Supplier] * Cheque Register """, - "category": 'Accounting & Finance', - "sequence": 4, - "website" : "http://openerp.com", - "images" : ["images/customer_payment.jpeg","images/journal_voucher.jpeg","images/sales_receipt.jpeg","images/supplier_voucher.jpeg"], - "depends" : ["account"], - "init_xml" : [ + 'category': 'Accounting & Finance', + 'sequence': 4, + 'website' : 'http://openerp.com', + 'images' : ['images/customer_payment.jpeg','images/journal_voucher.jpeg','images/sales_receipt.jpeg','images/supplier_voucher.jpeg'], + 'depends' : ['account'], + 'data' : [ 'account_voucher_data.xml', ], - "demo_xml" : [], + 'demo' : [], - "update_xml" : [ - "security/ir.model.access.csv", - "account_voucher_sequence.xml", - "account_voucher_workflow.xml", - "account_voucher_report.xml", - "wizard/account_statement_from_invoice_view.xml", - "account_voucher_view.xml", - "voucher_payment_receipt_view.xml", - "voucher_sales_purchase_view.xml", - "account_voucher_wizard.xml", - "account_voucher_pay_invoice.xml", - "report/account_voucher_sales_receipt_view.xml", - "security/account_voucher_security.xml" + 'data' : [ + 'security/ir.model.access.csv', + 'account_voucher_sequence.xml', + 'account_voucher_workflow.xml', + 'account_voucher_report.xml', + 'wizard/account_statement_from_invoice_view.xml', + 'account_voucher_view.xml', + 'voucher_payment_receipt_view.xml', + 'voucher_sales_purchase_view.xml', + 'account_voucher_wizard.xml', + 'account_voucher_pay_invoice.xml', + 'report/account_voucher_sales_receipt_view.xml', + 'security/account_voucher_security.xml' ], - "test" : [ - "test/account_voucher.yml", - "test/sales_receipt.yml", - "test/sales_payment.yml", - "test/account_voucher_report.yml", - "test/case1_usd_usd.yml", - "test/case2_usd_eur_debtor_in_eur.yml", - "test/case2_usd_eur_debtor_in_usd.yml", - "test/case3_eur_eur.yml", - "test/case4_cad_chf.yml", - "test/case_eur_usd.yml", + 'test' : [ + 'test/account_voucher.yml', + 'test/sales_receipt.yml', + 'test/sales_payment.yml', + 'test/account_voucher_report.yml', + 'test/case1_usd_usd.yml', + 'test/case2_usd_eur_debtor_in_eur.yml', + '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, - "application": True, - "installable": True, + 'auto_install': False, + 'application': True, + 'installable': True, } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py index 859a65e7856..35191462e88 100644 --- a/addons/analytic/__openerp__.py +++ b/addons/analytic/__openerp__.py @@ -20,13 +20,13 @@ ############################################################################## { - "name" : "Analytic Accounting", - "version": "1.1", - "author" : "OpenERP SA", - "website" : "http://www.openerp.com", - "category": 'Hidden/Dependency', - "depends" : ["base", "decimal_precision", "mail"], - "description": """ + 'name' : 'Analytic Accounting', + 'version': '1.1', + 'author' : 'OpenERP SA', + 'website' : 'http://www.openerp.com', + 'category': 'Hidden/Dependency', + 'depends' : ['base', 'decimal_precision', 'mail'], + 'description': """ Module for defining analytic accounting object. =============================================== @@ -34,16 +34,16 @@ In OpenERP, analytic accounts are linked to general accounts but are treated totally independently. So, you can enter various different analytic operations that have no counterpart in the general financial accounts. """, - "init_xml" : [], - "update_xml": ['security/analytic_security.xml', - "security/ir.model.access.csv", - "analytic_sequence.xml", - "analytic_view.xml" + 'data' : [], + 'data': ['security/analytic_security.xml', + 'security/ir.model.access.csv', + 'analytic_sequence.xml', + 'analytic_view.xml' ], - 'demo_xml': [ + 'demo': [ ], 'installable': True, 'auto_install': False, - 'certificate' : "00462253285027988541", + 'certificate' : '00462253285027988541', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/analytic_contract_expense_project/__openerp__.py b/addons/analytic_contract_expense_project/__openerp__.py index b569330d117..4f87171aa60 100644 --- a/addons/analytic_contract_expense_project/__openerp__.py +++ b/addons/analytic_contract_expense_project/__openerp__.py @@ -28,15 +28,15 @@ This module is for modifying project view to show some data related to the hr_expense module. """, - "author": "OpenERP S.A.", - "website": "http://www.openerp.com/", - "depends": ["analytic_contract_hr_expense","project"], - "init_xml": [], - "update_xml": [ - "analytic_contract_expense_project_view.xml", + 'author': 'OpenERP S.A.', + 'website': 'http://www.openerp.com/', + 'depends': ['analytic_contract_hr_expense','project'], + 'data': [], + 'data': [ + 'analytic_contract_expense_project_view.xml', ], - 'demo_xml': [], - "css" : [ + 'demo': [], + 'css' : [ ], 'installable': True, 'auto_install': True, diff --git a/addons/analytic_contract_hr_expense/__openerp__.py b/addons/analytic_contract_hr_expense/__openerp__.py index 6d5cca8b574..2af987ab6f0 100644 --- a/addons/analytic_contract_hr_expense/__openerp__.py +++ b/addons/analytic_contract_hr_expense/__openerp__.py @@ -28,15 +28,15 @@ This module is for modifying account analytic view to show some data related to the hr_expense module. """, - "author": "OpenERP S.A.", - "website": "http://www.openerp.com/", - "depends": ["hr_expense","account_analytic_analysis"], - "init_xml": [], - "update_xml": [ - "analytic_contract_hr_expense_view.xml", + 'author': 'OpenERP S.A.', + 'website': 'http://www.openerp.com/', + 'depends': ['hr_expense','account_analytic_analysis'], + 'data': [], + 'data': [ + 'analytic_contract_hr_expense_view.xml', ], - 'demo_xml': [], - "css" : [ + 'demo': [], + 'css' : [ ], 'installable': True, 'auto_install': True, diff --git a/addons/analytic_contract_project/__openerp__.py b/addons/analytic_contract_project/__openerp__.py index 4e4f621663c..09aa56d4953 100644 --- a/addons/analytic_contract_project/__openerp__.py +++ b/addons/analytic_contract_project/__openerp__.py @@ -20,17 +20,17 @@ ############################################################################## { - "name" : "Contract on Project", - "version": "1.1", - "author" : "OpenERP SA", + 'name' : 'Contract on Project', + 'version': '1.1', + 'author' : 'OpenERP SA', 'category': 'Hidden', - "website" : "http://www.openerp.com", - "depends" : ["project", "account_analytic_analysis"], - "description": """ + 'website' : 'http://www.openerp.com', + 'depends' : ['project', 'account_analytic_analysis'], + 'description': """ Add "Contract Data" in project view. """, - "init_xml" : [], - "update_xml": ["analytic_contract_project_view.xml"], + 'data' : [], + 'data': ['analytic_contract_project_view.xml'], 'demo_xml': [], 'installable': True, 'auto_install': True, diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py index 1c1f345aca0..3705ffe71b2 100644 --- a/addons/analytic_user_function/__openerp__.py +++ b/addons/analytic_user_function/__openerp__.py @@ -41,9 +41,9 @@ compatible with older configurations. 'website': 'http://www.openerp.com', 'images': ['images/analytic_user_function.jpeg'], 'depends': ['hr_timesheet_sheet'], - 'init_xml': [], - 'update_xml': ['analytic_user_function_view.xml', 'security/ir.model.access.csv'], - 'demo_xml': [], + 'data': [], + 'data': ['analytic_user_function_view.xml', 'security/ir.model.access.csv'], + 'demo': [], 'installable': True, 'auto_install': False, 'certificate': '0082277138269', diff --git a/addons/anonymization/__openerp__.py b/addons/anonymization/__openerp__.py index acfc5ac3792..f6db94e6ac9 100644 --- a/addons/anonymization/__openerp__.py +++ b/addons/anonymization/__openerp__.py @@ -40,9 +40,9 @@ anonymization process to recover your previous data. 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['base'], - 'init_xml': [], - 'update_xml': [], - 'demo_xml': [ + 'data': [], + 'data': [], + 'demo': [ 'anonymization_demo.xml', ], 'data': [ diff --git a/addons/anonymization/anonymization_view.xml b/addons/anonymization/anonymization_view.xml index 5aba288d4f8..6d11dbe37fb 100644 --- a/addons/anonymization/anonymization_view.xml +++ b/addons/anonymization/anonymization_view.xml @@ -1,6 +1,6 @@ - + diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py index 2b7fcab8b12..665968c6613 100644 --- a/addons/association/__openerp__.py +++ b/addons/association/__openerp__.py @@ -33,8 +33,8 @@ membership products (schemes). """, 'author': 'OpenERP SA', 'depends': ['base_setup', 'membership', 'event'], - 'update_xml': ['security/ir.model.access.csv', 'profile_association.xml'], - 'demo_xml': [], + 'data': ['security/ir.model.access.csv', 'profile_association.xml'], + 'demo': [], 'installable': True, 'auto_install': False, 'certificate': '0078696047261', diff --git a/addons/audittrail/__openerp__.py b/addons/audittrail/__openerp__.py index 9ba403bcee3..adb4a9ba55c 100644 --- a/addons/audittrail/__openerp__.py +++ b/addons/audittrail/__openerp__.py @@ -34,13 +34,13 @@ and can check logs. 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['base'], - 'init_xml': [], - 'update_xml': [ + 'data': [], + 'data': [ 'wizard/audittrail_view_log_view.xml', 'audittrail_view.xml', 'security/ir.model.access.csv', ], - 'demo_xml': ['audittrail_demo.xml'], + 'demo': ['audittrail_demo.xml'], 'installable': True, 'auto_install': False, 'certificate': '0062572348749', diff --git a/addons/auth_ldap/__openerp__.py b/addons/auth_ldap/__openerp__.py index 4e5bc811dca..1e3fd814fee 100644 --- a/addons/auth_ldap/__openerp__.py +++ b/addons/auth_ldap/__openerp__.py @@ -19,12 +19,12 @@ ############################################################################## { - "name" : "Authentication via LDAP", - "version" : "1.0", - "depends" : ["base"], - "images" : ["images/ldap_configuration.jpeg"], - "author" : "OpenERP SA", - "description": """ + 'name' : 'Authentication via LDAP', + 'version' : '1.0', + 'depends' : ['base'], + 'images' : ['images/ldap_configuration.jpeg'], + 'author' : 'OpenERP SA', + 'description': """ Adds support for authentication by LDAP server. =============================================== This module allows users to login with their LDAP username and password, and @@ -100,17 +100,17 @@ authentication if installed at the same time. """, - "website" : "http://www.openerp.com", - "category" : "Authentication", - "data" : [ - "users_ldap_view.xml", - "user_ldap_installer.xml", - "security/ir.model.access.csv", + 'website' : 'http://www.openerp.com', + 'category' : 'Authentication', + 'data' : [ + 'users_ldap_view.xml', + 'user_ldap_installer.xml', + 'security/ir.model.access.csv', ], - "auto_install": False, - "installable": True, - "certificate" : "001141446349334700221", - "external_dependencies" : { + 'auto_install': False, + 'installable': True, + 'certificate' : '001141446349334700221', + 'external_dependencies' : { 'python' : ['ldap'], } } diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py index eff92685313..b54aa53f782 100644 --- a/addons/base_action_rule/__openerp__.py +++ b/addons/base_action_rule/__openerp__.py @@ -36,14 +36,14 @@ trigger an automatic reminder email. 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['base', 'mail'], - 'init_xml': [ + 'data': [ 'base_action_rule_data.xml' ], - 'update_xml': [ + 'data': [ 'base_action_rule_view.xml', 'security/ir.model.access.csv', ], - 'demo_xml': [], + 'demo': [], 'installable': True, 'auto_install': False, 'certificate' : '001017908446466333429', diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py index 58f666baa0d..a8eb55a4283 100644 --- a/addons/base_calendar/__openerp__.py +++ b/addons/base_calendar/__openerp__.py @@ -20,9 +20,9 @@ ############################################################################## { - "name": "Calendar Layer", - "version": "1.0", - "depends": ["base", "base_status", "mail", "base_action_rule"], + 'name': 'Calendar Layer', + 'version': '1.0', + 'depends': ['base', 'base_status', 'mail', 'base_action_rule'], 'description': """ This is a full-featured calendar system. ======================================== @@ -35,25 +35,25 @@ It supports: If you need to manage your meetings, you should install the CRM module. """, - "author": "OpenERP SA", + 'author': 'OpenERP SA', 'category': 'Hidden/Dependency', 'website': 'http://www.openerp.com', - "init_xml": [ + 'data': [ 'base_calendar_data.xml', 'crm_meeting_data.xml', ], - "demo_xml": ['crm_meeting_demo.xml'], - "update_xml": [ + 'demo': ['crm_meeting_demo.xml'], + 'data': [ 'security/calendar_security.xml', 'security/ir.model.access.csv', 'wizard/base_calendar_invite_attendee_view.xml', 'base_calendar_view.xml', 'crm_meeting_view.xml', ], - "test" : ['test/base_calendar_test.yml'], - "installable": True, - "auto_install": False, - "certificate": "00694071962960352821", + 'test' : ['test/base_calendar_test.yml'], + 'installable': True, + 'auto_install': False, + 'certificate': '00694071962960352821', 'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg',], } diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py index 62edc76b277..e57bab0c16f 100644 --- a/addons/base_crypt/__openerp__.py +++ b/addons/base_crypt/__openerp__.py @@ -19,13 +19,13 @@ # ############################################################################## { - "name" : "DB Password Encryption", - "version" : "1.1", - "author" : ['OpenERP SA', "FS3"], - "maintainer" : "OpenERP SA", - "website" : "http://www.openerp.com", - "category" : "Tools", - "description": """ + 'name' : 'DB Password Encryption', + 'version' : '1.1', + 'author' : ['OpenERP SA', 'FS3'], + 'maintainer' : 'OpenERP SA', + 'website' : 'http://www.openerp.com', + 'category' : 'Tools', + 'description': """ Replaces cleartext passwords in the database with a secure hash. ================================================================ @@ -54,11 +54,11 @@ Interation with LDAP authentication: This module is currently not compatible with the ``user_ldap`` module and will disable LDAP authentication completely if installed at the same time. """, - "depends" : ["base"], - "data" : [], - "auto_install": False, - "installable": True, - "certificate" : "00721290471310299725", + 'depends' : ['base'], + 'data' : [], + 'auto_install': False, + 'installable': True, + 'certificate' : '00721290471310299725', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py index f7778c13f2b..9df87d6b138 100644 --- a/addons/base_iban/__openerp__.py +++ b/addons/base_iban/__openerp__.py @@ -21,7 +21,7 @@ { 'name': 'IBAN Bank Accounts', 'version': '1.0', - "category": 'Hidden/Dependency', + 'category': 'Hidden/Dependency', 'description': """ This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for it's validity. ===================================================================================================================== @@ -32,8 +32,8 @@ with a single statement. 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['base'], - 'init_xml': ['base_iban_data.xml'], - 'update_xml': ['base_iban_view.xml'], + 'data': ['base_iban_data.xml'], + 'data': ['base_iban_view.xml'], 'installable': True, 'auto_install': False, 'certificate': '0050014379549', diff --git a/addons/base_iban/base_iban_data.xml b/addons/base_iban/base_iban_data.xml index ac481098254..eafc8dfcff8 100644 --- a/addons/base_iban/base_iban_data.xml +++ b/addons/base_iban/base_iban_data.xml @@ -1,6 +1,6 @@ - + diff --git a/addons/l10n_cl/__openerp__.py b/addons/l10n_cl/__openerp__.py index d10acdae575..19c499d9f7d 100644 --- a/addons/l10n_cl/__openerp__.py +++ b/addons/l10n_cl/__openerp__.py @@ -17,34 +17,32 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # -############################################################################## +############################################################################## { - "name": "Chile Localization Chart Account", - "version": "1.0", - "description": """ + 'name': 'Chile Localization Chart Account', + 'version': '1.0', + 'description': """ Chilean accounting chart and tax localization. Plan contable chileno e impuestos de acuerdo a disposiciones vigentes """, - "author": "Cubic ERP", - "website": "http://cubicERP.com", - "category": "Localization/Account Charts", - "depends": [ - "account_chart", - ], - "data":[ - "account_tax_code.xml", - "l10n_cl_chart.xml", - "account_tax.xml", - "l10n_cl_wizard.xml", - ], - "demo_xml": [ - ], - "update_xml": [ - ], - "active": False, - "installable": True, + 'author': 'Cubic ERP', + 'website': 'http://cubicERP.com', + 'category': 'Localization/Account Charts', + 'depends': [ + 'account_chart', + ], + 'data':[ + 'account_tax_code.xml', + 'l10n_cl_chart.xml', + 'account_tax.xml', + 'l10n_cl_wizard.xml', + ], + 'demo': [], + 'data': [], + 'active': False, + 'installable': True, 'images': ['images/config_chart_l10n_cl.jpeg','images/l10n_cl_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py index e173c5ebba2..f69c7b04205 100644 --- a/addons/l10n_cn/__openerp__.py +++ b/addons/l10n_cn/__openerp__.py @@ -18,31 +18,31 @@ # ############################################################################## { - "name" : "中国会计科目表 - Accounting", - "version" : "1.0", - "category": "Localization/Account Charts", - "author" : "openerp-china.org", - "maintainer":"openerp-china.org", - "website":"http://openerp-china.org", - "url":"http://code.google.com/p/openerp-china/source/browse/#svn/trunk/l10n_cn", - "description": """ + 'name' : '中国会计科目表 - Accounting', + 'version' : '1.0', + 'category': 'Localization/Account Charts', + 'author' : 'openerp-china.org', + 'maintainer':'openerp-china.org', + 'website':'http://openerp-china.org', + 'url':'http://code.google.com/p/openerp-china/source/browse/#svn/trunk/l10n_cn', + 'description': """ 添加中文省份数据 科目类型\会计科目表模板\增值税\辅助核算类别\管理会计凭证簿\财务会计凭证簿 ============================================================ """, - "depends" : ["base","account"], - 'init_xml': [ + 'depends' : ['base','account'], + 'data': [ 'base_data.xml', ], - "demo_xml" : [], - "update_xml" : [ + 'demo' : [], + 'data' : [ 'account_chart.xml', - "l10n_chart_cn_wizard.xml", + 'l10n_chart_cn_wizard.xml', ], - "license": "GPL-3", - "auto_install": False, - "installable": True, - "certificate": '00925445983542952285', + 'license': 'GPL-3', + 'auto_install': False, + 'installable': True, + 'certificate': '00925445983542952285', 'images': ['images/config_chart_l10n_cn.jpeg','images/l10n_cn_chart.jpeg'], } diff --git a/addons/l10n_cn/base_data.xml b/addons/l10n_cn/base_data.xml index 18242ba38b9..c65978b6560 100644 --- a/addons/l10n_cn/base_data.xml +++ b/addons/l10n_cn/base_data.xml @@ -1,162 +1,162 @@ - - - - - - - 北京市 - 京 - - - - 上海市 - 沪 - - - - 浙江省 - 浙 - - - - 天津市 - 津 - - - - 安徽省 - 皖 - - - - 福建省 - 闽 - - - - 重庆市 - 渝 - - - - 江西省 - 赣 - - - - 山东省 - 鲁 - - - - 河南省 - 豫 - - - - 内蒙古自治区 - 蒙 - - - - 湖北省 - 鄂 - - - - 新疆维吾尔自治区 - 新 - - - - 湖南省 - 湘 - - - - 宁夏回族自治区 - 宁 - - - - 广东省 - 粤 - - - - 西藏自治区 - 藏 - - - - 海南省 - 琼 - - - - 广西壮族自治区 - 桂 - - - - 四川省 - 蜀 - - - - 河北省 - 冀 - - - - 贵州省 - 黔 - - - - 山西省 - 晋 - - - - 云南省 - 滇 - - - - 辽宁省 - 辽 - - - - 陕西省 - 陕 - - - - 吉林省 - 吉 - - - - 甘肃省 - 甘 - - - - 黑龙江省 - 黑 - - - - 青海省 - 青 - - - - 江苏省 - 苏 - - - - + + + + + + + 北京市 + 京 + + + + 上海市 + 沪 + + + + 浙江省 + 浙 + + + + 天津市 + 津 + + + + 安徽省 + 皖 + + + + 福建省 + 闽 + + + + 重庆市 + 渝 + + + + 江西省 + 赣 + + + + 山东省 + 鲁 + + + + 河南省 + 豫 + + + + 内蒙古自治区 + 蒙 + + + + 湖北省 + 鄂 + + + + 新疆维吾尔自治区 + 新 + + + + 湖南省 + 湘 + + + + 宁夏回族自治区 + 宁 + + + + 广东省 + 粤 + + + + 西藏自治区 + 藏 + + + + 海南省 + 琼 + + + + 广西壮族自治区 + 桂 + + + + 四川省 + 蜀 + + + + 河北省 + 冀 + + + + 贵州省 + 黔 + + + + 山西省 + 晋 + + + + 云南省 + 滇 + + + + 辽宁省 + 辽 + + + + 陕西省 + 陕 + + + + 吉林省 + 吉 + + + + 甘肃省 + 甘 + + + + 黑龙江省 + 黑 + + + + 青海省 + 青 + + + + 江苏省 + 苏 + + + + diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py index 562af835398..410170543e3 100644 --- a/addons/l10n_cr/__openerp__.py +++ b/addons/l10n_cr/__openerp__.py @@ -54,9 +54,9 @@ Everything is in English with Spanish translation. Further translations are welc please go to http://translations.launchpad.net/openerp-costa-rica. """, 'depends': ['account', 'account_chart', 'base'], - 'init_xml': [], - 'demo_xml': [], - 'update_xml': [ + 'data': [], + 'demo': [], + 'data': [ 'l10n_cr_base_data.xml', 'data/account_account_type.xml', 'data/account_account_template.xml', diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py index 232a1abb3ad..f3a1cfa6c35 100644 --- a/addons/l10n_de/__openerp__.py +++ b/addons/l10n_de/__openerp__.py @@ -38,19 +38,19 @@ # Die Zuordnung der Steuern für Ein- und Ausfuhren aus EU Ländern, sowie auch # für den Ein- und Verkauf aus und in Drittländer sollten beim Partner # (Lieferant/Kunde)hinterlegt werden (in Anhängigkeit vom Herkunftsland -# des Lieferanten/Kunden). Die Zuordnung beim Kunden ist "höherwertig" als +# des Lieferanten/Kunden). Die Zuordnung beim Kunden ist 'höherwertig' als # die Zuordnung bei Produkten und überschreibt diese im Einzelfall. # # Zur Vereinfachung der Steuerausweise und Buchung bei Auslandsgeschäften # erlaubt OpenERP ein generelles Mapping von Steuerausweis und Steuerkonten -# (z.B. Zuordnung "Umsatzsteuer 19%" zu "steuerfreie Einfuhren aus der EU") +# (z.B. Zuordnung 'Umsatzsteuer 19%' zu 'steuerfreie Einfuhren aus der EU') # zwecks Zuordnung dieses Mappings zum ausländischen Partner (Kunde/Lieferant). # Die Rechnungsbuchung beim Einkauf bewirkt folgendes: # Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den # jeweiligen Kategorien für den Vorsteuer Steuermessbetrag (z.B. Vorsteuer # Steuermessbetrag Voller Steuersatz 19%). -# Der Steuerbetrag erscheint unter der Kategorie "Vorsteuern" (z.B. Vorsteuer +# Der Steuerbetrag erscheint unter der Kategorie 'Vorsteuern' (z.B. Vorsteuer # 19%). Durch multidimensionale Hierachien können verschiedene Positionen # zusammengefasst werden und dann in Form eines Reports ausgegeben werden. # @@ -58,7 +58,7 @@ # Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den # jeweiligen Kategorien für den Umsatzsteuer Steuermessbetrag # (z.B. Umsatzsteuer Steuermessbetrag Voller Steuersatz 19%). -# Der Steuerbetrag erscheint unter der Kategorie "Umsatzsteuer" +# Der Steuerbetrag erscheint unter der Kategorie 'Umsatzsteuer' # (z.B. Umsatzsteuer 19%). Durch multidimensionale Hierachien können # verschiedene Positionen zusammengefasst werden. # Die zugewiesenen Steuerausweise können auf Ebene der einzelnen @@ -89,19 +89,19 @@ # Die Zuordnung der Steuern für Ein- und Ausfuhren aus EU Ländern, sowie auch # für den Ein- und Verkauf aus und in Drittländer sollten beim Partner # (Lieferant/Kunde) hinterlegt werden (in Anhängigkeit vom Herkunftsland -# des Lieferanten/Kunden). Die Zuordnung beim Kunden ist "höherwertig" als +# des Lieferanten/Kunden). Die Zuordnung beim Kunden ist 'höherwertig' als # die Zuordnung bei Produkten und überschreibt diese im Einzelfall. # # Zur Vereinfachung der Steuerausweise und Buchung bei Auslandsgeschäften # erlaubt OpenERP ein generelles Mapping von Steuerausweis und Steuerkonten -# (z.B. Zuordnung "Umsatzsteuer 19%" zu "steuerfreie Einfuhren aus der EU") +# (z.B. Zuordnung 'Umsatzsteuer 19%' zu 'steuerfreie Einfuhren aus der EU') # zwecks Zuordnung dieses Mappings zum ausländischen Partner (Kunde/Lieferant). # Die Rechnungsbuchung beim Einkauf bewirkt folgendes: # Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den # jeweiligen Kategorien für den Vorsteuer Steuermessbetrag (z.B. Vorsteuer # Steuermessbetrag Voller Steuersatz 19%). -# Der Steuerbetrag erscheint unter der Kategorie "Vorsteuern" (z.B. Vorsteuer +# Der Steuerbetrag erscheint unter der Kategorie 'Vorsteuern' (z.B. Vorsteuer # 19%). Durch multidimensionale Hierachien können verschiedene Positionen # zusammengefasst werden und dann in Form eines Reports ausgegeben werden. # @@ -109,7 +109,7 @@ # Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den # jeweiligen Kategorien für den Umsatzsteuer Steuermessbetrag # (z.B. Umsatzsteuer Steuermessbetrag Voller Steuersatz 19%). -# Der Steuerbetrag erscheint unter der Kategorie "Umsatzsteuer" +# Der Steuerbetrag erscheint unter der Kategorie 'Umsatzsteuer' # (z.B. Umsatzsteuer 19%). Durch multidimensionale Hierachien können # verschiedene Positionen zusammengefasst werden. # Die zugewiesenen Steuerausweise können auf Ebene der einzelnen @@ -121,35 +121,35 @@ { - "name" : "Deutschland - Accounting", - "version" : "1.0", - "author" : "openbig.org", - "website" : "http://www.openbig.org", - "category" : "Localization/Account Charts", - "description": """ + 'name' : 'Deutschland - Accounting', + 'version' : '1.0', + 'author' : 'openbig.org', + 'website' : 'http://www.openbig.org', + 'category' : 'Localization/Account Charts', + 'description': """ Dieses Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem SKR03. ============================================================================== German accounting chart and localization. """, - "depends" : ['base', 'account', 'base_iban', 'base_vat', 'account_chart'], - "init_xml" : [ ], - "demo_xml" : [ ], - "update_xml" : [ - "account_tax_skr03.xml", - "account_types_skr03.xml", - "account_chart_skr03.xml", - "account_chart_template_skr03.xml", - "account_tax_fiscal_position_skr03.xml", - "account_tax_skr04.xml", - "account_types_skr04.xml", - "account_chart_skr04.xml", - "account_chart_template_skr04.xml", - "account_tax_fiscal_position_skr04.xml", - "l10n_de_wizard.xml", + 'depends' : ['base', 'account', 'base_iban', 'base_vat', 'account_chart'], + 'data' : [ ], + 'demo' : [ ], + 'data' : [ + 'account_tax_skr03.xml', + 'account_types_skr03.xml', + 'account_chart_skr03.xml', + 'account_chart_template_skr03.xml', + 'account_tax_fiscal_position_skr03.xml', + 'account_tax_skr04.xml', + 'account_types_skr04.xml', + 'account_chart_skr04.xml', + 'account_chart_template_skr04.xml', + 'account_tax_fiscal_position_skr04.xml', + 'l10n_de_wizard.xml', ], - "installable": True, - "certificate": "00517849017945584893", + 'installable': True, + 'certificate': '00517849017945584893', 'images': ['images/config_chart_l10n_de.jpeg','images/l10n_de_chart.jpeg'], } diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py index 9dd81606036..a1c062f5232 100644 --- a/addons/l10n_ec/__openerp__.py +++ b/addons/l10n_ec/__openerp__.py @@ -35,14 +35,14 @@ Accounting chart and localization for Ecuador. 'account_chart', 'account_coda', ], - 'init_xml': [], - 'update_xml': [ + 'data': [], + 'data': [ 'account_tax_code.xml', 'account_chart.xml', 'account_tax.xml', 'l10n_chart_ec_wizard.xml', ], - 'demo_xml': [], + 'demo': [], 'installable': True, 'certificate' : '001226484516187330589', 'images': ['images/config_chart_l10n_ec.jpeg','images/l10n_ec_chart.jpeg'], diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py index b2897e07748..6022f5ed31b 100644 --- a/addons/l10n_es/__openerp__.py +++ b/addons/l10n_es/__openerp__.py @@ -22,12 +22,12 @@ ############################################################################## { - "name" : "Spanish - Accounting (PGCE 2008)", - "version" : "3.0", - "author" : "Spanish Localization Team", + 'name' : 'Spanish - Accounting (PGCE 2008)', + 'version' : '3.0', + 'author' : 'Spanish Localization Team', 'website' : 'https://launchpad.net/openerp-spain', - "category" : "Localization/Account Charts", - "description": """ + 'category' : 'Localization/Account Charts', + 'description': """ Spanish Charts of Accounts (PGCE 2008). ======================================= @@ -40,23 +40,23 @@ Spanish Charts of Accounts (PGCE 2008). Note: You should install the l10n_ES_account_balance_report module for yearly account reporting (balance, profit & losses). """, - "license" : "GPL-3", - "depends" : ["account", "base_vat", "base_iban"], - "init_xml" : [ - "account_chart.xml", - "taxes_data.xml", - "fiscal_templates.xml", - "account_chart_pymes.xml", - "taxes_data_pymes.xml", - "fiscal_templates_pymes.xml", - "l10n_es_wizard.xml" + 'license' : 'GPL-3', + 'depends' : ['account', 'base_vat', 'base_iban'], + 'data' : [ + 'account_chart.xml', + 'taxes_data.xml', + 'fiscal_templates.xml', + 'account_chart_pymes.xml', + 'taxes_data_pymes.xml', + 'fiscal_templates_pymes.xml', + 'l10n_es_wizard.xml' ], - "demo_xml" : [], - "update_xml" : [ + 'demo' : [], + 'data' : [ ], - "auto_install": False, - "installable": True, - "certificate" : "00408828172062583229", + 'auto_install': False, + 'installable': True, + 'certificate' : '00408828172062583229', 'images': ['images/config_chart_l10n_es.jpeg','images/l10n_es_chart.jpeg'], } diff --git a/addons/l10n_es/account_chart.xml b/addons/l10n_es/account_chart.xml index 5147024deae..8ffabd17fe7 100644 --- a/addons/l10n_es/account_chart.xml +++ b/addons/l10n_es/account_chart.xml @@ -1,6 +1,6 @@ - + diff --git a/addons/l10n_es/account_chart_pymes.xml b/addons/l10n_es/account_chart_pymes.xml index 76cd713fe94..ed2e4f18e7c 100644 --- a/addons/l10n_es/account_chart_pymes.xml +++ b/addons/l10n_es/account_chart_pymes.xml @@ -1,6 +1,6 @@ - + - + res.config.view.base res.config diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml index f02abd90985..8aa18bd8df4 100644 --- a/openerp/addons/base/res/res_security.xml +++ b/openerp/addons/base/res/res_security.xml @@ -1,6 +1,6 @@ - + Partner Manager diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml index cd0b7e999b3..11be6e35bd1 100644 --- a/openerp/addons/base/security/base_security.xml +++ b/openerp/addons/base/security/base_security.xml @@ -1,6 +1,6 @@ - + - - Accounting - + + + @@ -19,10 +19,8 @@ automatic 100 - - - + diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml index f9c9070ddbf..5458f397e36 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml @@ -1,7 +1,8 @@ - + + @@ -20,13 +21,7 @@ - - My Current Timesheet - - - STOCK_JUSTIFY_FILL - - + diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 68727832e53..f6ef5bc2ee9 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -8,21 +8,11 @@ groups="base.group_user" sequence="10"/> - + - - News Feed - - - - - - My Feeds - - - - + + diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py index a55f67bda2c..8770aa53429 100644 --- a/addons/project_timesheet/__openerp__.py +++ b/addons/project_timesheet/__openerp__.py @@ -35,15 +35,14 @@ with the effect of creating, editing and deleting either ways. 'website': 'http://www.openerp.com', 'images': ['images/invoice_task_work.jpeg', 'images/my_timesheet.jpeg', 'images/working_hour.jpeg'], 'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice', 'account_analytic_analysis'], - 'init_xml': ['project_timesheet_data.xml'], - 'update_xml': [ - "security/ir.model.access.csv", - "security/project_timesheet_security.xml", - "process/project_timesheet_process.xml", - "report/task_report_view.xml", - "project_timesheet_view.xml", - ], - 'demo_xml': ["project_timesheet_demo.xml"], + 'data': [ + 'security/ir.model.access.csv', + 'security/project_timesheet_security.xml', + 'process/project_timesheet_process.xml', + 'report/task_report_view.xml', + 'project_timesheet_view.xml', + ], + 'demo': ['project_timesheet_demo.xml'], 'test': [ 'test/worktask_entry_to_timesheetline_entry.yml', 'test/work_timesheet.yml', diff --git a/addons/project_timesheet/project_timesheet_data.xml b/addons/project_timesheet/project_timesheet_data.xml deleted file mode 100644 index ed87cb8c65f..00000000000 --- a/addons/project_timesheet/project_timesheet_data.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - From 818c9dd2b12377e02ebe43eb20757f3bfabfd367 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Wed, 22 Aug 2012 16:44:12 +0200 Subject: [PATCH 28/31] [IMP] indentation bzr revid: abo@openerp.com-20120822144412-6lnbo1n5jdv32vb4 --- addons/crm/crm_meeting_view.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index d7f59267a30..068f7cfbf64 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -2,9 +2,8 @@ - - - + + calendar.attendee.form.inherit calendar.attendee @@ -13,7 +12,7 @@ - + From a337ca201d7d72b485c0e330c433afc50bef458a Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 22 Aug 2012 16:49:46 +0200 Subject: [PATCH 29/31] [IMP] rng: forbid redundant @type for menuitem, now inferred from the action type + minor cleanup bzr revid: odo@openerp.com-20120822144946-fdsw9ee1ia3nfe86 --- openerp/import_xml.rng | 1 - openerp/tools/convert.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/openerp/import_xml.rng b/openerp/import_xml.rng index bf5a9e1800e..5dd789c6e95 100644 --- a/openerp/import_xml.rng +++ b/openerp/import_xml.rng @@ -185,7 +185,6 @@ - diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py index 5fd88889602..8269fa5d7ff 100644 --- a/openerp/tools/convert.py +++ b/openerp/tools/convert.py @@ -593,11 +593,11 @@ form: module.record_id""" % (xml_id,) a_action = rec.get('action','').encode('utf8') # determine the type of action - if ('.' in a_action): - # this is an action refering to another module: extract this module's name + if '.' in a_action: + # action referring to another module a_action_module, a_action_name = a_action.split('.') else: - # this is a local action: fetch the current module's name + # local action: use current module a_action_module = self.module a_action_name = a_action From 31c6018909f25aa0c029e3f7bd41139a3280d415 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Wed, 22 Aug 2012 18:32:37 +0200 Subject: [PATCH 30/31] [IMP] remove unused dummy() method bzr revid: abo@openerp.com-20120822163237-ujifdtucyl18w9ze --- addons/project/project.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/addons/project/project.py b/addons/project/project.py index 1a8f8c8bfe5..ab1c3c47dfe 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -250,9 +250,6 @@ class project(osv.osv): type='many2many', relation='res.users', string='Followers'), } - def dummy(self, cr, uid, ids, context): - return True - def _get_type_common(self, cr, uid, context): ids = self.pool.get('project.task.type').search(cr, uid, [('case_default','=',1)], context=context) return ids @@ -526,7 +523,7 @@ def Project(): mail_alias = self.pool.get('mail.alias') if not vals.get('alias_id'): vals.pop('alias_name', None) # prevent errors during copy() - alias_id = mail_alias.create_unique_alias(cr, uid, + alias_id = mail_alias.create_unique_alias(cr, uid, # Using '+' allows using subaddressing for those who don't # have a catchall domain setup. {'alias_name': "project+"+short_name(vals['name'])}, From 0b29e7579d0f42bf0e6f74b16edf53845f417c53 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Wed, 22 Aug 2012 19:46:35 +0200 Subject: [PATCH 31/31] [IMP] avoid re-computing the module's field by setting it to bzr revid: abo@openerp.com-20120822174635-agqupq0iyqc0rn9v --- openerp/addons/base/module/module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index c5df273ea02..d523ff0ac7f 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -192,7 +192,7 @@ class module(osv.osv): 'category_id': fields.many2one('ir.module.category', 'Category', readonly=True, select=True), 'shortdesc': fields.char('Module Name', size=64, readonly=True, translate=True), 'summary': fields.char('Summary', size=64, readonly=True, translate=True), - 'description': fields.function(_get_desc, string='Description', type='html', method=True, readonly=True), + 'description': fields.function(_get_desc, string='Description', type='html', method=True, readonly=True, store=True), 'author': fields.char("Author", size=128, readonly=True), 'maintainer': fields.char('Maintainer', size=128, readonly=True), 'contributors': fields.text('Contributors', readonly=True),