[UPD] frappe_etax_service: create CN from payment

frappe_etax_service/inet/inet_data_template.py

@@ -15,17 +15,9 @@ def prepare_data_invoice(doc):
     )
     d["create_purpose_code"] = doc.create_purpose_code
     d["create_purpose"] = doc.create_purpose
-    d["ref_document_id"] = (
-        doc.debit_origin_id.name
-        or doc.reversed_entry_id.name
-        or doc.replaced_entry_id.name
-    )
+    d["ref_document_id"] = doc._get_ref_document_id()
     d["ref_document_issue_dtm"] = doc._get_origin_inv_date()
-    d["ref_document_type_code"] = (
-        doc.debit_origin_id.etax_doctype
-        or doc.reversed_entry_id.etax_doctype
-        or doc.replaced_entry_id.etax_doctype
-    )
+    d["ref_document_type_code"] = doc._get_ref_document_type_code()
     d["buyer_ref_document"] = doc.payment_reference
     d["seller_branch_id"] = doc._get_branch_id() or doc.company_id.branch
     d["source_system"] = (
@@ -60,21 +52,26 @@ def prepare_data_invoice(doc):
     for line in doc.invoice_line_ids.filtered(
         lambda inv_line: not inv_line.display_type and inv_line.price_unit > 0
     ):
-        doc_lines.append(
-            {
-                "product_code": line.product_id and line.product_id.default_code or "",
-                "product_name": line.product_id and line.product_id.name or line.name,
-                "product_price": line.price_unit,
-                "product_quantity": line.quantity,
-                "line_tax_type_code": line.tax_ids.name and "VAT" or "FRE",
-                "line_tax_rate": line.tax_ids and line.tax_ids[0].amount or 0.00,
-                "line_base_amount": line.tax_ids and line.price_subtotal or 0.00,
-                "line_tax_amount": line.tax_ids
-                and (line.price_total - line.price_subtotal)
-                or 0.0,
-                "line_total_amount": line.price_total,
-            }
-        )
+        if not line.not_send_to_etax:
+            doc_lines.append(
+                {
+                    "product_code": line.product_id
+                    and line.product_id.default_code
+                    or "",
+                    "product_name": line.product_id
+                    and line.product_id.name
+                    or line.name,
+                    "product_price": line.price_unit,
+                    "product_quantity": line.quantity,
+                    "line_tax_type_code": line.tax_ids.name and "VAT" or "FRE",
+                    "line_tax_rate": line.tax_ids and line.tax_ids[0].amount or 0.00,
+                    "line_base_amount": line.tax_ids and line.price_subtotal or 0.00,
+                    "line_tax_amount": line.tax_ids
+                    and (line.price_total - line.price_subtotal)
+                    or 0.0,
+                    "line_total_amount": line.price_total,
+                }
+            )
     d["line_item_information"] = doc_lines
     d["original_amount_untaxed"] = doc._get_additional_amount()[0]
     d["final_amount_untaxed"] = doc._get_additional_amount()[2]

frappe_etax_service/models/account_move.py

@@ -1,13 +1,26 @@
 # Copyright 2023 Kitti U.
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
-from odoo import _, api, models
+from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
 
 
 class AccountMove(models.Model):
     _name = "account.move"
     _inherit = ["account.move", "etax.th"]
 
+    is_credit_payment_entry = fields.Boolean(
+        string="Use Credit Note on Payment",
+        default=False,
+        help="This is used to indicate this document \
+            will cancel etax payment on INET (Case Etax)",
+    )
+    etax_payment_id = fields.Many2one(
+        "account.payment",
+        string="Etax Payment",
+        help="If 'Use Credit Note on Payment' is selected, \
+            Select payment for retrieve original data.",
+    )
+
     # def button_etax_invoices(self):
     #     self.ensure_one()
     #     return {
@@ -18,6 +31,29 @@ class AccountMove(models.Model):
     #         "target": "new",
     #     }
 
+    @api.onchange("is_credit_payment_entry", "create_purpose")
+    def _onchange_ref(self):
+        if self.is_credit_payment_entry:
+            self.ref = self.create_purpose
+
+    def _get_ref_document_id(self):
+        if self.is_credit_payment_entry:
+            return self.etax_payment_id.name
+        return (
+            self.debit_origin_id.name
+            or self.reversed_entry_id.name
+            or self.replaced_entry_id.name
+        )
+
+    def _get_ref_document_type_code(self):
+        if self.is_credit_payment_entry:
+            return self.etax_payment_id.etax_doctype
+        return (
+            self.debit_origin_id.etax_doctype
+            or self.reversed_entry_id.etax_doctype
+            or self.replaced_entry_id.etax_doctype
+        )
+
     def action_open_replacement_wizard(self):
         self.ensure_one()
         return {
@@ -45,6 +81,9 @@ def _get_origin_inv_date(self):
         In case of Credit note or Debit note, we need invoice date of origin invoice
         to fill in h08_additional_ref_issue_dtm
         """
+        if self.is_credit_payment_entry:
+            return self.etax_payment_id.date.strftime("%Y-%m-%dT%H:%M:%S")
+
         if self.debit_origin_id and self.debit_origin_id.invoice_date:
             return self.debit_origin_id.invoice_date.strftime("%Y-%m-%dT%H:%M:%S")
 
@@ -75,6 +114,19 @@ def _get_additional_amount(self):
             original_amount_untaxed = False
             diff_amount_untaxed = False
             corrected_amount_untaxed = self.amount_untaxed
+
+        # Special Case: If this is credit note for cancelled payment
+        # We need to recompute original_amount_untaxed, diff_amount_untaxed
+        # and corrected_amount_untaxed
+        if self.is_credit_payment_entry:
+            tax_base = self.tax_invoice_ids or False
+            if not tax_base:
+                raise ValidationError(_("Tax invoice not found!"))
+            if len(tax_base) != 1:
+                raise ValidationError(_("Not support multi tax invoice line"))
+            original_amount_untaxed = abs(tax_base[0].tax_base_amount)
+            diff_amount_untaxed = original_amount_untaxed
+            corrected_amount_untaxed = 0.00
         return (original_amount_untaxed, diff_amount_untaxed, corrected_amount_untaxed)
 
     @api.depends("restrict_mode_hash_table", "state")
@@ -109,3 +161,9 @@ def create_replacement_etax(self):
         self.button_cancel()
         self.name = old_number  # Ensure name.
         return move
+
+
+class AccountMoveLine(models.Model):
+    _inherit = "account.move.line"
+
+    not_send_to_etax = fields.Boolean(default=False)

frappe_etax_service/models/account_payment.py

@@ -32,6 +32,7 @@ def action_draft(self):
                 lambda pay: pay.etax_status in ("success", "processing", "to_process")
             )
             and not self.has_create_replacement
+            and not self._context.get("force_reset", False)
         ):
             raise ValidationError(
                 _(

frappe_etax_service/views/account_move_views.xml

@@ -1,17 +1,32 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <!--
-        decoration-info
-        decoration-success
-        decoration-warning
-        decoration-muted
-        decoration-danger
-     -->
+
     <record id="view_move_form_etax" model="ir.ui.view">
         <field name="name">view.move.form</field>
         <field name="model">account.move</field>
         <field name="inherit_id" ref="account.view_move_form" />
         <field name="arch" type="xml">
+            <xpath expr="//field[@name='invoice_line_ids']/tree" position="inside">
+                <field name="not_send_to_etax" optional="hide" />
+            </xpath>
+            <xpath
+                expr="//field[@name='invoice_line_ids']/form/sheet/group"
+                position="inside"
+            >
+                <field name="not_send_to_etax" optional="hide" />
+            </xpath>
+            <xpath
+                expr="//page/field[@name='line_ids']/tree/field[@name='tax_ids']"
+                position="after"
+            >
+                <field name="not_send_to_etax" optional="hide" />
+            </xpath>
+            <xpath
+                expr="//page/field[@name='line_ids']/form//field[@name='tax_ids']"
+                position="after"
+            >
+                <field name="not_send_to_etax" optional="hide" />
+            </xpath>
             <xpath expr="//header" position="after">
                 <field name="etax_status" invisible="1" />
                 <div
@@ -103,6 +118,16 @@
                                 attrs="{'invisible': [('doc_name_template', '=', False)]}"
                             /> -->
                         </group>
+                        <group string="Special Case">
+                            <field
+                                name="is_credit_payment_entry"
+                                attrs="{'readonly': [('state', '!=', 'draft')]}"
+                            />
+                            <field
+                                name="etax_payment_id"
+                                attrs="{'invisible': [('is_credit_payment_entry', '=', False)], 'required': [('is_credit_payment_entry', '=', True)]}"
+                            />
+                        </group>
                     </group>
                 </page>
             </xpath>