Merge lp:~openerp-dev/openobject-addons/7.0-opw-590221 into lp:openobject-addons/7.0

[Jigar A.]

timezone issue: when converting the "order date" of Sales Orders or Purchase Orders into the "reference date" for scheduling delivery and procurement, the "order date" is taken as if it was in UTC like all datetime values. In reality it is a fields.date and therefore expressed in the user's timezone.

Test Case
Modules Installed Sale, Purchase Requisition, MRP and PST time zone of User.
Create SO with Order date = 2012-03-26 and When SO is confirmed, it calculates the Expected DO Date like [Sale Order Date (on the SO) + Customer Lead Time (on the SO line, coming from the product) - Security Days (on the company)] so expected date shown to according to PST tz will be 2012-03-25 17:00:00 instead of 2012-03-26 00:00:00. Same implies to PO. as mention on Bug report.

And
Also Improved the confusing and mis-leading Tool-tips for the Company Level Lead time fields Purchase Lead Time and Security Days.

Kindly Review this.
Thank You

[Naresh(OpenERP) (nch-openerp)]

Hi Jigar,

Seems a cool fix ! Such a trap was not cached before where conversion being on a field type of different nature.

However few improvements I feel we should do !

It will be nice if we make this method in general so that any one can use it easily. Say we can define this in
server/openerp/tools/misc.py and then can be accessed where ever its needed. This will reduce code duplicity too.

*Usability* : we can improve a bit the help text added or can have community opinion on this !

*Supplier Order*:

This is the leads/security time for each purchase order. For company security purpose this many days will be removed from the date what suppliers has promised to you.

*Customer Order*:

For company security purpose this many days will be removed from the date, what you have promised to customers,
to cope up with any problems of procurement, final shipping, order negotiation etc.

Thanks,
Naresh Soni
OpenERP Enterprise Services

review: Needs Fixing

[Jigar A. (ifixthat)]

Hello,
Have Committed the **Usability** Improvements as suggested.
I do agree with that this should be generic Implantation, but by keeping specific handling on addons side then, It is possible for people to update a single module without updating the whole code if we think of stable perspective.
Yes we should forward port this to trunk with adding this as Utility either Under Tools as you suggested, or Under Date field definitions which will target it as Date related function.
Kindly review the issue.
Thank You

=== modified file 'project_mrp/test/project_task_procurement.yml'
--- project_mrp/test/project_task_procurement.yml	2012-12-18 16:37:16 +0000
+++ project_mrp/test/project_task_procurement.yml	2013-04-04 12:34:35 +0000
@@ -27,7 +27,7 @@
         assert (not project and not account) or project.analytic_account_id == account, "Project does not correspond."
     planned_hours = self._convert_qty_company_hours(cr, uid, procurement, context=context)
     assert task.planned_hours == planned_hours, 'Planned Hours do not correspond.'
-    assert datetime.strptime(task.date_deadline, '%Y-%m-%d') == datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S'), 'Deadline does not correspond.'
+    assert datetime.strptime(task.date_deadline, '%Y-%m-%d') == datetime.strptime(procurement.date_planned[:10], '%Y-%m-%d'), 'Deadline does not correspond.'
     if procurement.product_id.product_manager:
         assert task.user_id.id == procurement.product_id.product_manager.id, 'Allocated Person does not correspond with Service Product Manager.'
 -

=== modified file 'purchase/company.py'
--- purchase/company.py	2012-12-06 14:56:32 +0000
+++ purchase/company.py	2013-04-04 12:34:35 +0000
@@ -24,8 +24,12 @@
 class company(osv.osv):
     _inherit = 'res.company'
     _columns = {
-        'po_lead': fields.float('Purchase Lead Time', required=True,
-            help="This is the leads/security time for each purchase order."),
+        'po_lead': fields.float(
+            'Purchase Lead Time', required=True,
+            help="Margin of error for supplier lead times. When the system"\
+                 "generates Purchase Orders for procuring products,"\
+                 "they will be scheduled that many days earlier "\
+                 "to cope with unexpected supplier delays."),
     }
     _defaults = {
         'po_lead': lambda *a: 1.0,

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2012-12-21 16:48:08 +0000
+++ purchase/purchase.py	2013-04-04 12:34:35 +0000
@@ -20,6 +20,8 @@
 ##############################################################################
 
 import time
+import pytz
+from openerp import SUPERUSER_ID
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
@@ -593,11 +595,33 @@
             wf_service.trg_validate(uid, 'purchase.order', id, 'purchase_cancel', cr)
         return True
 
+    def date_to_datetime(self, cr, uid, userdate, context=None):
+        """ Convert date values expressed in user's timezone to
+        server-side UTC timestamp, assuming a default arbitrary
+        time of 12:00 AM - because a time is needed.
+    
+        :param str userdate: date string in in user time zone
+        :return: UTC datetime string for server-side use
+        """
+        # TODO: move to fields.datetime in server after 7.0
+        user_datetime = datetime.strptime(userdate, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(hours=12.0)
+        if context and context.get('tz'):
+            tz_name = context['tz']
+        else:
+            tz_name = self.pool.get('res.users').read(cr, SUPERUSER_ID, uid, ['tz'])['tz']
+        if tz_name:
+            utc = pytz.timezone('UTC')
+            context_tz = pytz.timezone(tz_name)
+            local_timestamp = context_tz.localize(user_datetime, is_dst=False)
+            user_datetime = local_timestamp.astimezone(utc)
+            return user_datetime.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        return userdate
+
     def _prepare_order_picking(self, cr, uid, order, context=None):
         return {
             'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in'),
             'origin': order.name + ((order.origin and (':' + order.origin)) or ''),
-            'date': order.date_order,
+            'date': self.date_to_datetime(cr, uid, order.date_order, context),
             'partner_id': order.dest_address_id.id or order.partner_id.id,
             'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none',
             'type': 'in',
@@ -615,8 +639,8 @@
             'product_uos_qty': order_line.product_qty,
             'product_uom': order_line.product_uom.id,
             'product_uos': order_line.product_uom.id,
-            'date': order_line.date_planned,
-            'date_expected': order_line.date_planned,
+            'date': self.date_to_datetime(cr, uid, order.date_order, context),
+            'date_expected': self.date_to_datetime(cr, uid, order.date_order, context),
             'location_id': order.partner_id.property_stock_supplier.id,
             'location_dest_id': order.location_id.id,
             'picking_id': picking_id,

=== modified file 'sale_stock/company.py'
--- sale_stock/company.py	2012-12-06 14:56:32 +0000
+++ sale_stock/company.py	2013-04-04 12:34:35 +0000
@@ -24,9 +24,12 @@
 class company(osv.osv):
     _inherit = 'res.company'
     _columns = {
-        'security_lead': fields.float('Security Days', required=True,
-            help="This is the days added to what you promise to customers "\
-            "for security purpose"),
+        'security_lead': fields.float(
+            'Security Days', required=True,
+            help="Margin of error for dates promised to customers. "\
+                 "Products will be scheduled for procurement and delivery "\
+                 "that many days earlier than the actual promised date, to "\
+                 "cope with unexpected delays in the supply chain."),
     }
     _defaults = {
         'security_lead': 0.0,

=== modified file 'sale_stock/sale_stock.py'
--- sale_stock/sale_stock.py	2012-12-21 16:48:08 +0000
+++ sale_stock/sale_stock.py	2013-04-04 12:34:35 +0000
@@ -25,6 +25,8 @@
 from openerp.osv import fields, osv
 from openerp import netsvc
 from openerp.tools.translate import _
+import pytz
+from openerp import SUPERUSER_ID
 
 class sale_shop(osv.osv):
     _inherit = "sale.shop"
@@ -232,6 +234,28 @@
                     res.append(line.procurement_id.id)
         return res
 
+    def date_to_datetime(self, cr, uid, userdate, context=None):
+        """ Convert date values expressed in user's timezone to
+        server-side UTC timestamp, assuming a default arbitrary
+        time of 12:00 AM - because a time is needed.
+    
+        :param str userdate: date string in in user time zone
+        :return: UTC datetime string for server-side use
+        """
+        # TODO: move to fields.datetime in server after 7.0
+        user_datetime = datetime.strptime(userdate, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(hours=12.0)
+        if context and context.get('tz'):
+            tz_name = context['tz']
+        else:
+            tz_name = self.pool.get('res.users').read(cr, SUPERUSER_ID, uid, ['tz'])['tz']
+        if tz_name:
+            utc = pytz.timezone('UTC')
+            context_tz = pytz.timezone(tz_name)
+            local_timestamp = context_tz.localize(user_datetime, is_dst=False)
+            user_datetime = local_timestamp.astimezone(utc)
+            return user_datetime.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        return userdate
+
     # if mode == 'finished':
     #   returns True if all lines are done, False otherwise
     # if mode == 'canceled':
@@ -314,7 +338,7 @@
         return {
             'name': pick_name,
             'origin': order.name,
-            'date': order.date_order,
+            'date': self.date_to_datetime(cr, uid, order.date_order, context),
             'type': 'out',
             'state': 'auto',
             'move_type': order.picking_policy,
@@ -348,7 +372,8 @@
         return True
 
     def _get_date_planned(self, cr, uid, order, line, start_date, context=None):
-        date_planned = datetime.strptime(start_date, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=line.delay or 0.0)
+        start_date = self.date_to_datetime(cr, uid, start_date, context)
+        date_planned = datetime.strptime(start_date, DEFAULT_SERVER_DATETIME_FORMAT) + relativedelta(days=line.delay or 0.0)
         date_planned = (date_planned - timedelta(days=order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
         return date_planned
 

=== modified file 'sale_stock/test/picking_order_policy.yml'
--- sale_stock/test/picking_order_policy.yml	2012-12-18 22:50:15 +0000
+++ sale_stock/test/picking_order_policy.yml	2013-04-04 12:34:35 +0000
@@ -26,7 +26,8 @@
     order = self.browse(cr, uid, ref("sale.sale_order_6"))
     for order_line in order.order_line:
         procurement = order_line.procurement_id
-        date_planned = datetime.strptime(order.date_order, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=order_line.delay or 0.0)
+        sale_order_date = self.date_to_datetime(cr, uid, order.date_order, context)
+        date_planned = datetime.strptime(sale_order_date, DEFAULT_SERVER_DATETIME_FORMAT) + relativedelta(days=order_line.delay or 0.0)
         date_planned = (date_planned - timedelta(days=order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
         assert procurement.date_planned == date_planned, "Scheduled date is not correspond."
         assert procurement.product_id.id == order_line.product_id.id, "Product is not correspond."
@@ -60,7 +61,8 @@
       output_id = sale_order.shop_id.warehouse_id.lot_output_id.id
       for move in picking.move_lines:
          order_line = move.sale_line_id
-         date_planned = datetime.strptime(sale_order.date_order, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=order_line.delay or 0.0)
+         sale_order_date = self.date_to_datetime(cr, uid, sale_order.date_order, context)
+         date_planned = datetime.strptime(sale_order_date, DEFAULT_SERVER_DATETIME_FORMAT) + relativedelta(days=order_line.delay or 0.0)
          date_planned = (date_planned - timedelta(days=sale_order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
          assert datetime.strptime(move.date_expected, DEFAULT_SERVER_DATETIME_FORMAT) == datetime.strptime(date_planned, DEFAULT_SERVER_DATETIME_FORMAT), "Excepted Date is not correspond with Planned Date."
          assert move.product_id.id == order_line.product_id.id,"Product is not correspond."