Simplify workflow engine
review256001
This commit is contained in:
1 parent
3d4a905161
commit
be7c3cda09
2 files changed
+3
-2
No files matched your search
+2
-1
@@ -56,7 +56,8 @@ class Carrier(ModelSQL, ModelView):
|
||||
'Compute carrier sale price with currency'
|
||||
user_obj = Pool().get('res.user')
|
||||
if carrier.carrier_cost_method == 'product':
|
||||
user = user_obj.browse(Transaction().user)
|
||||
user = user_obj.browse(Transaction().user
|
||||
or Transaction().context.get('user'))
|
||||
return carrier.carrier_product.list_price, user.company.currency.id
|
||||
return 0, False
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
|
||||
|
||||
requires = []
|
||||
for dep in info.get('depends', []):
|
||||
if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
|
||||
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
|
||||
requires.append('trytond_%s >= %s.%s, < %s.%s' %
|
||||
(dep, major_version, minor_version, major_version,
|
||||
minor_version + 1))
|
||||
|
||||
Reference in new issue
Block a user