Merge branch 'main' of http://192.168.40.251:3000/jsoto/MBS

PROYECTO/mbsERP.4pw

@@ -265,8 +265,22 @@
       <Library binaryName="FUNCIONES_IR" id="-2079122474" label="FUNCIONES_IR"/>
     </Group>
     <Group id="2068304233" label="VENTAS">
-      <Library binaryName="FORMULARIOS_VE" id="-1377937444" label="FORMULARIOS_VE"/>
+      <Library binaryName="FORMULARIOS_VE" dependencies="-1026233879" id="-1377937444" label="FORMULARIOS_VE">
-      <Library binaryName="FUNCIONES_VE" id="-1093277845" label="FUNCIONES_VE"/>
+        <File filePath="vedir/vefmmt004.4fd"/>
+        <File filePath="vedir/vefmmt101.4fd"/>
+      </Library>
+      <Library binaryName="FUNCIONES_VE" dependencies="-1026233879" id="-1093277845" label="FUNCIONES_VE">
+        <File filePath="vedir/vefumt001.4gl"/>
+        <File filePath="vedir/veprgb000.4gl"/>
+      </Library>
+      <Application binaryName="veprmt004" dependencies="-1093277845,-1026233879,-764824792" id="657833718" label="veprmt004">
+        <Configuration commandLineArguments="jsoto lmmjvsd2014" id="86284586" label="Configuration"/>
+        <File filePath="vedir/veprmt004.4gl"/>
+      </Application>
+      <Application binaryName="veprmt101" dependencies="-1093277845,-1026233879,-764824792,493047263" id="-519209967" label="veprmt101">
+        <Configuration commandLineArguments="jsoto lmmjvsd2014" id="955022326" label="Configuration"/>
+        <File filePath="vedir/veprmt101.4gl"/>
+      </Application>
     </Group>
   </Group>
   <Group id="128554475" label="Packages" language="Genero">

PROYECTO/vedir/vefmmt004.4fd

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ManagedForm databaseName="smarmotech" fileVersion="31400" gstVersion="3140a" name="ManagedForm" uid="{1254fc78-ad1f-4d50-b8f8-9d9603b9f5a8}">
+<ManagedForm databaseName="smarmotech" fileVersion="40100" gstVersion="60003" name="ManagedForm" uid="{1254fc78-ad1f-4d50-b8f8-9d9603b9f5a8}">
   <AGSettings>
-    <DynamicProperties version="2"/>
+    <DynamicProperties version="4"/>
   </AGSettings>
   <Record name="record1" uid="{959dd681-c0d9-4791-948c-0ccbabe0997b}">
     <RecordField colName="cod_zona" fieldIdRef="1" fieldType="TABLE_COLUMN" name="vetb00008.cod_zona" sqlTabName="vetb00008" uid="{0eb5b67f-ffb0-4c8a-a628-00c8ce58ca85}"/>
@@ -15,6 +15,11 @@
     <RecordField fieldIdRef="8" name="porctransporte" uid="{6383f4f6-2033-4898-98aa-0874e5b91b77}"/>
   </Record>
   <Form gridHeight="24" gridWidth="80" name="vefmmt004">
+    <ToolBar name="toolbar1">
+      <ToolBarItem image="new" name="adicionar" text="Adicionar"/>
+      <ToolBarItem image="find" name="consultar_modificar" text="Consultar Y Modificar"/>
+      <ToolBarItem image="exit" name="salir" text="Salir"/>
+    </ToolBar>
     <Grid gridHeight="24" gridWidth="80" name="grid1" posX="0" posY="0">
       <Label gridHeight="1" gridWidth="17" name="label1" posX="1" posY="0" text="Codigo de la Zona"/>
       <Edit autoNext="true" colName="cod_zona" comment="Digite el codigo de la Zona" fieldId="1" fieldType="TABLE_COLUMN" gridHeight="1" gridWidth="4" name="vetb00008.cod_zona" posX="22" posY="0" sqlTabName="vetb00008" tabIndex="1" widget="Edit"/>

PROYECTO/vedir/vefmmt101.4fd

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ManagedForm databaseName="smarmotech" fileVersion="31400" gstVersion="31405" name="ManagedForm" uid="{bfee9a55-426c-42bb-8868-8ff5e84f14bb}">
+<ManagedForm databaseName="smarmotech" fileVersion="40100" gstVersion="60003" name="ManagedForm" uid="{bfee9a55-426c-42bb-8868-8ff5e84f14bb}">
   <AGSettings>
-    <DynamicProperties version="2"/>
+    <DynamicProperties version="4"/>
   </AGSettings>
   <Record additionalTables="" joinLeft="" joinOperator="" joinRight="" name="sclientes" order="" uid="{9c1c9934-632c-4221-845f-a8d348c37740}" where="">
     <RecordField colName="num_rnc1" fieldIdRef="10" name="num_rnc1" sqlTabName="formonly" table_alias_name="" uid="{2ddf9bee-4153-4363-b511-f9900085eda5}"/>
@@ -251,6 +251,6 @@
     </Folder>
   </Form>
   <DiagramLayout>
-    <![CDATA[AAAAAgAAAEwAewA3AGQAYQA4AGYAOQA3AGEALQA5AGEAOQA5AC0ANABkADUAMwAtAGEANAA4AGIALQBkADEAYgA0ADAAMgA4AGMANAAyADEAYQB9QHDAACnAADlASgAAdgABAj9gYk3S8an8AQAAAEwAewA5AGQAYwBjAGUAZgBkAGQALQAzADcAZgBjAC0ANAA3AGUAZAAtAGIAOAA3AGIALQAwAGMAOAA5AGEANAAwADcAMwAwAGMANAB9wHdzM1eZmYhAQMzNQmZoSz9wYk3S8an8AQAAAEwAewA4ADkAYQA5ADUAMAA5AGEALQAwAGMAYgBiAC0ANAAwADgAYQAtAGIAYgBmADMALQBlADAANAAzADIANwAwADEAOAA3AGUANgB9wGGzM0TmZm1AdBmZrbMzOz+GhysCDEm8AQAAAEwAewA5AGMAMQBjADkAOQAzADQALQA2ADMAMgBjAC0ANAAyADIAMQAtADgANAA1AGYALQBhADgAZAAzADQAOABjADMANwA3ADQAMAB9wEBmZnMzMzVAQTMzVTMzUD+AYk3S8an8AQAAAEwAewA1AGIANQA0AGYAMQAxAGMALQBlAGIAZgA0AC0ANAAxAGEAMQAtAGIAMQBiAGYALQA0ADgAMABmAGYAYwBkADkANABkADUAZAB9QGnmZqEzM4VAaJmZ0czNHT94k3S8an76AQAAAEwAewAwADYAZQBiADYAZABhADgALQBiADcAZAA5AC0ANAA4AGMANQAtAGEANwBkADYALQA1ADgANwA3AGYAYwA3AGYAMgAxADcAMAB9wGRMzOdmZkBAU8zNEGZnHj90euFHrhR7AQ==]]>
+    <![CDATA[AAAAAgAAAEwAewAwADYAZQBiADYAZABhADgALQBiADcAZAA5AC0ANAA4AGMANQAtAGEANwBkADYALQA1ADgANwA3AGYAYwA3AGYAMgAxADcAMAB9wGRMzOdmZkBAU8zNEGZnHj90euFHrhR7AQAAAEwAewA4ADkAYQA5ADUAMAA5AGEALQAwAGMAYgBiAC0ANAAwADgAYQAtAGIAYgBmADMALQBlADAANAAzADIANwAwADEAOAA3AGUANgB9wGGzM0TmZm1AdBmZrbMzOz+GhysCDEm8AQAAAEwAewA1AGIANQA0AGYAMQAxAGMALQBlAGIAZgA0AC0ANAAxAGEAMQAtAGIAMQBiAGYALQA0ADgAMABmAGYAYwBkADkANABkADUAZAB9QGnmZqEzM4VAaJmZ0czNHT94k3S8an76AQAAAEwAewA3AGQAYQA4AGYAOQA3AGEALQA5AGEAOQA5AC0ANABkADUAMwAtAGEANAA4AGIALQBkADEAYgA0ADAAMgA4AGMANAAyADEAYQB9QHDAACnAADlASgAAdgABAj9gYk3S8an8AQAAAEwAewA5AGQAYwBjAGUAZgBkAGQALQAzADcAZgBjAC0ANAA3AGUAZAAtAGIAOAA3AGIALQAwAGMAOAA5AGEANAAwADcAMwAwAGMANAB9wHdzM1eZmYhAQMzNQmZoSz9wYk3S8an8AQAAAEwAewA5AGMAMQBjADkAOQAzADQALQA2ADMAMgBjAC0ANAAyADIAMQAtADgANAA1AGYALQBhADgAZAAzADQAOABjADMANwA3ADQAMAB9wEBmZnMzMzVAQTMzVTMzUD+AYk3S8an8AQ==]]>
   </DiagramLayout>
 </ManagedForm>

PROYECTO/vedir/veprmt004.4gl

@@ -34,18 +34,14 @@ FUNCTION veprmt004()
     DISPLAY "Zonas" AT 6, 37
 
     MENU "OPCIONES"
-        COMMAND "Adicionar"
+        ON ACTION Adicionar
-            "<Esc> Adiciona Registro    <Delete> Cancela Operacion"
-            HELP 5
             LET int_flag = FALSE
             CLEAR FORM
             CALL vepcad004()
-        COMMAND "Consultar-modificar"
+        ON ACTION Consultar_modificar
-            "<Esc> Realiza Busqueda     <Delete> Cancela Operacion"
-            HELP 6
             LET int_flag = FALSE
             CALL vepcmf004()
-        COMMAND "Salir" "Retorna Menu Anterior"
+        ON ACTION Salir
             EXIT MENU
     END MENU
 END FUNCTION

PROYECTO/vedir/veprmt101.4gl

@@ -55,6 +55,7 @@ MAIN
  DEFER INTERRUPT
  CALL ARG_VAL(1) RETURNING usuarios
  CALL ARG_VAL(2) RETURNING clave
+ 
  CONNECT TO "marmotech" AS "IFMX" USER usuarios USING clave
  CONNECT TO "smarmotech" AS "MSSQL" USER usuarios USING clave