agrego correos

SAT-CFDI · Apr 3, 2024 · 3e84a62 · 3e84a62
1 parent 21fae3a
commit 3e84a62
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/satdigitalinvoice/facturacion.py b/satdigitalinvoice/facturacion.py
@@ -115,7 +115,7 @@ def __init__(self):
             self.window[t].bind("<Return>", "_enter")
             self.window[t].bind("<FocusOut>", "_enter", propagate=False)
 
-        for t in ('facturas_periodo', 'emitidas_search', 'recibidas_search', 'ajustes_periodo', 'periodo'):
+        for t in ('facturas_periodo', 'emitidas_search', 'recibidas_search', 'ajustes_periodo', 'periodo', 'prediales'):
             self.window[t].bind("<Return>", "_enter")
 
         modifier_key = "Command" if OS.get_os() == OS.MACOS else "Control"
@@ -1206,15 +1206,17 @@ def action(self, event, values):
                         os.path.abspath(archivo_diot)
                     )
 
-                case "periodo_enter":
+                case "periodo_enter" | "prediales_enter":
                     rfc = values["contabilidad_rfc"]
                     dp = to_date_period(values["periodo"])
+                    prediales = to_int(values["prediales"])
 
                     declaracion_provisional = calculate_declaracion_provisional(
                         self.get_all_invoices(),
                         dp,
                         ClientsManager()[rfc],
-                        self.rfc_prediales
+                        self.rfc_prediales,
+                        prediales
                     )
                     self.window['declaracion'].update(
                         append=False,

diff --git a/satdigitalinvoice/gui_functions.py b/satdigitalinvoice/gui_functions.py
@@ -422,7 +422,7 @@ def exportar_facturas(all_invoices, dp: DatePeriod, emisor_cif, rfc_prediales):
     return archivo_excel
 
 
-def calculate_declaracion_provisional(all_invoices, dp: DatePeriod, emisor_cif, rfc_prediales):
+def calculate_declaracion_provisional(all_invoices, dp: DatePeriod, emisor_cif, rfc_prediales, prediales_pago):
     emisor_rfc = emisor_cif['Rfc']
 
     emitidas_pagos = list(filter_payments_iter(invoices=all_invoices, fecha=dp, rfc_emisor=emisor_rfc))
@@ -431,7 +431,7 @@ def calculate_declaracion_provisional(all_invoices, dp: DatePeriod, emisor_cif,
 
     emitidas_pagos = sum_payments(emitidas_pagos)
     recibidas_pagos = sum_payments(recibidas_pagos)
-    prediales = sum_payments(prediales)['Subtotal']
+    prediales = prediales_pago or sum_payments(prediales)['Subtotal']
 
     # ISR
     total_ingresos = emitidas_pagos['Subtotal']

diff --git a/satdigitalinvoice/layout.py b/satdigitalinvoice/layout.py
@@ -551,6 +551,9 @@ def make_layout():
                                     sg.Combo([], default_value="", key="contabilidad_rfc", size=(15, 1)),
                                     sg.Text("Periodo:", pad=TEXT_PADDING),
                                     sg.Input((date.today() - relativedelta(months=1)).strftime(PERIODO_FMT), size=(11, 1), key="periodo"),
+                                    sg.Text("Prediales:", pad=TEXT_PADDING),
+                                    sg.Input("", size=(11, 1), key="prediales"),
+
                                     sg.Button(image_data=EXCEL_ICON, key="ver_excel", border_width=0, button_color=BUTTON_COLOR),
                                     sg.Button(image_data=DIOT_ICON, key="ver_diot", border_width=0, button_color=BUTTON_COLOR),
                                     sg.Button(image_data=FOLDER_ICON, key="ver_carpeta", border_width=0, button_color=BUTTON_COLOR),