From 6e1b51ca4238a71f95708f91ea2e5becf3828204 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Tue, 27 Apr 2010 15:57:44 +0200 Subject: [PATCH 01/12] [FIX] If the history of a case is empty, we can't send the message_id in the X-Headers bzr revid: stephane@openerp.com-20100427135744-0z46dbqhb3opky6y --- addons/crm/wizard/crm_send_email.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py index a0f91fb2ae5..c17a114e3d3 100644 --- a/addons/crm/wizard/crm_send_email.py +++ b/addons/crm/wizard/crm_send_email.py @@ -76,7 +76,8 @@ class crm_send_new_email(osv.osv_memory): case = case_pool.browse(cr, uid, res_id) if context.get('mail', 'new') == 'new': - message_id = case.history_line[0].message_id + if len(case.history_line): + message_id = case.history_line[0].message_id else: hist = hist_obj.browse(cr, uid, res_id) message_id = hist.message_id @@ -92,9 +93,10 @@ class crm_send_new_email(osv.osv_memory): case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['email_to'], details=body, email_from=email_from, message_id=message_id) x_headers = { - 'References':"%s" % (message_id), 'Reply-To':"%s" % case.section_id.reply_to, } + if message_id: + 'References':"%s" % (message_id) flag = False if case.section_id and case.section_id.server_id: flag = smtp_pool.send_email( From 74e259d210c3a76c5a35992fd28f79e792f4ce92 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Tue, 27 Apr 2010 16:19:22 +0200 Subject: [PATCH 02/12] [FIX] purchase: Set the property_product_pricelist_purchase in the partner form bzr revid: stephane@openerp.com-20100427141922-ft7ots37laav6sqh --- addons/purchase/partner_view.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml index 1e88cf50e12..58594493643 100644 --- a/addons/purchase/partner_view.xml +++ b/addons/purchase/partner_view.xml @@ -8,12 +8,12 @@ 36 - - + + - + - + From f6b5858e5c28f9c375a2beab229becadbdea2b68 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Tue, 27 Apr 2010 16:33:18 +0200 Subject: [PATCH 03/12] [FIX] Set the partner title in front of the name bzr revid: stephane@openerp.com-20100427143318-suhtdldt3i5t9gfe --- addons/account/report/invoice.rml | 2 +- .../report/report_account_invoice_layout.rml | 2 +- .../account_invoice_layout/report/special_message_invoice.rml | 2 +- addons/crm/wizard/crm_send_email.py | 3 ++- addons/l10n_ch/report/bvr.rml | 4 ++-- addons/l10n_ch/report/invoice.rml | 4 ++-- addons/purchase/report/order.rml | 4 ++-- addons/purchase/report/request_quotation.rml | 2 +- addons/report_intrastat/report/invoice.rml | 2 +- addons/sale/report/order.rml | 4 ++-- 10 files changed, 15 insertions(+), 14 deletions(-) diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index 1f29782b7ea..6f1cac05102 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -238,7 +238,7 @@ - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] + [[ o.partner_id.name ]] [[ o.partner_id.title or '' ]] [[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]] [[ o.address_invoice_id.street ]] [[ o.address_invoice_id.street2 or '' ]] diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml index e8f1cee42f3..950a84fc637 100644 --- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml +++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml @@ -191,7 +191,7 @@ - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] + [[ o.partner_id.name ]] [[ o.partner_id.title or '' ]] [[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]] [[ o.address_invoice_id.street ]] [[ o.address_invoice_id.street2 or '' ]] diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml index 133fffe5c0f..7eaae14497f 100644 --- a/addons/account_invoice_layout/report/special_message_invoice.rml +++ b/addons/account_invoice_layout/report/special_message_invoice.rml @@ -195,7 +195,7 @@ - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] + [[ o.partner_id.name ]] [[ o.partner_id.title or '' ]] [[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]] [[ o.address_invoice_id.street ]] [[ o.address_invoice_id.street2 or '' ]] diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py index c17a114e3d3..5658d3ee577 100644 --- a/addons/crm/wizard/crm_send_email.py +++ b/addons/crm/wizard/crm_send_email.py @@ -96,7 +96,8 @@ class crm_send_new_email(osv.osv_memory): 'Reply-To':"%s" % case.section_id.reply_to, } if message_id: - 'References':"%s" % (message_id) + x_headers['References'] = "%s" % (message_id) + flag = False if case.section_id and case.section_id.server_id: flag = smtp_pool.send_email( diff --git a/addons/l10n_ch/report/bvr.rml b/addons/l10n_ch/report/bvr.rml index caaa585d835..a3eed479be9 100755 --- a/addons/l10n_ch/report/bvr.rml +++ b/addons/l10n_ch/report/bvr.rml @@ -81,7 +81,7 @@ - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] + [[ o.partner_id.name ]] [[ o.partner_id.title or '' ]] [[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]] [[ o.address_invoice_id.street ]] [[ o.address_invoice_id.street2 or '' ]] @@ -164,4 +164,4 @@ [[mod10r('01'+str('%.2f' % o.amount_total).replace('.','').rjust(10,'0'))]]>[[ _get_ref(o) ]]+ [[o.partner_bank.bvr_number.split('-')[0]+(str(o.partner_bank.bvr_number.split('-')[1])).rjust(6,'0')+o.partner_bank.bvr_number.split('-')[2] ]]> - \ No newline at end of file + diff --git a/addons/l10n_ch/report/invoice.rml b/addons/l10n_ch/report/invoice.rml index ce5ef808f2a..104fbf2a367 100755 --- a/addons/l10n_ch/report/invoice.rml +++ b/addons/l10n_ch/report/invoice.rml @@ -155,7 +155,7 @@ - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] + [[ o.partner_id.name ]] [[ o.partner_id.title or '' ]] [[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]] [[ o.address_invoice_id.street ]] [[ o.address_invoice_id.street2 or '' ]] @@ -380,4 +380,4 @@ - \ No newline at end of file + diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index a9713776b4f..cd3e0dfb8fa 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -155,7 +155,7 @@ [[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]] Shipping address : - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] + [[ o.partner_id.name ]] [[ o.partner_id.title or '' ]] [[ addr.title or '' ]] [[ addr.name ]] [[ addr.street ]] [[ addr.street2 or '' ]] @@ -175,7 +175,7 @@ - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] + [[ o.partner_id.name ]] [[ o.partner_id.title or '' ]] [[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]] [[ o.partner_address_id.street ]] [[ o.partner_address_id.street2 or '' ]] diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml index c5f083bbf05..961ce8239b4 100644 --- a/addons/purchase/report/request_quotation.rml +++ b/addons/purchase/report/request_quotation.rml @@ -88,7 +88,7 @@ - [[ (order.partner_id and order.partner_id.title) or '' ]] [[ order.partner_id.name ]] + [[ order.partner_id.name ]] [[ order.partner_id.title or '' ]] [[ (order.partner_address_id and order.partner_address_id.title) or '' ]] [[ order.partner_address_id.name ]] [[ (order.partner_address_id and order.partner_address_id.street) or '']] [[ order.partner_address_id.street2 ]] [[ (order.partner_address_id and order.partner_address_id.zip) or '' ]] [[ (order.partner_address_id and order.partner_address_id.city) or '' ]] diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml index 89b6448072e..4c3bfd5d2c4 100644 --- a/addons/report_intrastat/report/invoice.rml +++ b/addons/report_intrastat/report/invoice.rml @@ -245,7 +245,7 @@ - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] + [[ o.partner_id.name ]] [[ o.partner_id.title or '' ]] [[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]] [[ o.address_invoice_id.street ]] [[ o.address_invoice_id.street2 or '' ]] diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml index fa03eb1624b..1c205b6c256 100644 --- a/addons/sale/report/order.rml +++ b/addons/sale/report/order.rml @@ -134,7 +134,7 @@ Shipping address : - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] + [[ o.partner_id.name ]] [[ o.partner_id.title or '' ]] [[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]] [[ o.partner_shipping_id.street ]] [[ o.partner_shipping_id.street2 or '' ]] @@ -155,7 +155,7 @@ - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] + [[ o.partner_id.name ]] [[ o.partner_id.title or '' ]] [[ o.partner_order_id.title or '' ]] [[ o.partner_order_id.name ]] [[ o.partner_order_id.street ]] [[ o.partner_order_id.street2 or '' ]] From 45800149edc2d976f2aab7871bdc74582acb5a84 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Tue, 27 Apr 2010 16:33:50 +0200 Subject: [PATCH 04/12] [FIX] crm: Hide the filename field, not needed for the end user bzr revid: stephane@openerp.com-20100427143350-bedhqdd40dwwsafg --- addons/crm/wizard/crm_send_email_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml index 4db670de61f..49758245eb0 100644 --- a/addons/crm/wizard/crm_send_email_view.xml +++ b/addons/crm/wizard/crm_send_email_view.xml @@ -20,11 +20,11 @@ - + - + - + From 170bc320cc2ff1a86628679cd4a7c8ce38b047c4 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Tue, 27 Apr 2010 17:15:05 +0200 Subject: [PATCH 05/12] [FIX] crm: Show the Name of the User in the 'from' field in the send email wizard bzr revid: stephane@openerp.com-20100427151505-4xtc16w4zkz4wszi --- addons/crm/wizard/crm_send_email.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py index 5658d3ee577..78bf362af45 100644 --- a/addons/crm/wizard/crm_send_email.py +++ b/addons/crm/wizard/crm_send_email.py @@ -162,7 +162,9 @@ class crm_send_new_email(osv.osv_memory): if 'email_from' in fields: res.update({'email_from': (case.section_id and case.section_id.reply_to) or \ (case.user_id and case.user_id.address_id and \ - case.user_id.address_id.email) or tools.config.get('email_from',False)}) + case.user_id.address_id.email and \ + "%s <%s>" % (case.user_id.name, case.user_id.address_id.email)) or \ + tools.config.get('email_from',False)}) if 'subject' in fields: res.update({'subject': '[%s] %s' %(str(case.id), case.name or '')}) if 'email_cc' in fields: From fd822d8b1d372c55bb827f880afa720c3f0a6d47 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 28 Apr 2010 09:20:02 +0200 Subject: [PATCH 06/12] [FIX] crm: Change the sequence of the priorities bzr revid: stephane@openerp.com-20100428072002-eu0s9bbx1x0um3jc --- addons/crm/crm.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 85a27bb5d55..b0515a3fa13 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -34,15 +34,15 @@ AVAILABLE_STATES = [ ('open', 'Open'), ('cancel', 'Cancelled'), ('done', 'Closed'), - ('pending', 'Pending') + ('pending', 'Pending'), ] AVAILABLE_PRIORITIES = [ - ('5', 'Lowest'), - ('4', 'Low'), - ('3', 'Normal'), + ('1', 'Highest'), ('2', 'High'), - ('1', 'Highest') + ('3', 'Normal'), + ('4', 'Low'), + ('5', 'Lowest'), ] class crm_case_section(osv.osv): From 393afb43b781bbe2a34c82b0aba02e55cd2cd0a6 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 28 Apr 2010 09:20:26 +0200 Subject: [PATCH 07/12] [FIX] crm: Remove the description of the case in the email bzr revid: stephane@openerp.com-20100428072026-j2cmpkzzbjn6d5di --- addons/crm/wizard/crm_send_email.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py index 78bf362af45..b0d20cd6e55 100644 --- a/addons/crm/wizard/crm_send_email.py +++ b/addons/crm/wizard/crm_send_email.py @@ -170,7 +170,7 @@ class crm_send_new_email(osv.osv_memory): if 'email_cc' in fields: res.update({'email_cc': case.email_cc or ''}) if 'text' in fields: - res.update({'text': '\n\n'+(case.user_id.signature or '') + '\n\n' + (case.description or '')}) + res.update({'text': '\n\n'+(case.user_id.signature or '')}) if 'state' in fields: res.update({'state': 'pending'}) return res From 54b33326a8ca76ecd785351e617015a87b98339d Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 28 Apr 2010 13:47:54 +0200 Subject: [PATCH 08/12] [FIX] base_setup: Remove the reference to the profile_training module in the configuration wizard bzr revid: stephane@openerp.com-20100428114754-yltf2wy68fdq6jxz --- addons/base_setup/base_setup_installer.xml | 1 - addons/base_setup/installer.py | 4 ---- 2 files changed, 5 deletions(-) diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml index 7a6d61a0e08..3b1a98f4d05 100644 --- a/addons/base_setup/base_setup_installer.xml +++ b/addons/base_setup/base_setup_installer.xml @@ -31,7 +31,6 @@ If you don't think you need any of these right now, you can easily install them - diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index 2c1ba113e47..d86e5f61796 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -78,10 +78,6 @@ class base_setup_installer(osv.osv_memory): help="Installs a preselected set of OpenERP " "applications which will help you manage your association " "more efficiently."), - 'profile_training':fields.boolean('Training Centers', - help="Helps you manage your training sessions and " - "centers, from the conception of a training project to the " - "gathering of trainee feedback."), 'profile_auction':fields.boolean('Auction Houses', help="Installs a preselected set of OpenERP " "applications selected to help you manage your auctions " From 714fdc0f98da47151724628b2f4a9103f2a5e41c Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 28 Apr 2010 13:52:22 +0200 Subject: [PATCH 09/12] [IMP] crm: Allow to an user to forward a lead to a partner bzr revid: stephane@openerp.com-20100428115222-kjs3gikx24eztjo1 --- addons/crm/__openerp__.py | 1 + addons/crm/crm_lead_view.xml | 11 +- addons/crm/wizard/__init__.py | 1 + addons/crm/wizard/crm_forward_to_partner.py | 160 ++++++++++++++++++ .../wizard/crm_forward_to_partner_view.xml | 38 +++++ 5 files changed, 208 insertions(+), 3 deletions(-) create mode 100644 addons/crm/wizard/crm_forward_to_partner.py create mode 100644 addons/crm/wizard/crm_forward_to_partner_view.xml diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index b3e45a33978..f9ec0e7d315 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -75,6 +75,7 @@ between mails and Open ERP.""", 'wizard/crm_opportunity_to_phonecall_view.xml', 'wizard/crm_partner_to_opportunity_view.xml', + 'wizard/crm_forward_to_partner_view.xml', 'wizard/crm_send_email_view.xml', 'wizard/crm_email_add_cc_view.xml', 'crm_view.xml', diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 03318270e9b..f89c558fee4 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -174,15 +174,20 @@ icon="gtk-undo" type="action" /> - - + + + + -