diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql index 063b143..005fda6 100644 --- a/Database/scripts/factuges.sql +++ b/Database/scripts/factuges.sql @@ -3936,6 +3936,7 @@ CREATE VIEW V_RECIBOS_CLIENTE( REFERENCIA, SITUACION, ID_FACTURA, + REFERENCIA_FACTURA, FECHA_FACTURA, FORMA_PAGO_FACTURA, IMPORTE_FACTURA, @@ -3982,6 +3983,7 @@ SELECT RECIBOS_CLIENTE.ID, END END, RECIBOS_CLIENTE.ID_FACTURA, + FACTURAS_CLIENTE.REFERENCIA, FACTURAS_CLIENTE.FECHA_FACTURA, FORMAS_PAGO.DESCRIPCION, FACTURAS_CLIENTE.IMPORTE_TOTAL, @@ -5362,7 +5364,8 @@ end ^ ALTER PROCEDURE PROC_PRE_CON_CAPITULOS ( - aid integer, tipo varchar(15)) + aid integer, + tipo varchar(15)) returns ( id integer, id_pre_con integer, @@ -5373,7 +5376,8 @@ returns ( visible smallint, tipo_articulo varchar(2), descuento float, - importe_descuento numeric(11,4)) + importe_descuento numeric(11,4), + valorado smallint) as declare variable num_filas integer; declare variable contador integer; @@ -5432,22 +5436,23 @@ begin end end - if (TIPO = 'Presupuesto') then begin for select id, id_presupuesto, posicion, tipo_detalle, tipo_articulo, F_RTFTOTEXT(concepto) as concepto, - coalesce(descuento,0), coalesce(importe_total,0), coalesce(visible, 1) + coalesce(descuento,0), coalesce(importe_total,0), coalesce(visible, 1), coalesce(valorado, 1) from presupuestos_cliente_detalles where id_presupuesto = :AID order by id_presupuesto, posicion into :ID, :ID_PRE_CON, :POSICION, :TIPO_DETALLE, :TIPO_ARTICULO, :CONCEPTO, - :DESCUENTO, :IMPORTE_TOTAL, :VISIBLE + :DESCUENTO, :IMPORTE_TOTAL, :VISIBLE, :VALORADO do begin contador = contador + 1; /*CONCEPTO*/ - if ((visible <> 0) and (tipo_detalle = 'Concepto')) then + if (tipo_detalle = 'Concepto') then + begin + if (visible <> 0) then begin /*Escribimos capitulo anterior*/ if ((Importe_total > 0) @@ -5463,6 +5468,7 @@ begin importe_descuento = importe_descuento_aux; descuento = descuento_aux; visible = 1; + valorado = 1; suspend; total_acumulado = 0.0; importe_descuento_aux = 0.0; @@ -5475,9 +5481,11 @@ begin tipo_articulo_aux = 'NA'; importe_total = Importe_aux; end - - total_acumulado = total_acumulado + importe_total; + end + if (valorado <> 0) then + total_acumulado = total_acumulado + importe_total; ultimo_tipo_detalle = tipo_detalle; + end /*TITULO*/ @@ -5502,6 +5510,7 @@ begin importe_descuento = importe_descuento_aux; descuento = descuento_aux; visible = 1; + valorado = 1; suspend; total_acumulado = 0.0; importe_descuento_aux = 0.0; @@ -5538,6 +5547,7 @@ begin importe_descuento = importe_descuento_aux; descuento = descuento_aux; visible = 1; + valorado = 1; suspend; break; end @@ -5546,12 +5556,12 @@ begin else if (TIPO = 'Contrato') then begin for select id, id_contrato, posicion, tipo_detalle, tipo_articulo, F_RTFTOTEXT(concepto) as concepto, - coalesce(descuento,0), coalesce(importe_total,0), coalesce(visible, 1) + coalesce(descuento,0), coalesce(importe_total,0), coalesce(visible, 1), coalesce(valorado, 1) from contratos_cliente_detalles where id_contrato = :AID order by id_contrato, posicion into :ID, :ID_PRE_CON, :POSICION, :TIPO_DETALLE, :TIPO_ARTICULO, :CONCEPTO, - :DESCUENTO, :IMPORTE_TOTAL, :VISIBLE + :DESCUENTO, :IMPORTE_TOTAL, :VISIBLE, :VALORADO do begin contador = contador + 1; @@ -5573,6 +5583,7 @@ begin importe_descuento = importe_descuento_aux; descuento = descuento_aux; visible = 1; + valorado = 1; suspend; total_acumulado = 0.0; importe_descuento_aux = 0.0; @@ -5586,7 +5597,8 @@ begin importe_total = Importe_aux; end - total_acumulado = total_acumulado + importe_total; + if (valorado <> 0) then + total_acumulado = total_acumulado + importe_total; ultimo_tipo_detalle = tipo_detalle; end @@ -5612,6 +5624,7 @@ begin importe_descuento = importe_descuento_aux; descuento = descuento_aux; visible = 1; + valorado = 1; suspend; total_acumulado = 0.0; importe_descuento_aux = 0.0; @@ -5648,6 +5661,7 @@ begin importe_descuento = importe_descuento_aux; descuento = descuento_aux; visible = 1; + valorado = 1; suspend; break; end diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj index bbc3c9a..41efe89 100644 --- a/Source/ApplicationBase/ApplicationBase.dproj +++ b/Source/ApplicationBase/ApplicationBase.dproj @@ -46,12 +46,6 @@ Package FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 - - - - - - RemObjects Data Abstract - SQLite Driver Microsoft Office 2000 Sample Automation Server Wrapper Components Microsoft Office XP Sample Automation Server Wrapper Components diff --git a/Source/ApplicationBase/ApplicationBase.res b/Source/ApplicationBase/ApplicationBase.res index 8b251f3..1641339 100644 Binary files a/Source/ApplicationBase/ApplicationBase.res and b/Source/ApplicationBase/ApplicationBase.res differ diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 426db58..e6af759 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -59,54 +59,54 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
TForm diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 8b251f3..1641339 100644 Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index f44e3be..958a997 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,34 +58,34 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res index 8b251f3..1641339 100644 Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ diff --git a/Source/Informes/1/InfReciboCliente.fr3 b/Source/Informes/1/InfReciboCliente.fr3 index cea4f58..b07c1c3 100644 --- a/Source/Informes/1/InfReciboCliente.fr3 +++ b/Source/Informes/1/InfReciboCliente.fr3 @@ -1,73 +1,29 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - diff --git a/Source/Informes/4/InfReciboCliente.fr3 b/Source/Informes/4/InfReciboCliente.fr3 index 29ba058..b07c1c3 100644 --- a/Source/Informes/4/InfReciboCliente.fr3 +++ b/Source/Informes/4/InfReciboCliente.fr3 @@ -1,75 +1,29 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - diff --git a/Source/Modulos/Articulos/Controller/Articulos_controller.RES b/Source/Modulos/Articulos/Controller/Articulos_controller.RES index 8b251f3..1641339 100644 Binary files a/Source/Modulos/Articulos/Controller/Articulos_controller.RES and b/Source/Modulos/Articulos/Controller/Articulos_controller.RES differ diff --git a/Source/Modulos/Articulos/Controller/Articulos_controller.dproj b/Source/Modulos/Articulos/Controller/Articulos_controller.dproj index 30a7bf3..0a37190 100644 --- a/Source/Modulos/Articulos/Controller/Articulos_controller.dproj +++ b/Source/Modulos/Articulos/Controller/Articulos_controller.dproj @@ -54,11 +54,11 @@ MainSource - - - - - + + + + + diff --git a/Source/Modulos/Articulos/Views/Articulos_view.RES b/Source/Modulos/Articulos/Views/Articulos_view.RES index 8b251f3..1641339 100644 Binary files a/Source/Modulos/Articulos/Views/Articulos_view.RES and b/Source/Modulos/Articulos/Views/Articulos_view.RES differ diff --git a/Source/Modulos/Articulos/Views/Articulos_view.dproj b/Source/Modulos/Articulos/Views/Articulos_view.dproj index d273fa4..9b2a152 100644 --- a/Source/Modulos/Articulos/Views/Articulos_view.dproj +++ b/Source/Modulos/Articulos/Views/Articulos_view.dproj @@ -54,12 +54,12 @@ MainSource - - - - - - + + + + + +
fEditorArticulo
diff --git a/Source/Modulos/Contabilidad/Views/Contabilidad_view.dproj b/Source/Modulos/Contabilidad/Views/Contabilidad_view.dproj index 0a6e86e..b43d3af 100644 --- a/Source/Modulos/Contabilidad/Views/Contabilidad_view.dproj +++ b/Source/Modulos/Contabilidad/Views/Contabilidad_view.dproj @@ -48,11 +48,11 @@ MainSource - - - - - + + + + +
frViewEpigrafes
TFrame diff --git a/Source/Modulos/Contabilidad/Views/Contabilidad_view.res b/Source/Modulos/Contabilidad/Views/Contabilidad_view.res index 8b251f3..1641339 100644 Binary files a/Source/Modulos/Contabilidad/Views/Contabilidad_view.res and b/Source/Modulos/Contabilidad/Views/Contabilidad_view.res differ diff --git a/Source/Modulos/Contactos/Controller/Contactos_controller.RES b/Source/Modulos/Contactos/Controller/Contactos_controller.RES index 8b251f3..1641339 100644 Binary files a/Source/Modulos/Contactos/Controller/Contactos_controller.RES and b/Source/Modulos/Contactos/Controller/Contactos_controller.RES differ diff --git a/Source/Modulos/Contactos/Controller/Contactos_controller.dproj b/Source/Modulos/Contactos/Controller/Contactos_controller.dproj index 9f86cd5..a6e9c1c 100644 --- a/Source/Modulos/Contactos/Controller/Contactos_controller.dproj +++ b/Source/Modulos/Contactos/Controller/Contactos_controller.dproj @@ -53,19 +53,19 @@ MainSource - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/Source/Modulos/Contactos/Data/Contactos_data.RES b/Source/Modulos/Contactos/Data/Contactos_data.RES index 8b251f3..1641339 100644 Binary files a/Source/Modulos/Contactos/Data/Contactos_data.RES and b/Source/Modulos/Contactos/Data/Contactos_data.RES differ diff --git a/Source/Modulos/Contactos/Data/Contactos_data.dproj b/Source/Modulos/Contactos/Data/Contactos_data.dproj index 8087b68..6dc339b 100644 --- a/Source/Modulos/Contactos/Data/Contactos_data.dproj +++ b/Source/Modulos/Contactos/Data/Contactos_data.dproj @@ -49,12 +49,12 @@ MainSource - - - - - - + + + + + +
DataModuleClientes
TDAClientDataModule diff --git a/Source/Modulos/Contactos/Model/Contactos_model.RES b/Source/Modulos/Contactos/Model/Contactos_model.RES index 8b251f3..1641339 100644 Binary files a/Source/Modulos/Contactos/Model/Contactos_model.RES and b/Source/Modulos/Contactos/Model/Contactos_model.RES differ diff --git a/Source/Modulos/Contactos/Model/Contactos_model.dproj b/Source/Modulos/Contactos/Model/Contactos_model.dproj index d62420c..d15789f 100644 --- a/Source/Modulos/Contactos/Model/Contactos_model.dproj +++ b/Source/Modulos/Contactos/Model/Contactos_model.dproj @@ -49,22 +49,22 @@ MainSource + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dproj b/Source/Modulos/Contactos/Views/Contactos_view.dproj index 7443283..b092513 100644 --- a/Source/Modulos/Contactos/Views/Contactos_view.dproj +++ b/Source/Modulos/Contactos/Views/Contactos_view.dproj @@ -47,41 +47,41 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fEditorCliente
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.res b/Source/Modulos/Contactos/Views/Contactos_view.res index 8b251f3..1641339 100644 Binary files a/Source/Modulos/Contactos/Views/Contactos_view.res and b/Source/Modulos/Contactos/Views/Contactos_view.res differ diff --git a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.RES b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.RES index 8b251f3..1641339 100644 Binary files a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.RES and b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.RES differ diff --git a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj index 8e7ca78..77532e5 100644 --- a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj +++ b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj @@ -49,57 +49,57 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogOpcionesImpresionContratosCliente
diff --git a/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.RES b/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.RES index 8b251f3..1641339 100644 Binary files a/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.RES and b/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.RES differ diff --git a/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.dproj b/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.dproj index 8d6ad1a..d366605 100644 --- a/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.dproj +++ b/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.dproj @@ -49,15 +49,15 @@ MainSource - - - - - - - - - + + + + + + + + + diff --git a/Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.RES b/Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.RES index 8b251f3..1641339 100644 Binary files a/Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.RES and b/Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.RES differ diff --git a/Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.dproj b/Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.dproj index 3b4d0c6..c7e5c12 100644 --- a/Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.dproj +++ b/Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.dproj @@ -49,7 +49,7 @@ MainSource - +
DataModuleFacturasCliente
TDAClientDataModule diff --git a/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.RES b/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.RES index 8b251f3..1641339 100644 Binary files a/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.RES and b/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.RES differ diff --git a/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.dproj b/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.dproj index b114d58..c12b50e 100644 --- a/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.dproj +++ b/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.dproj @@ -41,13 +41,7 @@ Delphi.Personality Package -FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 - - - - - - +FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 RemObjects Pascal Script - RemObjects SDK 3.0 Integration EurekaLog 5.1.9 FacturasCliente_model.dpk @@ -57,13 +51,13 @@ MainSource - - + + + - @@ -551,4 +545,4 @@ mtException_AntiFreeze0="The application seems to be frozen." Count mtInvalidEmailMsg=1 mtInvalidEmailMsg0="Invalid email." TextsCollection=English -EurekaLog Last Line --> \ No newline at end of file +EurekaLog Last Line --> diff --git a/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.RES b/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.RES index 8b251f3..1641339 100644 Binary files a/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.RES and b/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.RES differ diff --git a/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.dproj b/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.dproj index 36c9895..f0181e7 100644 --- a/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.dproj +++ b/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.dproj @@ -41,19 +41,7 @@ Delphi.Personality Package -FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 - - - - - - - - - - - - +FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 RemObjects Pascal Script - RemObjects SDK 3.0 Integration EurekaLog 5.1.9 FacturasCliente_plugin.dpk @@ -63,9 +51,9 @@ MainSource - - - + + +
PluginFacturasCliente
 @@ -553,4 +541,4 @@ mtException_AntiFreeze0="The application seems to be frozen." Count mtInvalidEmailMsg=1 mtInvalidEmailMsg0="Invalid email." TextsCollection=English -EurekaLog Last Line --> \ No newline at end of file +EurekaLog Last Line --> diff --git a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.RES b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.RES index 8b251f3..1641339 100644 Binary files a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.RES and b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.RES differ diff --git a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.RES b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.RES index 8b251f3..1641339 100644 Binary files a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.RES and b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.RES differ diff --git a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.dproj b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.dproj index 0c5f4c7..695c44e 100644 --- a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.dproj +++ b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.dproj @@ -38,9 +38,9 @@ MainSource - - - + + + diff --git a/Source/Modulos/Gestor de informes/Data/GestorInformes_data.RES b/Source/Modulos/Gestor de informes/Data/GestorInformes_data.RES index 8b251f3..1641339 100644 Binary files a/Source/Modulos/Gestor de informes/Data/GestorInformes_data.RES and b/Source/Modulos/Gestor de informes/Data/GestorInformes_data.RES differ diff --git a/Source/Modulos/Gestor de informes/Data/GestorInformes_data.dproj b/Source/Modulos/Gestor de informes/Data/GestorInformes_data.dproj index b6b38a3..1be404c 100644 --- a/Source/Modulos/Gestor de informes/Data/GestorInformes_data.dproj +++ b/Source/Modulos/Gestor de informes/Data/GestorInformes_data.dproj @@ -38,14 +38,14 @@ MainSource - - + +