From 5e3d5f73ec7dca395a0bf7ddc78e09f3d846e24e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 1 Jun 2012 15:25:17 +0200 Subject: [PATCH] [IMP] procurement/scheduler: scheduler messages based on res.request are now posted on user wall. bzr revid: tde@openerp.com-20120601132517-8bkwomz8ds7bzonp --- addons/procurement/schedulers.py | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py index 4475373974a..cc29f5662e0 100644 --- a/addons/procurement/schedulers.py +++ b/addons/procurement/schedulers.py @@ -19,15 +19,15 @@ # ############################################################################## -import time from datetime import datetime from dateutil.relativedelta import relativedelta +import netsvc +import pooler from osv import osv +from osv import fields from tools.translate import _ from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT import tools -import netsvc -import pooler class procurement_order(osv.osv): _inherit = 'procurement.order' @@ -69,7 +69,7 @@ class procurement_order(osv.osv): cr.commit() company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id maxdate = (datetime.today() + relativedelta(days=company.schedule_range)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT) - start_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss') + start_date = fields.datetime.now() offset = 0 report = [] report_total = 0 @@ -113,8 +113,8 @@ class procurement_order(osv.osv): proc.product_id.name,)) report_except += 1 if uid: - request = self.pool.get('res.request') - end_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss') + # Chatter: old res.request is now a chatter on res.users, id=uid + end_date = fields.datetime.now() summary = _("""Here is the procurement scheduling report. Start Time: %s @@ -125,7 +125,7 @@ class procurement_order(osv.osv): Exceptions:\n""") % (start_date, end_date, report_total, report_except, report_later) summary += '\n'.join(report) - self.message_append_note(cr, uid, [proc.id], body=summary) + self.pool.get('res.users').message_append_note(cr, uid, [uid], body=summary, context=context) if use_new_cursor: cr.commit() offset += len(ids) @@ -232,7 +232,6 @@ class procurement_order(osv.osv): orderpoint_obj = self.pool.get('stock.warehouse.orderpoint') location_obj = self.pool.get('stock.location') procurement_obj = self.pool.get('procurement.order') - request_obj = self.pool.get('res.request') wf_service = netsvc.LocalService("workflow") report = [] offset = 0 @@ -288,12 +287,8 @@ class procurement_order(osv.osv): if use_new_cursor: cr.commit() if user_id and report: - request_obj.create(cr, uid, { - 'name': 'Orderpoint report.', - 'act_from': user_id, - 'act_to': user_id, - 'body': '\n'.join(report) - }) + # Chatter: old res.request is now a chatter on res.users, id=uid + self.pool.get('res.users').message_append_note(cr, uid, [user_id], body='\n'.join(report), subject=_('Orderpoint report'), context=context) if use_new_cursor: cr.commit() cr.close()