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

[FIX]purchase/purchase_requisition: when copy rfq, delete reference to tender, but not when copy is called when generating po from tender. 

bzr revid: csn@openerp.com-20130606133328-p5hgf7mj9ki4zqi7
This commit is contained in:
Cedric Snauwaert 2013-06-06 15:33:28 +02:00
parent 77f8b5f5db
commit 13b91f8887
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/purchase/purchase.py
View File

@ -743,6 +743,7 @@ class purchase_order(osv.osv):
'invoiced':False,
'invoice_ids': [],
'picking_ids': [],
'origin' : '',
'name': self.pool.get('ir.sequence').get(cr, uid, 'purchase.order'),
})
return super(purchase_order, self).copy(cr, uid, id, default, context)

24
addons/purchase_requisition/purchase_requisition.py
View File

@ -284,6 +284,8 @@ class purchase_requisition(osv.osv):
#copy a quotation for this supplier and change order_line then validate it
quotation_id = po.search(cr, uid, [('requisition_id', '=', tender.id), ('partner_id', '=', supplier)], limit=1)[0]
new_po = po.copy(cr, uid, quotation_id, default = {'order_line': []}, context=context)
#put back link to tender on PO
po.write(cr, uid, new_po, {'requisition_id': tender.id, 'origin': tender.name}, context=context)
#duplicate po_line and change product_qty if needed and associate them to newly created PO
for line in product_line:
poline.copy(cr, uid, line.id, default = {'product_qty': line.quantity_bid, 'order_id': new_po}, context=context)
@ -356,22 +358,8 @@ purchase_requisition_line()
class purchase_order(osv.osv):
_inherit = "purchase.order"
def _belong_to_bid_group(self, cr, uid, ids, field_names, arg=None, context=None):
belong = False
group_bid_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'purchase', 'group_advance_bidding')[1]
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
for group in user.groups_id:
if group.id == group_bid_id:
belong = True
result = {}
if not ids: return result
for id in ids:
result.setdefault(id, belong)
return result
_columns = {
'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition'),
'advance_bidding_group': fields.function(_belong_to_bid_group, method=True, type='boolean', string="Belong to advance bidding group"),
}
def wkf_confirm_order(self, cr, uid, ids, context=None):
@ -389,6 +377,14 @@ class purchase_order(osv.osv):
po.requisition_id.tender_done(context=context)
return res
def copy(self, cr, uid, id, default=None, context=None):
if not default:
default = {}
default.update({
'requisition_id':False,
})
return super(purchase_order, self).copy(cr, uid, id, default, context)
purchase_order()
class purchase_order_line(osv.osv):