diff --git a/addons/account/account.py b/addons/account/account.py
index 9e86e8ddfa5..5b4f9dd01c5 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -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 = {}
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 0f7de933e3f..744e9d5adc4 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -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:
diff --git a/addons/association_vertical/aso_data.xml b/addons/association_vertical/aso_data.xml
index 74080c1f3eb..6d9354190c0 100644
--- a/addons/association_vertical/aso_data.xml
+++ b/addons/association_vertical/aso_data.xml
@@ -2,7 +2,7 @@
- No One
+ No One Association
diff --git a/addons/invoice_payment_tab/invoice_payment_tab_view.xml b/addons/invoice_payment_tab/invoice_payment_tab_view.xml
index a1781fdb21a..ad14122c152 100644
--- a/addons/invoice_payment_tab/invoice_payment_tab_view.xml
+++ b/addons/invoice_payment_tab/invoice_payment_tab_view.xml
@@ -11,7 +11,7 @@
-
+