diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index d1ec2b1c260..20a78c59d4d 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -43,8 +43,10 @@ This new object will regroup and will allow you to easily keep track and order a
"security/ir.model.access.csv","purchase_requisition_sequence.xml"
],
"active": False,
- "test":['test/purchase_requisition_report.yml',
- 'test/purchase_requisition_test.yml',
+ "test":[
+ 'test/purchase_requisition_demo.yml',
+ 'test/purchase_requisition.yml',
+ 'test/cancel_purchase_requisition.yml',
],
"installable": True,
"certificate" : "001023264099823179629",
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index d619e3a82f5..cc0956b8755 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -19,7 +19,8 @@
# along with this program. If not, see .
#
##############################################################################
-
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
import time
import netsvc
@@ -83,6 +84,89 @@ class purchase_requisition(osv.osv):
self.write(cr, uid, ids, {'state':'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
return True
+ def _planned_date(self, requisition, delay=0.0):
+ company = requisition.company_id
+ date_planned = False
+ if requisition.date_start:
+ date_planned = datetime.strptime(requisition.date_start, '%Y-%m-%d %H:%M:%S') - relativedelta(days=company.po_lead)
+ else:
+ date_planned = datetime.today() - relativedelta(days=company.po_lead)
+ if delay:
+ date_planned -= relativedelta(days=delay)
+ return date_planned and date_planned.strftime('%Y-%m-%d %H:%M:%S') or False
+
+ def _seller_details(self, cr, uid, requisition_line, supplier, context=None):
+ product_uom = self.pool.get('product.uom')
+ pricelist = self.pool.get('product.pricelist')
+ supplier_info = self.pool.get("product.supplierinfo")
+ product = requisition_line.product_id
+ default_uom_po_id = product.uom_po_id.id
+ qty = product_uom._compute_qty(cr, uid, requisition_line.product_uom_id.id, requisition_line.product_qty, default_uom_po_id)
+ seller_delay = 0.0
+ seller_price = False
+ seller_qty = False
+ for product_supplier in product.seller_ids:
+ if supplier.id == product_supplier.name and qty >= product_supplier.qty:
+ seller_delay = product_supplier.delay
+ seller_qty = product_supplier.qty
+ supplier_pricelist = supplier.property_product_pricelist_purchase or False
+ seller_price = pricelist.price_get(cr, uid, [supplier_pricelist.id], product.id, qty, False, {'uom': default_uom_po_id})[supplier_pricelist.id]
+ if seller_qty:
+ qty = max(qty,seller_qty)
+ date_planned = self._planned_date(requisition_line.requisition_id, seller_delay)
+ return seller_price, qty, default_uom_po_id, date_planned
+
+ def make_purchase_order(self, cr, uid, ids, partner_id, context=None):
+ """
+ Create New RFQ for Supplier
+ """
+ if context is None:
+ context = {}
+ assert partner_id, 'Supplier should be specified'
+ purchase_order = self.pool.get('purchase.order')
+ purchase_order_line = self.pool.get('purchase.order.line')
+ res_partner = self.pool.get('res.partner')
+ fiscal_position = self.pool.get('account.fiscal.position')
+ supplier = res_partner.browse(cr, uid, partner_id, context=context)
+ delivery_address_id = res_partner.address_get(cr, uid, [supplier.id], ['delivery'])['delivery']
+ supplier_pricelist = supplier.property_product_pricelist_purchase or False
+ res = {}
+ for requisition in self.browse(cr, uid, ids, context=context):
+ if supplier.id in filter(lambda x: x, [rfq.state <> 'cancel' and rfq.partner_id.id or None for rfq in requisition.purchase_ids]):
+ raise osv.except_osv(_('Warning'), _('You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation.') % supp_record.state)
+ location_id = requisition.warehouse_id.lot_input_id.id
+ purchase_id = purchase_order.create(cr, uid, {
+ 'origin': requisition.name,
+ 'partner_id': supplier.id,
+ 'partner_address_id': delivery_address_id,
+ 'pricelist_id': supplier_pricelist.id,
+ 'location_id': location_id,
+ 'company_id': requisition.company_id.id,
+ 'fiscal_position': supplier.property_account_position and supplier.property_account_position.id or False,
+ 'requisition_id':requisition.id,
+ 'notes':requisition.description,
+ 'warehouse_id':requisition.warehouse_id.id ,
+ })
+ res[requisition.id] = purchase_id
+ for line in requisition.line_ids:
+ product = line.product_id
+ seller_price, qty, default_uom_po_id, date_planned = self._seller_details(cr, uid, line, supplier, context=context)
+ taxes_ids = product.supplier_taxes_id
+ taxes = fiscal_position.map_tax(cr, uid, supplier.property_account_position, taxes_ids)
+ purchase_order_line.create(cr, uid, {
+ 'order_id': purchase_id,
+ 'name': product.partner_ref,
+ 'product_qty': qty,
+ 'product_id': product.id,
+ 'product_uom': default_uom_po_id,
+ 'price_unit': seller_price,
+ 'date_planned': date_planned,
+ 'notes': product.description_purchase,
+ 'taxes_id': [(6, 0, taxes)],
+ }, context=context)
+
+ return res
+
purchase_requisition()
class purchase_requisition_line(osv.osv):
@@ -96,7 +180,7 @@ class purchase_requisition_line(osv.osv):
'product_uom_id': fields.many2one('product.uom', 'Product UoM'),
'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade'),
- 'company_id': fields.many2one('res.company', 'Company', required=True),
+ 'company_id': fields.related('requisition_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
}
def onchange_product_id(self, cr, uid, ids, product_id,product_uom_id, context=None):
@@ -133,7 +217,7 @@ class purchase_order(osv.osv):
proc_obj.write(cr, uid, proc_ids, {'purchase_id': po.id})
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'purchase.order', order.id, 'purchase_cancel', cr)
- self.pool.get('purchase.requisition').write(cr, uid, [po.requisition_id.id], {'state':'done','date_end':time.strftime('%Y-%m-%d %H:%M:%S')})
+ po.requisition_id.tender_done(context=context)
return res
purchase_order()
diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml
index deb25fe9e14..910fc22bc63 100644
--- a/addons/purchase_requisition/purchase_requisition_demo.xml
+++ b/addons/purchase_requisition/purchase_requisition_demo.xml
@@ -6,24 +6,65 @@
+
+
+
+
-
+
- multiple
+ exclusive
-
-
-
-
-
-
+
+ [HDD3] HDD Seagate 7200.8 160GB
+
+
+
5
+
+
+
+
+
+
+
+
+
+
+
+
+ [HDD3] HDD Seagate 7200.8 160GB
+
+
+
+ 60
+ 5
+
+
+
+
+
+
+
+
+
+
+
+
+ [HDD3] HDD Seagate 7200.8 160GB
+
+
+
+ 50
+ 3
+
+
diff --git a/addons/purchase_requisition/test/cancel_purchase_requisition.yml b/addons/purchase_requisition/test/cancel_purchase_requisition.yml
new file mode 100644
index 00000000000..389c328a5cf
--- /dev/null
+++ b/addons/purchase_requisition/test/cancel_purchase_requisition.yml
@@ -0,0 +1,26 @@
+-
+ I cancel requisition.
+-
+ !python {model: purchase.requisition}: |
+ self.tender_cancel(cr, uid, [ref("requisition1")])
+-
+ I check requisition after cancelled.
+-
+ !assert {model: purchase.requisition, id: requisition1}:
+ - state == 'cancel'
+-
+ I reset requisition as "New".
+-
+ !python {model: purchase.requisition}: |
+ self.tender_reset(cr, uid, [ref('requisition1')])
+-
+ I duplicate requisition.
+-
+ !python {model: purchase.requisition}: |
+ self.copy(cr, uid, ref('requisition1'))
+-
+ I delete requisition.
+-
+ !python {model: purchase.order}: |
+ self.unlink(cr, uid, [ref("requisition1")])
+
diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml
index fb5fa774fc3..a2e5b743965 100644
--- a/addons/purchase_requisition/test/purchase_requisition.yml
+++ b/addons/purchase_requisition/test/purchase_requisition.yml
@@ -1,189 +1,90 @@
-
-
- In order to test the purchase requisition module, I will do a sale order -> purchase_requisition ->
- purchase flow and I will buy the required products at two different suppliers.
+ I create the procurement order and run that procurement.
-
- I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
- with the generation of purchase requisitions.
+ !python {model: make.procurement}: |
+ context.update({'active_model':'product.product', 'active_ids': [ref('product.product_product_hdd3')], 'active_id': ref('product.product_product_hdd3')})
-
- !record {model: product.product, id: product_product_laptopacer0}:
- categ_id: product.product_category_3
- cost_method: standard
- mes_type: fixed
- name: Laptop ACER
- procure_method: make_to_order
- purchase_requisition: 1
- seller_ids:
- - delay: 1
- name: base.res_partner_asus
- qty: 5.0
- min_qty: 1.0
- supply_method: buy
- type: product
+ !record {model: make.procurement, id: procurement_product_hdd3}:
+ product_id: product.product_product_hdd3
+ qty: 15
uom_id: product.product_uom_unit
- uom_po_id: product.product_uom_unit
- volume: 0.0
- warranty: 0.0
- weight: 0.0
- weight_net: 0.0
- list_price: 100.0
+ warehouse_id: stock.stock_warehouse_shop0
-
- Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0001.
+ !python {model: make.procurement}: |
+ self.make_procurement(cr, uid, [ref('procurement_product_hdd3')], context)
-
- !record {model: sale.order, id: sale_order_testtender0}:
- date_order: !eval time.strftime('%Y-%m-%d')
- invoice_quantity: order
- name: TEST/TENDER/0001
- order_line:
- - name: Laptop ACER
- price_unit: 100.0
- product_uom: product.product_uom_unit
- product_uom_qty: 5.0
- state: draft
- delay: 7.0
- product_id: product_product_laptopacer0
- product_uos_qty: 5.0
- th_weight: 0.0
- type: make_to_order
- order_policy: manual
- partner_id: base.res_partner_agrolait
- partner_invoice_id: base.res_partner_address_8
- partner_order_id: base.res_partner_address_8
- partner_shipping_id: base.res_partner_address_8
- picking_policy: direct
- pricelist_id: product.list0
- shop_id: sale.shop
+ I run the scheduler.
-
- I confirm the sale order.
+ !python {model: procurement.order}: |
+ self.run_scheduler(cr, uid)
-
- !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender0}
+ I check requisition details which created after run procurement.
-
- I launch the scheduler to compute all procurements, and specify all requisitions orders.
+ !python {model: procurement.order}: |
+ procurement_ids = self.search(cr, uid, [('requisition_id','!=', False)])
+ for procurement in self.browse(cr, uid, procurement_ids, context=context):
+ requisition = procurement.requisition_id
+ assert requisition.date_end == procurement.date_planned, "End date is not correspond."
+ assert len(requisition.line_ids) == 1, "Requisition Lines should be one."
+ line = requisition.line_ids[0]
+ assert line.product_id.id == procurement.product_id.id, "Product is not correspond."
+ assert line.product_uom_id.id == procurement.product_uom.id, "UOM is not correspond."
+ assert line.product_qty == procurement.product_qty, "Quantity is not correspond."
-
- !python {model: procurement.order.compute.all}: |
- proc_obj = self.pool.get('procurement.order')
- proc_obj._procure_confirm(cr,uid)
+ I open another requisition.
-
- On the purchase requisition, I create a new purchase order for the supplier 'DistriPC' by clicking on
- the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC .
--
- !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
- partner_address_id: base.res_partner_address_7
- partner_id: base.res_partner_4
--
- I create a new purchase order.
+ !python {model: purchase.requisition}: |
+ self.tender_in_progress(cr, uid, [ref("requisition1")], context=context)
+-
+ Supplier send one RFQ so I create requisition request of that supplier.
-
!python {model: purchase.requisition.partner}: |
- req_obj = self.pool.get('purchase.requisition')
- ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER')])
- self.create_order(cr, uid, [ref("purchase_requisition_partner_0")], {"lang":
- 'en_US', "active_model": "purchase.requisition", "tz": False, "record_id":
- 1, "active_ids": ids, "active_id": ids[0], })
-
+ context.update({"active_model": "purchase.requisition","active_ids": [ref("requisition1")],"active_id": ref("requisition1")})
+-
+ !record {model: purchase.requisition.partner, id: requisition_partner_0}:
+ partner_id: base.res_partner_desertic_hispafuentes
+-
+ !python {model: purchase.requisition.partner}: |
+ self.create_order(cr, uid, [ref("requisition_partner_0")], context=context)
-
- I check that I have two purchase orders on the purchase requisition.
--
- !python {model: purchase.order}: |
- from tools.translate import _
- order_ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
- ids=len(order_ids)
- assert(ids == 2), _('Purchase Order not Created')
-
--
- I set the purchase requisition as 'Not Exclusive'.
--
- !python {model: purchase.requisition}: |
- ids =self.search(cr, uid, [('origin','=','Laptop ACER')])
- self.write(cr,uid,ids[0],{'exclusive': 'multiple' })
--
- I change the quantities so that the purchase order for DistriPC includes 3 pieces and the
- purchase order for Asustek includes 2 pieces.
+ I check that the RFQ details which created for supplier.
-
!python {model: purchase.order}: |
- line_obj=self.pool.get('purchase.order.line')
- partner_obj=self.pool.get('res.partner')
- requistion_obj=self.pool.get('purchase.requisition')
- requistion_ids =requistion_obj.search(cr, uid, [('origin','=','Laptop ACER')])
- partner_id1=partner_obj.search(cr,uid,[('name','=','ASUStek')])[0]
- partner_id2=partner_obj.search(cr,uid,[('name','=','Distrib PC')])[0]
- purchase_id1= self.search(cr, uid, [('partner_id','=',partner_id1),('requisition_id','in',requistion_ids)])
- purchase_id2= self.search(cr, uid, [('partner_id','=',partner_id2),('requisition_id','in',requistion_ids)])
- order_line1=self.browse(cr, uid, purchase_id1, context)[0].order_line[0].id
- order_line2=self.browse(cr, uid, purchase_id2, context)[0].order_line[0].id
- line_obj.write(cr, uid, order_line1, {'product_qty':2})
- line_obj.write(cr, uid, order_line2, {'product_qty':3})
+ purchase_requisition = self.pool.get("purchase.requisition")
+ purchase_ids = self.search(cr, uid, [('requisition_id','=',ref("requisition1"))])
+ assert purchase_ids, "RFQ is not created."
+ rfq = self.browse(cr, uid, purchase_ids[0], context=context)
+ requisition = rfq.requisition_id
+ supplier = rfq.partner_id
+ assert supplier.id == ref('base.res_partner_desertic_hispafuentes'), "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 confirm and validate both purchase orders.
+ I confirmed RFQ which has best price.
-
!python {model: purchase.order}: |
- order_ids= self.search(cr, uid, [])
- import netsvc
- wf_service = netsvc.LocalService("workflow")
- for id in order_ids:
- wf_service.trg_validate(uid, 'purchase.order',id,'purchase_confirm', cr)
- wf_service.trg_validate(uid, 'purchase.order',id,'purchase_approve', cr)
--
- I check that the delivery order of the customer is in state 'Waiting Goods'.
--
- !python {model: stock.picking }: |
- from tools.translate import _
- picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
- if picking_id:
- pick=self.browse(cr,uid,picking_id[0])
- assert (pick.state =='confirmed'),_('Picking is not in confirm state.')
- assert (pick.move_lines[0].state == 'waiting'), _('Stock Move is not Waiting state.')
+ import netsvc
+ wf_service = netsvc.LocalService("workflow")
+ purchase = self.browse(cr, uid, ref('rfq2'), context=context)
+ wf_service.trg_validate(uid, 'purchase.order', purchase.id, 'purchase_confirm', cr)
-
- I receive the order of the supplier Asustek from the Incoming Products menu.
+ I check status of requisition after confirmed best RFQ.
-
- !python {model: stock.picking }: |
- import time
- partner_obj=self.pool.get('res.partner')
- order_obj=self.pool.get('purchase.order')
- partner_id=partner_obj.search(cr,uid,[('name','=','ASUStek')])[0]
- picking_id = self.search(cr, uid, [('address_id.partner_id','=',partner_id),('type','=','in')])
- if picking_id:
- pick=self.browse(cr,uid,picking_id[0])
- move =pick.move_lines[0]
- partial_datas = {
- 'partner_id': pick.address_id.partner_id.id,
- 'address_id': pick.address_id.id,
- 'delivery_date' : time.strftime('%Y-%m-%d'),
- }
- partial_datas['move%s'%(move.id)]= {
- 'product_id': move.product_id.id,
- 'product_qty': move.product_qty,
- 'product_uom': move.product_uom.id,
- }
- self.do_partial(cr, uid, picking_id,partial_datas)
+ !python {model: purchase.requisition}: |
+ requisition = self.browse(cr, uid, ref('requisition1'), context=context)
+ requisition.state == 'done', "Requisition should be closed."
-
- I receive the order of the supplier DistriPC from the Incoming Shipments menu.
--
- !python {model: stock.picking }: |
- import time
- partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]
- picking_id = self.search(cr, uid, [('address_id.partner_id','=',partner_id),('type','=','in')])
- if picking_id:
- pick=self.browse(cr,uid,picking_id[0])
- move =pick.move_lines[0]
- partial_datas = {
- 'partner_id':pick.address_id.partner_id.id,
- 'address_id': pick.address_id.id,
- 'delivery_date' : time.strftime('%Y-%m-%d'),
- }
- partial_datas['move%s'%(move.id)]= {
- 'product_id': move.product_id.id,
- 'product_qty': move.product_qty,
- 'product_uom': move.product_uom.id,
- }
- self.do_partial(cr, uid, picking_id,partial_datas)
--
- I check that the delivery order of the customer is in the state Available.
--
- !python {model: stock.picking }: |
- from tools.translate import _
- picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001'),('type','=','out')])
- if picking_id:
- pick=self.browse(cr,uid,picking_id[0])
- assert(pick.state == 'assigned'), _('Picking is not in available state')
-
+ I print a Requisition report
+-
+ !python {model: purchase.requisition}: |
+ import netsvc, tools, os
+ (data, format) = netsvc.LocalService('report.purchase.requisition').create(cr, uid, [ref('purchase_requisition.requisition1')], {}, {})
+ if tools.config['test_report_directory']:
+ file(os.path.join(tools.config['test_report_directory'], 'purchase_requisition-purchase_requisition_report.'+format), 'wb+').write(data)
diff --git a/addons/purchase_requisition/test/purchase_requisition_demo.yml b/addons/purchase_requisition/test/purchase_requisition_demo.yml
new file mode 100755
index 00000000000..42913f3e96e
--- /dev/null
+++ b/addons/purchase_requisition/test/purchase_requisition_demo.yml
@@ -0,0 +1,10 @@
+-
+ In order to test process of the purchase requisition ,I create requisition
+-
+ !record {model: purchase.requisition, id: requisition1}:
+ exclusive: exclusive
+ line_ids:
+ - product_id: product.product_product_cpu1
+ product_qty: 10.0
+ product_uom_id: product.product_uom_unit
+
diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
deleted file mode 100644
index 1ab9bca9493..00000000000
--- a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
+++ /dev/null
@@ -1,113 +0,0 @@
--
- In order to test the purchase requisition module, I will do a sale order -> purchase_requisition ->
- purchase flow and I will buy the required products at two different suppliers.
--
- I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
- with the generation of purchase requisitions.
--
- !record {model: product.product, id: product_product_laptopacer1}:
- categ_id: product.product_category_3
- cost_method: standard
- list_price: 1000.0
- mes_type: fixed
- name: Laptop ACER1
- procure_method: make_to_order
- purchase_requisition: 1
- seller_ids:
- - delay: 1
- name: base.res_partner_asus
- qty: 5.0
- min_qty: 1.0
- supply_method: buy
- type: product
- uom_id: product.product_uom_unit
- uom_po_id: product.product_uom_unit
--
- Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0002
--
- !record {model: sale.order, id: sale_order_testtender1}:
- date_order: !eval time.strftime('%Y-%m-%d')
- invoice_quantity: order
- name: TEST/TENDER/0002
- order_line:
- - name: Laptop ACER1
- price_unit: 1000.0
- product_uom: product.product_uom_unit
- product_uom_qty: 5.0
- state: draft
- 'delay': 7.0
- 'product_id': product_product_laptopacer1
- 'type': make_to_order
- order_policy: manual
- partner_id: base.res_partner_agrolait
- partner_invoice_id: base.res_partner_address_8
- partner_order_id: base.res_partner_address_8
- partner_shipping_id: base.res_partner_address_8
- picking_policy: direct
- pricelist_id: product.list0
- shop_id: sale.shop
--
- I confirm sale order.
--
- !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender1}
--
- I launch the scheduler to compute all procurements, and planify all requisitions orders.
--
- !python {model: procurement.order.compute.all}: |
- proc_obj = self.pool.get('procurement.order')
- proc_obj._procure_confirm(cr,uid)
--
- I should find a purchase requisition with the origin 'TEST/TENDER/0002', that includes a request for
- 5 Laptop ACER, and a purchase order on the default supplier for this product.
--
- !python {model: purchase.requisition}: |
- requisition_ids =self.search(cr, uid, [('origin','=','Laptop ACER1')])
- ids=len(requisition_ids)
- assert len(requisition_ids), "Purchase requisition hasn't Created"
--
- On the purchase requisition, I create a new purchase order for the supplier 'DistriPC' by clicking on
- the button 'New Request for Quotation'. This opens a window to ask me the supplier and I set DistriPC .
--
- I Create purchase.requisition.partner .
--
- !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
- partner_address_id: base.res_partner_address_7
- partner_id: base.res_partner_4
--
- I create a new purchase order for the supplier 'DistriPC'.
--
- !python {model: purchase.requisition.partner}: |
- req_obj = self.pool.get('purchase.requisition')
- ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER1')])
- self.create_order(cr, uid, [ref("purchase_requisition_partner_0")], {"lang":
- 'en_US', "active_model": "purchase.requisition", "tz": False, "record_id":
- 1, "active_ids": ids, "active_id": ids[0], })
--
- I set the purchase requisition as 'Exclusive'
--
- !python {model: purchase.requisition}: |
- ids =self.search(cr, uid, [('origin','=','Laptop ACER1')])
- self.write(cr,uid,ids[0],{'exclusive': 'exclusive' })
--
- I confirm and validate the Request for Quotation of ASUStek.
--
- !python {model: purchase.order}: |
- partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','ASUStek')])[0]
- req_obj = self.pool.get('purchase.requisition')
- ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER1')])
- purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','in',ids)])[0]
- import netsvc
- wf_service = netsvc.LocalService("workflow")
- if purchase_id:
- wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_confirm', cr)
- wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_approve', cr)
--
- I check that Request for Quotation of DistriPC is cancelled.
--
- !python {model: purchase.order}: |
- partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]
- req_obj = self.pool.get('purchase.requisition')
- ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER1')])
- purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','in',ids)])[0]
- state=self.browse(cr,uid,purchase_id).state
- assert (state=='cancel')
diff --git a/addons/purchase_requisition/test/purchase_requisition_report.yml b/addons/purchase_requisition/test/purchase_requisition_report.yml
deleted file mode 100644
index 29edea96a8a..00000000000
--- a/addons/purchase_requisition/test/purchase_requisition_report.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
- In order to test the PDF reports defined on Purchase Requisition, we will print a Requisition report
--
- !python {model: purchase.requisition}: |
- import netsvc, tools, os
- (data, format) = netsvc.LocalService('report.purchase.requisition').create(cr, uid, [ref('purchase_requisition.order_purchase_requisition1')], {}, {})
- if tools.config['test_report_directory']:
- file(os.path.join(tools.config['test_report_directory'], 'purchase_requisition-purchase_requisition_report.'+format), 'wb+').write(data)
diff --git a/addons/purchase_requisition/test/purchase_requisition_test.yml b/addons/purchase_requisition/test/purchase_requisition_test.yml
deleted file mode 100755
index 403eaca04fc..00000000000
--- a/addons/purchase_requisition/test/purchase_requisition_test.yml
+++ /dev/null
@@ -1,166 +0,0 @@
--
- In order to test the purchase requisition flow,I start by creating a new product 'MOB1'
--
- !record {model: product.product, id: product_product_mob1}:
- name: MOB1
- categ_id: product.product_category_3
- cost_method: standard
- mes_type: fixed
- price_margin: 2.0
- procure_method: make_to_stock
- property_stock_inventory: stock.location_inventory
- property_stock_procurement: stock.location_procurement
- property_stock_production: stock.location_production
- standard_price: 2000.0
- supply_method: buy
- type: product
- uom_id: product.product_uom_unit
- uom_po_id: product.product_uom_unit
- volume: 0.0
- warranty: 0.0
- weight: 0.0
- weight_net: 0.0
--
- I create purchase requisition for MOB1 for 1 quantity.
--
- !record {model: purchase.requisition, id: purchase_requisition_te0}:
- company_id: base.main_company
- exclusive: multiple
- line_ids:
- - company_id: base.main_company
- product_id: product_product_mob1
- product_qty: 10.0
- product_uom_id: product.product_uom_unit
- name: TE00009
--
- Initially purchase requisition is in draft state.
--
- !assert {model: purchase.requisition, id: purchase_requisition_te0}:
- - state == 'draft'
--
- Copy purchase requisition which is in draft state than confirm and Done it.
--
- !python {model: purchase.requisition}: |
- copy_id = self.copy(cr, uid, ref("purchase_requisition_te0"))
- self.tender_cancel(cr, uid, [copy_id], context=None)
- self.tender_reset(cr, uid, [copy_id], context=None)
- self.tender_in_progress(cr, uid, [copy_id], context=None)
- self.tender_done(cr, uid, [copy_id], context=None)
--
- I confirm the purchase requisition for MOB1.
--
- !python {model: purchase.requisition}: |
- self.tender_in_progress(cr, uid, [ref("purchase_requisition_te0")])
--
- I check that the purchase requisition which was initially in the draft state has transmit to In Progress after confirm it.
--
- !assert {model: purchase.requisition, id: purchase_requisition_te0}:
- - state == 'in_progress'
--
- In order to create a purchase order for 'Axelor', i click on the wizard 'Request a Quotation' and create record for wizard.
--
- !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
- partner_address_id: base.res_partner_address_3000
- partner_id: base.res_partner_desertic_hispafuentes
--
- I click on 'Create Quotation' for creating PO.
--
- !python {model: purchase.requisition.partner}: |
- self.create_order(cr, uid, [ref("purchase_requisition_partner_0")], {"active_model": "purchase.requisition",
- "active_ids": [ref("purchase_requisition_te0")],"active_id": ref("purchase_requisition_te0"), })
--
- I confirm the purchase order of Axelor.
--
- !python {model: purchase.order}: |
- purchase_id= self.search(cr, uid, [('requisition_id','=',ref("purchase_requisition_te0"))])
- import netsvc
- wf_service = netsvc.LocalService("workflow")
- if purchase_id:
- wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_confirm', cr)
- wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_approve', cr)
--
- I check that Quotation of Axelor is Approved.
--
- !python {model: purchase.order}: |
- purchase_id= self.search(cr, uid, [('requisition_id','=',ref("purchase_requisition_te0"))])[0]
- state=self.browse(cr,uid,purchase_id).state
- assert (state=='approved')
--
- I click on Done button
--
- !python {model: purchase.requisition}: |
- self.tender_done(cr, uid, [ref("purchase_requisition_te0")],)
--
- I check that after click on Done button state is in done.
--
- !assert {model: purchase.requisition, id: purchase_requisition_te0}:
- - state == 'done'
--
- In order to test the purchase requisition flow for Requisition Type is exclusive
--
- I create purchase requisition for Requisition Type is exclusive
--
- !record {model: purchase.requisition, id: purchase_requisition_ex1}:
- company_id: base.main_company
- exclusive: exclusive
- line_ids:
- - company_id: base.main_company
- product_id: product_product_mob1
- product_qty: 10.0
- product_uom_id: product.product_uom_unit
- name: TE000010
--
- I Create a First Purchase Order for the supplier 'Distrib PC'.
--
- !record {model: purchase.requisition.partner, id: purchase_requisition_partner_1}:
- partner_address_id: base.res_partner_address_7
- partner_id: base.res_partner_4
--
- I create Quotations For supplier 'Distrib PC'.
--
- !python {model: purchase.requisition.partner}: |
- self.create_order(cr, uid, [ref("purchase_requisition_partner_1")], {"active_model": "purchase.requisition",
- "active_ids": [ref("purchase_requisition_ex1")],"active_id": ref("purchase_requisition_ex1"), })
--
- I Create a Second Purchase Order for the supplier ASUStek.
--
- !record {model: purchase.requisition.partner, id: purchase_requisition_partner_2}:
- partner_address_id: base.res_partner_address_tang
- partner_id: base.res_partner_asus
--
- I create Quotations For supplier 'ASUStek'.
--
- !python {model: purchase.requisition.partner}: |
- self.create_order(cr, uid, [ref("purchase_requisition_partner_2")], {"active_model": "purchase.requisition",
- "active_ids": [ref("purchase_requisition_ex1")],"active_id": ref("purchase_requisition_ex1"), })
--
- I check that Initially purchase requisition is draft state.
--
- !assert {model: purchase.requisition, id: purchase_requisition_ex1}:
- - state == 'draft'
--
- I confirm the Second purchase order of ASUStek, than check that Quotation is Approved.
--
- !python {model: purchase.order}: |
- purchase_id= self.search(cr, uid, [('partner_id','=',ref("base.res_partner_asus")),('requisition_id','=',ref("purchase_requisition_ex1"))])
- import netsvc
- wf_service = netsvc.LocalService("workflow")
- if purchase_id:
- wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_confirm', cr)
- wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_approve', cr)
- state=self.browse(cr,uid,purchase_id[0]).state
- assert (state=='approved')
-
--
- I check that Quotation of Distrib PC is cancelled.
--
- !python {model: purchase.order}: |
- partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]
- purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','=',ref("purchase_requisition_ex1"))])[0]
- state=self.browse(cr,uid,purchase_id).state
- assert (state=='cancel')
--
- I check that Purchase Requisition is Done.
--
- !assert {model: purchase.requisition, id: purchase_requisition_ex1}:
- - state == 'done'
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index 766e0adb75a..043ed749f4b 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -20,8 +20,6 @@
##############################################################################
import time
-from datetime import datetime
-from dateutil.relativedelta import relativedelta
from osv import fields, osv
from osv.orm import browse_record, browse_null
from tools.translate import _
@@ -31,7 +29,7 @@ class purchase_requisition_partner(osv.osv_memory):
_description = "Purchase Requisition Partner"
_columns = {
'partner_id': fields.many2one('res.partner', 'Partner', required=True,domain=[('supplier', '=', True)]),
- 'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True),
+ 'partner_address_id':fields.many2one('res.partner.address', 'Address'),
}
def view_init(self, cr, uid, fields_list, context=None):
@@ -42,7 +40,7 @@ class purchase_requisition_partner(osv.osv_memory):
tender = self.pool.get('purchase.requisition').browse(cr, uid, record_id, context=context)
if not tender.line_ids:
raise osv.except_osv(_('Error!'), _('No Product in Tender'))
- True
+ return res
def onchange_partner_id(self, cr, uid, ids, partner_id):
if not partner_id:
@@ -52,94 +50,9 @@ class purchase_requisition_partner(osv.osv_memory):
return {'value':{'partner_address_id': addr['default']}}
def create_order(self, cr, uid, ids, context=None):
- """
- To Create a purchase orders .
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs
- @param context: A standard dictionary
- @return: {}
-
- """
- if context is None:
- context = {}
- record_ids = context and context.get('active_ids', False)
- if record_ids:
- data = self.browse(cr, uid, ids,context=context)[0]
- company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
- order_obj = self.pool.get('purchase.order')
- order_line_obj = self.pool.get('purchase.order.line')
- partner_obj = self.pool.get('res.partner')
- tender_line_obj = self.pool.get('purchase.requisition.line')
- pricelist_obj = self.pool.get('product.pricelist')
- prod_obj = self.pool.get('product.product')
- tender_obj = self.pool.get('purchase.requisition')
- acc_pos_obj = self.pool.get('account.fiscal.position')
- partner_id = data.partner_id.id
- supplier_data = data.partner_id
- address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
- list_line=[]
- purchase_order_line={}
- for tender in tender_obj.browse(cr, uid, record_ids, context=context):
- for supp_record in tender.purchase_ids:
- if supp_record.partner_id.id == partner_id and supp_record.state <> 'cancel':
- raise osv.except_osv(_('Warning'), _('You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation.') % supp_record.state)
- for line in tender.line_ids:
- partner_list = sorted([(partner.sequence, partner) for partner in line.product_id.seller_ids if partner])
- partner_rec = partner_list and partner_list[0] and partner_list[0][1] or False
- uom_id = line.product_id.uom_po_id and line.product_id.uom_po_id.id or False
-
- if tender.date_start:
- newdate = datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') - relativedelta(days=company.po_lead)
- else:
- newdate = datetime.today() - relativedelta(days=company.po_lead)
- delay = partner_rec and partner_rec.delay or 0.0
- if delay:
- newdate -= relativedelta(days=delay)
-
- partner = partner_rec and partner_rec.name or supplier_data
- pricelist_id = partner.property_product_pricelist_purchase and partner.property_product_pricelist_purchase.id or False
- price = pricelist_obj.price_get(cr, uid, [pricelist_id], line.product_id.id, line.product_qty, False, {'uom': uom_id})[pricelist_id]
- product = prod_obj.browse(cr, uid, line.product_id.id, context=context)
- location_id = self.pool.get('stock.warehouse').read(cr, uid, [tender.warehouse_id.id], ['lot_input_id'])[0]['lot_input_id'][0]
-
- purchase_order_line= {
- 'name': product.partner_ref,
- 'product_qty': line.product_qty,
- 'product_id': line.product_id.id,
- 'product_uom': uom_id,
- 'price_unit': price,
- 'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
- 'notes': product.description_purchase,
- }
- taxes_ids = line.product_id.product_tmpl_id.supplier_taxes_id
- taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
- purchase_order_line.update({
- 'taxes_id': [(6,0,taxes)]
- })
- list_line.append(purchase_order_line)
- purchase_id = order_obj.create(cr, uid, {
- 'origin': tender.purchase_ids and tender.purchase_ids[0].origin or tender.name,
- 'partner_id': partner_id,
- 'partner_address_id': address_id,
- 'pricelist_id': pricelist_id,
- 'location_id': tender.purchase_ids and tender.purchase_ids[0].location_id.id or line.product_id.product_tmpl_id.property_stock_production.id,
- 'company_id': tender.company_id.id,
- 'fiscal_position': partner.property_account_position and partner.property_account_position.id or False,
- 'requisition_id':tender.id,
- 'notes':tender.description,
- 'warehouse_id':tender.warehouse_id.id and tender.warehouse_id.id ,
- 'location_id':location_id,
- 'company_id':tender.company_id.id,
- })
- order_ids=[]
- for order_line in list_line:
- order_line.update({
- 'order_id': purchase_id
- })
- order_line_obj.create(cr,uid,order_line)
+ active_ids = context and context.get('active_ids', [])
+ data = self.browse(cr, uid, ids, context=context)[0]
+ self.pool.get('purchase.requisition').make_purchase_order(cr, uid, active_ids, data.partner_id.id, context=context)
return {'type': 'ir.actions.act_window_close'}
purchase_requisition_partner()