Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date

modules/supplier/front/agency-term/index/index.html

@@ -24,36 +24,42 @@
             </vn-textfield>
             <vn-input-number 
                 type="number"
+                step="0.01"
                 label="Minimum M3"
                 ng-model="supplierAgencyTerm.minimumM3"
                 rule>
             </vn-input-number>
             <vn-input-number 
                 type="number"
+                step="0.01"
                 label="Package Price"
                 ng-model="supplierAgencyTerm.packagePrice"
                 rule>
             </vn-input-number>
             <vn-input-number 
                 type="number"
+                step="0.01"
                 label="Km Price"
                 ng-model="supplierAgencyTerm.kmPrice"
                 rule>
             </vn-input-number>
             <vn-input-number 
                 type="number"
+                step="0.01"
                 label="M3 Price"
                 ng-model="supplierAgencyTerm.m3Price"
                 rule>
             </vn-input-number>
             <vn-input-number 
                 type="number"
+                step="0.01"
                 label="Route Price"
                 ng-model="supplierAgencyTerm.routePrice"
                 rule>
             </vn-input-number>
             <vn-input-number 
                 type="number"
+                step="0.01"
                 label="Minimum Km"
                 ng-model="supplierAgencyTerm.minimumKm"
                 rule>

modules/ticket/back/methods/state/editableStates.js

@@ -24,7 +24,7 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        let statesList = await models.State.find({where: filter.where}, myOptions);
+        let statesList = await models.State.find(filter, myOptions);
         const isProduction = await models.Account.hasRole(userId, 'production', myOptions);
         const isSalesPerson = await models.Account.hasRole(userId, 'salesPerson', myOptions);
         const isAdministrative = await models.Account.hasRole(userId, 'administrative', myOptions);

print/templates/reports/receipt/receipt.html

@@ -4,9 +4,9 @@
             <div class="content">
                 <h1 class="title centered uppercase">{{$t('title')}}</h1>
                 <p class="centered">
-                    Recibo de <strong class="uppercase">{{client.socialName}}</strong>, la cantidad de
+                    Recibo de <strong class="uppercase">{{client.socialName}}</strong>,
-                    <strong>{{receipt.amountPaid}} €</strong> en concepto de 'entrega a cuenta', quedando pendiente en
+                    la cantidad de <strong>{{receipt.amountPaid}} €</strong>
-                    la cuenta del cliente un saldo de <strong>{{receipt.amountUnpaid}} €</strong>.
+                    en concepto de 'entrega a cuenta'.
                 </p>
                 <div class="signature">
                     <img v-bind:src="getReportSrc('signature.png')" />

print/templates/reports/receipt/sql/receipt.sql

@@ -1,11 +1,10 @@
-SELECT 
+SELECT
-    r.id, 
+    r.id,
-    r.amountPaid, 
+    r.amountPaid,
-    cr.amount AS amountUnpaid, 
+    r.payed,
-    r.payed, 
     r.companyFk
 FROM receipt r
     JOIN client c ON c.id = r.clientFk
     JOIN vn.clientRisk cr ON cr.clientFk = c.id
         AND cr.companyFk = r.companyFk
-WHERE r.id = ?
+WHERE r.id = ?