Skip to content

Commit

Permalink
[MIG] l10n_it_fatturapa_in_rc: Migration to 14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
TheMule71 authored and OCA-git-bot committed Feb 4, 2022
1 parent ff59678 commit d889f51
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 26 deletions.
2 changes: 1 addition & 1 deletion l10n_it_fatturapa_in_rc/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"name": "ITA - Fattura elettronica - Inversione contabile",
"summary": "Modulo ponte tra e-fattura in acquisto e inversione" " contabile",
"version": "12.0.1.1.4",
"version": "14.0.1.0.0",
"development_status": "Beta",
"category": "Hidden",
"website": "https://github.com/OCA/l10n-italy" "l10n_it_fatturapa_in_rc",
Expand Down
7 changes: 3 additions & 4 deletions l10n_it_fatturapa_in_rc/models/account_invoice.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
from odoo import _, api, models
from odoo import _, models
from odoo.tools import float_compare


class InvoiceLine(models.Model):
_inherit = "account.invoice.line"
_inherit = "account.move.line"

@api.multi
def _set_rc_flag(self, invoice):
self.ensure_one()
if "fatturapa.attachment.in" in self.env.context.get("active_model", []):
Expand All @@ -16,7 +15,7 @@ def _set_rc_flag(self, invoice):


class Invoice(models.Model):
_inherit = "account.invoice"
_inherit = "account.move"

def e_inv_check_amount_tax(self):
if any(self.invoice_line_ids.mapped("rc")) and self.e_invoice_amount_tax:
Expand Down
1 change: 1 addition & 0 deletions l10n_it_fatturapa_in_rc/readme/CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
* Sergio Corato <info@efatto.it>
* Lorenzo Battistini <https://github.com/eLBati>
* Marco Colombo <https://github.com/TheMule71>
20 changes: 7 additions & 13 deletions l10n_it_fatturapa_in_rc/tests/test_fatturapa_in_rc.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
class TestInvoiceRC(FatturapaCommon):
def setUp(self):
super(TestInvoiceRC, self).setUp()
self.invoice_model = self.env["account.invoice"]
self.invoice_line_model = self.env["account.invoice.line"]
self.invoice_model = self.env["account.move"]
self.invoice_line_model = self.env["account.move.line"]
self.partner_model = self.env["res.partner"]
self._create_account()
self._create_taxes()
Expand Down Expand Up @@ -55,25 +55,21 @@ def _create_journals(self):
"name": "selfinvoice",
"type": "sale",
"code": "SLF",
"update_posted": True,
}
)
self.journal_reconciliation = journal_model.create(
{
"name": "RC reconciliation",
"type": "bank",
"code": "SLFRC",
"default_credit_account_id": self.account_selfinvoice.id,
"default_debit_account_id": self.account_selfinvoice.id,
"update_posted": True,
"default_account_id": self.account_selfinvoice.id,
}
)
self.journal_selfinvoice_extra = journal_model.create(
{
"name": "Extra Selfinvoice",
"type": "sale",
"code": "SLFEX",
"update_posted": True,
}
)

Expand Down Expand Up @@ -118,23 +114,21 @@ def test_00_xml_import(self):
self.assertEqual(invoice.invoice_line_ids[1].name, "BANCALI")
self.assertFalse(invoice.invoice_line_ids[0].rc)
self.assertTrue(invoice.invoice_line_ids[1].rc)
self.assertEqual(invoice.invoice_line_ids[0].tax_ids.name, "22% e-bill")
self.assertEqual(
invoice.invoice_line_ids[0].invoice_line_tax_ids.name, "22% e-bill"
)
self.assertEqual(
invoice.invoice_line_ids[1].invoice_line_tax_ids.name,
invoice.invoice_line_ids[1].tax_ids.name,
"Tax 22% Purchase RC ITA",
)
self.assertEqual(invoice.amount_total, 30.5)
self.assertEqual(invoice.get_tax_amount_added_for_rc(), 4.4)
self.assertEqual(invoice.amount_tax, 5.5)
self.assertEqual(invoice.e_invoice_amount_tax, 1.1)
invoice.action_invoice_open()
invoice._post()
self.assertAlmostEqual(invoice.rc_self_invoice_id.amount_total, 24.4)
self.assertEqual(invoice.rc_self_invoice_id.amount_tax, 4.4)
self.assertEqual(invoice.rc_self_invoice_id.amount_untaxed, 20)
self.assertEqual(
invoice.rc_self_invoice_id.invoice_line_ids.invoice_line_tax_ids.name,
invoice.rc_self_invoice_id.invoice_line_ids.tax_ids.name,
"Tax 22% Sales RC ITA",
)

Expand Down
15 changes: 7 additions & 8 deletions l10n_it_fatturapa_in_rc/wizard/wizard_import_fatturapa.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,25 @@ def _prepare_generic_line_data(self, line):
)
retLine["rc"] = True
if account_taxes:
retLine["invoice_line_tax_ids"] = [(6, 0, [account_taxes[0].id])]
retLine["tax_ids"] = [(6, 0, [account_taxes[0].id])]
return retLine
else:
return super(WizardImportFatturapa, self)._prepare_generic_line_data(line)

def set_invoice_line_ids(
self, FatturaBody, credit_account_id, partner, wt_found, invoice_data
self, FatturaBody, credit_account_id, partner, wt_found, invoice
):
res = super(WizardImportFatturapa, self).set_invoice_line_ids(
FatturaBody, credit_account_id, partner, wt_found, invoice_data
FatturaBody, credit_account_id, partner, wt_found, invoice
)
if not invoice_data.get("invoice_line_ids"):
return
if not invoice.invoice_line_ids:
return res
# set RC fiscal position
inv_line_ids = invoice_data["invoice_line_ids"][0][2]
inv_lines = self.env["account.invoice.line"].browse(inv_line_ids)
inv_lines = invoice.invoice_line_ids
if any(inv_lines.mapped("rc")):
rc_ita_fp = self.env["account.fiscal.position"].search(
[("rc_type_id.e_invoice_suppliers", "=", True)]
)
if rc_ita_fp:
invoice_data["fiscal_position_id"] = rc_ita_fp.id
invoice.fiscal_position_id = rc_ita_fp
return res

0 comments on commit d889f51

Please sign in to comment.