From c79b0b48def9ddfc93d8bbb5ca97a69dae7fc15c Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Wed, 8 May 2013 11:51:48 +0530 Subject: [PATCH 01/45] [IMP] In other info tab,renamed salesperson field to Responsible in supplier invoice and refunds bzr revid: fka@tinyerp.com-20130508062148-kypmyo2oi3b2pu9i --- addons/account/account_invoice_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 7469c38decb..96d6324ec7d 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -250,7 +250,7 @@ - + From 3b87fc2c872187298922a34c4af69a0e4e8345f4 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Wed, 8 May 2013 12:37:33 +0530 Subject: [PATCH 02/45] [IMP] add help in use_preprint_check and change help text for Check Date in Period in journal form view bzr revid: fka@tinyerp.com-20130508070733-h8lnupl2vc530ks9 --- addons/account/account.py | 3 +-- addons/account_check_writing/account.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 3959799f1bb..9b9878e6cb9 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -721,8 +721,7 @@ class account_journal(osv.osv): 'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'), 'entry_posted': fields.boolean('Skip \'Draft\' State for Manual Entries', help='Check this box if you don\'t want new journal entries to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation. \nNote that journal entries that are automatically created by the system are always skipping that state.'), 'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"), - 'allow_date':fields.boolean('Check Date in Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'), - + 'allow_date':fields.boolean('Check Date in Period', help= 'If checked, the entry won\'t be created if the entry date is not included into the selected period'), 'profit_account_id' : fields.many2one('account.account', 'Profit Account'), 'loss_account_id' : fields.many2one('account.account', 'Loss Account'), 'internal_account_id' : fields.many2one('account.account', 'Internal Transfers Account', select=1), diff --git a/addons/account_check_writing/account.py b/addons/account_check_writing/account.py index 035e3a710b0..2bdb0dc734d 100644 --- a/addons/account_check_writing/account.py +++ b/addons/account_check_writing/account.py @@ -26,7 +26,7 @@ class account_journal(osv.osv): _columns = { 'allow_check_writing': fields.boolean('Allow Check writing', help='Check this if the journal is to be used for writing checks.'), - 'use_preprint_check': fields.boolean('Use Preprinted Check'), + 'use_preprint_check': fields.boolean('Use Preprinted Check', help='Check if you use a preformated sheet for check'), } From b64931ac5e5337ecaa1fc750c7807e5952d3d7ce Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Wed, 8 May 2013 16:22:19 +0530 Subject: [PATCH 03/45] [IMP] change text in chart of account & tax wizard bzr revid: fka@tinyerp.com-20130508105219-675r49quptzjtmv6 --- addons/account/wizard/account_chart_view.xml | 2 +- addons/account/wizard/account_tax_chart_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml index 7533cb117eb..8ee79a08530 100644 --- a/addons/account/wizard/account_chart_view.xml +++ b/addons/account/wizard/account_chart_view.xml @@ -10,7 +10,7 @@ From 8ef6bf2da9f724684b520ac0166d4a96d43f1ad7 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Wed, 8 May 2013 16:41:44 +0530 Subject: [PATCH 04/45] [IMP] remove Payment Lines label bzr revid: fka@tinyerp.com-20130508111144-cint98dzh9quatp7 --- .../wizard/account_payment_populate_statement_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_payment/wizard/account_payment_populate_statement_view.xml b/addons/account_payment/wizard/account_payment_populate_statement_view.xml index acc85d661c2..2c775853e23 100644 --- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml +++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml @@ -8,7 +8,7 @@
- +
diff --git a/addons/account_payment/wizard/account_payment_populate_statement_view.xml b/addons/account_payment/wizard/account_payment_populate_statement_view.xml index 2c775853e23..2133f3bece9 100644 --- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml +++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml @@ -11,7 +11,7 @@
-
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 14/45] [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 15/45] [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 16/45] [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 17/45] [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 18/45] [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 19/45] [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 20/45] [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 21/45] [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 22/45] [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 23/45] [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 24/45] [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 25/45] [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'} + {}

From 58cc25138b39f295f381f4b9b02d270c7a972c4d Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (OpenERP)" Date: Thu, 22 Aug 2013 18:10:34 +0530 Subject: [PATCH 26/45] [IMP]improve string in account invoice tree view bzr revid: sgo@tinyerp.com-20130822124034-qkm6q814nx99tq6h --- addons/account/account_invoice_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index a692d8b97f7..364a6ad45b3 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -125,7 +125,7 @@ - + From 328ec9ceacfca0fddc9e23cc201a31c746b40225 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (OpenERP)" Date: Fri, 23 Aug 2013 11:11:17 +0530 Subject: [PATCH 27/45] [IMP]remove readonly from account budget account_ids bzr revid: sgo@tinyerp.com-20130823054117-1zwfcks0wwhx2xzu --- addons/account_budget/account_budget_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index 5d280c1d15a..237406ff657 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -54,7 +54,7 @@ - + From f273f356501ebc951492707b751326cfb99c6c0f Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 20 Dec 2013 16:30:45 +0530 Subject: [PATCH 28/45] [ADD] added default alias for leads bzr revid: tpa@tinyerp.com-20131220110045-kpny4indr16ais8n --- addons/crm/crm_data.xml | 9 +++++++- addons/crm/crm_lead.py | 5 +++++ addons/crm/res_config.py | 41 ++++++++++++++++++++++++++++++++++ addons/crm/res_config_view.xml | 8 +++++++ addons/mail/mail_thread.py | 4 ++-- 5 files changed, 64 insertions(+), 3 deletions(-) diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml index 1f1bd74391a..688a3f00738 100644 --- a/addons/crm/crm_data.xml +++ b/addons/crm/crm_data.xml @@ -30,7 +30,7 @@ Direct Sales DM True - info + salesinfo @@ -56,6 +56,13 @@ + + + info + + + + mail.group diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index eaf51293355..9a08b0d8d43 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -965,6 +965,11 @@ class crm_lead(format_address, osv.osv): default['stage_id'] = self._get_default_stage_id(cr, uid, local_context) return super(crm_lead, self).copy(cr, uid, id, default, context=context) + def get_empty_list_help(self, cr, uid, help, context=None): + context['empty_list_help_model'] = 'crm.case.section' + context['empty_list_help_id'] = context.get('default_section_id', None) + return super(crm_lead, self).get_empty_list_help(cr, uid, help, context=context) + # ---------------------------------------- # Mail Gateway # ---------------------------------------- diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py index 5f3ffe272e7..1fda9ed41d4 100644 --- a/addons/crm/res_config.py +++ b/addons/crm/res_config.py @@ -66,7 +66,48 @@ class crm_configuration(osv.TransientModel): 'group_multi_salesteams': fields.boolean("Organize Sales activities into multiple Sales Teams", implied_group='base.group_multi_salesteams', help="""Allows you to use Sales Teams to manage your leads and opportunities."""), + 'alias_prefix': fields.char('Default Alias Name for Leads'), + 'alias_domain' : fields.char('Alias Domain'), } + def get_default_alias_prefix(self, cr, uid, ids, context=None): + alias_name = '' + mail_alias = self.pool.get('mail.alias') + try: + alias_name = self.pool.get('ir.model.data').get_object(cr, uid, 'crm', 'mail_alias_lead_info').alias_name + except Exception: + model_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'crm.lead')], context=context) + alias_ids = mail_alias.search(cr, uid, [('alias_model_id', '=', model_ids[0]),('alias_defaults', '=', '{}')], context=context) + if alias_ids: + alias_name = mail_alias.browse(cr, uid, alias_ids[0], context=context).alias_name + return {'alias_prefix': alias_name} + + def set_default_alias_prefix(self, cr, uid, ids, context=None): + mail_alias = self.pool.get('mail.alias') + record = self.browse(cr, uid, ids[0], context=context) + default_alias_prefix = self.get_default_alias_prefix(cr, uid, ids, context=context)['alias_prefix'] + if record.alias_prefix != default_alias_prefix: + try: + alias = self.pool.get('ir.model.data').get_object(cr, uid, 'crm', 'mail_alias_lead_info') + if alias: + alias.write({'alias_name': record.alias_prefix}) + except Exception: + model_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'crm.lead')], context=context) + alias_ids = mail_alias.search(cr, uid, [('alias_model_id', '=', model_ids[0]),('alias_defaults', '=', '{}')], context=context) + if alias_ids: + mail_alias.write(cr, uid, alias_ids[0], {'alias_name': record.alias_prefix}, context=context) + else: + mail_alias.create_unique_alias(cr, uid, {'alias_name': record.alias_prefix}, model_name="crm.lead", context=context) + return True + + def get_default_alias_domain(self, cr, uid, ids, context=None): + alias_domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context) + if not alias_domain: + domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "web.base.url", context=context) + try: + alias_domain = urlparse.urlsplit(domain).netloc.split(':')[0] + except Exception: + pass + return {'alias_domain': alias_domain} # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml index 9fd542c9dbd..ef1da644a6a 100644 --- a/addons/crm/res_config_view.xml +++ b/addons/crm/res_config_view.xml @@ -25,10 +25,18 @@

+
+
+
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 57950376beb..e12bb85c631 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -113,10 +113,10 @@ class mail_thread(osv.AbstractModel): object_id.alias_id.alias_model_id.model == self._name and \ object_id.alias_id.alias_force_thread_id == 0: alias = object_id.alias_id - elif catchall_domain and model: # no specific res_id given -> generic help message, take an example alias (i.e. alias of some section_id) + if catchall_domain and model and not alias: #check for example alias if res_id not given or given res_id dose not contain alias-> generic help message, take an example alias (i.e. alias of some section_id) model_id = self.pool.get('ir.model').search(cr, uid, [("model", "=", self._name)], context=context)[0] alias_obj = self.pool.get('mail.alias') - alias_ids = alias_obj.search(cr, uid, [("alias_model_id", "=", model_id), ("alias_name", "!=", False), ('alias_force_thread_id', '=', 0)], context=context, order='id ASC') + alias_ids = alias_obj.search(cr, uid, [("alias_model_id", "=", model_id), ("alias_name", "!=", False), ('alias_force_thread_id', '=', False), ('alias_parent_thread_id', '=', False)], context=context, order='id ASC') if alias_ids and len(alias_ids) == 1: # if several aliases -> incoherent to propose one guessed from nowhere, therefore avoid if several aliases alias = alias_obj.browse(cr, uid, alias_ids[0], context=context) From 70925457cd07981f3147cd4ff494e11c606ff8fa Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 23 Dec 2013 15:35:10 +0530 Subject: [PATCH 29/45] [IMP] improved salesteam alias name bzr revid: tpa@tinyerp.com-20131223100510-5nivgxs54em9ztve --- addons/crm/crm_data.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml index 688a3f00738..f822d70f0ec 100644 --- a/addons/crm/crm_data.xml +++ b/addons/crm/crm_data.xml @@ -30,7 +30,7 @@ Direct Sales DM True - salesinfo + sales From 99c65811565ef9a41eb504edf4659d7450e1f155 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 27 Dec 2013 14:55:06 +0530 Subject: [PATCH 30/45] [IMP] improved code bzr revid: tpa@tinyerp.com-20131227092506-ux2owmkzbg2jz8b2 --- addons/crm/res_config.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py index 1fda9ed41d4..23ae817a4ce 100644 --- a/addons/crm/res_config.py +++ b/addons/crm/res_config.py @@ -70,6 +70,10 @@ class crm_configuration(osv.TransientModel): 'alias_domain' : fields.char('Alias Domain'), } + _defaults = { + 'alias_domain': lambda self, cr, uid, context:self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context), + } + def get_default_alias_prefix(self, cr, uid, ids, context=None): alias_name = '' mail_alias = self.pool.get('mail.alias') @@ -100,14 +104,4 @@ class crm_configuration(osv.TransientModel): mail_alias.create_unique_alias(cr, uid, {'alias_name': record.alias_prefix}, model_name="crm.lead", context=context) return True - def get_default_alias_domain(self, cr, uid, ids, context=None): - alias_domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context) - if not alias_domain: - domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "web.base.url", context=context) - try: - alias_domain = urlparse.urlsplit(domain).netloc.split(':')[0] - except Exception: - pass - return {'alias_domain': alias_domain} - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From d08269b31c0ce2b1d559cae729c7f2ad3fc03257 Mon Sep 17 00:00:00 2001 From: "Sunil Sharma (OpenERP)" Date: Fri, 27 Dec 2013 16:20:14 +0530 Subject: [PATCH 31/45] [imp]:crm:improve res_config view bzr revid: sunilsharma.sharma07@gmail.com-20131227105014-cqn3zjwi2ewwx64w --- addons/crm/res_config_view.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml index ef1da644a6a..48e8de1ce63 100644 --- a/addons/crm/res_config_view.xml +++ b/addons/crm/res_config_view.xml @@ -30,11 +30,14 @@