Yaltik/account-financial-tools
2
0
Fork 0
Code Pull Requests Activity

Add partner in move lines

Browse Source
This commit is contained in:
Andrea 2019-06-14 09:00:30 +02:00 committed by Andrea Stirpe
parent 0d9b82f4f9
commit 117e80f381
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
account_spread_cost_revenue/models/account_spread_line.py
View File

@ -94,6 +94,7 @@ class AccountInvoiceSpreadLine(models.Model):
'account_id': spread.debit_account_id.id, 'account_id': spread.debit_account_id.id,
'debit': amount if amount > 0.0 else 0.0, 'debit': amount if amount > 0.0 else 0.0,
'credit': -amount if amount < 0.0 else 0.0, 'credit': -amount if amount < 0.0 else 0.0,
'partner_id': self.spread_id.invoice_id.partner_id.id,
'analytic_account_id': analytic.id, 'analytic_account_id': analytic.id,
'analytic_tag_ids': analytic_tags, 'analytic_tag_ids': analytic_tags,
'currency_id': not_same_curr and current_currency.id or False, 'currency_id': not_same_curr and current_currency.id or False,
@ -103,6 +104,7 @@ class AccountInvoiceSpreadLine(models.Model):
'account_id': spread.credit_account_id.id, 'account_id': spread.credit_account_id.id,
'credit': amount if amount > 0.0 else 0.0, 'credit': amount if amount > 0.0 else 0.0,
'debit': -amount if amount < 0.0 else 0.0, 'debit': -amount if amount < 0.0 else 0.0,
'partner_id': self.spread_id.invoice_id.partner_id.id,
'analytic_account_id': analytic.id, 'analytic_account_id': analytic.id,
'analytic_tag_ids': analytic_tags, 'analytic_tag_ids': analytic_tags,
'currency_id': not_same_curr and current_currency.id or False, 'currency_id': not_same_curr and current_currency.id or False,

12
account_spread_cost_revenue/tests/test_account_invoice_spread.py
View File

@ -512,10 +512,8 @@ class TestAccountInvoiceSpread(common.TransactionCase):
invoice_mls = self.invoice.move_id.mapped('line_ids') invoice_mls = self.invoice.move_id.mapped('line_ids')
self.assertTrue(invoice_mls) self.assertTrue(invoice_mls)
count_balance_sheet = 0 count_balance_sheet = len(invoice_mls.filtered(
for invoice_ml in invoice_mls: lambda x: x.account_id == balance_sheet))
if invoice_ml.account_id == balance_sheet:
count_balance_sheet += 1
self.assertEqual(count_balance_sheet, 1) self.assertEqual(count_balance_sheet, 1)
self.spread.line_ids.create_and_reconcile_moves() self.spread.line_ids.create_and_reconcile_moves()
@ -572,10 +570,8 @@ class TestAccountInvoiceSpread(common.TransactionCase):
invoice_mls = self.invoice.move_id.mapped('line_ids') invoice_mls = self.invoice.move_id.mapped('line_ids')
self.assertTrue(invoice_mls) self.assertTrue(invoice_mls)
count_balance_sheet = 0 count_balance_sheet = len(invoice_mls.filtered(
for invoice_ml in invoice_mls: lambda x: x.account_id == balance_sheet))
if invoice_ml.account_id == balance_sheet:
count_balance_sheet += 1
self.assertEqual(count_balance_sheet, 1) self.assertEqual(count_balance_sheet, 1)
self.spread.company_id.force_move_auto_post = True self.spread.company_id.force_move_auto_post = True