pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[WIP] stock_account

Browse Source 
bzr revid: qdp-launchpad@openerp.com-20130711150023-sjian7my2r3t0x7l
This commit is contained in:
Quentin (OpenERP)
2013-07-11 17:00:23 +02:00
parent 038fd04ea5
commit c77e66bdc3
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/stock.py
+1 -19
View File
@@ -586,7 +586,7 @@ class stock_picking(osv.osv):
for pick in self.browse(cr, uid, ids, context=context):
ids2 = [move.id for move in pick.move_lines]
self.pool.get('stock.move').action_cancel(cr, uid, ids2, context)
self.write(cr, uid, ids, {'state': 'cancel', 'invoice_state': 'none'})
self.write(cr, uid, ids, {'state': 'cancel'})
return True
#
@@ -2058,24 +2058,6 @@ class stock_inventory(osv.osv):
def action_cancel_inventory(self, cr, uid, ids, context=None):
#TODO test
self.action_cancel_draft(cr, uid, ids, context=context)
#""" Cancels both stock move and inventory
#@return: True
#"""
#move_obj = self.pool.get('stock.move')
#account_move_obj = self.pool.get('account.move')
#for inv in self.browse(cr, uid, ids, context=context):
# move_obj.action_cancel(cr, uid, [x.id for x in inv.move_ids], context=context)
# for move in inv.move_ids:
# account_move_ids = account_move_obj.search(cr, uid, [('name', '=', move.name)])
# if account_move_ids:
# account_move_data_l = account_move_obj.read(cr, uid, account_move_ids, ['state'], context=context)
# for account_move in account_move_data_l:
# if account_move['state'] == 'posted':
# raise osv.except_osv(_('User Error!'),
# _('In order to cancel this inventory, you must first unpost related journal entries.'))
# account_move_obj.unlink(cr, uid, [account_move['id']], context=context)
# self.write(cr, uid, [inv.id], {'state': 'cancel'}, context=context)
#return True
class stock_inventory_line(osv.osv):
addons/stock_account/stock_account.py
+11
View File
@@ -315,6 +315,17 @@ class stock_picking(osv.osv):
'invoice_state': 'none',
}
#TODO: we don't need to change invoice_state on cancelation, do we?
#def action_cancel(self, cr, uid, ids, context=None):
# """ Changes picking state to cancel.
# @return: True
# """
# for pick in self.browse(cr, uid, ids, context=context):
# ids2 = [move.id for move in pick.move_lines]
# self.pool.get('stock.move').action_cancel(cr, uid, ids2, context)
# self.write(cr, uid, ids, {'state': 'cancel', 'invoice_state': 'none'})
# return True
def copy(self, cr, uid, id, default=None, context=None):
if default is None:
default = {}