Merge pull request #758 from Cristoto/task-111

Task 111
NeoRazorX · May 14, 2019 · a4a8007 · a4a8007
2 parents 063a5c4 + 820767d
commit a4a8007
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/Core/Model/Cliente.php b/Core/Model/Cliente.php
@@ -66,6 +66,18 @@ class Cliente extends Base\ComercialContact
      */
     public $idcontactoenv;
 
+    /**
+     *
+     * @var float
+     */
+    public $riesgoalcanzado;
+
+    /**
+     *
+     * @var float
+     */
+    public $riesgomax;
+
     /**
      * 
      * @param string $query

diff --git a/Core/Table/clientes.xml b/Core/Table/clientes.xml
@@ -101,6 +101,14 @@
         <name>regimeniva</name>
         <type>character varying(20)</type>
     </column>
+    <column>
+        <name>riesgoalcanzado</name>
+        <type>double precision</type>
+    </column>
+    <column>
+        <name>riesgomax</name>
+        <type>double precision</type>
+    </column>
     <column>
         <name>telefono1</name>
         <type>character varying(30)</type>

diff --git a/Core/XMLView/EditCliente.xml b/Core/XMLView/EditCliente.xml
@@ -102,6 +102,9 @@
                     <values></values>
                 </widget>
             </column>
+            <column name="max-warning" display="right" numcolumns="2" order="180">
+                <widget type="number" fieldname="riesgomax" />
+            </column>
         </group>
         <group name="other" title="other-data" numcolumns="12">
             <column name="create-date" numcolumns="3" order="100">

diff --git a/Core/XMLView/ListCliente.xml b/Core/XMLView/ListCliente.xml
@@ -39,21 +39,27 @@
         <column name="phone2" display="none" order="150">
             <widget type="text" fieldname="telefono2" />
         </column>
-        <column name="group" order="160">
+        <column name="reach-warning" display="right" numcolumns="2" order="160">
+            <widget type="number" fieldname="riesgoalcanzado" />
+        </column>
+        <column name="max-warning" display="right" numcolumns="2" order="170">
+            <widget type="number" fieldname="riesgomax" />
+        </column>
+        <column name="group" order="180">
             <widget type="select" fieldname="codgrupo" onclick="EditGrupoClientes">
                 <values source="gruposclientes" fieldcode="codgrupo" fieldtitle="nombre"></values>
             </widget>
         </column>
-        <column name="observations" order="180">
+        <column name="observations" order="190">
             <widget type="textarea" fieldname="observaciones" />
         </column>
-        <column name="blocked" display="none" order="190">
+        <column name="blocked" display="none" order="200">
             <widget type="checkbox" fieldname="debaja" />
         </column>
-        <column name="create-date" display="none" order="200">
+        <column name="create-date" display="none" order="210">
             <widget type="text" fieldname="fechaalta" />
         </column>
-        <column name="block-date" display="none" order="210">
+        <column name="block-date" display="none" order="220">
             <widget type="text" fieldname="fechabaja" />
         </column>
     </columns>