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

[IMP] stock: don't raise error on default values if removed default stock locations data

Browse Source 
bzr revid: mat@openerp.com-20130729102923-xx55fmomv72qbji6
This commit is contained in:
Martin Trigaux
2013-07-29 12:29:23 +02:00
parent 3037b94205
commit 10cda48728
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/stock.py
+18 -8
View File
@@ -25,7 +25,7 @@ import time
from operator import itemgetter
from itertools import groupby
from openerp.osv import fields, osv
from openerp.osv import fields, osv, orm
from openerp.tools.translate import _
from openerp import netsvc
from openerp import tools
@@ -1694,13 +1694,17 @@ class stock_move(osv.osv):
property_out = self.pool.get('res.partner').browse(cr, uid, context['address_out_id'], context).property_stock_customer
location_id = property_out and property_out.id or False
else:
location_xml_id = False
if picking_type in ('in', 'internal'):
location_xml_id = 'stock_location_stock'
try:
location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', 'stock_location_stock')
except (orm.except_orm, ValueError):
location_id = False
elif picking_type == 'out':
location_xml_id = 'stock_location_customers'
if location_xml_id:
location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)
try:
location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', 'stock_location_customers')
except (orm.except_orm, ValueError):
location_id = False
return location_id
def _default_location_source(self, cr, uid, context=None):
@@ -1947,8 +1951,14 @@ class stock_move(osv.osv):
elif type == 'out':
location_source_id = 'stock_location_stock'
location_dest_id = 'stock_location_customers'
source_location = mod_obj.get_object_reference(cr, uid, 'stock', location_source_id)
dest_location = mod_obj.get_object_reference(cr, uid, 'stock', location_dest_id)
try:
source_location = mod_obj.get_object_reference(cr, uid, 'stock', location_source_id)
except (orm.except_orm, ValueError):
source_location = False
try:
dest_location = mod_obj.get_object_reference(cr, uid, 'stock', location_dest_id)
except (orm.except_orm, ValueError):
dest_location = False
return {'value':{'location_id': source_location and source_location[1] or False, 'location_dest_id': dest_location and dest_location[1] or False}}
def onchange_date(self, cr, uid, ids, date, date_expected, context=None):