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

[MERGE] forward port of branch 8.0 up to e664d30

Browse Source
This commit is contained in:
Christophe Simonis
2016-05-04 14:31:38 +02:00
parent e2faeab4b8 e664d3074c
commit 19d62ec5a7
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_move_line.py
+2 -1
View File
@@ -1416,7 +1416,8 @@ class account_move_line(osv.osv):
account_id = 'account_collected_id' account_id = 'account_collected_id'
base_sign = 'base_sign' base_sign = 'base_sign'
tax_sign = 'tax_sign' tax_sign = 'tax_sign'
if journal.type in ('purchase_refund', 'sale_refund') or (journal.type in ('cash', 'bank') and total < 0 and tax_id.type_tax_use != 'sale'): is_refund = ((total > 0 and tax_id.type_tax_use == 'sale') or (total < 0 and tax_id.type_tax_use != 'sale'))
if journal.type in ('purchase_refund', 'sale_refund') or (journal.type in ('cash', 'bank') and is_refund):
base_code = 'ref_base_code_id' base_code = 'ref_base_code_id'
tax_code = 'ref_tax_code_id' tax_code = 'ref_tax_code_id'
account_id = 'account_paid_id' account_id = 'account_paid_id'
addons/product_expiry/product_expiry.py
+1 -1
View File
@@ -58,7 +58,7 @@ class stock_production_lot(osv.osv):
# Assign dates according to products data # Assign dates according to products data
def create(self, cr, uid, vals, context=None): def create(self, cr, uid, vals, context=None):
context = dict(context or {}) context = dict(context or {})
context['product_id'] = vals.get('product_id', context.get('default_product_id')) context['product_id'] = vals.get('product_id', context.get('default_product_id') or context.get('product_id'))
return super(stock_production_lot, self).create(cr, uid, vals, context=context) return super(stock_production_lot, self).create(cr, uid, vals, context=context)
_defaults = { _defaults = {