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

[WIP] stock_account 

bzr revid: qdp-launchpad@openerp.com-20130715112219-o1bh3hipzxpxrtw9
This commit is contained in:
Quentin (OpenERP) 2013-07-15 13:22:19 +02:00
parent ea5888642e
commit 6898ade414
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/sale_stock/__openerp__.py
View File

@ -45,7 +45,7 @@ You can choose flexible invoicing methods:
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'images': ['images/deliveries_to_invoice.jpeg'],
'depends': ['sale', 'stock', 'procurement'],
'depends': ['sale', 'stock_account', 'procurement'],
'init_xml': [],
'update_xml': ['security/sale_stock_security.xml',
'security/ir.model.access.csv',

2
addons/stock_account/product.py
View File

@ -186,7 +186,7 @@ class product_template(osv.osv):
'cost_method': fields.property(type='selection', selection=[('standard', 'Standard Price'), ('average', 'Average Price'), ('real', 'Real Price')],
help="""Standard Price: The cost price is manually updated at the end of a specific period (usually every year)
Average Price: The cost price is recomputed at each incoming shipment
Real Price: The cost price is calculated as the real price of the last outgoing shipment""",
Real Price: The cost price is calculated as the real price of each outgoing product""",
string="Costing Method", required=True),
'property_stock_account_input': fields.property(
type='many2one',

24
addons/stock_account/stock_account.py
View File

@ -73,7 +73,7 @@ class stock_quant(osv.osv):
location_from: can be None if it's a new quant
"""
def _account_entry_move(self, cr, uid, quant, location_from, location_to, move, context=None):
if quant.product_id.valuation <> 'realtime':
if quant.product_id.valuation <> 'real_time':
return False
company_from = self._location_owner(cr, uid, quant, location_from, context=context)
company_to = self._location_owner(cr, uid, quant, location_to, context=context)
@ -84,24 +84,24 @@ class stock_quant(osv.osv):
account_moves = []
# Create Journal Entry for products arriving in the company
if company_to:
if location_from.usage == 'customer':
if location_from and location_from.usage == 'customer':
#goods returned from customer
account_moves += self._create_account_move_line(cr, uid, quant, acc_dest, acc_valuation, context=context)
account_moves += self._create_account_move_line(cr, uid, quant, move, acc_dest, acc_valuation, context=context)
else:
account_moves += self._create_account_move_line(cr, uid, quant, acc_src, acc_valuation, context=context)
account_moves += self._create_account_move_line(cr, uid, quant, move, acc_src, acc_valuation, context=context)
# Create Journal Entry for products leaving the company
if company_from:
if location_to.usage == 'supplier':
if location_to and location_to.usage == 'supplier':
#goods returned to supplier
account_moves += self._create_account_move_line(cr, uid, quant, acc_valuation, acc_src, context=context)
account_moves += self._create_account_move_line(cr, uid, quant, move, acc_valuation, acc_src, context=context)
else:
account_moves += self._create_account_move_line(cr, uid, quant, acc_valuation, acc_dest, context=context)
account_moves += self._create_account_move_line(cr, uid, quant, move, acc_valuation, acc_dest, context=context)
def move_single_quant(self, cr, uid, quant, qty, move, context=None):
location_from = quant and quant.location_id or False
quant = super(stock_quant, self).move_single_quant(cr, uid, quant, qty, move, context=context)
quant.refresh()
location_from = quant.location_id
self._account_entry_move(cr, uid, quant, location_from, quant.location_id, move, context=context)
return quant
@ -263,8 +263,8 @@ class stock_quant(osv.osv):
debit_line_vals = {
'name': move.name,
'product_id': quant.product_id.id,
'quantity': quant.product_qty,
'product_uom_id': quant.product_id.product_uom.id,
'quantity': quant.qty,
'product_uom_id': quant.product_id.uom_id.id,
'ref': move.picking_id and move.picking_id.name or False,
'date': time.strftime('%Y-%m-%d'),
'partner_id': partner_id,
@ -274,8 +274,8 @@ class stock_quant(osv.osv):
credit_line_vals = {
'name': move.name,
'product_id': quant.product_id.id,
'quantity': quant.product_qty,
'product_uom_id': quant.product_id.product_uom.id,
'quantity': quant.qty,
'product_uom_id': quant.product_id.uom_id.id,
'ref': move.picking_id and move.picking_id.name or False,
'date': time.strftime('%Y-%m-%d'),
'partner_id': partner_id,