15.0 refact (#39)

* [WIP] Mejoro funciones básicas
	- Hago un raise en caso de que no coincidan las secuencia locales y los remotas
	- Permito agregar periodo de comprobantes asociados

* [WIP] Obtengo el primer numero de factura desde afip (interviniendo funciones de secuencia del core) ya que todas las secuencias comienzan con 0

Author: filoquin

l10n_ar_afipws_fe/models/account_move.py

@@ -40,6 +40,12 @@ class AccountMove(models.Model):
         string="CAE/CAI/CAEA due Date",
         states={"draft": [("readonly", False)]},
     )
+    afip_associated_period_from = fields.Date(
+        'AFIP Period from'
+    ) 
+    afip_associated_period_to = fields.Date(
+        'AFIP Period to'
+    ) 
     afip_qr_code = fields.Char(compute="_compute_qr_code", string="AFIP QR code")
     afip_message = fields.Text(
         string="AFIP Message",
@@ -72,6 +78,44 @@ class AccountMove(models.Model):
         "- NO: sí el comprobante asociado (original) NO se encuentra rechazado por el comprador",
     )
 
+    def _get_starting_sequence(self):
+        """ If use documents then will create a new starting sequence using the document type code prefix and the
+        journal document number with a 8 padding number """
+        if self.journal_id.l10n_latam_use_documents and self.company_id.account_fiscal_country_id.code == "AR" and self.journal_id.afip_ws:
+            if self.l10n_latam_document_type_id :
+                number = int(
+                    self.journal_id.get_pyafipws_last_invoice(
+                        self.l10n_latam_document_type_id
+                    )
+                ) 
+                return self._get_formatted_sequence(number)
+        return super()._get_starting_sequence()
+
+    def _set_next_sequence(self):
+        self.ensure_one()
+        if self._name == 'account.move' and self.journal_id.l10n_latam_use_documents and self.company_id.account_fiscal_country_id.code == "AR" and self.journal_id.afip_ws:
+
+            last_sequence = self._get_last_sequence()
+            new = not last_sequence
+            if new:
+                last_sequence = self._get_last_sequence(relaxed=True) or self._get_starting_sequence()
+
+            format, format_values = self._get_sequence_format_param(last_sequence)
+            if new:
+                format_values['seq'] = int(
+                    self.journal_id.get_pyafipws_last_invoice(
+                        self.l10n_latam_document_type_id
+                    )
+                ) 
+                format_values['year'] = self[self._sequence_date_field].year % (10 ** format_values['year_length'])
+                format_values['month'] = self[self._sequence_date_field].month
+            format_values['seq'] = format_values['seq'] + 1
+
+            self[self._sequence_field] = format.format(**format_values)
+            self._compute_split_sequence()
+        else:
+            super()._set_next_sequence()
+        
     @api.depends("journal_id", "afip_auth_code")
     def _compute_validation_type(self):
         for rec in self:
@@ -184,6 +228,13 @@ def do_pyafipws_request_cae(self):
 
             # Preparo los datos
             invoice_info = inv.map_invoice_info(afip_ws)
+            number_parts = self._l10n_ar_get_document_number_parts(
+                    inv.l10n_latam_document_number, inv.l10n_latam_document_type_id.code
+            )
+
+            if int(invoice_info["ws_next_invoice_number"]) != int(number_parts["invoice_number"]):
+
+                raise UserError(_('Check document number. Next is %s' % invoice_info["ws_next_invoice_number"]))
 
             # Creo la factura en el ambito de pyafipws
             inv.pyafipws_create_invoice(ws, invoice_info)
@@ -230,17 +281,17 @@ def do_pyafipws_request_cae(self):
                 "CAE solicitado con exito. CAE: %s. Resultado %s"
                 % (ws.CAE, ws.Resultado)
             )
-            inv.write(
-                {
+            vals = {
                     "afip_auth_mode": "CAE",
                     "afip_auth_code": ws.CAE,
                     "afip_auth_code_due": vto,
                     "afip_result": ws.Resultado,
                     "afip_message": msg,
                     "afip_xml_request": ws.XmlRequest,
                     "afip_xml_response": ws.XmlResponse,
-                }
-            )
+            }
+
+            inv.write(vals)
             # si obtuvimos el cae hacemos el commit porque estoya no se puede
             # volver atras
             # otra alternativa seria escribir con otro cursor el cae y que

l10n_ar_afipws_fe/models/account_move_ws.py

@@ -219,6 +219,8 @@ def wsfe_invoice_add_info(self, ws, invoice_info):
                 self.company_id.vat,
                 invoice_info["CbteAsoc"].invoice_date.strftime("%Y%m%d"),
             )
+        if  invoice_info["afip_associated_period_from"] and invoice_info["afip_associated_period_to"]:
+            ws.AgregarPeriodoComprobantesAsociados(invoice_info["afip_associated_period_from"],invoice_info["afip_associated_period_to"])
         self.pyafipws_add_tax(ws)
 
     def wsbfe_invoice_add_info(self, ws, invoice_info):
@@ -417,6 +419,8 @@ def base_map_invoice_info(self):
         invoice_info["moneda_ctz"] = self.l10n_ar_currency_rate
         invoice_info["CbteAsoc"] = self.get_related_invoices_data()
 
+        invoice_info["afip_associated_period_from"] = self.afip_associated_period_from
+        invoice_info["afip_associated_period_to"] = self.afip_associated_period_to
         return invoice_info
 
     def wsfe_map_invoice_info(self):
@@ -434,6 +438,9 @@ def wsfe_map_invoice_info(self):
             invoice_info["fecha_serv_hasta"] = invoice_info[
                 "fecha_serv_hasta"
             ].strftime("%Y%m%d")
+        if  invoice_info["afip_associated_period_from"] and invoice_info["afip_associated_period_to"]:
+            invoice_info["afip_associated_period_from"] = invoice_info["afip_associated_period_from"].strftime("%Y%m%d")
+            invoice_info["afip_associated_period_to"] = invoice_info["afip_associated_period_to"].strftime("%Y%m%d")
 
         return invoice_info
 
@@ -453,6 +460,11 @@ def wsbfe_map_invoice_info(self):
                 "fecha_serv_hasta"
             ].strftime("%Y%m%d")
 
+        if  invoice_info["afip_associated_period_from"] and invoice_info["afip_associated_period_to"]:
+            invoice_info["afip_associated_period_from"] = invoice_info["afip_associated_period_from"].strftime("%Y%m%d")
+            invoice_info["afip_associated_period_to"] = invoice_info["afip_associated_period_to"].strftime("%Y%m%d")
+
+
         invoice_info["zona"] = 1  # Nacional (la unica devuelta por afip)
         # los responsables no inscriptos no se usan mas
         invoice_info["impto_liq_rni"] = 0.0
@@ -495,6 +507,9 @@ def wsfex_map_invoice_info(self):
                     "Country: %s" % (self.journal_id.afip_ws, country.name)
                 )
             )
+        if  invoice_info["afip_associated_period_from"] and invoice_info["afip_associated_period_to"]:
+            invoice_info["afip_associated_period_from"] = invoice_info["afip_associated_period_from"].strftime("%Y%m%d")
+            invoice_info["afip_associated_period_to"] = invoice_info["afip_associated_period_to"].strftime("%Y%m%d")
 
         if self.invoice_incoterm_id:
             invoice_info["incoterms"] = self.invoice_incoterm_id.code

l10n_ar_afipws_fe/views/account_move_views.xml

@@ -15,11 +15,17 @@
                 <button name="action_post" type="object" attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('validation_type', '!=', 'production')]}" string="Validar en AFIP" class="oe_highlight" groups="account.group_account_invoice"/>
                 <button name="action_post" type="object" attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('validation_type', '!=', 'homologation')]}" string="Validar en HOMOLOGACION" class="oe_highlight" groups="account.group_account_invoice"/>
             </button>
-
             <field name="l10n_ar_afip_concept" position="after">
                 <field name="afip_fce_es_anulacion"/>
+                <label for="afip_auth_code" string="AFIP associated period" attrs="{'invisible': [('move_type', 'not in', ['out_refund'])]}"/>
+                <div class="oe_inline"  attrs="{'invisible': [('move_type', 'not in', ['out_refund'])]}">
+                        <field name="afip_associated_period_from" class="oe_inline" placeholder="Date From"/> -
+                        <field name="afip_associated_period_to" class="oe_inline" placeholder="Date to"/> 
+                </div>
+
             </field>
             <notebook>
+                
                 <page string="AFIP" name="afip" attrs="{'invisible': [('move_type', 'not in', ['out_invoice', 'out_refund'])]}">
                     <group>
                         <field name='validation_type' invisible="1"/>