diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index a376e19..e076739 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql index 4ca5cac..844a824 100644 --- a/Database/scripts/factuges.sql +++ b/Database/scripts/factuges.sql @@ -1705,7 +1705,7 @@ CREATE VIEW V_ALBARANES_CLIENTE( PROVINCIA, PERSONA_CONTACTO, TELEFONO, - MOVIL, + MOVIL, IMPORTE_NETO, IMPORTE_PORTE, DESCUENTO, @@ -1741,7 +1741,7 @@ SELECT ALBARANES_CLIENTE.ID_ALMACEN, ALMACENES.NOMBRE AS NOMBRE_ALMACEN, ALBARANES_CLIENTE.ID_PEDIDO, - PEDIDOS_CLIENTE.REFERENCIA AS REF_PEDIDO, + CONTRATOS_CLIENTE.REFERENCIA AS REF_PEDIDO, ALBARANES_CLIENTE.ID_FACTURA, FACTURAS_CLIENTE.REFERENCIA AS REF_FACTURA, ALBARANES_CLIENTE.ID_DIRECCION, @@ -1778,14 +1778,13 @@ FROM ALBARANES_CLIENTE INNER JOIN CONTACTOS ON (CONTACTOS.ID = ALBARANES_CLIENTE.ID_CLIENTE) INNER JOIN V_ALB_CLI_SITUACION ON (V_ALB_CLI_SITUACION.ID = ALBARANES_CLIENTE.ID) - LEFT OUTER JOIN PEDIDOS_CLIENTE ON (PEDIDOS_CLIENTE.ID = ALBARANES_CLIENTE.ID_PEDIDO) + LEFT OUTER JOIN CONTRATOS_CLIENTE ON (CONTRATOS_CLIENTE.ID = ALBARANES_CLIENTE.ID_PEDIDO) LEFT OUTER JOIN FACTURAS_CLIENTE ON (FACTURAS_CLIENTE.ID = ALBARANES_CLIENTE.ID_FACTURA) LEFT OUTER JOIN ALMACENES ON (ALMACENES.ID = ALBARANES_CLIENTE.ID_ALMACEN) LEFT OUTER JOIN EMPRESAS_TIENDAS ON (EMPRESAS_TIENDAS.ID = ALBARANES_CLIENTE.ID_TIENDA) ; - /* View: V_ALBARANES_PROVEEDOR */ CREATE VIEW V_ALBARANES_PROVEEDOR( ID, @@ -2769,6 +2768,7 @@ CREATE VIEW V_FACTURAS_CLIENTE( ASIENTO_PUNTEADO, ID_CONTRATO, REF_CONTRATO, + REF_CLI_CONTRATO, SIN_COMISION) AS SELECT FACTURAS_CLIENTE.ID, @@ -2778,7 +2778,10 @@ SELECT FACTURAS_CLIENTE.ID, FACTURAS_CLIENTE.ID_COMISION_LIQUIDADA, FACTURAS_CLIENTE.FECHA_FACTURA, FACTURAS_CLIENTE.FECHA_VENCIMIENTO, - TRIM(V_FAC_CLI_SITUACION.SITUACION), + case + when V_FAC_CLI_SITUACION.SITUACION is null then FACTURAS_CLIENTE.SITUACION + else TRIM(V_FAC_CLI_SITUACION.SITUACION) + end as situacion, FACTURAS_CLIENTE.BASE_IMPONIBLE, FACTURAS_CLIENTE.DESCUENTO, FACTURAS_CLIENTE.IMPORTE_DESCUENTO, @@ -2819,6 +2822,7 @@ SELECT FACTURAS_CLIENTE.ID, V_CONT_FAC_CLI_VENTAS.ASIENTO_PUNTEADO, FACTURAS_CLIENTE.ID_CONTRATO, CONTRATOS_CLIENTE.REFERENCIA, + CONTRATOS_CLIENTE.REFERENCIA_CLIENTE, FACTURAS_CLIENTE.SIN_COMISION FROM V_FAC_CLI_SITUACION diff --git a/Resources/Iconos/Barras2.jpg b/Resources/Iconos/Barras2.jpg new file mode 100644 index 0000000..c0086be Binary files /dev/null and b/Resources/Iconos/Barras2.jpg differ diff --git a/Resources/Iconos/logo-uecko.jpg b/Resources/Iconos/logo-uecko.jpg new file mode 100644 index 0000000..c427e25 Binary files /dev/null and b/Resources/Iconos/logo-uecko.jpg differ diff --git a/Resources/Iconos/pie-uecko.jpg b/Resources/Iconos/pie-uecko.jpg new file mode 100644 index 0000000..3f4061d Binary files /dev/null and b/Resources/Iconos/pie-uecko.jpg differ diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index ab68290..a730d90 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -44,13 +44,6 @@ Package FalseTrueFalseLibreria base de FactuGESFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 - - - - - - - VCL for the Web Design Package for CodeGear RAD Studio CodeGear WebSnap Components CodeGear SOAP Components @@ -65,54 +58,54 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 37fef3b..8cb2b79 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -51,7 +51,8 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2620FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.6.2.0FactuGESFactuGES2.6.2.0 +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2630FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.6.3.0FactuGESFactuGES2.6.3.0 + File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index b214215..86d7508 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Informes/1/InfFacturaCliente(UECKO).fr3 b/Source/Informes/1/InfFacturaCliente(UECKO).fr3 new file mode 100644 index 0000000..86db81d --- /dev/null +++ b/Source/Informes/1/InfFacturaCliente(UECKO).fr3 @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj index 1491e59..d43cb0c 100644 --- a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj +++ b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj @@ -15,6 +15,7 @@ + @@ -181,14 +182,23 @@ + + + + + + + + + - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas index 2ff0c11..00d5d0e 100644 --- a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas +++ b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas @@ -9,9 +9,9 @@ const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosAlbaranes = '{F1405E5E-2557-4222-8709-EE2F6A0D9542}'; - RID_AlbaranesCliente = '{69D16F16-C561-4FB5-B0A6-57197A742A38}'; - RID_AlbaranesCliente_Detalles = '{F249E060-7F8D-4515-A8ED-9B547A282F9F}'; + RID_ListaAnosAlbaranes = '{341C2DAC-F578-4289-BEC6-A22088E12DDA}'; + RID_AlbaranesCliente = '{9E0606CC-EF63-4EDA-B7FA-D41CC8803129}'; + RID_AlbaranesCliente_Detalles = '{4D6277E1-50CF-4276-9A60-C66040C70E0E}'; { Data table names } nme_ListaAnosAlbaranes = 'ListaAnosAlbaranes'; @@ -153,7 +153,7 @@ const type { IListaAnosAlbaranes } IListaAnosAlbaranes = interface(IDAStronglyTypedDataTable) - ['{FE187003-4E59-47D2-88C1-8E70EF5C1015}'] + ['{18882089-8287-47C7-9C5D-931786CE7191}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -188,7 +188,7 @@ type { IAlbaranesCliente } IAlbaranesCliente = interface(IDAStronglyTypedDataTable) - ['{9D28E73E-56C6-4D73-835B-96C1171AD3AC}'] + ['{79507D33-A636-472C-B17E-D017E6D4FCAE}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -739,7 +739,7 @@ type { IAlbaranesCliente_Detalles } IAlbaranesCliente_Detalles = interface(IDAStronglyTypedDataTable) - ['{43704339-3297-4D9C-ABA1-A9B1FD3529C7}'] + ['{E5EA0F49-1453-4D24-9E59-0EDC0AEC18F7}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); diff --git a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas index aad655c..8a8ad9b 100644 --- a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas +++ b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas @@ -9,14 +9,14 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosAlbaranesDelta = '{8A8F5396-5B0A-4D9F-8F0B-F06E0F97799B}'; - RID_AlbaranesClienteDelta = '{CD300F28-DA65-4511-905E-17534DE499F2}'; - RID_AlbaranesCliente_DetallesDelta = '{FD279313-BC40-4AD8-8370-E05FB59C733D}'; + RID_ListaAnosAlbaranesDelta = '{A83C6728-0F72-4994-B6BD-27A86E154F6A}'; + RID_AlbaranesClienteDelta = '{07D97148-0DFB-49CD-B447-24C9143ECA30}'; + RID_AlbaranesCliente_DetallesDelta = '{D45C143D-1990-46DF-80F3-DE6AC699561E}'; type { IListaAnosAlbaranesDelta } IListaAnosAlbaranesDelta = interface(IListaAnosAlbaranes) - ['{8A8F5396-5B0A-4D9F-8F0B-F06E0F97799B}'] + ['{A83C6728-0F72-4994-B6BD-27A86E154F6A}'] { Property getters and setters } function GetOldANOValue : String; @@ -50,7 +50,7 @@ type { IAlbaranesClienteDelta } IAlbaranesClienteDelta = interface(IAlbaranesCliente) - ['{CD300F28-DA65-4511-905E-17534DE499F2}'] + ['{07D97148-0DFB-49CD-B447-24C9143ECA30}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -602,7 +602,7 @@ type { IAlbaranesCliente_DetallesDelta } IAlbaranesCliente_DetallesDelta = interface(IAlbaranesCliente_Detalles) - ['{FD279313-BC40-4AD8-8370-E05FB59C733D}'] + ['{D45C143D-1990-46DF-80F3-DE6AC699561E}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_ALBARANValue : Integer; diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm index c0f2bdf..df7d990 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm @@ -94,10 +94,9 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente Width = 119 end object cxGridViewREF_PEDIDO: TcxGridDBColumn + Caption = 'Ref. Contrato' DataBinding.FieldName = 'REF_PEDIDO' - Visible = False BestFitMaxWidth = 45 - VisibleForCustomization = False Width = 39 end object cxGridViewFECHA_PREVISTA_ENVIO: TcxGridDBColumn diff --git a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj index 9b96fcb..8e7ca78 100644 --- a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj +++ b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj @@ -49,50 +49,57 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogOpcionesImpresionContratosCliente
@@ -154,13 +161,6 @@
frViewElegirArticulosContratosCliente
TFrame - - - - - - -