audrius/stock-logistics-warehouse
1
0
Fork 1
mirror of https://github.com/OCA/stock-logistics-warehouse.git synced 2025-01-21 14:27:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] PEP8

Browse Source
This commit is contained in:
Lorenzo Battistini
2013-10-18 18:10:50 +02:00
parent 11fdb6f96a
commit 26187a4012
4 changed files with 167 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stock_lot_valuation/__init__.py
View File

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
#
# This program is free software: you can redistribute it and/or modify

21
stock_lot_valuation/__openerp__.py
View File

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
#
# This program is free software: you can redistribute it and/or modify
@@ -24,26 +24,29 @@
'category': 'Warehouse Management',
'description': """
Stock valuation (standard or average price, ...) based on lots.
This module extends standard stock valuation (based on products). Valuing lots allows to have different costs for different lots of the same product.
This module extends standard stock valuation (based on products).
Valuing lots allows to have different costs for different lots of the same
product.
Usage
-----
Set the 'Lot valuation' flag on product form (used for real time valuation).
As for products, lots have 'cost' and 'costing method' fields. Also, a 'Change Standard Price' wizard is available.
As for products, lots have 'cost' and 'costing method' fields. Also, a
'Change Standard Price' wizard is available.
""",
'author': 'Agile Business Group',
'website': 'http://www.agilebg.com',
'license': 'AGPL-3',
"depends" : ['stock'],
"data" : [
"depends": ['stock'],
"data": [
"wizard/stock_change_standard_price_view.xml",
"product_view.xml",
"stock_view.xml",
],
"demo" : [],
],
"demo": [],
'test': [
'test/stock.yml', # TODO cover user interface operations
],
'test/stock.yml', # TODO cover user interface operations
],
"active": False,
"installable": True
}

8
stock_lot_valuation/product.py
View File

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
#
# This program is free software: you can redistribute it and/or modify
@@ -21,10 +21,12 @@
from openerp.osv import fields, orm
from openerp.tools.translate import _
class product_product(orm.Model):
_inherit = "product.product"
_columns = {
'lot_valuation':fields.boolean('Lot valuation',
'lot_valuation': fields.boolean(
'Lot valuation',
help="Use lot valuation instead of product valuation"),
}
}

238
stock_lot_valuation/stock.py
View File

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
#
# This program is free software: you can redistribute it and/or modify
@@ -22,23 +22,28 @@ from openerp.osv import fields, orm
from openerp.tools.translate import _
import openerp.addons.decimal_precision as dp
class stock_production_lot(orm.Model):
_inherit = "stock.production.lot"
_columns = {
'standard_price': fields.float('Cost', digits_compute=dp.get_precision('Lot Price'),
help="Cost price (in company currency) of the lot used for standard"
" stock valuation in accounting.",
groups="base.group_user"),
'cost_method': fields.selection([
('standard', 'Standard Price'),
('average', 'Average Price')
'standard_price': fields.float(
'Cost', digits_compute=dp.get_precision('Lot Price'),
help="Cost price (in company currency) of the lot used for "
"standard stock valuation in accounting.",
groups="base.group_user"
),
'cost_method': fields.selection(
[
('standard', 'Standard Price'),
('average', 'Average Price')
], 'Costing Method',
help="Standard Price: The cost price is manually updated at the end"
" of a specific period. \nAverage Price: The cost price is "
"recomputed at each incoming shipment."),
}
help="Standard Price: The cost price is manually updated at the "
"end of a specific period. \nAverage Price: The cost price is "
"recomputed at each incoming shipment."
),
}
def price_get(self, cr, uid, ids, context=None):
if context is None:
context = {}
@@ -48,25 +53,31 @@ class stock_production_lot(orm.Model):
res[lot.id] = lot['standard_price'] or 0.0
if 'uom' in context:
uom = lot.product_id.uom_id or lot.product_id.uos_id
res[lot.id] = product_uom_obj._compute_price(cr, uid,
res[lot.id] = product_uom_obj._compute_price(
cr, uid,
uom.id, res[lot.id], context['uom'])
# Convert from price_type currency to asked one
if 'currency_id' in context:
currency_id = False
if lot.company_id and lot.company_id.currency_id:
currency_id = lot.company_id.currency_id.id
elif (lot.product_id.company_id
and lot.product_id.company_id.currency_id):
currency_id = lot.product_id.company_id.currency_id.id
elif (
lot.product_id.company_id
and lot.product_id.company_id.currency_id
):
currency_id = lot.product_id.company_id.currency_id.id
if currency_id:
res[lot.id] = self.pool.get('res.currency').compute(cr, uid,
res[lot.id] = self.pool.get('res.currency').compute(
cr, uid,
currency_id,
context['currency_id'], res[lot.id],context=context)
context['currency_id'], res[lot.id], context=context)
return res
def do_change_standard_price(self, cr, uid, ids, datas, context=None):
""" Changes the Standard Price of Lot and creates an account move accordingly.
@param datas : dict. contain default datas like new_price, stock_output_account, stock_input_account, stock_journal
""" Changes the Standard Price of Lot and creates an account move
accordingly.
@param datas : dict. contain default datas like new_price,
stock_output_account, stock_input_account, stock_journal
@param context: A standard dictionary
"""
location_obj = self.pool.get('stock.location')
@@ -80,17 +91,23 @@ class stock_production_lot(orm.Model):
stock_input_acc = datas.get('stock_input_account', False)
journal_id = datas.get('stock_journal', False)
lot_obj = self.browse(cr, uid, ids, context=context)[0]
account_valuation = lot_obj.product_id.categ_id.property_stock_valuation_account_id
account_valuation_id = account_valuation and account_valuation.id or False
account_valuation = (
lot_obj.product_id.categ_id.property_stock_valuation_account_id)
account_valuation_id = (
account_valuation and account_valuation.id or False)
if not account_valuation_id:
raise osv.except_osv(_('Error!'),
raise osv.except_osv(
_('Error!'),
_('Specify valuation Account for Product Category: %s.')
% (lot_obj.product_id.categ_id.name))
move_ids = []
loc_ids = location_obj.search(cr, uid, [('usage', '=', 'internal')],
loc_ids = location_obj.search(
cr, uid, [('usage', '=', 'internal')],
context=context)
for rec_id in ids:
for location in location_obj.browse(cr, uid, loc_ids, context=context):
for location in location_obj.browse(
cr, uid, loc_ids, context=context
):
c = context.copy()
c.update({
'location_id': location.id,
@@ -101,42 +118,55 @@ class stock_production_lot(orm.Model):
qty = lot.stock_available
diff = lot.standard_price - new_price
if not diff:
raise osv.except_osv(_('Error!'),
_("No difference between standard price and new price!"))
raise osv.except_osv(
_('Error!'),
_("No difference between standard price!"
" and new price"))
if qty:
company_id = location.company_id and location.company_id.id or False
company_id = (
location.company_id and location.company_id.id or False
)
if not company_id:
raise osv.except_osv(_('Error!'),
raise osv.except_osv(
_('Error!'),
_('Please specify company in Location.'))
#
# Accounting Entries
#
product = lot.product_id
if not journal_id and product.categ_id.property_stock_journal:
if (
not journal_id
and product.categ_id.property_stock_journal
):
journal_id = product.categ_id.property_stock_journal.id
if not journal_id:
raise osv.except_osv(_('Error!'),
raise osv.except_osv(
_('Error!'),
_("Please define journal "
"on the product category: '%s' (id: %d).") %
"on the product category: '%s' (id: %d).") %
(product.categ_id.name, product.categ_id.id,))
move_id = move_obj.create(cr, uid, {
'journal_id': journal_id,
'company_id': company_id
}, context=context)
}, context=context)
move_ids.append(move_id)
if diff > 0:
if not stock_input_acc:
stock_input_acc = product.property_stock_account_input.id
stock_input_acc = (
product.property_stock_account_input.id
)
if not stock_input_acc:
stock_input_acc = (
product.categ_id.property_stock_account_input_categ.id
)
product.categ_id.
property_stock_account_input_categ.id
)
if not stock_input_acc:
raise osv.except_osv(_('Error!'),
raise osv.except_osv(
_('Error!'),
_("Please define stock input account "
"for this product: '%s' (id: %d).") %
"for this product: '%s' (id: %d).") %
(product.name, product.id,))
amount_diff = qty * diff
move_line_obj.create(cr, uid, {
@@ -144,24 +174,28 @@ class stock_production_lot(orm.Model):
'account_id': stock_input_acc,
'debit': amount_diff,
'move_id': move_id,
}, context=context)
}, context=context)
move_line_obj.create(cr, uid, {
'name': product.categ_id.name,
'account_id': account_valuation_id,
'credit': amount_diff,
'move_id': move_id
}, context=context)
}, context=context)
elif diff < 0:
if not stock_output_acc:
stock_output_acc = product.property_stock_account_output.id
stock_output_acc = (
product.property_stock_account_output.id
)
if not stock_output_acc:
stock_output_acc = (
product.categ_id.property_stock_account_output_categ.id
)
product.categ_id.
property_stock_account_output_categ.id
)
if not stock_output_acc:
raise osv.except_osv(_('Error!'),
raise osv.except_osv(
_('Error!'),
_("Please define stock output account "
"for this product: '%s' (id: %d).") %
"for this product: '%s' (id: %d).") %
(product.name, product.id,))
amount_diff = qty * -diff
move_line_obj.create(cr, uid, {
@@ -169,50 +203,58 @@ class stock_production_lot(orm.Model):
'account_id': stock_output_acc,
'credit': amount_diff,
'move_id': move_id
}, context=context)
}, context=context)
move_line_obj.create(cr, uid, {
'name': product.categ_id.name,
'account_id': account_valuation_id,
'debit': amount_diff,
'move_id': move_id
}, context=context)
}, context=context)
self.write(cr, uid, rec_id, {'standard_price': new_price})
return move_ids
class stock_move(orm.Model):
_inherit = "stock.move"
def _get_reference_accounting_values_for_valuation(self, cr, uid, move, context=None):
res = super(stock_move,self)._get_reference_accounting_values_for_valuation(
cr, uid, move, context=context)
def _get_reference_accounting_values_for_valuation(
self, cr, uid, move, context=None
):
res = super(
stock_move, self)._get_reference_accounting_values_for_valuation(
cr, uid, move, context=context)
if move.product_id.lot_valuation and move.prodlot_id:
product_uom_obj = self.pool.get('product.uom')
qty = product_uom_obj._compute_qty(cr, uid, move.product_uom.id,
qty = product_uom_obj._compute_qty(
cr, uid, move.product_uom.id,
move.product_qty, move.product_id.uom_id.id)
if context is None:
context = {}
currency_ctx = dict(context, currency_id = move.company_id.currency_id.id)
amount_unit = move.prodlot_id.price_get(context=currency_ctx)[move.prodlot_id.id]
currency_ctx = dict(
context, currency_id=move.company_id.currency_id.id)
amount_unit = move.prodlot_id.price_get(
context=currency_ctx)[move.prodlot_id.id]
reference_amount = amount_unit * qty
new_res = (reference_amount, move.company_id.currency_id.id)
res = new_res
return res
def do_partial(self, cr, uid, ids, partial_datas, context=None):
if context is None:
context = {}
pick_obj = self.pool.get('stock.picking')
for move in self.browse(cr, uid, ids, context=context):
pick_obj.write_lot(cr, uid, move, partial_datas, context=context)
res = super(stock_move,self).do_partial(
res = super(stock_move, self).do_partial(
cr, uid, ids, partial_datas, context=context)
return res
class stock_picking(orm.Model):
_inherit = "stock.picking"
def compute_price(self, cr, uid, partial_datas, move, context=None):
if context is None:
context = {}
@@ -220,12 +262,12 @@ class stock_picking(orm.Model):
uom_obj = self.pool.get('product.uom')
move_obj = self.pool.get('stock.move')
currency_obj = self.pool.get('res.currency')
partial_data = partial_datas.get('move%s'%(move.id), {})
product_uom = partial_data.get('product_uom',False)
product_qty = partial_data.get('product_qty',0.0)
product_currency = partial_data.get('product_currency',False)
product_price = partial_data.get('product_price',0.0)
partial_data = partial_datas.get('move%s' % (move.id), {})
product_uom = partial_data.get('product_uom', False)
product_qty = partial_data.get('product_qty', 0.0)
product_currency = partial_data.get('product_currency', False)
product_price = partial_data.get('product_price', 0.0)
lot = lot_obj.browse(cr, uid, move.prodlot_id.id, context=context)
product = lot.product_id
move_currency_id = move.company_id.currency_id.id
@@ -233,66 +275,84 @@ class stock_picking(orm.Model):
qty = uom_obj._compute_qty(
cr, uid, product_uom, product_qty, product.uom_id.id)
if qty > 0:
new_price = currency_obj.compute(cr, uid, product_currency,
new_price = currency_obj.compute(
cr, uid, product_currency,
move_currency_id, product_price)
new_price = uom_obj._compute_price(cr, uid, product_uom, new_price,
new_price = uom_obj._compute_price(
cr, uid, product_uom, new_price,
product.uom_id.id)
if lot.stock_available <= 0:
new_std_price = new_price
else:
# Get the standard price
amount_unit = lot.price_get(context=context)[lot.id]
new_std_price = (((amount_unit * lot.stock_available)
+ (new_price * qty))/(lot.stock_available + qty))
new_std_price = (
((amount_unit * lot.stock_available)
+ (new_price * qty)) / (lot.stock_available + qty)
)
lot_obj.write(cr, uid, [lot.id],{'standard_price': new_std_price},
context=context)
lot_obj.write(
cr, uid, [lot.id], {'standard_price': new_std_price},
context=context
)
# Record the values that were chosen in the wizard, so they can be
# used for inventory valuation if real-time valuation is enabled.
move_obj.write(cr, uid, [move.id],{
move_obj.write(cr, uid, [move.id], {
'price_unit': product_price,
'price_currency_id': product_currency
}, context=context)
}, context=context)
def write_lot(self, cr, uid, move, partial_datas, context=None):
lot_obj = self.pool.get('stock.production.lot')
currency_obj = self.pool.get('res.currency')
uom_obj = self.pool.get('product.uom')
if partial_datas.get('move%s'%(move.id)):
partial_data = partial_datas.get('move%s'%(move.id), {})
product_price = partial_data.get('product_price',0.0)
product_currency = partial_data.get('product_currency',False)
product_uom = partial_data.get('product_uom',False)
if partial_datas.get('move%s' % (move.id)):
partial_data = partial_datas.get('move%s' % (move.id), {})
product_price = partial_data.get('product_price', 0.0)
product_currency = partial_data.get('product_currency', False)
product_uom = partial_data.get('product_uom', False)
if partial_data.get('prodlot_id'):
lot = lot_obj.browse(cr, uid, partial_data['prodlot_id'], context)
lot = lot_obj.browse(
cr, uid, partial_data['prodlot_id'], context)
product = lot.product_id
if move.product_id.lot_valuation and (
move.picking_id.type == 'in') and (lot.cost_method == 'average'):
self.compute_price(cr, uid, partial_datas, move, context=context)
if move.product_id.lot_valuation and product_price and not lot.standard_price:
new_price = currency_obj.compute(cr, uid, product_currency,
if (
move.product_id.lot_valuation and (
move.picking_id.type == 'in'
) and (lot.cost_method == 'average')
):
self.compute_price(
cr, uid, partial_datas, move, context=context)
if (
move.product_id.lot_valuation and product_price
and not lot.standard_price
):
new_price = currency_obj.compute(
cr, uid, product_currency,
move.company_id.currency_id.id, product_price)
new_price = uom_obj._compute_price(cr, uid, product_uom, new_price,
new_price = uom_obj._compute_price(
cr, uid, product_uom, new_price,
product.uom_id.id)
lot.write({'standard_price': new_price})
def do_partial(self, cr, uid, ids, partial_datas, context=None):
if context is None:
context = {}
for pick in self.browse(cr, uid, ids, context=context):
for move in pick.move_lines:
self.write_lot(cr, uid, move, partial_datas, context=context)
res = super(stock_picking,self).do_partial(
res = super(stock_picking, self).do_partial(
cr, uid, ids, partial_datas, context=context)
return res
class stock_partial_picking(orm.TransientModel):
_inherit = "stock.partial.picking"
def _product_cost_for_average_update(self, cr, uid, move):
res = super(stock_partial_picking,self)._product_cost_for_average_update(
cr, uid, move)
res = super(
stock_partial_picking, self
)._product_cost_for_average_update(cr, uid, move)
if move.prodlot_id and move.product_id.lot_valuation:
res['cost'] = move.prodlot_id.standard_price
return res