Agregando FIX para declarar facturas solamente validas

Author: monroy95

factura_electronica/factura_electronica/doctype/vat_declaration/vat_declaration.json

@@ -11,7 +11,8 @@
   "declaration_month",
   "posting_date",
   "documents_in_declaration_section",
-  "declaration_items"
+  "declaration_items",
+  "amended_from"
  ],
  "fields": [
   {
@@ -52,9 +53,19 @@
    "fieldtype": "Data",
    "label": "Title",
    "unique": 1
+  },
+  {
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "VAT Declaration",
+   "print_hide": 1,
+   "read_only": 1
   }
  ],
- "modified": "2020-07-28 15:59:22.293228",
+ "is_submittable": 1,
+ "modified": "2020-07-28 18:05:37.730574",
  "modified_by": "Administrator",
  "module": "Factura Electronica",
  "name": "VAT Declaration",

factura_electronica/factura_electronica/report/purchase_and_sales_ledger_tax_declaration/generate_tax_declaration.py

@@ -30,10 +30,11 @@ def generate_vat_declaration(company, year, month, declared, report_data):
         for record in records:
             # 3 - Si no existe la declaracion se agregara
             if not frappe.db.exists('VAT Declaration', {'link_name': record.get('invoice_name')}):
-                declaration_invoices.append({
-                    'link_doctype': 'Sales Invoice' if record.get('compras_ventas') == 'V' else 'Purchase Invoice',
-                    'link_name': record.get('invoice_name')
-                })
+                if record.get('docstatus') == 1:  # Solamente recibira docs validados
+                    declaration_invoices.append({
+                        'link_doctype': 'Sales Invoice' if record.get('compras_ventas') == 'V' else 'Purchase Invoice',
+                        'link_name': record.get('invoice_name')
+                    })
 
         # 4 - Validamos que por lo menos exista un elemento para crear la declaracion
         if len(declaration_invoices) > 0:
@@ -48,12 +49,15 @@ def generate_vat_declaration(company, year, month, declared, report_data):
                     "declaration_year": year,
                     "declaration_month": MONTHS_MAP.get(str(month)),
                     "declaration_items": declaration_invoices,
-                    "docstatus": 0
+                    "docstatus": 1
                 })
 
                 # for validated documents: status_journal = vat_dec.insert(ignore_permissions=True)
                 # status_declaration = vat_dec.save(ignore_permissions=True)
                 status_declaration = vat_dec.insert(ignore_permissions=True)
+
+                # 5 - Actualizamos las facturas con su nueva Referencia en campo de tipo data,
+
             else:
                 nme_reg = f'VAT Declaration {date.today()}'
                 frappe.msgprint(msg=_(f"We're sorry. A statement for the same month was found: <b>{nme_reg}</b>,\

factura_electronica/factura_electronica/report/purchase_and_sales_ledger_tax_declaration/purchase_and_sales_ledger_tax_declaration.js

@@ -96,7 +96,7 @@ frappe.query_reports["Purchase and Sales Ledger Tax Declaration"] = {
                         //window.open("/api/method/factura_electronica.api_erp.download_asl_files");
                         // window.open("sihaysistema.com", "_blank");
                         //console.log(report.filters);
-                        console.log(report.data);
+                        // console.log(report.data);
                         frappe.call({
                             method: "factura_electronica.factura_electronica.report.purchase_and_sales_ledger_tax_declaration.generate_tax_declaration.generate_vat_declaration",
                             args: {