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

[REF] purchase_requisition: 

purchase_requisition/wizard/purchase_requisition_partner.py
* [REF] In create_order() method, move stuff of creating purchase order into 'purchase.requisition' object.
purchase_requisition/purchase_requisition.py
* [ADD] introduce new method: make_purchase_order()
        - to create new RFQ of specified supplier with plannned date, price

bzr revid: hmo@tinyerp.com-20111202072755-e3ura2cmnh78utet
This commit is contained in:
Harry (OpenERP) 2011-12-02 12:57:55 +05:30
parent bdf23343b1
commit 6ced5c16c1
3 changed files with 95 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
addons/purchase_requisition/purchase_requisition.py
View File

@ -19,7 +19,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
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):

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

@ -50,6 +50,7 @@
I check that the RFQ details which created for supplier.
-
!python {model: purchase.order}: |
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)
@ -60,10 +61,10 @@
for rfq_line in rfq.order_line:
for line in requisition.line_ids:
if rfq_line.product_id.id == line.product_id.id:
product = line.product_id
uom_id = line.product_uom_id.id or False
assert rfq_line.product_qty == line.product_qty, "Quantity is not correspond."
assert rfq_line.product_uom.id == uom_id, "UOM is not correspond."
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.
-

95
addons/purchase_requisition/wizard/purchase_requisition_partner.py
View File

@ -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 _
@ -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()