Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

front/salix/components/log/index.js

@@ -150,10 +150,10 @@ export default class Controller extends Section {
             if (value == null || value == '') return null;
             switch (prop) {
             case 'search':
-                const or = [{changedModelId: value}];
-                if (!/^[0-9]+$/.test(value))
-                    or.push({changedModelValue: {like: `%${value}%`}});
-                return {or};
+                if (/^[0-9]+$/.test(value))
+                    return {changedModelId: value};
+                else
+                    return {changedModelValue: {like: `%${value}%`}};
             case 'changes':
                 return {or: [
                     {oldInstance: {like: `%${value}%`}},

modules/client/back/methods/client/getCard.js

@@ -59,6 +59,12 @@ module.exports = function(Self) {
                         fields: ['id', 'name']
                     }
                 },
+                {
+                    relation: 'businessType',
+                    scope: {
+                        fields: ['description']
+                    }
+                },
                 {
                     relation: 'account',
                     scope: {

modules/client/front/descriptor/index.html

@@ -43,6 +43,10 @@
                     {{$ctrl.client.salesPersonUser.name}}
                 </span>
             </vn-label-value>
+            <vn-label-value
+                label="Business type"
+                value="{{$ctrl.client.businessType.description}}">
+            </vn-label-value>
         </div>
         <div class="icons">
             <vn-icon

modules/client/front/descriptor/locale/es.yml

@@ -8,3 +8,4 @@ Client invoices list: Listado de facturas del cliente
 Pay method: Forma de pago
 Unpaid Dated: "Fecha: {{dated | date:'dd/MM/yyyy'}}"
 Unpaid Amount: "Importe: {{amount | currency: 'EUR':2}}"
+Business type: Tipo de negocio

modules/item/back/locale/item-botanical/en.yml

@@ -1,4 +1,4 @@
-name: botanical
+name: botanical data
 columns:
     itemFk: item
     genusFk: genus

modules/item/back/locale/item-botanical/es.yml

@@ -1,4 +1,4 @@
-name: botánico
+name: datos botánicos
 columns:
     itemFk: artículo
     genusFk: género

modules/item/back/locale/item/en.yml

@@ -35,7 +35,7 @@ columns:
     packingOut: packing out
     hasMinPrice: has min price
     isFragile: fragile
-    isFloramondo: is floramondo
+    isFloramondo: floramondo
     packingShelve: packing shelve
     isLaid: laid
     inkFk: ink

modules/item/back/locale/item/es.yml

@@ -35,7 +35,7 @@ columns:
     packingOut: empaquetar
     hasMinPrice: tiene precio mínimo
     isFragile: frágil
-    isFloramondo: es floramondo
+    isFloramondo: floramondo
     packingShelve: estantería embalaje
     isLaid: puesto
     inkFk: tinta

modules/shelving/back/locale/shelving/en.yml

@@ -0,0 +1,11 @@
+name: shelving
+columns:
+    id: id
+    code: code
+    parkingFk: parking
+    isPrinted: printed
+    priority: priority
+    parked: parked
+    userFk: user
+    isSpam: SPAM
+    isRecyclable: recyclable

modules/shelving/back/locale/shelving/es.yml

@@ -0,0 +1,11 @@
+name: estantería
+columns:
+    id: id
+    code: código
+    parkingFk: parking
+    isPrinted: impreso
+    priority: prioridad
+    parked: aparcado
+    userFk: usuario
+    isSpam: SPAM
+    isRecyclable: reciclable

modules/ticket/back/locale/expedition/en.yml

@@ -12,3 +12,5 @@ columns:
     hostFk: PC
     isBox: box
     itemPackingTypeFk: packing type
+    externalId: external id
+    stateTypeFk: status

modules/ticket/back/locale/expedition/es.yml

@@ -12,3 +12,5 @@ columns:
     hostFk: PC
     isBox: caja
     itemPackingTypeFk: tipo empaquetado
+    externalId: id externo
+    stateTypeFk: estado

modules/worker/back/locale/business/en.yml

@@ -4,9 +4,20 @@ columns:
     companyCodeFk: company
     started: started
     ended: ended
+    workerBusiness: business
+    reasonEndFk: ending reason
     payedHolidays: payed holidays
+    occupationCodeFk: occupation
     workerFk: worker
+    notes: notes
+    departmentFk: department
+    workerBusinessProfessionalCategoryFk: professional category
     calendarTypeFk: calendar type
     isHourlyLabor: hourly labor
     workcenterFk: workcenter
+    rate: rate
+    workerBusinessCategoryFk: category
+    workerBusinessTypeFk: type
     amount: amount
+    workerBusinessAgreementFk: agreement
+    basicSalary: salary

modules/worker/back/locale/business/es.yml

@@ -4,9 +4,20 @@ columns:
     companyCodeFk: empresa
     started: iniciado
     ended: finalizado
+    workerBusiness: negocio
+    reasonEndFk: motivo finalización
     payedHolidays: vacaciones pagadas
+    occupationCodeFk: ocupación
     workerFk: trabajador
+    notes: notas
+    departmentFk: departamento
+    workerBusinessProfessionalCategoryFk: categoría profesional
     calendarTypeFk: tipo calendario
     isHourlyLabor: horario laboral
     workcenterFk: centro de trabajo
+    rate: tarifa
+    workerBusinessCategoryFk: categoría
+    workerBusinessTypeFk: tipo
     amount: salario
+    workerBusinessAgreementFk: acuerdo
+    basicSalary: salario base

modules/worker/back/locale/worker-document/en.yml

@@ -0,0 +1,6 @@
+name: document
+columns:
+    id: id
+    worker: worker
+    document: document
+    isReadableByWorker: readable by worker

modules/worker/back/locale/worker-document/es.yml

@@ -0,0 +1,6 @@
+name: documento
+columns:
+    id: id
+    worker: trabajador
+    document: documento
+    isReadableByWorker: accesible por trabajador