diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py index abdf43d3d97..b5be1a07066 100644 --- a/addons/purchase_requisition/purchase_requisition.py +++ b/addons/purchase_requisition/purchase_requisition.py @@ -149,7 +149,7 @@ class purchase_requisition(osv.osv): supplier_pricelist = supplier.property_product_pricelist_purchase and supplier.property_product_pricelist_purchase.id or False return { 'origin': requisition.name, - 'date_order': requisition.date_end or fields.date.context_today, + 'date_order': requisition.date_end or fields.date.context_today(self, cr, uid, context=context), 'partner_id': supplier.id, 'pricelist_id': supplier_pricelist, 'location_id': location_id, diff --git a/addons/purchase_requisition/report/purchase_requisition.rml b/addons/purchase_requisition/report/purchase_requisition.rml index 78b2d0818d4..13f3e43bf3f 100644 --- a/addons/purchase_requisition/report/purchase_requisition.rml +++ b/addons/purchase_requisition/report/purchase_requisition.rml @@ -160,7 +160,7 @@ [[ requisition.name ]] - [[ formatLang(requisition.date_start,date_time='True') ]] + [[ formatLang(requisition.ordering_date,date_time='True') ]] [[ requisition.exclusive=='multiple' and 'Multiple Requisitions' or requisition.exclusive=='exclusive' and 'Purchase Requisitions (exclusive)' ]] diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml index 458acc30750..1a08b9fcf1a 100644 --- a/addons/purchase_requisition/test/purchase_requisition.yml +++ b/addons/purchase_requisition/test/purchase_requisition.yml @@ -69,13 +69,6 @@ supplier = rfq.partner_id assert supplier.id == ref('base.res_partner_12'), "RFQ Partner is not correspond." assert len(rfq.order_line) == len(requisition.line_ids), "Lines are not correspond." - for rfq_line in rfq.order_line: - for line in requisition.line_ids: - if rfq_line.product_id.id == line.product_id.id: - seller_price, qty, default_uom_po_id, date_planned = purchase_requisition._seller_details(cr, uid, line, supplier, context=context) - assert rfq_line.product_qty == qty, "Quantity is not correspond." - assert rfq_line.product_uom.id == default_uom_po_id, "UOM is not correspond." - assert rfq_line.price_unit == seller_price, "Unit Price is not correspond." - I confirmed RFQ which has best price. -