diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index 69faf8a..ab9682f 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 2366feb..4d05ff7 100644 --- a/Database/scripts/factuges.sql +++ b/Database/scripts/factuges.sql @@ -2453,8 +2453,6 @@ ON (V_ALB_PROV_DETALLES.ID_ALBARAN = ALBARANES_PROVEEDOR.ID) WHERE (V_ALB_PROV_DETALLES.ID_ALMACEN IS NOT NULL) ; - - /* View: V_HIS_MOV_REGULARIZACIONES */ CREATE VIEW V_HIS_MOV_REGULARIZACIONES( FECHA, @@ -2467,12 +2465,11 @@ AS SELECT FECHA_MOVIMIENTO, ID_ALMACEN, ID_ARTICULO, TIPO, CASE WHEN TIPO = 'S' THEN (-1)* CANTIDAD ELSE CANTIDAD END, -'Regularizaci¢n por - ' || CAUSA +'Regularización por - ' || CAUSA FROM MOVIMIENTOS ; - /* View: V_HIS_MOV_AUX */ CREATE VIEW V_HIS_MOV_AUX( FECHA, @@ -4473,6 +4470,46 @@ or ((v_ped_cli_detalle_colores.COLOR11 - coalesce(v_alb_cli_detalle_colores.COLO or ((v_ped_cli_detalle_colores.COLOR12 - coalesce(v_alb_cli_detalle_colores.COLOR12, 0)) <> 0) ; +CREATE VIEW V_ARTICULOS_PENDIENTES( + ID_ARTICULO, + REFERENCIA, + DESCRIPCION, + COLOR1, + COLOR2, + COLOR3, + COLOR4, + COLOR5, + COLOR6, + COLOR7, + COLOR8, + COLOR9, + COLOR10, + COLOR11, + COLOR12, + TOTAL) +AS +select V_PED_CLI_ART_COLORES_PEND.ID_ARTICULO, ARTICULOS.REFERENCIA, ARTICULOS.DESCRIPCION, +SUM(V_PED_CLI_ART_COLORES_PEND.COLOR1), +SUM(V_PED_CLI_ART_COLORES_PEND.COLOR2), +SUM(V_PED_CLI_ART_COLORES_PEND.COLOR3), +SUM(V_PED_CLI_ART_COLORES_PEND.COLOR4), +SUM(V_PED_CLI_ART_COLORES_PEND.COLOR5), +SUM(V_PED_CLI_ART_COLORES_PEND.COLOR6), +SUM(V_PED_CLI_ART_COLORES_PEND.COLOR7), +SUM(V_PED_CLI_ART_COLORES_PEND.COLOR8), +SUM(V_PED_CLI_ART_COLORES_PEND.COLOR9), +SUM(V_PED_CLI_ART_COLORES_PEND.COLOR10), +SUM(V_PED_CLI_ART_COLORES_PEND.COLOR11), +SUM(V_PED_CLI_ART_COLORES_PEND.COLOR12), +SUM(V_PED_CLI_ART_COLORES_PEND.COLOR1) + SUM(V_PED_CLI_ART_COLORES_PEND.COLOR2) + SUM(V_PED_CLI_ART_COLORES_PEND.COLOR3) + +SUM(V_PED_CLI_ART_COLORES_PEND.COLOR4) + SUM(V_PED_CLI_ART_COLORES_PEND.COLOR5) + SUM(V_PED_CLI_ART_COLORES_PEND.COLOR6) + +SUM(V_PED_CLI_ART_COLORES_PEND.COLOR7) + SUM(V_PED_CLI_ART_COLORES_PEND.COLOR8) + SUM(V_PED_CLI_ART_COLORES_PEND.COLOR9) + +SUM(V_PED_CLI_ART_COLORES_PEND.COLOR10)+SUM(V_PED_CLI_ART_COLORES_PEND.COLOR11) + SUM(V_PED_CLI_ART_COLORES_PEND.COLOR12) + +from V_PED_CLI_ART_COLORES_PEND +left join articulos on (articulos.ID = V_PED_CLI_ART_COLORES_PEND.ID_ARTICULO) +group by 1,2,3 +; /******************************************************************************/ /**** Primary Keys ****/ diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index aa2fac6..c7a9050 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -59,32 +59,32 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
diff --git a/Source/GUIBase/uEditorColores.pas b/Source/GUIBase/uEditorColores.pas index 1f71f3f..a51d7d7 100644 --- a/Source/GUIBase/uEditorColores.pas +++ b/Source/GUIBase/uEditorColores.pas @@ -100,6 +100,7 @@ procedure TfEditorColores.FormShow(Sender: TObject); begin inherited; PonerTituloArticulo; + eColor1.SetFocus; end; function TfEditorColores.GetTotal: Double; diff --git a/Source/Modulos/Contactos/Contactos_Group.groupproj b/Source/Modulos/Contactos/Contactos_Group.groupproj index acab602..e6ab4f4 100644 --- a/Source/Modulos/Contactos/Contactos_Group.groupproj +++ b/Source/Modulos/Contactos/Contactos_Group.groupproj @@ -9,6 +9,8 @@ + + @@ -111,14 +113,32 @@ + + + + + + + + + + + + + + + + + + - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Contactos/Controller/uClientesController.pas b/Source/Modulos/Contactos/Controller/uClientesController.pas index 4c37d5c..fd3115c 100644 --- a/Source/Modulos/Contactos/Controller/uClientesController.pas +++ b/Source/Modulos/Contactos/Controller/uClientesController.pas @@ -19,7 +19,7 @@ type function Eliminar(ACliente: IBizContacto; AllItems: Boolean = false): Boolean; overload; procedure Preview(ACliente : IBizCliente; AllItems: Boolean = false); procedure Print(ACliente : IBizCliente; AllItems: Boolean = false); - procedure VerPresupuestosDeCliente(ACliente : IBizCliente); + procedure VerPedidosDeCliente(ACliente : IBizCliente); procedure VerAlbaranesDeCliente(ACliente : IBizCliente); procedure VerFacturasDeCliente(ACliente : IBizCliente); procedure VerRecibosDeCliente(ACliente : IBizCliente); @@ -52,7 +52,7 @@ type function Eliminar(ACliente: IBizContacto; AllItems: Boolean = false): Boolean; overload; procedure Preview(ACliente : IBizCliente; AllItems: Boolean = false); procedure Print(ACliente : IBizCliente; AllItems: Boolean = false); - procedure VerPresupuestosDeCliente(ACliente : IBizCliente); + procedure VerPedidosDeCliente(ACliente : IBizCliente); procedure VerAlbaranesDeCliente(ACliente : IBizCliente); procedure VerFacturasDeCliente(ACliente : IBizCliente); procedure VerRecibosDeCliente(ACliente : IBizCliente); @@ -475,10 +475,10 @@ begin end; end; -procedure TClientesController.VerPresupuestosDeCliente(ACliente : IBizCliente); +procedure TClientesController.VerPedidosDeCliente(ACliente : IBizCliente); var AModule : TModuleController; - APlugin : IMCPresupuestosCliente; + APlugin : IMCPedidosCliente; begin if not Assigned(ACliente) then raise Exception.Create ('Cliente no asignado (VerPresupuestosDeCliente)'); @@ -486,11 +486,11 @@ begin if not ACliente.DataTable.Active then ACliente.DataTable.Active := True; - AModule := AppFactuGES.GetModule(MODULENAME_PRESUPUESTOS_CLIENTE); + AModule := AppFactuGES.GetModule(MODULENAME_PEDIDOS_CLIENTE); if Assigned(AModule) then try - if Supports(AModule, IMCPresupuestosCliente, APlugin) then - APlugin.VerPresupuestos(ACliente.ID, ACliente.NOMBRE); + if Supports(AModule, IMCPedidosCliente, APlugin) then + APlugin.VerPedidos(ACliente.ID, ACliente.NOMBRE); finally APlugin := NIL; end; diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.dfm b/Source/Modulos/Contactos/Views/uEditorCliente.dfm index 3020e3f..bb7c803 100644 --- a/Source/Modulos/Contactos/Views/uEditorCliente.dfm +++ b/Source/Modulos/Contactos/Views/uEditorCliente.dfm @@ -73,7 +73,7 @@ inherited fEditorCliente: TfEditorCliente Visible = False DropdownCombo = True object TBXItem36: TSpTBXItem - Action = actDocumentosPresupuestos + Action = actDocumentosPedidos end object TBXItem35: TSpTBXItem Action = actDocumentosAlbaranes @@ -105,7 +105,7 @@ inherited fEditorCliente: TfEditorCliente Caption = 'Documentos relacionados' ImageIndex = 22 object TBXItem39: TSpTBXItem - Action = actDocumentosPresupuestos + Action = actDocumentosPedidos end object TBXItem38: TSpTBXItem Action = actDocumentosAlbaranes @@ -151,16 +151,16 @@ inherited fEditorCliente: TfEditorCliente ExplicitWidth = 778 ExplicitHeight = 502 inherited PngSpeedButton1: TPngSpeedButton - Left = 716 - ExplicitLeft = 716 + Left = 733 + ExplicitLeft = 733 end inherited PngSpeedButton2: TPngSpeedButton - Left = 716 - ExplicitLeft = 716 + Left = 733 + ExplicitLeft = 733 end inherited PngSpeedButton3: TPngSpeedButton - Left = 716 - ExplicitLeft = 716 + Left = 733 + ExplicitLeft = 733 end inherited eCalle: TcxDBTextEdit Left = 138 @@ -193,12 +193,12 @@ inherited fEditorCliente: TfEditorCliente Width = 246 end inherited eCodigoPostal: TcxDBTextEdit - Left = 301 + Left = 310 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 301 + ExplicitLeft = 310 end inherited eObservaciones: TcxDBMemo Style.LookAndFeel.SkinName = '' @@ -249,48 +249,48 @@ inherited fEditorCliente: TfEditorCliente Width = 246 end inherited cbFelicitacion: TcxDBCheckBox - Left = 396 - ExplicitLeft = 396 + Left = 405 + ExplicitLeft = 405 ExplicitWidth = 370 Width = 370 end inherited eTlfParticular: TcxDBTextEdit - Left = 491 + Left = 500 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 491 + ExplicitLeft = 500 ExplicitWidth = 177 Width = 177 end inherited eTlfTrabajo: TcxDBTextEdit - Left = 491 + Left = 500 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 491 + ExplicitLeft = 500 ExplicitWidth = 177 Width = 177 end inherited eTlfMovil: TcxDBTextEdit - Left = 491 + Left = 500 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 491 + ExplicitLeft = 500 ExplicitWidth = 177 Width = 177 end inherited eFax: TcxDBTextEdit - Left = 491 + Left = 500 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 491 + ExplicitLeft = 500 ExplicitWidth = 177 Width = 177 end @@ -305,44 +305,44 @@ inherited fEditorCliente: TfEditorCliente Width = 246 end inherited eNIFCIF: TcxDBTextEdit - Left = 215 + Left = 218 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 215 + ExplicitLeft = 218 ExplicitWidth = 162 Width = 162 end inherited eMailTrabajo: TcxDBHyperLinkEdit - Left = 491 + Left = 500 Properties.Prefix = 'mailto:' Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 491 + ExplicitLeft = 500 ExplicitWidth = 148 Width = 148 end inherited eMailParticular: TcxDBHyperLinkEdit - Left = 491 + Left = 500 Properties.Prefix = 'mailto:' Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 491 + ExplicitLeft = 500 ExplicitWidth = 148 Width = 148 end inherited ePaginaWeb: TcxDBHyperLinkEdit - Left = 491 + Left = 500 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 491 + ExplicitLeft = 500 ExplicitWidth = 148 Width = 148 end @@ -419,6 +419,18 @@ inherited fEditorCliente: TfEditorCliente inherited ToolBar1: TToolBar Width = 778 ExplicitWidth = 778 + inherited ToolButton1: TToolButton + ExplicitWidth = 62 + end + inherited ToolButton4: TToolButton + ExplicitWidth = 74 + end + inherited ToolButton2: TToolButton + ExplicitWidth = 67 + end + inherited ToolButton7: TToolButton + ExplicitWidth = 117 + end end end end @@ -667,6 +679,18 @@ inherited fEditorCliente: TfEditorCliente inherited ToolBar1: TToolBar Width = 778 ExplicitWidth = 778 + inherited ToolButton1: TToolButton + ExplicitWidth = 62 + end + inherited ToolButton4: TToolButton + ExplicitWidth = 74 + end + inherited ToolButton2: TToolButton + ExplicitWidth = 67 + end + inherited ToolButton7: TToolButton + ExplicitWidth = 117 + end end end end @@ -701,13 +725,13 @@ inherited fEditorCliente: TfEditorCliente Visible = False OnExecute = actDocumentosFacturasExecute end - object actDocumentosPresupuestos: TAction + object actDocumentosPedidos: TAction Category = 'Acciones' - Caption = 'Presupuestos' + Caption = 'Pedidos' Enabled = False ImageIndex = 23 Visible = False - OnExecute = actDocumentosPresupuestosExecute + OnExecute = actDocumentosPedidosExecute end object actDocumentosAlbaranes: TAction Category = 'Acciones' diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.pas b/Source/Modulos/Contactos/Views/uEditorCliente.pas index 5ca3551..64082af 100644 --- a/Source/Modulos/Contactos/Views/uEditorCliente.pas +++ b/Source/Modulos/Contactos/Views/uEditorCliente.pas @@ -32,7 +32,7 @@ type TBXSubmenuItem3: TSpTBXSubmenuItem; TBXItem33: TSpTBXItem; TBXSeparatorItem6: TSpTBXSeparatorItem; - actDocumentosPresupuestos: TAction; + actDocumentosPedidos: TAction; actDocumentosAlbaranes: TAction; actDocumentosFacturas: TAction; TBXSubmenuItem8: TSpTBXSubmenuItem; @@ -49,7 +49,7 @@ type procedure FormShow(Sender: TObject); procedure actGruposClienteExecute(Sender: TObject); procedure actDocumentosFacturasExecute(Sender: TObject); - procedure actDocumentosPresupuestosExecute(Sender: TObject); + procedure actDocumentosPedidosExecute(Sender: TObject); procedure actDocumentosAlbaranesExecute(Sender: TObject); procedure actDocumentosRecibosExecute(Sender: TObject); protected @@ -82,10 +82,10 @@ begin (FController as IClientesController).VerFacturasDeCliente(IBizCliente(FContacto)); end; -procedure TfEditorCliente.actDocumentosPresupuestosExecute(Sender: TObject); +procedure TfEditorCliente.actDocumentosPedidosExecute(Sender: TObject); begin inherited; - (FController as IClientesController).VerPresupuestosDeCliente(IBizCliente(FContacto)); + (FController as IClientesController).VerPedidosDeCliente(IBizCliente(FContacto)); end; procedure TfEditorCliente.actDocumentosRecibosExecute(Sender: TObject); diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.dfm b/Source/Modulos/Contactos/Views/uEditorClientes.dfm index 39bac17..057ad61 100644 --- a/Source/Modulos/Contactos/Views/uEditorClientes.dfm +++ b/Source/Modulos/Contactos/Views/uEditorClientes.dfm @@ -52,16 +52,15 @@ inherited fEditorClientes: TfEditorClientes Width = 857 ExplicitWidth = 857 inherited tbxMain: TSpTBXToolbar - ExplicitWidth = 632 + ExplicitWidth = 799 object TBXSubmenuItem3: TSpTBXSubmenuItem [13] Caption = 'Documentos relacionados' DisplayMode = nbdmImageAndText ImageIndex = 24 Images = SmallImages - Visible = False DropdownCombo = True object TBXItem43: TSpTBXItem - Action = actDocumentosPresupuestos + Action = actDocumentosPedidos end object TBXItem42: TSpTBXItem Action = actDocumentosAlbaranes @@ -90,7 +89,7 @@ inherited fEditorClientes: TfEditorClientes Images = SmallImages DropdownCombo = True object TBXItem40: TSpTBXItem - Action = actDocumentosPresupuestos + Action = actDocumentosPedidos end object TBXItem39: TSpTBXItem Action = actDocumentosAlbaranes @@ -135,7 +134,7 @@ inherited fEditorClientes: TfEditorClientes Width = 857 Height = 270 ExplicitWidth = 857 - ExplicitHeight = 168 + ExplicitHeight = 270 inherited cxGridView: TcxGridDBTableView DataController.Summary.FooterSummaryItems = < item @@ -225,6 +224,9 @@ inherited fEditorClientes: TfEditorClientes BuiltInReportLink = True end end + inherited dxPSEngineController1: TdxPSEngineController + Active = True + end inherited cxViewGridPopupMenu: TcxGridPopupMenu PopupMenus = < item @@ -249,9 +251,7 @@ inherited fEditorClientes: TfEditorClientes object actDocumentosFacturas: TAction [2] Category = 'Acciones' Caption = 'Facturas' - Enabled = False ImageIndex = 27 - Visible = False OnExecute = actDocumentosFacturasExecute OnUpdate = actDocumentosFacturasUpdate end @@ -267,30 +267,24 @@ inherited fEditorClientes: TfEditorClientes Enabled = False Visible = False end - object actDocumentosPresupuestos: TAction + object actDocumentosPedidos: TAction Category = 'Acciones' - Caption = 'Presupuestos' - Enabled = False + Caption = 'Pedidos' ImageIndex = 25 - Visible = False - OnExecute = actDocumentosPresupuestosExecute + OnExecute = actDocumentosPedidosExecute OnUpdate = actDocumentosFacturasUpdate end object actDocumentosAlbaranes: TAction Category = 'Acciones' Caption = 'Albaranes' - Enabled = False ImageIndex = 26 - Visible = False OnExecute = actDocumentosAlbaranesExecute OnUpdate = actDocumentosFacturasUpdate end object actDocumentosRecibos: TAction Category = 'Acciones' Caption = 'Recibos' - Enabled = False ImageIndex = 28 - Visible = False OnExecute = actDocumentosRecibosExecute OnUpdate = actDocumentosFacturasUpdate end @@ -2227,7 +2221,7 @@ inherited fEditorClientes: TfEditorClientes Caption = 'Documentos relacionados' ImageIndex = 24 object Presupuestos1: TMenuItem - Action = actDocumentosPresupuestos + Action = actDocumentosPedidos end object Albaranes1: TMenuItem Action = actDocumentosAlbaranes diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.pas b/Source/Modulos/Contactos/Views/uEditorClientes.pas index d1e7054..2eaddcb 100644 --- a/Source/Modulos/Contactos/Views/uEditorClientes.pas +++ b/Source/Modulos/Contactos/Views/uEditorClientes.pas @@ -21,7 +21,7 @@ type actGruposCliente: TAction; JsListaContactosNoEliminados: TJSDialog; frViewClientes1: TfrViewClientes; - actDocumentosPresupuestos: TAction; + actDocumentosPedidos: TAction; actDocumentosAlbaranes: TAction; actDocumentosFacturas: TAction; TBXItem381: TSpTBXItem; @@ -44,7 +44,7 @@ type TBXItem45: TSpTBXItem; procedure actGruposClienteExecute(Sender: TObject); procedure actDocumentosFacturasUpdate(Sender: TObject); - procedure actDocumentosPresupuestosExecute(Sender: TObject); + procedure actDocumentosPedidosExecute(Sender: TObject); procedure actDocumentosFacturasExecute(Sender: TObject); procedure actDocumentosAlbaranesExecute(Sender: TObject); procedure actDocumentosRecibosExecute(Sender: TObject); @@ -90,10 +90,10 @@ begin and ViewGrid.EsSeleccionCeldaDatos end; -procedure TfEditorClientes.actDocumentosPresupuestosExecute(Sender: TObject); +procedure TfEditorClientes.actDocumentosPedidosExecute(Sender: TObject); begin inherited; - (FController as IClientesController).VerPresupuestosDeCliente(IBizCliente(FContactos)); + (FController as IClientesController).VerPedidosDeCliente(IBizCliente(FContactos)); end; procedure TfEditorClientes.actDocumentosRecibosExecute(Sender: TObject); diff --git a/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.dpk b/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.dpk index 8bf07d0..56071a7 100644 --- a/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.dpk +++ b/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.dpk @@ -54,6 +54,7 @@ contains uIEditorDireccionEntregaPedidoCliente in 'View\uIEditorDireccionEntregaPedidoCliente.pas', uPedidosClienteReportController in 'uPedidosClienteReportController.pas', uIEditorPedidosClientePreview in 'View\uIEditorPedidosClientePreview.pas', - uIDialogListaPedidosCliEnvioEMail in 'View\uIDialogListaPedidosCliEnvioEMail.pas'; + uIDialogListaPedidosCliEnvioEMail in 'View\uIDialogListaPedidosCliEnvioEMail.pas', + uIEditorArticulosPendientes in 'View\uIEditorArticulosPendientes.pas'; end. diff --git a/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.dproj b/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.dproj index 59c3a69..af82c49 100644 --- a/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.dproj +++ b/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.dproj @@ -49,34 +49,35 @@ MainSource - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + +