From 584f5216ce2d9a3c5d4179ad0d4daf7633192a55 Mon Sep 17 00:00:00 2001 From: Saurang Suthar Date: Tue, 6 Nov 2012 18:19:42 +0530 Subject: [PATCH 01/12] [IMP]hr_expense:removed on chenge method which is put on hr_expense_ok field bzr revid: ssu@tinyerp.com-20121106124942-ehomc5nhuhwrci1w --- addons/hr_expense/hr_expense.py | 10 ---------- addons/hr_expense/hr_expense_view.xml | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index c9961fa8a1d..96a37c0e448 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -236,16 +236,6 @@ class product_product(osv.osv): 'hr_expense_ok': fields.boolean('Can be Expensed', help="Specify if the product can be selected in an HR expense line."), } - def on_change_hr_expense_ok(self, cr, uid, id, hr_expense_ok): - - if not hr_expense_ok: - return {} - data_obj = self.pool.get('ir.model.data') - cat_id = data_obj._get_id(cr, uid, 'hr_expense', 'cat_expense') - categ_id = data_obj.browse(cr, uid, cat_id).res_id - res = {'value' : {'type':'service','sale_ok' :False,'categ_id':categ_id }} - return res - product_product() class hr_expense_line(osv.osv): diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index fbaa4c1f87e..5f43e235837 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -195,7 +195,7 @@
- +
From 06dccd161b69786c7cd59c754f918c7a2ac401db Mon Sep 17 00:00:00 2001 From: Saurang Suthar Date: Tue, 6 Nov 2012 18:49:50 +0530 Subject: [PATCH 02/12] [IMP]plugin_thunderbird:removed pdf link from doc bzr revid: ssu@tinyerp.com-20121106131950-a7sksi1ohtqg3zxq --- addons/plugin_thunderbird/plugin_thunderbird.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/plugin_thunderbird/plugin_thunderbird.py b/addons/plugin_thunderbird/plugin_thunderbird.py index 6473758883d..017901473ab 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.py +++ b/addons/plugin_thunderbird/plugin_thunderbird.py @@ -36,7 +36,6 @@ class plugin_thunderbird_installer(osv.osv_memory): _defaults = { 'thunderbird': True, 'plugin_name': 'openerp_plugin.xpi', - 'pdf_file': 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html', } def default_get(self, cr, uid, fields, context=None): From 3e62fdf486687ccdf6223a2a8225d64e768e508b Mon Sep 17 00:00:00 2001 From: "pankita shah (Open ERP)" Date: Wed, 7 Nov 2012 11:22:21 +0530 Subject: [PATCH 03/12] [IMP] name instead of complete_name bzr revid: shp@tinyerp.com-20121107055221-j83k7f4o9w8oo07c --- addons/project/project_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index ec29b19e97b..7fe0ffd693c 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -164,7 +164,7 @@ project.project - + From 112d203526bd8d436f5d951586b4bab45be0fe53 Mon Sep 17 00:00:00 2001 From: Saurang Suthar Date: Wed, 7 Nov 2012 11:52:34 +0530 Subject: [PATCH 04/12] [IMP]account:removed create button from Unrealized Gain or Loss bzr revid: ssu@tinyerp.com-20121107062234-1yamk5qzh3r7u89m --- addons/account/account_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 19128b42d6e..007145a3158 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -306,7 +306,7 @@ Unrealized Gain or Loss account.account - + From bac3e37b372e96c739ee2e816568e2b440872101 Mon Sep 17 00:00:00 2001 From: Saurang Suthar Date: Wed, 7 Nov 2012 12:12:34 +0530 Subject: [PATCH 05/12] [IMP]plugin_thunderbird:improved with right link of Thunderbird plugin bzr revid: ssu@tinyerp.com-20121107064234-fhn8wh6zhffedyck --- addons/plugin_thunderbird/plugin_thunderbird.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/plugin_thunderbird/plugin_thunderbird.py b/addons/plugin_thunderbird/plugin_thunderbird.py index 017901473ab..52d240f609d 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.py +++ b/addons/plugin_thunderbird/plugin_thunderbird.py @@ -36,6 +36,7 @@ class plugin_thunderbird_installer(osv.osv_memory): _defaults = { 'thunderbird': True, 'plugin_name': 'openerp_plugin.xpi', + 'pdf_file' : 'http://doc.openerp.com/v6.1/book/2/3_CRM_Contacts/communicate.html#managing-your-crm-from-mozilla-thunderbird', } def default_get(self, cr, uid, fields, context=None): From 1797cf8daa87054e630bc110b9d0a9c3a7c3b9ab Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 7 Nov 2012 15:50:05 +0530 Subject: [PATCH 06/12] [IMP] account: improve fiscal position form view. bzr revid: tpa@tinyerp.com-20121107102005-mas6cx6amsvvinnv --- addons/account/partner_view.xml | 54 +++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml index 4bee2002ffd..459621c84d2 100644 --- a/addons/account/partner_view.xml +++ b/addons/account/partner_view.xml @@ -6,34 +6,42 @@ account.fiscal.position.form account.fiscal.position -
+ - - - - - - - - - - - - - - - - - -
- - - - + + + + + + + + + +
+ + + + +
+ + + + + + + + +
+ + + + +
+ From d4f4cc3d11c66f3bb8faa2a18fc9e199348b1ec0 Mon Sep 17 00:00:00 2001 From: "Jalpesh Patel (OpenERP)" Date: Wed, 7 Nov 2012 15:50:38 +0530 Subject: [PATCH 07/12] [IMP] phonecalls analysis grouped by salesperson by default bzr revid: pja@tinyerp.com-20121107102038-l3s4s9glh802xpn3 --- addons/crm/report/crm_phonecall_report_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml index a2120aef6ab..1f1a4f91046 100644 --- a/addons/crm/report/crm_phonecall_report_view.xml +++ b/addons/crm/report/crm_phonecall_report_view.xml @@ -91,7 +91,7 @@ crm.phonecall.report form tree,graph - {"search_default_year":1,"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]} + {"search_default_year":1,"search_default_Salesperson":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]} From this report, you can analyse the performance of your sales team, based on their phone calls. You can group or filter the information according to several criteria and drill down the information, by adding more groups in the report. From bc6747de0b40a0d9f5b2ac976fbd79b33952e8f7 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 7 Nov 2012 16:58:07 +0530 Subject: [PATCH 08/12] [IMP] hr_holidays: show the number of remaining days in the dropdown of leave types. bzr revid: tpa@tinyerp.com-20121107112807-yb3g23qk0hy13lxy --- addons/hr_holidays/hr_holidays.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index f315f3d4ef3..5e7a90cd727 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -90,6 +90,19 @@ class hr_holidays_status(osv.osv): 'color_name': 'red', 'active': True, } + + def name_get(self, cr, uid, ids, context=None): + if not ids: + return [] + reads = self.read(cr, uid, ids, ['name', 'remaining_leaves'], context=context) + res = [] + for record in reads: + name = record['name'] + if record['remaining_leaves']: + name = name + ' (' +str(record['remaining_leaves']) + ')' + res.append((record['id'], name)) + return res + hr_holidays_status() class hr_holidays(osv.osv): From c6fb0e5d19dd7df2a62dfae39ed9c0271b44a2d9 Mon Sep 17 00:00:00 2001 From: "pankita shah (Open ERP)" Date: Wed, 7 Nov 2012 17:54:18 +0530 Subject: [PATCH 09/12] [IMP] add seprator string,improve taxname bzr revid: shp@tinyerp.com-20121107122418-px58982yrneqhpsa --- addons/account/account_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 19128b42d6e..8af0519c595 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2159,7 +2159,8 @@ - + + From d833e25c2d5437370b00365bad5aea6a463d014f Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Thu, 8 Nov 2012 07:52:59 +0530 Subject: [PATCH 10/12] [FIX]: FIX voucher company_id and state domain problem bzr revid: atp@tinyerp.com-20121108022259-qs0uy4151ucggpz0 --- addons/account_voucher/voucher_payment_receipt_view.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index 881a5e38f1c..5eb98162d5f 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -54,6 +54,8 @@
+ + Date: Thu, 8 Nov 2012 15:05:24 +0530 Subject: [PATCH 11/12] [FIX]: Fix chart of account toolbar problem bzr revid: atp@tinyerp.com-20121108093524-guzshn0bxzhydp12 --- addons/account/project/project_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 88cf901fdae..3d47b77c229 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -49,6 +49,7 @@ child_complete_ids + From 070589ee7dba86dd3d0a8928ebdd331d4faaa0c6 Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Fri, 9 Nov 2012 13:10:49 +0530 Subject: [PATCH 12/12] [REM]: Remove pdf_file field from plugin bzr revid: atp@tinyerp.com-20121109074049-0rrdb9k0r2e0c33o --- addons/plugin_thunderbird/plugin_thunderbird.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/plugin_thunderbird/plugin_thunderbird.py b/addons/plugin_thunderbird/plugin_thunderbird.py index e10f05c04a3..923611b97a9 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.py +++ b/addons/plugin_thunderbird/plugin_thunderbird.py @@ -35,7 +35,6 @@ class plugin_thunderbird_installer(osv.osv_memory): _defaults = { 'thunderbird': True, 'plugin_name': 'openerp_plugin.xpi', - 'pdf_file' : 'http://doc.openerp.com/v6.1/book/2/3_CRM_Contacts/communicate.html#managing-your-crm-from-mozilla-thunderbird', } def default_get(self, cr, uid, fields, context=None):