parent
a961da825b
commit
e4a6a913da
|
@ -927,14 +927,15 @@ class account_move_reconcile(osv.osv):
|
|||
'name': lambda self,cr,uid,ctx={}: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile') or '/',
|
||||
}
|
||||
def reconcile_partial_check(self, cr, uid, ids, type='auto', context={}):
|
||||
for rec in self.pool.get('account.move.reconcile').browse(cr, uid, ids):
|
||||
for rec in self.browse(cr, uid, ids, context):
|
||||
total = 0.0
|
||||
for line in rec.line_partial_ids:
|
||||
total += (line.debit or 0.0) - (line.credit or 0.0)
|
||||
if not total:
|
||||
self.write(cr,uid, map(lambda x: x.id, rec.line_partial_ids), {'reconcile_id': rec.id })
|
||||
for line in rec.line_partial_ids:
|
||||
total += (line.debit or 0.0) - (line.credit or 0.0)
|
||||
if not total:
|
||||
self.pool.get('account.move.line').write(cr, uid,
|
||||
map(lambda x: x.id, rec.line_partial_ids),
|
||||
{'reconcile_id': rec.id }
|
||||
)
|
||||
return True
|
||||
def name_get(self, cr, uid, ids, context=None):
|
||||
result = {}
|
||||
|
|
|
@ -378,7 +378,8 @@ class account_move_line(osv.osv):
|
|||
unmerge.append(line.id)
|
||||
total += (line.debit or 0.0) - (line.credit or 0.0)
|
||||
if not total:
|
||||
return self.reconcile(cr, uid, merges+unmerge, context=context)
|
||||
res = self.reconcile(cr, uid, merges+unmerge, context=context)
|
||||
return res
|
||||
r_id = self.pool.get('account.move.reconcile').create(cr, uid, {
|
||||
'type': type,
|
||||
'line_partial_ids': map(lambda x: (4,x,False), merges+unmerge)
|
||||
|
@ -578,14 +579,12 @@ class account_move_line(osv.osv):
|
|||
if not context:
|
||||
context={}
|
||||
raise_ex=False
|
||||
account_obj = self.pool.get('account.account')
|
||||
acc=account_obj.browse(cr,uid,ids)[0]
|
||||
|
||||
if ('debit' in vals and 'credit' in vals) and not vals['debit'] and not vals['credit']:
|
||||
raise_ex=True
|
||||
if ('debit' in vals and 'credit' not in vals) and not vals['debit'] and not acc.credit:
|
||||
if ('debit' in vals and 'credit' not in vals) and not vals['debit']:
|
||||
raise_ex=True
|
||||
if ('credit' in vals and 'debit' not in vals) and not vals['credit'] and not acc.debit:
|
||||
if ('credit' in vals and 'debit' not in vals) and not vals['credit']:
|
||||
raise_ex=True
|
||||
|
||||
if raise_ex:
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<terp>
|
||||
<data>
|
||||
<record id="noone" model="res.groups">
|
||||
<field name="name">No One</field>
|
||||
<field name="name">No One Association</field>
|
||||
</record>
|
||||
<record id="hr.menu_hr_root" model="ir.ui.menu">
|
||||
<field eval="[(6,0,[ref('noone')])]" name="groups_id"/>
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -11,7 +11,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<notebook position="inside">
|
||||
<page string="Payments">
|
||||
<field name="move_lines" colspan="4"/>
|
||||
<field name="move_lines" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</field>
|
||||
|
|
Loading…
Reference in New Issue