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

bugfixes 

bzr revid: fp@tinyerp.com-20081120100850-fex0sppydulu5ieq
This commit is contained in:
Fabien Pinckaers 2008-11-20 11:08:50 +01:00
parent e43f7c54bc
commit 4d45485468
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/account/account_move_line.py
View File

@ -688,11 +688,8 @@ class account_move_line(osv.osv):
if ('journal_id' in vals):
journal=self.pool.get('account.journal').browse(cr,uid,vals['journal_id'])
journal_flag=True
if not journal.analytic_journal_id:
del_line=True
if ('analytic_account_id' in vals) and (not vals['analytic_account_id']):
del_line=True
del_line=True
if del_line:
for obj in obj_line.analytic_lines:
@ -875,6 +872,8 @@ class account_move_line(osv.osv):
'journal_id': journal.analytic_journal_id.id,
'ref': vals['ref'],
})]
else:
raise osv.except_osv(_('No analytic journal !'), _('Please set an analytic journal on this financial journal !'))
result = super(osv.osv, self).create(cr, uid, vals, context)
# CREATE Taxes
if 'account_tax_id' in vals and vals['account_tax_id']:

1
addons/sale/sale.py
View File

@ -962,7 +962,6 @@ class sale_config_picking_policy(osv.osv_memory):
for o in self.browse(cr, uid, ids, context=context):
ir_values_obj = self.pool.get('ir.values')
ir_values_obj.set(cr,uid,'default',False,'picking_policy',['sale.order'],o.picking_policy)
ir_values_obj = self.pool.get('ir.values')
ir_values_obj.set(cr,uid,'default',False,'order_policy',['sale.order'],o.order_policy)
if o.step=='one':