From ffa4027a4e0b2ec0fae5b5d5d546d6b340884609 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Wed, 2 Sep 2015 11:12:43 +0200 Subject: [PATCH] [FIX] purchase: _get_name_price_quantity_date takes date string --- addons/purchase/purchase.py | 9 ++++----- addons/purchase_requisition/purchase_requisition.py | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 453b3c7c423..48be52f429b 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -465,7 +465,7 @@ class PurchaseOrderLine(models.Model): res = self._get_name_price_quantity_date( self.product_id, self.partner_id, - datetime.strptime(self.order_id.date_order, DEFAULT_SERVER_DATETIME_FORMAT) if self.order_id.date_order else datetime.today(), + self.order_id.date_order and self.order_id.date_order[:10], self.product_qty, self.product_uom, self.order_id.currency_id) @@ -497,7 +497,6 @@ class PurchaseOrderLine(models.Model): :param browse_record product_id: product.product, for which we want to get the information - :param str lang: language in which we want the product name :param browse_record partner_id: res.partner, supplier of the product :param str date: order date :param float quantity: quantity of product in product_uom UoM @@ -578,7 +577,7 @@ class ProcurementOrder(models.Model): res = self.env['purchase.order.line']._get_name_price_quantity_date( procurement.product_id, procurement.purchase_line_id.partner_id, - datetime.strptime(procurement.purchase_line_id.order_id.date_order, DEFAULT_SERVER_DATETIME_FORMAT), + procurement.purchase_line_id.order_id.date_order and procurement.purchase_line_id.order_id.date_order[:10], product_qty, procurement.product_uom, procurement.purchase_line_id.order_id.currency_id) @@ -651,7 +650,7 @@ class ProcurementOrder(models.Model): res = self.env['purchase.order.line']._get_name_price_quantity_date( self.product_id, supplier.name, - datetime.strptime(po.date_order, DEFAULT_SERVER_DATETIME_FORMAT), + po.date_order and po.date_order[:10], self.product_qty, self.product_uom, po.currency_id, @@ -738,7 +737,7 @@ class ProcurementOrder(models.Model): res = self.env['purchase.order.line']._get_name_price_quantity_date( self.product_id, partner, - datetime.strptime(po.date_order, DEFAULT_SERVER_DATETIME_FORMAT), + po.date_order and po.date_order[:10], line.product_qty + procurement.product_qty, self.product_uom, po.currency_id) diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py index cdbe175f2fe..0110b79de7c 100644 --- a/addons/purchase_requisition/purchase_requisition.py +++ b/addons/purchase_requisition/purchase_requisition.py @@ -3,7 +3,7 @@ from datetime import datetime from openerp.osv import fields, osv -from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT +from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT, DEFAULT_SERVER_DATE_FORMAT from openerp.tools.translate import _ import openerp.addons.decimal_precision as dp from openerp.exceptions import UserError @@ -150,7 +150,7 @@ class purchase_requisition(osv.osv): res = po_line_obj._get_name_price_quantity_date(cr, uid, requisition_line.product_id, supplier, - date_order, + date_order and date_order[:10], qty, product.uom_po_id, po.currency_id,