Merge branch 'dev' into 4797-lilium-worker-notifications

CHANGELOG.md

@@ -12,7 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -  (Trabajadores -> Nuevo trabajador)  Nueva sección
 
 ### Changed
--
+- (Entradas -> Compras) Cambiados los campos "Precio Grouping/Packing" por "PVP" y "Precio" por "Coste"
+- (Artículos -> Últimas entradas) Cambiados los campos "P.P.U." y "P.P.P." por "PVP"
 
 ### Fixed
 - (Artículos -> Etiquetas) Permite intercambiar la relevancia entre dos etiquetas.

loopback/locale/en.json

@@ -67,7 +67,7 @@
 	"Changed client paymethod": "I have changed the pay method for client [{{clientName}} ({{clientId}})]({{{url}}})",
 	"Sent units from ticket": "I sent *{{quantity}}* units of [{{concept}} ({{itemId}})]({{{itemUrl}}}) to *\"{{nickname}}\"* coming from ticket id [{{ticketId}}]({{{ticketUrl}}})",
 	"Change quantity": "{{concept}} change of {{oldQuantity}} to {{newQuantity}}",
-    "Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
+	"Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
 	"Claim state has changed to incomplete": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *incomplete*",
 	"Claim state has changed to canceled": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *canceled*",
 	"Customs agent is required for a non UEE member": "Customs agent is required for a non UEE member",
@@ -137,15 +137,18 @@
 	"Password does not meet requirements": "Password does not meet requirements",
 	"You don't have privileges to change the zone": "You don't have privileges to change the zone or for these parameters there are more than one shipping options, talk to agencies",
 	"Not enough privileges to edit a client": "Not enough privileges to edit a client",
-    "Claim pickup order sent": "Claim pickup order sent [{{claimId}}]({{{claimUrl}}}) to client *{{clientName}}*",
+	"Claim pickup order sent": "Claim pickup order sent [{{claimId}}]({{{claimUrl}}}) to client *{{clientName}}*",
 	"You don't have grant privilege": "You don't have grant privilege",
 	"You don't own the role and you can't assign it to another user": "You don't own the role and you can't assign it to another user",
-    "Email verify": "Email verify",
+	"Email verify": "Email verify",
 	"Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) merged with [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
-    "Sale(s) blocked, please contact production": "Sale(s) blocked, please contact production",
 	"App locked": "App locked by user {{userId}}",
-    "The sales of the receiver ticket can't be modified": "The sales of the receiver ticket can't be modified",
+	"The sales of the receiver ticket can't be modified": "The sales of the receiver ticket can't be modified",
-    "Receipt's bank was not found": "Receipt's bank was not found",
+	"Receipt's bank was not found": "Receipt's bank was not found",
-    "This receipt was not compensated": "This receipt was not compensated",
+	"This receipt was not compensated": "This receipt was not compensated",
-    "Client's email was not found": "Client's email was not found"
+	"Client's email was not found": "Client's email was not found",
+	"It is not possible to modify tracked sales": "It is not possible to modify tracked sales",
+	"It is not possible to modify sales that their articles are from Floramondo": "It is not possible to modify sales that their articles are from Floramondo",
+	"It is not possible to modify cloned sales": "It is not possible to modify cloned sales",
+	"Valid priorities: 1,2,3": "Valid priorities: 1,2,3"
 }

loopback/locale/es.json

@@ -84,7 +84,6 @@
 	"The current ticket can't be modified": "El ticket actual no puede ser modificado",
 	"The current claim can't be modified": "La reclamación actual no puede ser modificada",
 	"The sales of this ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas",
-	"Sale(s) blocked, contact production": "Linea(s) bloqueada(s), contacte con produccion",
 	"Please select at least one sale": "Por favor selecciona al menos una linea",
 	"All sales must belong to the same ticket": "Todas las lineas deben pertenecer al mismo ticket",
 	"NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
@@ -259,5 +258,8 @@
 	"Try again": "Vuelve a intentarlo",
 	"Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9",
 	"Failed to upload file": "Error al subir archivo",
-	"The DOCUWARE PDF document does not exists": "The DOCUWARE PDF document does not exists"
+	"The DOCUWARE PDF document does not exists": "El documento PDF Docuware no existe",
+    "It is not possible to modify tracked sales": "No es posible modificar líneas de pedido que se hayan empezado a preparar",
+    "It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",
+    "It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas"
 }

modules/entry/front/latest-buys/locale/es.yml

@@ -1,5 +1,5 @@
 Edit buy(s): Editar compra(s)
-Buying value: Precio
+Buying value: Coste
 Freight value: Porte
 Commission value: Comisión
 Package value: Embalaje

modules/entry/front/summary/index.html

@@ -114,8 +114,7 @@
                         <th translate center field="grouping">Grouping</th>
                         <th translate center field="buyingValue">Buying value</th>
                         <th translate center field="price3">Import</th>
-                        <th translate center expand field="price2">Grouping price</th>
+                        <th translate center expand field="price">PVP</th>
-                        <th translate center expand field="price3">Packing price</th>
                     </tr>
                 </thead>
                 <tbody ng-repeat="line in buys">
@@ -136,8 +135,7 @@
                         </vn-td>
                         <td center title="{{::line.buyingValue | currency: 'EUR':2}}">{{::line.buyingValue | currency: 'EUR':2}}</td>
                         <td center title="{{::line.quantity * line.buyingValue | currency: 'EUR':2}}">{{::line.quantity * line.buyingValue | currency: 'EUR':2}}</td>
-                        <td center title="{{::line.price2 | currency: 'EUR':2}}">{{::line.price2 | currency: 'EUR':2}}</td>
+                        <td center title="Grouping / Packing">{{::line.price2 | currency: 'EUR':2 | dashIfEmpty}} / {{::line.price3 | currency: 'EUR':2 | dashIfEmpty}}</td>
-                        <td center title="{{::line.price3 | currency: 'EUR':2}}">{{::line.price3 | currency: 'EUR':2}}</td>
                     </tr>
                     <tr class="dark-row">
                         <td shrink>

modules/item/front/last-entries/index.html

@@ -35,8 +35,7 @@
                         <vn-th field="warehouseFk">Warehouse</vn-th>
                         <vn-th field="landed">Landed</vn-th>
                         <vn-th number>Entry</vn-th>
-                        <vn-th number vn-tooltip="Price Per Unit">P.P.U</vn-th>
+                        <vn-th vn-tooltip="Grouping / Packing">PVP</vn-th>
-                        <vn-th number vn-tooltip="Price Per Package">P.P.P</vn-th>
                         <vn-th number class="expendable">Label</vn-th>
                         <vn-th number>Packing</vn-th>
                         <vn-th number>Grouping</vn-th>
@@ -65,8 +64,9 @@
                                 {{::entry.entryFk | dashIfEmpty}}
                             </span>
                         </vn-td>
-                        <vn-td number>{{::entry.price2 | dashIfEmpty}}</vn-td>
+                        <vn-td title="{{::entry.price2 | currency: 'EUR':2 | dashIfEmpty}} / {{::entry.price3 | currency: 'EUR':2 | dashIfEmpty}}">
-                        <vn-td number>{{::entry.price3 | dashIfEmpty}}</vn-td>
+                            {{::entry.price2 | currency: 'EUR':2 | dashIfEmpty}} / {{::entry.price3 | currency: 'EUR':2 | dashIfEmpty}}
+                        </vn-td>
                         <vn-td number class="expendable">{{entry.stickers | dashIfEmpty}}</vn-td>
                         <vn-td number>
                             <vn-chip translate-attr="{title: 'Packing'}" ng-class="{'message': entry.groupingMode == 2}">
@@ -84,11 +84,11 @@
                             class="expendable">
                                 <span
                                     vn-tooltip="
-                                    {{::$ctrl.$t('Cost')}}: {{::entry.buyingValue| dashIfEmpty}}<br> 
+                                    {{::$ctrl.$t('Cost')}}: {{::entry.buyingValue | currency: 'EUR':2 | dashIfEmpty}}<br>
-                                    {{::$ctrl.$t('Package')}}: {{::entry.packageValue| dashIfEmpty}}<br>
+                                    {{::$ctrl.$t('Package')}}: {{::entry.packageValue | currency: 'EUR':2 | dashIfEmpty}}<br>
-                                    {{::$ctrl.$t('Freight')}}: {{::entry.freightValue| dashIfEmpty}}<br>
+                                    {{::$ctrl.$t('Freight')}}: {{::entry.freightValue | currency: 'EUR':2 | dashIfEmpty}}<br>
-                                    {{::$ctrl.$t('Comission')}}: {{::entry.comissionValue| dashIfEmpty}}">
+                                    {{::$ctrl.$t('Comission')}}: {{::entry.comissionValue | currency: 'EUR':2 | dashIfEmpty}}">
-                                    {{::entry.cost | dashIfEmpty}}
+                                    {{::entry.cost | currency: 'EUR':2 | dashIfEmpty}}
                                 </span>
                         </vn-td>
                         <vn-td number>{{::entry.weight | dashIfEmpty}}</vn-td>

modules/ticket/back/methods/sale/canEdit.js

@@ -56,6 +56,13 @@ module.exports = Self => {
         const shouldEditCloned = canEditCloned || !hasSaleCloned;
         const shouldEditFloramondo = canEditFloramondo || !hasSaleFloramondo;
 
-        return shouldEditTracked && shouldEditCloned && shouldEditFloramondo;
+        if (!shouldEditTracked)
+            throw new UserError('It is not possible to modify tracked sales');
+        if (!shouldEditCloned)
+            throw new UserError('It is not possible to modify cloned sales');
+        if (!shouldEditFloramondo)
+            throw new UserError('It is not possible to modify sales that their articles are from Floramondo');
+
+        return true;
     };
 };

modules/ticket/back/methods/sale/deleteSales.js

@@ -43,9 +43,7 @@ module.exports = Self => {
         try {
             const saleIds = sales.map(sale => sale.id);
 
-            const canEditSales = await models.Sale.canEdit(ctx, saleIds, myOptions);
+            await models.Sale.canEdit(ctx, saleIds, myOptions);
-            if (!canEditSales)
-                throw new UserError(`Sale(s) blocked, please contact production`);
 
             const ticket = await models.Ticket.findById(ticketId, {
                 include: {

modules/ticket/back/methods/sale/recalculatePrice.js

@@ -37,9 +37,7 @@ module.exports = Self => {
         try {
             const salesIds = sales.map(sale => sale.id);
 
-            const canEditSale = await models.Sale.canEdit(ctx, salesIds, myOptions);
+            await models.Sale.canEdit(ctx, salesIds, myOptions);
-            if (!canEditSale)
-                throw new UserError(`Sale(s) blocked, please contact production`);
 
             const query = `
                 DROP TEMPORARY TABLE IF EXISTS tmp.recalculateSales;

modules/ticket/back/methods/sale/reserve.js

@@ -51,9 +51,7 @@ module.exports = Self => {
         try {
             const salesIds = sales.map(sale => sale.id);
 
-            const canEditSale = await models.Sale.canEdit(ctx, salesIds, myOptions);
+            await models.Sale.canEdit(ctx, salesIds, myOptions);
-            if (!canEditSale)
-                throw new UserError(`Sale(s) blocked, please contact production`);
 
             let changesMade = '';
             const promises = [];

modules/ticket/back/methods/sale/specs/canEdit.spec.js

@@ -50,7 +50,7 @@ describe('sale canEdit()', () => {
 
         it('should return false if any of the sales has a saleTracking record', async() => {
             const tx = await models.Sale.beginTransaction({});
-
+            let error;
             try {
                 const options = {transaction: tx};
 
@@ -59,15 +59,15 @@ describe('sale canEdit()', () => {
 
                 const sales = [31];
 
-                const result = await models.Sale.canEdit(ctx, sales, options);
+                await models.Sale.canEdit(ctx, sales, options);
-
-                expect(result).toEqual(false);
-
                 await tx.rollback();
             } catch (e) {
                 await tx.rollback();
-                throw e;
+                error = e;
             }
+
+            expect(error).toEqual(
+                new Error('It is not possible to modify tracked sales'));
         });
     });
 
@@ -75,22 +75,22 @@ describe('sale canEdit()', () => {
         const saleCloned = [29];
         it('should return false if any of the sales is cloned', async() => {
             const tx = await models.Sale.beginTransaction({});
-
+            let error;
             try {
                 const options = {transaction: tx};
 
                 const buyerId = 35;
                 const ctx = {req: {accessToken: {userId: buyerId}}};
 
-                const result = await models.Sale.canEdit(ctx, saleCloned, options);
+                await models.Sale.canEdit(ctx, saleCloned, options);
-
-                expect(result).toEqual(false);
-
                 await tx.rollback();
             } catch (e) {
                 await tx.rollback();
-                throw e;
+                error = e;
             }
+
+            expect(error).toEqual(
+                new Error('It is not possible to modify cloned sales'));
         });
 
         it('should return true if any of the sales is cloned and has the correct role', async() => {
@@ -130,7 +130,7 @@ describe('sale canEdit()', () => {
         it('should return false if any of the sales isFloramondo', async() => {
             const tx = await models.Sale.beginTransaction({});
             const sales = [26];
-
+            let error;
             try {
                 const options = {transaction: tx};
 
@@ -140,15 +140,15 @@ describe('sale canEdit()', () => {
                 const saleToEdit = await models.Sale.findById(sales[0], null, options);
                 await saleToEdit.updateAttribute('itemFk', 9, options);
 
-                const result = await models.Sale.canEdit(ctx, sales, options);
+                await models.Sale.canEdit(ctx, sales, options);
-
-                expect(result).toEqual(false);
-
                 await tx.rollback();
             } catch (e) {
                 await tx.rollback();
-                throw e;
+                error = e;
             }
+
+            expect(error).toEqual(
+                new Error('It is not possible to modify sales that their articles are from Floramondo'));
         });
 
         it('should return true if any of the sales is of isFloramondo and has the correct role', async() => {

modules/ticket/back/methods/sale/updateConcept.js

@@ -40,10 +40,7 @@ module.exports = Self => {
         try {
             const currentLine = await models.Sale.findById(id, null, myOptions);
 
-            const canEditSale = await models.Sale.canEdit(ctx, [id], myOptions);
+            await models.Sale.canEdit(ctx, [id], myOptions);
-
-            if (!canEditSale)
-                throw new UserError(`Sale(s) blocked, please contact production`);
 
             const line = await currentLine.updateAttributes({concept: newConcept}, myOptions);
 

modules/ticket/back/methods/sale/updatePrice.js

@@ -66,9 +66,7 @@ module.exports = Self => {
 
             const sale = await models.Sale.findById(id, filter, myOptions);
 
-            const canEditSale = await models.Sale.canEdit(ctx, [id], myOptions);
+            await models.Sale.canEdit(ctx, [id], myOptions);
-            if (!canEditSale)
-                throw new UserError(`Sale(s) blocked, please contact production`);
 
             const oldPrice = sale.price;
             const userId = ctx.req.accessToken.userId;

modules/ticket/back/methods/sale/updateQuantity.js

@@ -41,9 +41,7 @@ module.exports = Self => {
         }
 
         try {
-            const canEditSale = await models.Sale.canEdit(ctx, [id], myOptions);
+            await models.Sale.canEdit(ctx, [id], myOptions);
-            if (!canEditSale)
-                throw new UserError(`Sale(s) blocked, please contact production`);
 
             const filter = {
                 include: {

print/templates/reports/receipt/receipt.html

@@ -4,7 +4,7 @@
             <div class="content">
                 <h1 class="title centered uppercase">{{$t('title')}}</h1>
                 <p class="centered">
-                    Recibo de <strong class="uppercase">{{client.socialName}}</strong>,
+                    Recibo #{{receipt.id}} de <strong class="uppercase">{{client.socialName}}</strong>,
                     la cantidad de <strong>{{receipt.amountPaid}} €</strong>
                     en concepto de 'entrega a cuenta'.
                 </p>