From 7c63902af85f5ef1fb181b134e37fb3f5344f896 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 5 Dec 2011 16:03:11 +0100 Subject: [PATCH 01/12] [FIX] clean some warnings. bzr revid: vmt@openerp.com-20111205150311-6xkx4eytvxnkvdck --- addons/anonymization/security/ir.model.access.csv | 2 -- addons/hr_payroll/hr_payroll_demo.xml | 1 - addons/l10n_ch/bank_view.xml | 8 -------- addons/l10n_ch/sterchi_chart/account.xml | 2 -- addons/l10n_gt/l10n_gt_base.xml | 1 - addons/mrp_jit/__openerp__.py | 2 +- addons/stock_planning/test/stock_planning.yml | 1 - 7 files changed, 1 insertion(+), 16 deletions(-) diff --git a/addons/anonymization/security/ir.model.access.csv b/addons/anonymization/security/ir.model.access.csv index b558227df24..5531738338b 100644 --- a/addons/anonymization/security/ir.model.access.csv +++ b/addons/anonymization/security/ir.model.access.csv @@ -3,5 +3,3 @@ "access_ir_model_fields_anonymization_user","ir_model_fields_anonymization user","model_ir_model_fields_anonymization",,1,0,0,0 "access_ir_model_fields_anonymization_history_group_system","ir_model_fields_anonymization_history group_user","model_ir_model_fields_anonymization_history","base.group_system",1,1,1,1 "access_ir_model_fields_anonymization_history_user","ir_model_fields_anonymization_history user","model_ir_model_fields_anonymization_history",,1,0,0,0 -"access_ir_model_fields_anonymize_wizard_group_system","ir_model_fields_anonymize_wizard group_user","model_ir_model_fields_anonymize_wizard","base.group_system",1,1,1,1 -"access_ir_model_fields_anonymize_wizard_user","ir_model_fields_anonymize_wizard user","model_ir_model_fields_anonymize_wizard",,1,0,0,0 diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml index e888ad6f133..fbe8578b3ea 100644 --- a/addons/hr_payroll/hr_payroll_demo.xml +++ b/addons/hr_payroll/hr_payroll_demo.xml @@ -158,7 +158,6 @@ This is Quentin Paolino's contract - diff --git a/addons/l10n_ch/bank_view.xml b/addons/l10n_ch/bank_view.xml index 705e2d63ef4..e23be1bb6ac 100644 --- a/addons/l10n_ch/bank_view.xml +++ b/addons/l10n_ch/bank_view.xml @@ -6,7 +6,6 @@ res.bank.form res.bank form - @@ -23,7 +22,6 @@ res.bank.tree res.bank tree - @@ -40,7 +38,6 @@ res.partner_bank.form.hide.f1 res.partner form - @@ -51,7 +48,6 @@ res.partner_bank.form.hide.f2 res.partner form - @@ -63,7 +59,6 @@ res.partner_bank.form.hide.f2 res.partner form - @@ -94,7 +89,6 @@ res.partner_bank.form.hide.acc_number.frominvoice res.partner.bank form - @@ -106,7 +100,6 @@ res.partner_bank.form.hide.bank.frominvoice res.partner.bank form - @@ -118,7 +111,6 @@ res.partner_bank.form.hide.frominvoice res.partner.bank form - diff --git a/addons/l10n_ch/sterchi_chart/account.xml b/addons/l10n_ch/sterchi_chart/account.xml index ded5f542fe5..8fdd29fe8a8 100644 --- a/addons/l10n_ch/sterchi_chart/account.xml +++ b/addons/l10n_ch/sterchi_chart/account.xml @@ -177,14 +177,12 @@ Bilan : Debiteurs receivable - True unreconciled none Bilan : Fournisseurs payable - True unreconciled none diff --git a/addons/l10n_gt/l10n_gt_base.xml b/addons/l10n_gt/l10n_gt_base.xml index c52e7e94532..5238d7b4f23 100644 --- a/addons/l10n_gt/l10n_gt_base.xml +++ b/addons/l10n_gt/l10n_gt_base.xml @@ -16,7 +16,6 @@ GTQ - GTQ Q 0.01 4 diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py index 72ef35ebc4b..6f8aec2dcc9 100644 --- a/addons/mrp_jit/__openerp__.py +++ b/addons/mrp_jit/__openerp__.py @@ -41,7 +41,7 @@ In that case, you can not use priorities any more on the different picking. """, 'author': 'OpenERP SA', - 'depends': ['procurement'], + 'depends': ['procurement', 'mrp'], 'update_xml': ['mrp_jit.xml'], 'demo_xml': [], 'test': ['test/mrp_jit.yml'], diff --git a/addons/stock_planning/test/stock_planning.yml b/addons/stock_planning/test/stock_planning.yml index df2f53dbb6e..f9608461f8a 100644 --- a/addons/stock_planning/test/stock_planning.yml +++ b/addons/stock_planning/test/stock_planning.yml @@ -168,7 +168,6 @@ !python {model: stock.sale.forecast}: | forecast_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_pc1'))]) write_dict = {'product_qty': 30.0, - 'analyzed_section_id': ref("crm.section_sales_department"), 'analyzed_period1_id': ref("stock_period_03"), 'analyzed_user_id': ref("base.user_root"), 'analyzed_warehouse_id': ref("stock.warehouse0")} From b28f574799bee172e0b35f6335e9a8722dbd3148 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 5 Dec 2011 16:55:10 +0100 Subject: [PATCH 02/12] [FIX] clean some warnings. bzr revid: vmt@openerp.com-20111205155510-many34fn09yr58x0 --- addons/hr_holidays/hr_holidays.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index d22c5b9f1bb..746c2764315 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -262,7 +262,7 @@ class hr_holidays(osv.osv): 'name': record.name, 'categ_id': record.holiday_status_id.categ_id.id, 'duration': record.number_of_days_temp * 8, - 'note': record.notes, + 'description': record.notes, 'user_id': record.user_id.id, 'date': record.date_from, 'end_date': record.date_to, From bca8a89bc5afa128769e397ba5780f4957e39567 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Tue, 6 Dec 2011 11:13:54 +0100 Subject: [PATCH 03/12] [FIX] clean some warnings. bzr revid: vmt@openerp.com-20111206101354-snbya2xtl8pjwskc --- addons/account/account.py | 2 +- addons/account/account_bank.py | 1 - addons/account/account_invoice.py | 6 +-- addons/l10n_br/data/account_tax_template.xml | 47 +------------------- addons/l10n_cr/data/account_tax_template.xml | 2 - addons/mrp_jit/__openerp__.py | 2 +- 6 files changed, 6 insertions(+), 54 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 73c1018d66b..384ef47e980 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1223,7 +1223,7 @@ class account_move(osv.osv): 'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}), 'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}), 'state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'State', required=True, readonly=True, - help='All manually created new journal entry are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'), + help='All manually created new journal entries are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'), 'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}), 'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'), 'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True), diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py index 01eab2fbb01..02270b94186 100644 --- a/addons/account/account_bank.py +++ b/addons/account/account_bank.py @@ -99,7 +99,6 @@ class bank(osv.osv): 'type': 'bank', 'company_id': bank.company_id.id, 'analytic_journal_id': False, - 'currency_id': False, 'default_credit_account_id': acc_bank_id, 'default_debit_account_id': acc_bank_id, 'view_id': view_id_cash diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index fcd630ea78b..39cc471c2f6 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -923,7 +923,6 @@ class account_invoice(osv.osv): 'line_id': line, 'journal_id': journal_id, 'date': date, - 'type': entry_type, 'narration':inv.comment } period_id = inv.period_id and inv.period_id.id or False @@ -1081,7 +1080,8 @@ class account_invoice(osv.osv): del line['invoice_id'] for field in ('company_id', 'partner_id', 'account_id', 'product_id', 'uos_id', 'account_analytic_id', 'tax_code_id', 'base_code_id'): - line[field] = line.get(field, False) and line[field][0] + if line.get(field): + line[field] = line[field][0] if 'invoice_line_tax_id' in line: line['invoice_line_tax_id'] = [(6,0, line.get('invoice_line_tax_id', [])) ] return map(lambda x: (0,0,x), lines) @@ -1209,7 +1209,7 @@ class account_invoice(osv.osv): l2['name'] = name lines = [(0, 0, l1), (0, 0, l2)] - move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date, 'type': entry_type} + move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date} move_id = self.pool.get('account.move').create(cr, uid, move, context=context) line_ids = [] diff --git a/addons/l10n_br/data/account_tax_template.xml b/addons/l10n_br/data/account_tax_template.xml index 58f860e0d90..fcdcb4d30e6 100644 --- a/addons/l10n_br/data/account_tax_template.xml +++ b/addons/l10n_br/data/account_tax_template.xml @@ -5,7 +5,6 @@ IPI IPI - vat 0.00 @@ -21,7 +20,6 @@ IPI 2% IPI 2% - vat 0.02 @@ -37,7 +35,6 @@ IPI 3% IPI 3% - vat 0.03 @@ -53,7 +50,6 @@ IPI 4% IPI 4% - vat 0.04 @@ -69,7 +65,6 @@ IPI 5% IPI 5% - vat 0.05 @@ -85,7 +80,6 @@ IPI 7% IPI 7% - vat 0.07 @@ -101,7 +95,6 @@ IPI 8% IPI 8% - vat 0.08 @@ -117,7 +110,6 @@ IPI 10% IPI 10% - vat 0.10 @@ -133,7 +125,6 @@ IPI 12% IPI 12% - vat 0.12 @@ -149,7 +140,6 @@ IPI 13% IPI 13% - vat 0.13 @@ -165,7 +155,6 @@ IPI 15% IPI 15% - vat 0.15 @@ -181,7 +170,6 @@ IPI 16% IPI 16% - vat 0.16 @@ -197,7 +185,6 @@ IPI 18% IPI 18% - vat 0.18 @@ -213,7 +200,6 @@ IPI 20% IPI 20% - vat 0.20 @@ -229,7 +215,6 @@ IPI 22% IPI 22% - vat 0.22 @@ -245,7 +230,6 @@ IPI 25% IPI 25% - vat 0.25 @@ -261,7 +245,6 @@ IPI 27% IPI 27% - vat 0.27 @@ -277,7 +260,6 @@ IPI 30% IPI 30% - vat 0.30 @@ -293,7 +275,6 @@ IPI 35% IPI 35% - vat 0.35 @@ -309,7 +290,6 @@ IPI 40% IPI 40% - vat 0.40 @@ -325,7 +305,6 @@ IPI 42% IPI 42% - vat 0.42 @@ -341,7 +320,6 @@ IPI 45% IPI 45% - vat 0.45 @@ -357,7 +335,6 @@ IPI 50% IPI 50% - vat 0.50 @@ -373,7 +350,6 @@ IPI 60% IPI 60% - vat 0.60 @@ -389,7 +365,6 @@ IPI 330% IPI 330% - vat 3.30 @@ -405,7 +380,6 @@ ICMS Interno ICMS Interno - vat 0.00 @@ -421,7 +395,6 @@ ICMS Externo ICMS Externo - vat 0.00 @@ -437,7 +410,6 @@ ICMS Subist ICMS Subist - vat 0.00 @@ -451,7 +423,6 @@ ICMS Externo 7% ICMS Externo 7% - vat 0.07 @@ -467,7 +438,6 @@ ICMS Externo 12% ICMS Externo 12% - vat 0.12 @@ -483,7 +453,6 @@ ICMS Interno 19% ICMS Interno 19% - vat 0.19 @@ -499,7 +468,6 @@ ICMS Interno 26% ICMS Interno 26% - vat 0.26 @@ -515,7 +483,6 @@ PIS PIS - vat 0.00 @@ -531,7 +498,6 @@ PIS 0,65% PIS 0,65% - vat 0.0065 @@ -547,7 +513,6 @@ COFINS COFINS - vat 0.00 @@ -563,7 +528,6 @@ COFINS 3% COFINS 3% - vat 0.03 @@ -579,7 +543,6 @@ IRPJ IRPJ - vat 0.00 @@ -593,7 +556,6 @@ IR IR - vat 0.00 @@ -607,7 +569,6 @@ ISS ISS - vat 0.00 @@ -621,7 +582,6 @@ ISS 1% ISS 1% - vat 0.01 @@ -635,7 +595,6 @@ ISS 2% ISS 2% - vat 0.02 @@ -649,7 +608,6 @@ ISS 3% ISS 3% - vat 0.03 @@ -663,7 +621,6 @@ ISS 4% ISS 4% - vat 0.04 @@ -677,7 +634,6 @@ ISS 5% ISS 5% - vat 0.05 @@ -691,7 +647,6 @@ CSLL CSLL - vat 0.00 @@ -703,4 +658,4 @@ - \ No newline at end of file + diff --git a/addons/l10n_cr/data/account_tax_template.xml b/addons/l10n_cr/data/account_tax_template.xml index 7626b25b5ad..42b5ca03a13 100644 --- a/addons/l10n_cr/data/account_tax_template.xml +++ b/addons/l10n_cr/data/account_tax_template.xml @@ -11,7 +11,6 @@ 10 13 percent - all true @@ -34,7 +33,6 @@ 10 13 percent - all true diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py index 6f8aec2dcc9..72ef35ebc4b 100644 --- a/addons/mrp_jit/__openerp__.py +++ b/addons/mrp_jit/__openerp__.py @@ -41,7 +41,7 @@ In that case, you can not use priorities any more on the different picking. """, 'author': 'OpenERP SA', - 'depends': ['procurement', 'mrp'], + 'depends': ['procurement'], 'update_xml': ['mrp_jit.xml'], 'demo_xml': [], 'test': ['test/mrp_jit.yml'], From ce8bee8ba7b9f9ef6e3dba1fc33d343d6b878678 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Tue, 6 Dec 2011 11:29:01 +0100 Subject: [PATCH 04/12] [FIX] clean some warnings. bzr revid: vmt@openerp.com-20111206102901-ngovpq1cky629xsp --- addons/l10n_br/data/l10n_br_account_chart_template.xml | 2 +- addons/l10n_uk/l10n_uk_wizard.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_br/data/l10n_br_account_chart_template.xml b/addons/l10n_br/data/l10n_br_account_chart_template.xml index 9dbcb4d558f..89ccee11edc 100644 --- a/addons/l10n_br/data/l10n_br_account_chart_template.xml +++ b/addons/l10n_br/data/l10n_br_account_chart_template.xml @@ -19,7 +19,7 @@ This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. open - onskip + once diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml index b7da2ee5c6b..b4f96afc700 100644 --- a/addons/l10n_uk/l10n_uk_wizard.xml +++ b/addons/l10n_uk/l10n_uk_wizard.xml @@ -34,7 +34,7 @@ 10 - onskip + once open From 4660ee49907b68d07d5aaa352622e53d7f3907df Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Tue, 6 Dec 2011 11:57:58 +0100 Subject: [PATCH 05/12] [FIX] clean some warnings. bzr revid: vmt@openerp.com-20111206105758-j00f9b67jfvp5dxh --- addons/sale/sale.py | 1 - addons/stock/test/stock_test.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 48e51059cff..98a5f322842 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -701,7 +701,6 @@ class sale_order(osv.osv): 'location_id': order.shop_id.warehouse_id.lot_stock_id.id, 'procure_method': line.type, 'move_id': move_id, - 'property_ids': [(6, 0, [x.id for x in line.property_ids])], 'company_id': order.company_id.id, } diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml index 63650ffeb38..6e41849ea51 100644 --- a/addons/stock/test/stock_test.yml +++ b/addons/stock/test/stock_test.yml @@ -307,7 +307,6 @@ } split_id = self.pool.get('stock.move.split').create(cr, uid, partial_datas, context={}) split_move_data= { - 'lot_id': split_id, 'quantity': 10, 'name': 'lot', } From 159dc31327f179998c83dfa83d56deb1f2b96427 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Tue, 6 Dec 2011 12:22:58 +0100 Subject: [PATCH 06/12] [FIX] clean some warnings. bzr revid: vmt@openerp.com-20111206112258-wnppot8orjvmpnh2 --- addons/account/account.py | 2 +- addons/project_issue/project_issue.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 384ef47e980..3fdd8a03b27 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -3154,7 +3154,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'type': line.account_type == 'cash' and 'cash' or 'bank', 'company_id': company_id, 'analytic_journal_id': False, - 'currency_id': False, + 'currency': False, } if line.currency_id: vals_journal['view_id'] = view_id_cur diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index b83efbc4996..22cc02b8645 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -312,7 +312,7 @@ class project_issue(crm.crm_case, osv.osv): 'name': bug.name, 'partner_id': bug.partner_id.id, 'description':bug.description, - 'date': bug.date, + 'date_deadline': bug.date, 'project_id': bug.project_id.id, 'priority': bug.priority, 'user_id': bug.user_id.id, From f20cdb19f52dba8551a06a2bf02898502b695108 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Tue, 6 Dec 2011 13:19:55 +0100 Subject: [PATCH 07/12] [FIX] clean some warnings. bzr revid: vmt@openerp.com-20111206121955-tbv84nfcni0c0q8k --- addons/hr_payroll/hr_payroll_demo.xml | 2 +- .../wizard/hr_timesheet_invoice_create_final_view.xml | 1 - addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml index fbe8578b3ea..7d670d6cafa 100644 --- a/addons/hr_payroll/hr_payroll_demo.xml +++ b/addons/hr_payroll/hr_payroll_demo.xml @@ -146,7 +146,7 @@ Default contract for marketing executives - + diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml index d366e795c15..514996816cc 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml @@ -13,7 +13,6 @@ - Invoice client_action_multi diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml index 799c544a0c8..5acb2729abb 100644 --- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml +++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml @@ -165,7 +165,7 @@ car fix 15 - none + none @@ -266,7 +266,7 @@ 165 python result = bool(contract.insurance_employee_deduction) - result = -contract.insurance_employee_deduction + result = -contract.insurance_employee_deduction From faedeae2309fe3db290a31df1503d1c39fc3ac9c Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Tue, 6 Dec 2011 14:12:45 +0100 Subject: [PATCH 08/12] [FIX] clean some warnings. bzr revid: vmt@openerp.com-20111206131245-3my263o19q69f7e7 --- .../marketing_campaign_demo.xml | 104 +++++++----------- addons/survey/wizard/survey_answer.py | 4 +- 2 files changed, 42 insertions(+), 66 deletions(-) diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml index ee11fbcdb75..abf29f2c011 100644 --- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml +++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml @@ -34,137 +34,113 @@ - Thanks for showing interest in OpenERP - info@tinyerp.com - + Thanks for showing interest in OpenERP + info@tinyerp.com - - - Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team, - mako + + + Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team, For OpenERP OnDemand Free Trial 2010 - crm.lead - Propose to subscribe to the OpenERP Discovery Day on May 2010 - info@tinyerp.com - + Propose to subscribe to the OpenERP Discovery Day on May 2010 + info@tinyerp.com - - - Hello,We have very good offer that might suit you. + + + Hello,We have very good offer that might suit you. We propose you to subscribe to the OpenERP Discovery Day on May 2010. If any further information required kindly revert back. We really appreciate your co-operation on this. Regards,OpenERP Team, - mako For OpenERP Discovery Day on May 2010 - crm.lead - Thanks for subscribing to the OpenERP Discovery Day - info@tinyerp.com - + Thanks for subscribing to the OpenERP Discovery Day + info@tinyerp.com - - - Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day. + + + Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day. If any further information required kindly revert back. I really appreciate your co-operation on this. Regards,OpenERP Team, - mako For OpenERP Discovery Day - crm.lead - Thanks for buying the OpenERP book - info@tinyerp.com - + Thanks for buying the OpenERP book + info@tinyerp.com - - - Hello,Thanks for showing intrest and buying the OpenERP book. + + + Hello,Thanks for showing intrest and buying the OpenERP book. If any further information required kindly revert back. I really appreciate your co-operation on this. Regards,OpenERP Team, - mako For OpenERP book - crm.lead - Propose a free technical training to Gold partners - info@tinyerp.com - + Propose a free technical training to Gold partners + info@tinyerp.com - - - Hello, We have very good offer that might suit you. + + + Hello, We have very good offer that might suit you. For our gold partners,We are arranging free technical training on june,2010. If any further information required kindly revert back. I really appreciate your co-operation on this. Regards,OpenERP Team, - mako For technical training to Gold partners - crm.lead - Propose paid training to Silver partners - info@tinyerp.com - + Propose paid training to Silver partners + info@tinyerp.com - - - Hello, We have very good offer that might suit you. + + + Hello, We have very good offer that might suit you. For our silver partners,We are paid technical training on june,2010. If any further information required kindly revert back. I really appreciate your co-operation on this. Regards,OpenERP Team, - mako For training to Silver partners - crm.lead - Propose gold partnership to silver partners - info@tinyerp.com - + Propose gold partnership to silver partners + info@tinyerp.com - - - Hello, We have very good offer that might suit you. + + + Hello, We have very good offer that might suit you. For our silver partners,We are offering Gold partnership. If any further information required kindly revert back. I really appreciate your co-operation on this. Regards,OpenERP Team, - mako For gold partnership to silver partners - crm.lead - Thanks for subscribing to technical training - info@tinyerp.com - + Thanks for subscribing to technical training + info@tinyerp.com - - - Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this. + + + Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this. Regards,OpenERP Team, - mako For subscribing to technical training - crm.lead diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py index f913f922c55..b49c9c7d156 100644 --- a/addons/survey/wizard/survey_answer.py +++ b/addons/survey/wizard/survey_answer.py @@ -528,8 +528,8 @@ class survey_question_wiz(osv.osv_memory): Create the Answer of survey and store in survey.response object, and if set validation of question then check the value of question if value is wrong then raise the exception. """ if context is None: context = {} - - survey_question_wiz_id = super(survey_question_wiz,self).create(cr, uid, vals, context=context) + + survey_question_wiz_id = super(survey_question_wiz,self).create(cr, uid, {'name': vals.get('name')}, context=context) if context.has_key('active') and context.get('active',False): return survey_question_wiz_id From ff22d6eca99d721b5b6b76730bc0053f677c3583 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Tue, 6 Dec 2011 15:21:30 +0100 Subject: [PATCH 09/12] [FIX] clean some warnings. bzr revid: vmt@openerp.com-20111206142130-y2nu8bx6jzjviojk --- .../base_report_creator/security/ir.model.access.csv | 1 + addons/email_template/security/ir.model.access.csv | 1 + addons/import_sugarcrm/__openerp__.py | 10 ++++++---- addons/import_sugarcrm/security/ir.model.access.csv | 3 +++ addons/users_ldap/__openerp__.py | 1 + 5 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 addons/import_sugarcrm/security/ir.model.access.csv diff --git a/addons/base_report_creator/security/ir.model.access.csv b/addons/base_report_creator/security/ir.model.access.csv index 24e5a1c4cee..c9e78315b67 100644 --- a/addons/base_report_creator/security/ir.model.access.csv +++ b/addons/base_report_creator/security/ir.model.access.csv @@ -2,3 +2,4 @@ "access_base_report_creator_report","base_report_creator.report","model_base_report_creator_report","base.group_system",1,1,1,1 "access_base_report_creator_report_fields","base_report_creator.report.fields","model_base_report_creator_report_fields","base.group_system",1,1,1,1 "access_base_report_creator_report_filter","base_report_creator.report.filter","model_base_report_creator_report_filter","base.group_system",1,1,1,1 +"access_base_report_creator_report_result","base_report_creator.report.result","model_base_report_creator_report_result","base.group_system",1,1,1,1 diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv index f5f61240a96..3903a95f9ce 100644 --- a/addons/email_template/security/ir.model.access.csv +++ b/addons/email_template/security/ir.model.access.csv @@ -2,3 +2,4 @@ "access_email_template","email.template","model_email_template",,1,0,0,0 "access_email_template_system","email.template system","model_email_template","base.group_system",1,1,1,1 "access_email_template_manager","email.template","model_email_template",,1,1,1,1 +"access_email_template_preview_system","email.template.preview system","model_email_template_preview","base.group_system",1,1,1,1 diff --git a/addons/import_sugarcrm/__openerp__.py b/addons/import_sugarcrm/__openerp__.py index 927a4b542ed..c0ad1ba250b 100644 --- a/addons/import_sugarcrm/__openerp__.py +++ b/addons/import_sugarcrm/__openerp__.py @@ -28,10 +28,12 @@ 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['import_base','crm', 'document'], - 'init_xml': [], - 'update_xml': ["wizard/import_message_view.xml", - "import_sugarcrm_view.xml"], - 'demo_xml': [], + 'data': [ + "wizard/import_message_view.xml", + "import_sugarcrm_view.xml", + "security/ir.model.access.csv", + ], + 'demo': [], 'test': [], 'installable': True, 'active': False, diff --git a/addons/import_sugarcrm/security/ir.model.access.csv b/addons/import_sugarcrm/security/ir.model.access.csv new file mode 100644 index 00000000000..20e93035b6c --- /dev/null +++ b/addons/import_sugarcrm/security/ir.model.access.csv @@ -0,0 +1,3 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_import_sugarcrm_system","import.sugarcrm system","model_import_sugarcrm","base.group_system",1,1,1,1 +"access_import_message_system","import.message system","model_import_message","base.group_system",1,1,1,1 diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py index adab3ff892c..09b070b0be6 100644 --- a/addons/users_ldap/__openerp__.py +++ b/addons/users_ldap/__openerp__.py @@ -120,6 +120,7 @@ will disable LDAP authentication if installed at the same time. "data" : [ "users_ldap_view.xml", "user_ldap_installer.xml", + "security/ir.model.access.csv", ], "active": False, "installable": True, From a557720086c0b1ed003f33edf81bc50e6519a843 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Wed, 7 Dec 2011 10:07:05 +0100 Subject: [PATCH 10/12] [FIX] users_ldap: forgot to add ir_model_access csv file. bzr revid: vmt@openerp.com-20111207090705-cnotcrjyc53bahud --- addons/users_ldap/security/ir.model.access.csv | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 addons/users_ldap/security/ir.model.access.csv diff --git a/addons/users_ldap/security/ir.model.access.csv b/addons/users_ldap/security/ir.model.access.csv new file mode 100644 index 00000000000..d26bd0a6d48 --- /dev/null +++ b/addons/users_ldap/security/ir.model.access.csv @@ -0,0 +1,2 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_res_company_ldap","res_company_ldap","model_res_company_ldap","base.group_system",1,1,1,1 From 62c3f987146227ee1968541d8c2f7350660c2283 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Wed, 7 Dec 2011 14:45:35 +0100 Subject: [PATCH 11/12] [IMP] sale/procurement: still add the property_ids, but via inheritance (the property_ids value was removed in a previous clean warning commit). bzr revid: vmt@openerp.com-20111207134535-y8oav1gurv8b7rd5 --- addons/procurement/procurement.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 9556b1aa081..88238afd3ee 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -569,4 +569,15 @@ class stock_warehouse_orderpoint(osv.osv): return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context=context) stock_warehouse_orderpoint() + +class sale_order(osv.osv): + _inherit = 'sale.order' + + def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, + date_planned, *args): + d = super(sale_order, self)._prepare_order_line_procurement(cr, uid, + order, line, move_id, date_planned, *args) + d['property_ids'] = [(6, 0, [x.id for x in line.property_ids])] + return d + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 706e732f494b44408d276d245f53c9c9c87eb541 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Wed, 7 Dec 2011 15:58:54 +0100 Subject: [PATCH 12/12] [FIX] sale/mrp: revert previous commit, reestablish the setting of the property_ids fields (which does not exist yet). bzr revid: vmt@openerp.com-20111207145854-p334skwo93fy124l --- addons/procurement/procurement.py | 11 ----------- addons/sale/sale.py | 3 +++ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 88238afd3ee..9556b1aa081 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -569,15 +569,4 @@ class stock_warehouse_orderpoint(osv.osv): return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context=context) stock_warehouse_orderpoint() - -class sale_order(osv.osv): - _inherit = 'sale.order' - - def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, - date_planned, *args): - d = super(sale_order, self)._prepare_order_line_procurement(cr, uid, - order, line, move_id, date_planned, *args) - d['property_ids'] = [(6, 0, [x.id for x in line.property_ids])] - return d - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 98a5f322842..9c3ba5d5200 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -701,6 +701,9 @@ class sale_order(osv.osv): 'location_id': order.shop_id.warehouse_id.lot_stock_id.id, 'procure_method': line.type, 'move_id': move_id, + # Added by mrp, but mrp is not a dependency, this will trigger a warning + # if mrp is not installed. + 'property_ids': [(6, 0, [x.id for x in line.property_ids])], 'company_id': order.company_id.id, }