From 992c7bc76ec78e0aad4f258ec8e246476ec72511 Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Mon, 1 Aug 2011 17:15:43 +0530 Subject: [PATCH 01/58] [FIX]: fix a problem of sending email if we are using sendmail tool with server action it was coded in such way that we can not send email without --email-from parameter, but in case if we are using sendmail, we can user user's emails or auto generated email to define email-from bzr revid: mga@openerp.com-20110801114543-hi12oqciol8a62pc --- openerp/addons/base/ir/ir_actions.py | 30 ++++++++++++++++++---------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index 7c8a2414d25..8e7bd8dd167 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -32,6 +32,7 @@ import copy import os from xml import dom from report.report_sxw import report_sxw, report_rml +from socket import gethostname class actions(osv.osv): _name = 'ir.actions.actions' @@ -598,16 +599,18 @@ class actions_server(osv.osv): logger = logging.getLogger(self._name) if context is None: context = {} + user = self.pool.get('res.users').browse(cr, uid, uid) for action in self.browse(cr, uid, ids, context): obj_pool = self.pool.get(action.model_id.model) obj = obj_pool.browse(cr, uid, context['active_id'], context=context) cxt = { - 'context': dict(context), # copy context to prevent side-effects of eval - 'object': obj, + 'context':dict(context), # copy context to prevent side-effects of eval + 'object':obj, 'time':time, - 'cr': cr, - 'pool' : self.pool, - 'uid' : uid + 'cr':cr, + 'pool':self.pool, + 'uid':uid, + 'user':user } expr = eval(str(action.condition), cxt) if not expr: @@ -629,13 +632,14 @@ class actions_server(osv.osv): 'uid': uid, 'object':obj, 'obj': obj, + 'user':user } eval(action.code, localdict, mode="exec", nocopy=True) # nocopy allows to return 'action' if 'action' in localdict: return localdict['action'] if action.state == 'email': - user = config['email_from'] + email_from = config['email_from'] address = str(action.email) try: address = eval(str(action.email), cxt) @@ -643,16 +647,20 @@ class actions_server(osv.osv): pass if not address: - logger.info('Partner Email address not Specified!') + logger.info('Partner email address not specified!') continue - if not user: - logger.info('Email-From address not Specified at server!') - raise osv.except_osv(_('Error'), _("Please specify server option --email-from !")) + + if not email_from: + logger.info('Email from address not specify at server option --email-from !') + if user.user_email: + email_from = user.user_email + else: + email_from = "%s@%s" % (user.login, gethostname()) subject = self.merge_message(cr, uid, action.subject, action, context) body = self.merge_message(cr, uid, action.message, action, context) - if tools.email_send(user, [address], subject, body, debug=False, subtype='html') == True: + if tools.email_send(email_from, [address], subject, body, debug=False, subtype='html') == True: logger.info('Email successfully sent to: %s', address) else: logger.warning('Failed to send email to: %s', address) From d852a2a828371f02522677de5f5c2e5e7cde3903 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Mon, 8 Aug 2011 18:38:57 +0530 Subject: [PATCH 02/58] [IMP]account,hr_timesheet_sheet,mrp,pad,point_of_sale,purchase:Improvement is done in company view bzr revid: mma@tinyerp.com-20110808130857-fyxra4gte3nsp60u --- addons/account/company.py | 6 +++--- .../hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 13 ++++++++----- addons/mrp/company_view.xml | 6 +++--- addons/pad/company_pad.xml | 9 ++++++--- addons/point_of_sale/point_of_sale_view.xml | 13 ++++++++----- addons/procurement/company_view.xml | 10 +++++----- addons/project/project_view.xml | 9 ++++++--- addons/purchase/company_view.xml | 6 +++--- addons/sale/company_view.xml | 6 +++--- 9 files changed, 45 insertions(+), 33 deletions(-) diff --git a/addons/account/company.py b/addons/account/company.py index c7836e0128b..82a60beb461 100644 --- a/addons/account/company.py +++ b/addons/account/company.py @@ -36,9 +36,9 @@ class res_company(osv.osv): } _defaults = { - 'overdue_msg': 'Please note that the following payments are now due. If your payment \ - has been sent, kindly forward your payment details. If payment will be \ - delayed further, please contact us to discuss. \ + 'overdue_msg': 'Please note that the following payments are now due.\ + \nIf your payment has been sent, kindly forward your payment details.\ + \nIf payment will be delayed further, please contact us to discuss.\ \nWould your payment have been carried out after this mail was sent, please consider the present one as void.' } diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 321e4c2addd..be6c4509557 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -202,14 +202,17 @@ res.company.sheet res.company form + 18 - - - - + + + + + - + + diff --git a/addons/mrp/company_view.xml b/addons/mrp/company_view.xml index f5f06518565..3c33a332977 100644 --- a/addons/mrp/company_view.xml +++ b/addons/mrp/company_view.xml @@ -6,12 +6,12 @@ res.company.mrp.config res.company form - 22 + 24 - + - + diff --git a/addons/pad/company_pad.xml b/addons/pad/company_pad.xml index 754776715d7..0ee80937d18 100644 --- a/addons/pad/company_pad.xml +++ b/addons/pad/company_pad.xml @@ -6,9 +6,12 @@ form - - - + + + + + + diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 1435f6cc2b6..8bf7155096c 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -637,13 +637,16 @@ view.company.form.pos res.company form + 25 - - - - - + + + + + + + diff --git a/addons/procurement/company_view.xml b/addons/procurement/company_view.xml index 4d14f69edde..a5319c43640 100644 --- a/addons/procurement/company_view.xml +++ b/addons/procurement/company_view.xml @@ -6,14 +6,14 @@ res.company.mrp.config res.company form - 17 + 25 - + - - - + + + diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 85cde448c6d..cafe538e12a 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -528,13 +528,16 @@ res.company.task.config res.company form + 22 - - + + + - + + diff --git a/addons/purchase/company_view.xml b/addons/purchase/company_view.xml index d9d2fb9f9ee..04e48af29d9 100644 --- a/addons/purchase/company_view.xml +++ b/addons/purchase/company_view.xml @@ -6,12 +6,12 @@ res.company.mrp.config res.company form - 19 + 22 - + - + diff --git a/addons/sale/company_view.xml b/addons/sale/company_view.xml index 96ff91e8e90..567bf50948f 100644 --- a/addons/sale/company_view.xml +++ b/addons/sale/company_view.xml @@ -5,12 +5,12 @@ res.company.mrp.config res.company form - 24 + 20 - + - + From de2cb73d3add5e7c06bfceb229946865353e71cb Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 10 Aug 2011 11:34:26 +0530 Subject: [PATCH 03/58] [IMP]l10n_ch: rml_footer2 Replace with account_number2 bzr revid: mma@tinyerp.com-20110810060426-3y4ea0reolawrz42 --- addons/l10n_ch/company_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_ch/company_view.xml b/addons/l10n_ch/company_view.xml index df49cf123be..9a9b1464f8d 100644 --- a/addons/l10n_ch/company_view.xml +++ b/addons/l10n_ch/company_view.xml @@ -7,7 +7,7 @@ form - + From 170ee9bf72132b553dfd856cb5476b0c00d9419d Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Tue, 16 Aug 2011 19:03:53 +0530 Subject: [PATCH 04/58] [IMP]: remove stage type in lead and opportunity bzr revid: ksa@tinyerp.co.in-20110816133353-kfgzeotfuwoe0jle --- addons/crm/crm_lead.py | 2 +- addons/crm/crm_lead_view.xml | 2 +- addons/crm/crm_opportunity.py | 2 +- addons/crm/crm_opportunity_view.xml | 2 +- addons/crm/report/crm_lead_report.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 294c5dfbf56..7644bf08042 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -155,7 +155,7 @@ class crm_lead(crm_case, osv.osv): ],'Type', help="Type is used to separate Leads and Opportunities"), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 'date_closed': fields.datetime('Closed', readonly=True), - 'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('type','=','lead')]"), + 'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[(section_ids', '=', section_id)]"), 'user_id': fields.many2one('res.users', 'Salesman'), 'referred': fields.char('Referred By', size=64), 'date_open': fields.datetime('Opened', readonly=True), diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index cc0297c16f4..812ba11b623 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -74,7 +74,7 @@ - +