pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] purchase: _get_name_price_quantity_date takes date string

Browse Source
This commit is contained in:
Nicolas Martinelli
2015-09-02 19:35:12 +02:00
parent 834721e708
commit ffa4027a4e
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/purchase/purchase.py
+4 -5
View File
@@ -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)
addons/purchase_requisition/purchase_requisition.py
+2 -2
View File
@@ -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,