Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

CHANGELOG.md

@@ -24,13 +24,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - (Tickets -> Crear Factura) Al facturar se envia automáticamente el pdf al cliente
 - (Artículos -> Histórico) Filtro para mostrar lo anterior al inventario
-
+- (Trabajadores -> Nuevo trabajador) Permite elegir el método de pago
 
 ### Changed
 - (Trabajadores -> Nuevo trabajador) Los clientes se crean sin 'TR' pero se añade tipo de negocio 'Trabajador'
 
 ### Fixed
 - (Tickets -> Líneas) Se permite hacer split de líneas al mismo ticket
+- (Tickets -> Cambiar estado) Ahora muestra la lista completa de todos los estados
 
 
 

back/methods/edi/sql/item.sql

@@ -1,9 +1,9 @@
 LOAD DATA LOCAL INFILE ?
 	INTO TABLE `edi`.`item`
+	CHARACTER SET ascii
 	FIELDS TERMINATED BY ';'
 	LINES TERMINATED BY '\n' (@col1, @col2, @col3, @col4, @col5, @col6, @col7, @col8, @col9, @col10, @col11, @col12)
-	SET
+	SET id = @col2,
-		id = @col2,
 		product_name = @col4,
 		name = @col5,
 		plant_id = @col7,
@@ -11,3 +11,4 @@ LOAD DATA LOCAL INFILE ?
 		entry_date = STR_TO_DATE(@col10, '%Y%m%d'),
 		expiry_date = IFNULL(NULL,STR_TO_DATE(@col11, '%Y%m%d')),
 		change_date_time = STR_TO_DATE(@col12, '%Y%m%d%H%i')
+		

back/methods/edi/updateData.js

@@ -121,7 +121,8 @@ module.exports = Self => {
 				host: ftpConfig.host,
 				username: ftpConfig.user,
 				password: ftpConfig.password,
-                procotol: 'ftp'
+				procotol: 'ftp',
+				additionalLftpCommands: 'set ssl:verify-certificate no'
 			});
 		}
 
@@ -132,7 +133,7 @@ module.exports = Self => {
 		const ftpClient = await getFtpClient();
 		console.debug(`Checking checksum for file ${file.name}...`);
 
-        ftpClient.cat(`codes/${file.name}.txt`);
+		ftpClient.cat(`codes/${file.name}.TXT`);
 
 		const response = await new Promise((resolve, reject) => {
 			ftpClient.exec((err, response) => {

db/changes/231201/00-wagon.sql

@@ -56,8 +56,6 @@ CREATE TABLE `vn`.`collectionWagonTicket` (
 
 ALTER TABLE `vn`.`wagon` ADD `typeFk` int(11) unsigned NOT NULL;
 ALTER TABLE `vn`.`wagon` ADD `label` int(11) unsigned NOT NULL;
-ALTER TABLE `vn`.`wagon` ADD CONSTRAINT `wagon_type` FOREIGN KEY (`typeFk`) REFERENCES `wagonType` (`id`) ON UPDATE CASCADE;
-
 INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
     VALUES
         ('WagonType', '*', '*', 'ALLOW', 'ROLE', 'productionAssi'),
@@ -70,3 +68,4 @@ INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `pri
         ('WagonType', 'createWagonType', '*', 'ALLOW', 'ROLE', 'productionAssi'),
         ('WagonType', 'deleteWagonType', '*', 'ALLOW', 'ROLE', 'productionAssi'),
         ('WagonType', 'editWagonType', '*', 'ALLOW', 'ROLE', 'productionAssi');
+

db/changes/232001/00-wagon.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`wagon` ADD CONSTRAINT `wagon_type` FOREIGN KEY (`typeFk`) REFERENCES `wagonType` (`id`) ON UPDATE CASCADE;

db/changes/232201/00-workerConfigPayMethod.sql

@@ -1,7 +1,7 @@
 ALTER TABLE `vn`.`workerConfig` ADD payMethodFk tinyint(3) unsigned NULL;
 ALTER TABLE `vn`.`workerConfig` ADD CONSTRAINT workerConfig_FK FOREIGN KEY (roleFk) REFERENCES account.`role`(id) ON DELETE RESTRICT ON UPDATE CASCADE;
 ALTER TABLE `vn`.`workerConfig` ADD CONSTRAINT workerConfig_FK_1 FOREIGN KEY (payMethodFk) REFERENCES `vn`.`payMethod`(id) ON DELETE SET NULL ON UPDATE CASCADE;
--- Cuando se apruebe el PR quitar y poner en redmine para hacerse manualmente
+
 UPDATE `vn`.`workerConfig`
     SET payMethodFk = 4
     WHERE id=1;

db/dump/structure.sql

@@ -61950,7 +61950,6 @@ BEGIN
  * @vWarehouseFk almacen donde buscar
  * @vDate Si la fecha es null, muestra el histórico desde el inventario. Si la fecha no es null, muestra histórico desde la fecha pasada.
  */
-
 	DECLARE vDateInventory DATETIME;
 	DECLARE vInvCalculated INT;
 

docker-compose.yml

@@ -43,7 +43,7 @@ services:
           - node.role == worker
       resources:
         limits:
-          memory: 4G
+          memory: 8G
 configs:
   datasources:
     external: true

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))
-                if (!/^[0-9]+$/.test(value))
+                    return {changedModelId: value};
-                    or.push({changedModelValue: {like: `%${value}%`}});
+                else
-                return {or};
+                    return {changedModelValue: {like: `%${value}%`}};
             case 'changes':
                 return {or: [
                     {oldInstance: {like: `%${value}%`}},

modules/account/back/locale/vn-user/en.yml

@@ -15,3 +15,7 @@ columns:
     image: image
     hasGrant: has grant
     userFk: user
+    recoverPass: recover password
+    role: role
+    sync: pending sync
+    lastPassChange: password changed

modules/account/back/locale/vn-user/es.yml

@@ -15,3 +15,7 @@ columns:
     image: imagen
     hasGrant: puede delegar
     userFk: usuario
+    recoverPass: recuperar contraseña
+    role: rol
+    sync: Pendiente de sincronizar
+    lastPassChange: contraseña modificada

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-dms/en.yml

@@ -1,6 +1,6 @@
 name: document
 columns:
     id: id
-    dmsFk: dms
+    worker: worker
-    workerFk: worker
+    document: document
     isReadableByWorker: readable by worker

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

@@ -1,6 +1,6 @@
 name: documento
 columns:
     id: id
-    dmsFk: dms
+    worker: trabajador
-    workerFk: trabajador
+    document: documento
-    isReadableByWorker: legible por trabajador
+    isReadableByWorker: accesible por trabajador

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

@@ -1,20 +1,32 @@
 name: worker
 columns:
     id: id
+    code: code
     firstName: first name
     lastName: last name
+    sub: buyer number
+    photo: photo
     phone: phone
+    mobileExtension: mobile extension
     userFk: user
     bossFk: boss
+    fiDueDate: FI due date
+    hasMachineryAuthorized: machinery authorized
+    seniority: seniority
+    isTodayRelative: today relative
+    isF11Allowed: F11 allowed
+    sectorFk: sector
     maritalStatus: marital status
+    labelerFk: labeler
     originCountryFk: origin country
     educationLevelFk: education level
     SSN: SSN
-    labelerFk: labeler
+    fi: fiscal identifier
-    mobileExtension: mobile extension
+    birth: birth date
-    code: code
+    isDisable: disabled
+    isFreelance: freelance
+    isSsDiscounted: SS discounted
+    sex: sex
+    businessFk: current contract
+    balance: balance
     locker: locker
-    workerFk: worker
-    sectorFk: sector
-
-

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

@@ -1,20 +1,32 @@
 name: trabajador
 columns:
     id: id
+    code: código
     firstName: nombre
     lastName: apellido
+    sub: número comprador
+    photo: foto
     phone: teléfono
+    mobileExtension: extensión móvil
     userFk: usuario
     bossFk: jefe
+    fiDueDate: caducidad DNI
+    hasMachineryAuthorized: maquinaria autorizada
+    seniority: antigüedad
+    isTodayRelative: relativo hoy
+    isF11Allowed: F11 autorizado
+    sectorFk: sector
     maritalStatus: estado civil
+    labelerFk: etiquetadora
     originCountryFk: país origen
     educationLevelFk: nivel educativo
     SSN: SSN
-    labelerFk: etiquetadora
+    fi: identificador fiscal
-    mobileExtension: extensión móvil
+    birth: nacimiento
-    code: código
+    isDisable: deshabilitado
-    locker: casillero
+    isFreelance: autónomo
-    workerFk: trabajador
+    isSsDiscounted: descuento SS
-    sectorFk: sector
+    sex: sexo
-
+    businessFk: contrato actual
-
+    balance: saldo
+    locker: taquilla

modules/worker/back/methods/worker-time-control/sendMail.js

@@ -230,21 +230,21 @@ module.exports = Self => {
                         }, myOptions);
                     } else {
                         const weekDay = day.dated.getDay();
-                        const journeys = await models.Journey.find({
+                        const journeys = await models.BusinessSchedule.find({
                             where: {
-                                business_id: day.businessFk,
+                                businessFk: day.businessFk,
-                                day_id: weekDay
+                                weekday: weekDay
                             }
                         }, myOptions);
 
                         let timeTableDecimalInSeconds = 0;
                         for (let journey of journeys) {
                             const start = Date.vnNew();
-                            const [startHours, startMinutes, startSeconds] = getTime(journey.start);
+                            const [startHours, startMinutes, startSeconds] = getTime(journey.started);
                             start.setHours(startHours, startMinutes, startSeconds, 0);
 
                             const end = Date.vnNew();
-                            const [endHours, endMinutes, endSeconds] = getTime(journey.end);
+                            const [endHours, endMinutes, endSeconds] = getTime(journey.ended);
                             end.setHours(endHours, endMinutes, endSeconds, 0);
 
                             const result = (end - start) / 1000;
@@ -255,7 +255,7 @@ module.exports = Self => {
                             const timeTableDecimal = timeTableDecimalInSeconds / 3600;
                             if (day.timeWorkDecimal == timeTableDecimal) {
                                 const timed = new Date(day.dated);
-                                const [startHours, startMinutes, startSeconds] = getTime(journey.start);
+                                const [startHours, startMinutes, startSeconds] = getTime(journey.started);
                                 await models.WorkerTimeControl.create({
                                     userFk: day.workerFk,
                                     timed: timed.setHours(startHours, startMinutes, startSeconds),
@@ -263,7 +263,7 @@ module.exports = Self => {
                                     isSendMail: true
                                 }, myOptions);
 
-                                const [endHours, endMinutes, endSeconds] = getTime(journey.end);
+                                const [endHours, endMinutes, endSeconds] = getTime(journey.ended);
                                 await models.WorkerTimeControl.create({
                                     userFk: day.workerFk,
                                     timed: timed.setHours(endHours, endMinutes, endSeconds),
@@ -276,7 +276,7 @@ module.exports = Self => {
                                 });
                                 if (journey == minStart) {
                                     const timed = new Date(day.dated);
-                                    const [startHours, startMinutes, startSeconds] = getTime(journey.start);
+                                    const [startHours, startMinutes, startSeconds] = getTime(journey.started);
                                     await models.WorkerTimeControl.create({
                                         userFk: day.workerFk,
                                         timed: timed.setHours(startHours, startMinutes, startSeconds),
@@ -304,7 +304,7 @@ module.exports = Self => {
                                 });
                                 if (journey == minStart) {
                                     const timed = new Date(day.dated);
-                                    const [startHours, startMinutes, startSeconds] = getTime(journey.start);
+                                    const [startHours, startMinutes, startSeconds] = getTime(journey.started);
                                     await models.WorkerTimeControl.create({
                                         userFk: day.workerFk,
                                         timed: timed.setHours(startHours + 1, startMinutes, startSeconds),

modules/worker/back/model-config.json

@@ -2,6 +2,9 @@
     "AbsenceType": {
         "dataSource": "vn"
     },
+    "BusinessSchedule": {
+        "dataSource": "vn"
+    },
     "Calendar": {
         "dataSource": "vn"
     },
@@ -38,9 +41,6 @@
     "EducationLevel": {
         "dataSource": "vn"
     },
-    "Journey": {
-        "dataSource": "vn"
-    },
     "ProfileType":{
         "dataSource": "vn"
     },

modules/worker/back/models/business-schedule.json

@@ -1,26 +1,26 @@
 {
-    "name": "Journey",
+    "name": "BusinessSchedule",
     "base": "VnModel",
     "options": {
         "mysql": {
-            "table": "postgresql.journey"
+            "table": "businessSchedule"
         }
     },
     "properties": {
-        "journey_id": {
+        "id": {
             "id": true,
             "type": "number"
         },
-        "day_id": {
+        "weekday": {
             "type": "number"
         },
-        "start": {
+        "started": {
             "type": "date"
         },
-        "end": {
+        "ended": {
             "type": "date"
         },
-        "business_id": {
+        "businessFk": {
             "type": "number"
         }
     }

modules/worker/front/routes.json

@@ -75,7 +75,7 @@
             "state": "worker.card.workerLog",
             "component": "vn-worker-log",
             "description": "Log",
-            "acl": ["salesAssistant"]
+            "acl": ["hr"]
         }, {
             "url": "/note",
             "state": "worker.card.note",