'Purchase Order Line', ondelete='set null', select=True,
readonly=True),
}
- _defaults = {
- 'purchase_line_id': False
- }
+
+ def _get_reference_accounting_values_for_valuation(self, cr, uid, move, context=None):
+ """
+ Overrides the default stock valuation to take into account the currency that was specified
+ on the purchase order in case the valuation data was not directly specified during picking
+ confirmation.
+ """
+ reference_amount, reference_currency_id = super(stock_move, self)._get_reference_accounting_values_for_valuation(cr, uid, move, context=context)
+ if move.product_id.cost_method != 'average' or not move.price_unit:
+ # no average price costing or cost not specified during picking validation, we will
+ # plug the purchase line values if they are found.
+ if move.purchase_line_id and move.picking_id.purchase_id.pricelist_id:
+ reference_amount, reference_currency_id = move.purchase_line_id.price_unit * move.product_qty, move.picking_id.purchase_id.pricelist_id.currency_id.id
+ return reference_amount, reference_currency_id
+
stock_move()
#
ondelete='set null', select=True),
}
_defaults = {
- 'purchase_id': lambda *a: False,
+ 'purchase_id': False,
}
+ def _get_address_invoice(self, cr, uid, picking):
+ """ Gets invoice address of a partner
+ @return {'contact': address, 'invoice': address} for invoice
+ """
+ res = super(stock_picking, self)._get_address_invoice(cr, uid, picking)
+ if picking.purchase_id:
+ partner_obj = self.pool.get('res.partner')
+ partner = picking.purchase_id.partner_id or picking.address_id.partner_id
+ data = partner_obj.address_get(cr, uid, [partner.id],
+ ['contact', 'invoice'])
+ res.update(data)
+ return res
+
def get_currency_id(self, cursor, user, picking):
if picking.purchase_id:
return picking.purchase_id.pricelist_id.currency_id.id
return picking.note + '\n' + picking.purchase_id.notes
else:
return picking.purchase_id.notes
- return super(stock_picking, self)._get_comment_invoice(cursor, user,
- picking)
+ return super(stock_picking, self)._get_comment_invoice(cursor, user, picking)
def _get_price_unit_invoice(self, cursor, user, move_line, type):
if move_line.purchase_line_id:
- return move_line.purchase_line_id.price_unit
- return super(stock_picking, self)._get_price_unit_invoice(cursor,
- user, move_line, type)
+ if move_line.purchase_line_id.order_id.invoice_method == 'picking':
+ return move_line.price_unit
+ else:
+ return move_line.purchase_line_id.price_unit
+ return super(stock_picking, self)._get_price_unit_invoice(cursor, user, move_line, type)
def _get_discount_invoice(self, cursor, user, move_line):
if move_line.purchase_line_id:
return 0.0
- return super(stock_picking, self)._get_discount_invoice(cursor, user,
- move_line)
+ return super(stock_picking, self)._get_discount_invoice(cursor, user, move_line)
def _get_taxes_invoice(self, cursor, user, move_line, type):
if move_line.purchase_line_id:
return [x.id for x in move_line.purchase_line_id.taxes_id]
- return super(stock_picking, self)._get_taxes_invoice(cursor, user,
- move_line, type)
+ return super(stock_picking, self)._get_taxes_invoice(cursor, user, move_line, type)
def _get_account_analytic_invoice(self, cursor, user, picking, move_line):
- if move_line.purchase_line_id:
+ if picking.purchase_id and move_line.purchase_line_id:
return move_line.purchase_line_id.account_analytic_id.id
- return super(stock_picking, self)._get_account_analytic_invoice(cursor,
- user, picking, move_line)
+ return super(stock_picking, self)._get_account_analytic_invoice(cursor, user, picking, move_line)
def _invoice_line_hook(self, cursor, user, move_line, invoice_line_id):
if move_line.purchase_line_id:
invoice_line_obj = self.pool.get('account.invoice.line')
- invoice_line_obj.write(cursor, user, [invoice_line_id], {'note': move_line.purchase_line_id.notes,})
- return super(stock_picking, self)._invoice_line_hook(cursor, user,
- move_line, invoice_line_id)
+ invoice_line_obj.write(cursor, user, [invoice_line_id], {'note': move_line.purchase_line_id.notes,})
+ return super(stock_picking, self)._invoice_line_hook(cursor, user, move_line, invoice_line_id)
def _invoice_hook(self, cursor, user, picking, invoice_id):
purchase_obj = self.pool.get('purchase.order')
if picking.purchase_id:
- purchase_obj.write(cursor, user, [picking.purchase_id.id], {'invoice_id': invoice_id,
- })
- return super(stock_picking, self)._invoice_hook(cursor, user,
- picking, invoice_id)
-
-stock_picking()
+ purchase_obj.write(cursor, user, [picking.purchase_id.id], {'invoice_ids': [(4, invoice_id)]})
+ return super(stock_picking, self)._invoice_hook(cursor, user, picking, invoice_id)
class stock_partial_picking(osv.osv_memory):
_inherit = 'stock.partial.picking'
-
- def default_get(self, cr, uid, fields, context=None):
- """ To get default values for the object.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
- """
- pick_obj = self.pool.get('stock.picking')
- res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
- for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
- for m in pick.move_lines:
- if (m.product_id.cost_method == 'average'):
- if pick.type == 'in' and m.purchase_line_id:
- res['move%s_product_price'%(m.id)] = m.purchase_line_id.price_unit
- if pick.purchase_id:
- res['move%s_product_currency'%(m.id)] = pick.purchase_line_id.pricelist_id.currency_id.id
- return res
-stock_partial_picking()
-
-class stock_partial_move(osv.osv_memory):
- _inherit = "stock.partial.move"
- def default_get(self, cr, uid, fields, context=None):
- """ To get default values for the object.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
- """
- res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
- move_obj = self.pool.get('stock.move')
- for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
- if (m.product_id.cost_method == 'average'):
- if m.picking_id.type == 'in' and m.purchase_line_id:
- res['move%s_product_price'%(m.id)] = m.purchase_line_id.price_unit
- if m.picking_id.purchase_id:
- res['move%s_product_currency'%(m.id)] = m.picking_id.purchase_id.pricelist_id.currency_id.id
- return res
-stock_partial_move()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+ # Overridden to inject the purchase price as true 'cost price' when processing
+ # incoming pickings.
+ def _product_cost_for_average_update(self, cr, uid, move):
+ if move.picking_id.purchase_id:
+ return {'cost': move.purchase_line_id.price_unit,
+ 'currency': move.picking_id.purchase_id.pricelist_id.currency_id.id}
+ return super(stock_partial_picking, self)._product_cost_for_average_update(cr, uid, move)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
projects / odoo / odoo.git / blobdiff