odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] fix purchase_requisition 

bzr revid: qdp-launchpad@openerp.com-20130806102448-dbdno2pebl24msnf
This commit is contained in:
Quentin (OpenERP) 2013-08-06 12:24:48 +02:00
parent 158f165836 dd8c53c075
commit 11d431010b
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/purchase_requisition/purchase_requisition.py
View File

@ -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,

2
addons/purchase_requisition/report/purchase_requisition.rml
View File

@ -160,7 +160,7 @@
<para style="terp_default_Centre_8">[[ requisition.name ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ formatLang(requisition.date_start,date_time='True') ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(requisition.ordering_date,date_time='True') ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ requisition.exclusive=='multiple' and 'Multiple Requisitions' or requisition.exclusive=='exclusive' and 'Purchase Requisitions (exclusive)' ]]</para>

7
addons/purchase_requisition/test/purchase_requisition.yml
View File

@ -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.
-