audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[REF] Payment Order: move all move preparation code in _prepare_move

Browse Source
This commit is contained in:
Thomas Binsfeld
2019-04-10 14:05:02 +02:00
parent 241b38747f
commit ed53202f70
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
account_payment_order/models/account_payment_order.py
View File

@@ -380,6 +380,15 @@ class AccountPaymentOrder(models.Model):
'payment_order_id': self.id,
'line_ids': [],
}
total_company_currency = total_payment_currency = 0
for bline in bank_lines:
total_company_currency += bline.amount_company_currency
total_payment_currency += bline.amount_currency
partner_ml_vals = self._prepare_move_line_partner_account(bline)
vals['line_ids'].append((0, 0, partner_ml_vals))
trf_ml_vals = self._prepare_move_line_offsetting_account(
total_company_currency, total_payment_currency, bank_lines)
vals['line_ids'].append((0, 0, trf_ml_vals))
return vals
@api.multi
@@ -466,16 +475,6 @@ class AccountPaymentOrder(models.Model):
post_move = self.payment_mode_id.post_move
am_obj = self.env['account.move']
mvals = self._prepare_move(blines)
total_company_currency = total_payment_currency = 0
for bline in blines:
total_company_currency += bline.amount_company_currency
total_payment_currency += bline.amount_currency
partner_ml_vals = self._prepare_move_line_partner_account(
bline)
mvals['line_ids'].append((0, 0, partner_ml_vals))
trf_ml_vals = self._prepare_move_line_offsetting_account(
total_company_currency, total_payment_currency, blines)
mvals['line_ids'].append((0, 0, trf_ml_vals))
move = am_obj.create(mvals)
blines.reconcile_payment_lines()
if post_move: