Merge pull request #564 from Adelantia/master

Añadido ventasinstock al modelo productos y a EditProducto.xml
NeoRazorX · Jul 17, 2018 · 7da4755 · 7da4755
2 parents 2bbe8e1 + 2f512b6
commit 7da4755
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Core/Model/Producto.php b/Core/Model/Producto.php
@@ -174,7 +174,7 @@ public function clear()
         $this->secompra = true;
         $this->sevende = true;
         $this->stockfis = 0.0;
-        $this->ventasinstock = false;
+        $this->ventasinstock = AppSettings::get('default', 'ventasinstock');
     }
 
     /**

diff --git a/Core/XMLView/EditProducto.xml b/Core/XMLView/EditProducto.xml
@@ -73,6 +73,9 @@
             <column name="bloqueado" title="blocked" order="130">
                 <widget type="checkbox" fieldname="bloqueado"/>
             </column>
+            <column name="ventasinstock" title="sale-no-stock" order="140">
+                <widget type="checkbox" fieldname="ventasinstock"/>
+            </column>
         </group>
         <group name="observations" numcolumns="12">
             <column name="observations" order="100">

diff --git a/Core/XMLView/SettingsDefault.xml b/Core/XMLView/SettingsDefault.xml
@@ -63,7 +63,7 @@
                     <values source="impuestos" fieldcode="codimpuesto" fieldtitle="descripcion"></values>
                 </widget>
             </column>
-            <column name="ventasinstock" numcolumns="3" order="140">
+            <column name="ventasinstock" title="sale-no-stock" numcolumns="3" order="140">
                 <widget type="checkbox" fieldname="ventasinstock" />
             </column>
         </group>