From 74a6e4000e1187e14af2387283f66e9808b04be7 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Fri, 9 Jan 2009 13:09:37 +0530 Subject: [PATCH 01/11] Minot edit of Account for recursion bzr revid: jvo@tinyerp.com-20090109073937-plxgu32hxe5y5w47 --- addons/account/account.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index a883755f7e4..dece8d18b21 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -154,7 +154,7 @@ class account_account(osv.osv): args[pos] = ('id','in',ids1) pos+=1 - if context and context.has_key('consolidate_childs'): #add concolidated childs of accounts + if context and context.has_key('consolidate_childs'): #add consolidated childs of accounts ids = super(account_account,self).search(cr, uid, args, offset, limit, order, context=context, count=count) for consolidate_child in self.browse(cr, uid, context['account_id']).child_consol_ids: @@ -170,7 +170,7 @@ class account_account(osv.osv): ids3 = [] for rec in self.browse(cr, uid, ids2, context=context): for child in rec.child_consol_ids: - ids3.append[child.id] + ids3.append(child.id) if ids3: ids3 = self._get_children_and_consol(cr, uid, ids3, context) return ids2+ids3 From 24216293789163df0af0d69ad09bd51ccc332eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Najla=C3=A2=20EL=20KHAYAT?= Date: Fri, 9 Jan 2009 09:26:58 +0100 Subject: [PATCH 04/11] add exception for cursor bzr revid: nel@tinyerp.com-20090109082658-uwf8zywyilsmiel9 --- addons/mrp/wizard/wizard_orderpoint_procurement.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/mrp/wizard/wizard_orderpoint_procurement.py b/addons/mrp/wizard/wizard_orderpoint_procurement.py index fad59243837..e847e117927 100644 --- a/addons/mrp/wizard/wizard_orderpoint_procurement.py +++ b/addons/mrp/wizard/wizard_orderpoint_procurement.py @@ -41,10 +41,13 @@ parameter_fields = { def _procure_calculation_orderpoint(self, db_name, uid, data, context): db, pool = pooler.get_db_and_pool(db_name) cr = db.cursor() - proc_obj = pool.get('mrp.procurement') - automatic = data['form']['automatic'] - proc_obj._procure_orderpoint_confirm(cr, uid, automatic=automatic,\ - use_new_cursor=cr.dbname, context=context) + try: + proc_obj = pool.get('mrp.procurement') + automatic = data['form']['automatic'] + proc_obj._procure_orderpoint_confirm(cr, uid, automatic=automatic,\ + use_new_cursor=cr.dbname, context=context) + finally: + cr.close() return {} def _procure_calculation(self, cr, uid, data, context): From 3ccc8357d5d5466acc97f1b065f500e9b096eeb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Najla=C3=A2=20EL=20KHAYAT?= Date: Fri, 9 Jan 2009 09:27:49 +0100 Subject: [PATCH 05/11] add exception for cursor bzr revid: nel@tinyerp.com-20090109082749-hpj8lpsu1jtukhis --- addons/mrp/wizard/wizard_procurement.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/mrp/wizard/wizard_procurement.py b/addons/mrp/wizard/wizard_procurement.py index b8a19c3ff97..7a0433f34c3 100644 --- a/addons/mrp/wizard/wizard_procurement.py +++ b/addons/mrp/wizard/wizard_procurement.py @@ -35,8 +35,11 @@ parameter_fields = { def _procure_calculation_procure(self, db_name, uid, data, context): db, pool = pooler.get_db_and_pool(db_name) cr = db.cursor() - proc_obj = pool.get('mrp.procurement') - proc_obj._procure_confirm(cr, uid, use_new_cursor=cr.dbname, context=context) + try: + proc_obj = pool.get('mrp.procurement') + proc_obj._procure_confirm(cr, uid, use_new_cursor=cr.dbname, context=context) + finally: + cr.close() return {} def _procure_calculation(self, cr, uid, data, context): From 02de8a94c797e589b23f2ed0557920a1bde5f324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Najla=C3=A2=20EL=20KHAYAT?= Date: Fri, 9 Jan 2009 09:30:15 +0100 Subject: [PATCH 06/11] change versions of terp files bzr revid: nel@tinyerp.com-20090109083015-1m378z8fkk6s38xy --- addons/account/__terp__.py | 2 +- addons/account_analytic_analysis/__terp__.py | 2 +- addons/account_payment/__terp__.py | 2 +- addons/hr/__terp__.py | 2 +- addons/hr_holidays/__terp__.py | 2 +- addons/mrp/__terp__.py | 2 +- addons/product/__terp__.py | 2 +- addons/project/__terp__.py | 2 +- addons/stock/__terp__.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py index 3d3905ed249..ea8e9868628 100644 --- a/addons/account/__terp__.py +++ b/addons/account/__terp__.py @@ -21,7 +21,7 @@ ############################################################################## { "name" : "Accounting and financial management", - "version" : "1.0", + "version" : "1.1", "depends" : ["product", "base", "process"], "author" : "Tiny", "description": """Financial and accounting module that covers: diff --git a/addons/account_analytic_analysis/__terp__.py b/addons/account_analytic_analysis/__terp__.py index 650dcd4fb50..fc8e1c650b5 100644 --- a/addons/account_analytic_analysis/__terp__.py +++ b/addons/account_analytic_analysis/__terp__.py @@ -24,7 +24,7 @@ "description": """Modifiy the account analytic view to show important data for project manager of services companies. Add menu to show relevant information for each manager.""", - "version" : "1.0", + "version" : "1.1", "author" : "Camptocamp", "category" : "Generic Modules/Accounting", "module": "", diff --git a/addons/account_payment/__terp__.py b/addons/account_payment/__terp__.py index 0a88b0b5940..09790dc4e1e 100644 --- a/addons/account_payment/__terp__.py +++ b/addons/account_payment/__terp__.py @@ -21,7 +21,7 @@ ############################################################################## { "name": "Payment Management", - "version": "1.0", + "version": "1.1", "author": "Tiny", "category": "Generic Modules/Payment", "depends": ["account"], diff --git a/addons/hr/__terp__.py b/addons/hr/__terp__.py index d39891ed3ee..7fc30815e57 100644 --- a/addons/hr/__terp__.py +++ b/addons/hr/__terp__.py @@ -21,7 +21,7 @@ ############################################################################## { "name" : "Human Resources", - "version" : "1.0", + "version" : "1.1", "author" : "Tiny", "category" : "Generic Modules/Human Resources", "website" : "http://www.openerp.com", diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py index 0018d20d984..feef8b159ea 100644 --- a/addons/hr_holidays/__terp__.py +++ b/addons/hr_holidays/__terp__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- { "name" : "Human Resources: Holidays management", - "version" : "0.1", + "version" : "1.1", "author" : "Tiny & Axelor", "category" : "Generic Modules/Human Resources", "website" : "http://www.openerp.com", diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py index 5ea266c3a0d..3cb5bdbe1c7 100644 --- a/addons/mrp/__terp__.py +++ b/addons/mrp/__terp__.py @@ -21,7 +21,7 @@ ############################################################################## { "name" : "Manufacturing Resource Planning", - "version" : "1.0", + "version" : "1.1", "author" : "Tiny", "website" : "http://www.openerp.com", "category" : "Generic Modules/Production", diff --git a/addons/product/__terp__.py b/addons/product/__terp__.py index bbc4d667b75..8619679aeb6 100644 --- a/addons/product/__terp__.py +++ b/addons/product/__terp__.py @@ -21,7 +21,7 @@ ############################################################################## { "name" : "Products & Pricelists", - "version" : "1.0", + "version" : "1.1", "author" : "Tiny", "category" : "Generic Modules/Inventory Control", "depends" : ["base", "process"], diff --git a/addons/project/__terp__.py b/addons/project/__terp__.py index 3668c7d7470..1837346d740 100644 --- a/addons/project/__terp__.py +++ b/addons/project/__terp__.py @@ -21,7 +21,7 @@ ############################################################################## { "name" : "Project Management", - "version": "1.0", + "version": "1.1", "author" : "Tiny", "website" : "http://www.openerp.com", "category" : "Generic Modules/Projects & Services", diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py index dc09385b09f..bf10b150fe3 100644 --- a/addons/stock/__terp__.py +++ b/addons/stock/__terp__.py @@ -21,7 +21,7 @@ ############################################################################## { "name" : "Stock Management", - "version" : "1.0", + "version" : "1.1", "author" : "Tiny", "website" : "http://www.openerp.com", "depends" : ["product", "account"], From 7bc60a97aec122bcc9b48eb56d28415f08bdd1fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Najla=C3=A2=20EL=20KHAYAT?= Date: Fri, 9 Jan 2009 16:02:58 +0100 Subject: [PATCH 07/11] delete process file from terp bzr revid: nel@tinyerp.com-20090109150258-m4nmvhz7df4n79mq --- addons/stock/__terp__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py index a698adc2564..319faba6e14 100644 --- a/addons/stock/__terp__.py +++ b/addons/stock/__terp__.py @@ -44,7 +44,6 @@ "report_stock_view.xml", "security/stock_security.xml", "security/ir.model.access.csv", - "process/stock_process.xml" ], 'demo_xml': ['stock_demo.xml'], 'installable': True, From 123f3119bac13d4c21a541afefe2cadf90c8ae98 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 9 Jan 2009 16:14:48 +0100 Subject: [PATCH 08/11] [IMP] change version number bzr revid: christophe@tinyerp.com-20090109151448-7ibcvg3h47k2mlf1 --- addons/purchase/__terp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/purchase/__terp__.py b/addons/purchase/__terp__.py index 129d020ebe9..f66c1d75dbe 100644 --- a/addons/purchase/__terp__.py +++ b/addons/purchase/__terp__.py @@ -23,7 +23,7 @@ { 'name': 'Purchase Management', - 'version': '1.0', + 'version': '1.1', 'category': 'Generic Modules/Sales & Purchases', 'description': """Module for purchase management Request for quotation, Create Supplier Invoice, Print Order...""", From b73ba942d883c04b672ec7fa96b2390ea3192124 Mon Sep 17 00:00:00 2001 From: "Sofia (Open ERP)" Date: Sat, 10 Jan 2009 12:42:27 +0530 Subject: [PATCH 09/11] bugfixed for duplicate fields bzr revid: sso@tinyerp.com-20090110071227-23m7p5bh7e7t9l4g --- addons/crm_configuration/crm_bugs_view.xml | 2 +- addons/crm_configuration/crm_fund_view.xml | 4 ++-- addons/crm_configuration/crm_jobs_view.xml | 2 +- addons/crm_configuration/crm_phonecall_view.xml | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml index 5335aefbb7d..17c54f16377 100644 --- a/addons/crm_configuration/crm_bugs_view.xml +++ b/addons/crm_configuration/crm_bugs_view.xml @@ -87,7 +87,7 @@ - + diff --git a/addons/crm_configuration/crm_fund_view.xml b/addons/crm_configuration/crm_fund_view.xml index 51cf92d9bd1..038cfc23bdf 100644 --- a/addons/crm_configuration/crm_fund_view.xml +++ b/addons/crm_configuration/crm_fund_view.xml @@ -37,7 +37,7 @@ - + @@ -70,7 +70,7 @@ - +
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml index dd33f9c2e0a..3e196da0ac2 100644 --- a/addons/crm_configuration/crm_jobs_view.xml +++ b/addons/crm_configuration/crm_jobs_view.xml @@ -115,7 +115,7 @@ - + diff --git a/addons/crm_configuration/crm_phonecall_view.xml b/addons/crm_configuration/crm_phonecall_view.xml index c87eef8c535..61eba3043fb 100644 --- a/addons/crm_configuration/crm_phonecall_view.xml +++ b/addons/crm_configuration/crm_phonecall_view.xml @@ -74,7 +74,6 @@ - From fd499facba36b89e5eaeb490f3bd0f6d374025ac Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Mon, 12 Jan 2009 12:14:44 +0530 Subject: [PATCH 10/11] Bug 316173 lp bug: https://launchpad.net/bugs/316173 fixed bzr revid: jvo@tinyerp.com-20090112064444-ye7mayvd42uj7j9f --- addons/account/invoice.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 64a1c31da64..8a5cc00589e 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -383,6 +383,8 @@ class account_invoice(osv.osv): cr.execute("DELETE FROM account_invoice_tax WHERE invoice_id=%s", (id,)) for taxe in ait_obj.compute(cr, uid, id).values(): ait_obj.create(cr, uid, taxe) + # Update the stored value (fields.function), so we write to trigger recompute + self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context) return True def button_compute(self, cr, uid, ids, context=None, set_total=False): From 52a7fb6e87c125181cdefb84b6ffc96494579542 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Mon, 12 Jan 2009 12:18:05 +0530 Subject: [PATCH 11/11] quality bzr revid: mra@tinyerp.com-20090112064805-6noberspeq4a27lz --- addons/base_module_quality/speed_test/speed_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base_module_quality/speed_test/speed_test.py b/addons/base_module_quality/speed_test/speed_test.py index 33456e4729f..99523f23735 100644 --- a/addons/base_module_quality/speed_test/speed_test.py +++ b/addons/base_module_quality/speed_test/speed_test.py @@ -50,7 +50,7 @@ This test checks the speed of the module. Note that at least 5 demo data is need module_name = module_path.split('/')[-1] obj_list = self.get_objects(cr, uid, module_name) obj_counter = 0 - score = 0 + score = 0.0 obj_ids = self.get_ids(cr, uid, obj_list) result_dict = {} result_dict2 = {} @@ -63,7 +63,7 @@ This test checks the speed of the module. Note that at least 5 demo data is need if size: list = [] - #we perform the operation twice, and count the number of queries in the second run. This allows to avoid the cache effect. (like translated terms that asks for more queries) + #we perform the operation twice, and count the number of queries in the second run. This allows to avoid the cache effect. (like translated terms that asks for more queries) pool.get(obj).read(cr, uid, [ids[0]]) c = cr.count pool.get(obj).read(cr, uid, [ids[0]])