From 82fe0985a54cfb51cb417f3ae296df5e051c2a4c Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP Trainee)" Date: Wed, 29 May 2013 14:56:36 +0530 Subject: [PATCH 01/12] [IMP] account: set breadcum Journal Items in bank statement, and align filter by field in partner ladger wizard. bzr revid: nco@tinyerp.com-20130529092636-0e81g0zx96butvmm --- addons/account/account_bank_statement.py | 1 + addons/account/wizard/account_report_partner_ledger_view.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 023765d73f0..bcdb60fe58b 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -491,6 +491,7 @@ class account_bank_statement(osv.osv): ctx = (context or {}).copy() ctx['journal_id'] = self.browse(cr, uid, ids[0], context=context).journal_id.id return { + 'name':'Journal Items', 'view_type':'form', 'view_mode':'tree', 'res_model':'account.move.line', diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml index 34c5d55e4c1..61b57f87d7e 100644 --- a/addons/account/wizard/account_report_partner_ledger_view.xml +++ b/addons/account/wizard/account_report_partner_ledger_view.xml @@ -15,7 +15,7 @@ - + From 1f2bc6a0b910579ab7e4cd13cae456fdbdae7a9d Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP Trainee)" Date: Wed, 29 May 2013 15:05:08 +0530 Subject: [PATCH 02/12] [IMP] Webkit Logos and Webkit Headers/Footers have a parent menu : Settings > Technical > Webkit. bzr revid: nco@tinyerp.com-20130529093508-fovjf0zlpkpe4feg --- addons/report_webkit/header_view.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/report_webkit/header_view.xml b/addons/report_webkit/header_view.xml index 30407f89385..833e813ba4e 100644 --- a/addons/report_webkit/header_view.xml +++ b/addons/report_webkit/header_view.xml @@ -48,7 +48,8 @@ form tree,form - + + Webkit Headers/Footers @@ -56,7 +57,7 @@ form tree,form - + From 74e1e041a5954211ee4ef344fc0440104b0563f8 Mon Sep 17 00:00:00 2001 From: "Chandni Machchhar (OpenERP Trainee)" Date: Wed, 29 May 2013 15:15:16 +0530 Subject: [PATCH 03/12] [IMP] remove editable bottom from tree view of meeting types. bzr revid: nco@tinyerp.com-20130529094516-0x2dfc5gna1ccy5q --- addons/base_calendar/crm_meeting_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml index d9b659b91fa..1befadf8bac 100644 --- a/addons/base_calendar/crm_meeting_view.xml +++ b/addons/base_calendar/crm_meeting_view.xml @@ -9,7 +9,7 @@ Meeting Types Tree crm.meeting.type - + From 608af8d06c97b4ed478a1cecc23a28a99e428a2b Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP Trainee)" Date: Wed, 29 May 2013 17:54:29 +0530 Subject: [PATCH 04/12] [IMP] remove unused warning given while Schedule a meeting from phone call, select Attendee and Save. so remve defalt state value. bzr revid: nco@tinyerp.com-20130529122429-q9u8qswk8rl3x01i --- addons/crm/crm_phonecall.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index 0d7004e005b..d87d9ab26cb 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -264,7 +264,6 @@ class crm_phonecall(base_state, osv.osv): 'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False, 'default_user_id': uid, 'default_email_from': phonecall.email_from, - 'default_state': 'open', 'default_name': phonecall.name, } return res From e9fbcae722cedd4ad5ddaa2cef520cb0887697bf Mon Sep 17 00:00:00 2001 From: "Pooja Zankhariya (OpenERP Trainee)" Date: Wed, 29 May 2013 18:31:19 +0530 Subject: [PATCH 05/12] [IMP] set atendee of phone call contact into meeting if it creates form the phonecall. bzr revid: nco@tinyerp.com-20130529130119-nl0kdwo7lqkbo35w --- addons/crm/crm_phonecall.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index d87d9ab26cb..26e64e0ce0e 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -261,11 +261,12 @@ class crm_phonecall(base_state, osv.osv): res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context) res['context'] = { 'default_phonecall_id': phonecall.id, - 'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False, 'default_user_id': uid, 'default_email_from': phonecall.email_from, 'default_name': phonecall.name, } + if phonecall.partner_id and phonecall.partner_id.email: + res['context']['default_partner_ids']= [phonecall.partner_id] and [phonecall.partner_id.id] or False return res def action_button_convert2opportunity(self, cr, uid, ids, context=None): From cdfc5649749a9fab65a5612755e920135754257f Mon Sep 17 00:00:00 2001 From: "Nimesh Contractor (OpenERP)" Date: Wed, 29 May 2013 18:35:59 +0530 Subject: [PATCH 06/12] [IMP] improve code. bzr revid: nco@tinyerp.com-20130529130559-neom3q6ndlr1rxav --- addons/crm/crm_phonecall.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index 26e64e0ce0e..225deb54866 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -257,16 +257,18 @@ class crm_phonecall(base_state, osv.osv): Open meeting's calendar view to schedule a meeting on current phonecall. :return dict: dictionary value for created meeting view """ + partner_ids = [] phonecall = self.browse(cr, uid, ids[0], context) + if phonecall.partner_id and phonecall.partner_id.email: + partner_ids.append(phonecall.partner_id.id) res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context) res['context'] = { 'default_phonecall_id': phonecall.id, + 'default_partner_ids': partner_ids or False, 'default_user_id': uid, 'default_email_from': phonecall.email_from, 'default_name': phonecall.name, } - if phonecall.partner_id and phonecall.partner_id.email: - res['context']['default_partner_ids']= [phonecall.partner_id] and [phonecall.partner_id.id] or False return res def action_button_convert2opportunity(self, cr, uid, ids, context=None): From 6d20cdc0439103aaf361c165f44f7c2d9c3e8aeb Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP Trainee)" Date: Fri, 31 May 2013 18:56:40 +0530 Subject: [PATCH 07/12] [IMP]account: set breadcum Journal Items in asset bzr revid: baradmahendra344@gmail.com-20130531132640-ycc72g8jlmtgm1km --- addons/account_asset/account_asset.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 5c019155fdc..f95fcb60770 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -352,6 +352,7 @@ class account_asset_asset(osv.osv): context = {} context.update({'search_default_asset_id': ids, 'default_asset_id': ids}) return { + 'name':'journal items', 'view_type': 'form', 'view_mode': 'tree,form', 'res_model': 'account.move.line', From c39b35fb478bcfe10602ae746cb0792eb8596e8b Mon Sep 17 00:00:00 2001 From: "Nimesh Contractor (OpenERP)" Date: Mon, 3 Jun 2013 15:50:12 +0530 Subject: [PATCH 08/12] [FIX] crm shedule call default state error. bzr revid: nco@tinyerp.com-20130603102012-obuz62351o1czhgx --- addons/crm/crm_phonecall_menu.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml index 2344604a294..2e626965470 100644 --- a/addons/crm/crm_phonecall_menu.xml +++ b/addons/crm/crm_phonecall_menu.xml @@ -106,7 +106,7 @@ tree,calendar [('state','!=','done')] - + {}

From 91a657d4a3d5b76e19eb966c58eb820a5dbf3a42 Mon Sep 17 00:00:00 2001 From: "Nimesh Contractor (OpenERP)" Date: Mon, 3 Jun 2013 16:56:01 +0530 Subject: [PATCH 09/12] [IMP] make string translateable. bzr revid: nco@tinyerp.com-20130603112601-n1b14xdz2iacr1i8 --- addons/account/account_bank_statement.py | 2 +- addons/account_asset/account_asset.py | 2 +- addons/crm/crm_phonecall.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index bcdb60fe58b..74e8c8d51e9 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -491,7 +491,7 @@ class account_bank_statement(osv.osv): ctx = (context or {}).copy() ctx['journal_id'] = self.browse(cr, uid, ids[0], context=context).journal_id.id return { - 'name':'Journal Items', + 'name':_('Journal Items'), 'view_type':'form', 'view_mode':'tree', 'res_model':'account.move.line', diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index f95fcb60770..fdde5a7bdd2 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -352,7 +352,7 @@ class account_asset_asset(osv.osv): context = {} context.update({'search_default_asset_id': ids, 'default_asset_id': ids}) return { - 'name':'journal items', + 'name':_('journal items'), 'view_type': 'form', 'view_mode': 'tree,form', 'res_model': 'account.move.line', diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index 225deb54866..f4b66fc4d3e 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -264,7 +264,7 @@ class crm_phonecall(base_state, osv.osv): res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context) res['context'] = { 'default_phonecall_id': phonecall.id, - 'default_partner_ids': partner_ids or False, + 'default_partner_ids': partner_ids or [], 'default_user_id': uid, 'default_email_from': phonecall.email_from, 'default_name': phonecall.name, From 2b313fd2ae72ac48c8b3628b27b3abf7c339fcd0 Mon Sep 17 00:00:00 2001 From: "Nimesh Contractor (OpenERP)" Date: Mon, 3 Jun 2013 17:15:23 +0530 Subject: [PATCH 10/12] [IMP] improve code bzr revid: nco@tinyerp.com-20130603114523-vzdorpta47sbq5ub --- addons/account/account_bank_statement.py | 2 +- addons/account_asset/account_asset.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 74e8c8d51e9..46fdac57f3e 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -491,7 +491,7 @@ class account_bank_statement(osv.osv): ctx = (context or {}).copy() ctx['journal_id'] = self.browse(cr, uid, ids[0], context=context).journal_id.id return { - 'name':_('Journal Items'), + 'name': _('Journal Items'), 'view_type':'form', 'view_mode':'tree', 'res_model':'account.move.line', diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index fdde5a7bdd2..d39a30ba4cc 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -352,7 +352,7 @@ class account_asset_asset(osv.osv): context = {} context.update({'search_default_asset_id': ids, 'default_asset_id': ids}) return { - 'name':_('journal items'), + 'name': _('Journal Items'), 'view_type': 'form', 'view_mode': 'tree,form', 'res_model': 'account.move.line', From 45b427b8b56c271c35b8d8c7ece19bfa3231581f Mon Sep 17 00:00:00 2001 From: "Nimesh Contractor (OpenERP)" Date: Tue, 4 Jun 2013 18:45:33 +0530 Subject: [PATCH 11/12] [IMP] improve code. bzr revid: nco@tinyerp.com-20130604131533-uti2v9n35l3ma7zb --- addons/crm/crm_phonecall.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index f4b66fc4d3e..e7a5e3c0cbd 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -264,7 +264,7 @@ class crm_phonecall(base_state, osv.osv): res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context) res['context'] = { 'default_phonecall_id': phonecall.id, - 'default_partner_ids': partner_ids or [], + 'default_partner_ids': partner_ids, 'default_user_id': uid, 'default_email_from': phonecall.email_from, 'default_name': phonecall.name, From 401445163458e1fd9e4570caaffe907c3131c94c Mon Sep 17 00:00:00 2001 From: "Jaydeep Barot (OpenERP Trainee)" Date: Thu, 22 Aug 2013 14:26:42 +0530 Subject: [PATCH 12/12] [IMP] add null context of action on logged calls bzr revid: jaydeep.gvp@gmail.com-20130822085642-82v9kbxjpmm3s0gx --- addons/crm/crm_phonecall_menu.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml index 7b097f2f19a..2e626965470 100644 --- a/addons/crm/crm_phonecall_menu.xml +++ b/addons/crm/crm_phonecall_menu.xml @@ -58,7 +58,7 @@ tree,calendar [] - {'default_state': 'done'} + {}