db/changes/10410-january/00-workerLabour.sql

@@ -0,0 +1,25 @@
+ALTER TABLE `postgresql`.`business` ADD payedHolidays INT NULL;
+ALTER TABLE `postgresql`.`business` CHANGE payedHolidays payedHolidays INT NULL AFTER reasonEndFk;
+
+CREATE OR REPLACE
+ALGORITHM = UNDEFINED VIEW `vn`.`workerLabour` AS
+select
+`b`.`business_id` AS `businessFk`,
+`p`.`id_trabajador` AS `workerFk`,
+`bl`.`workcenter_id` AS `workCenterFk`,
+`b`.`date_start` AS `started`,
+`b`.`date_end` AS `ended`,
+`d`.`id` AS `departmentFk`,
+`b`.`payedHolidays` AS `payedHolidays`
+from
+((((`postgresql`.`person` `p`
+join `postgresql`.`profile` `pr` on
+((`pr`.`person_id` = `p`.`person_id`)))
+join `postgresql`.`business` `b` on
+((`b`.`client_id` = `pr`.`profile_id`)))
+join `postgresql`.`business_labour` `bl` on
+((`b`.`business_id` = `bl`.`business_id`)))
+join `vn`.`department` `d` on
+((`d`.`id` = `bl`.`department_id`)))
+order by
+`b`.`date_start` desc

db/dump/fixtures.sql

@@ -1292,11 +1292,11 @@ INSERT INTO `vn`.`supplierAddress`(`id`, `supplierFk`, `nickname`, `street`, `pr
         (5, 442, 'GCR building',                  'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222'),
         (6, 442, 'The Gotham Tonight building',   'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222');
 
-INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`,`isFarmer`,`commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`)
+INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`, `commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`)
     VALUES
-        (1,   'Plants SL',             'Plants nick',   4100000001, 1, '06089160W', 0, 0, CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15, 4,  1, 1, 18, 'flowerPlants', 1),
+        (1,   'Plants SL',             'Plants nick',   4100000001, 1, '06089160W', 0, CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15, 4,  1, 1, 18, 'flowerPlants',  1),
-        (2,   'Farmer King',           'The farmer',    4000020002, 1, '87945234L', 1, 0, CURDATE(), 1, 'supplier address 2', 'SILLA',      2, 43022, 1, 2, 10, 93, 2, 8, 18, 'animals', 1),
+        (2,   'Farmer King',           'The farmer',    4000020002, 1, '87945234L', 0, CURDATE(), 1, 'supplier address 2', 'SILLA',      2, 43022, 1, 2, 10, 93, 2, 8, 18, 'animals',       1),
-        (442, 'Verdnatura Levante SL', 'Verdnatura',    5115000442, 1, '06815934E', 0, 0, CURDATE(), 1, 'supplier address 3', 'SILLA',      1, 43022, 1, 2, 15, 6,  9, 3, 18, 'flowerPlants', 1);
+        (442, 'Verdnatura Levante SL', 'Verdnatura',    5115000442, 1, '06815934E', 0, CURDATE(), 1, 'supplier address 3', 'SILLA',      1, 43022, 1, 2, 15, 6,  9, 3, 18, 'flowerPlants',  1);
 
 INSERT INTO `vn`.`supplierContact`(`id`, `supplierFk`, `phone`, `mobile`, `email`, `observation`, `name`)
     VALUES

front/core/styles/icons/salixfont.css

@@ -91,32 +91,26 @@
 }
 .icon-calc_volum .path1:before {
   content: "\e915";
-  color: rgb(0, 0, 0);
 }
 .icon-calc_volum .path2:before {
   content: "\e916";
   margin-left: -1em;
-  color: rgb(0, 0, 0);
 }
 .icon-calc_volum .path3:before {
   content: "\e917";
   margin-left: -1em;
-  color: rgb(0, 0, 0);
 }
 .icon-calc_volum .path4:before {
   content: "\e918";
   margin-left: -1em;
-  color: rgb(0, 0, 0);
 }
 .icon-calc_volum .path5:before {
   content: "\e919";
   margin-left: -1em;
-  color: rgb(0, 0, 0);
 }
 .icon-calc_volum .path6:before {
   content: "\e91a";
   margin-left: -1em;
-  color: rgb(255, 255, 255);
 }
 .icon-deliveryprices:before {
   content: "\e91c";
@@ -144,7 +138,6 @@
 }
 .icon-invoice:before {
   content: "\e924";
-  color: #5f5f5f;
 }
 .icon-supplier:before {
   content: "\e925";
@@ -160,7 +153,6 @@
 }
 .icon-shipment-01:before {
   content: "\e929";
-  color: #000;
 }
 .icon-inventory:before {
   content: "\e92b";
@@ -398,7 +390,6 @@
 }
 .icon-bucket:before {
   content: "\e97a";
-  color: #000;
 }
 .icon-mandatory:before {
   content: "\e97b";
@@ -411,7 +402,6 @@
 }
 .icon-invoices:before {
   content: "\e97f";
-  color: #000;
 }
 .icon-grid:before {
   content: "\e980";

front/core/styles/text.scss

@@ -51,7 +51,7 @@ h1, h2, h3, h4, h5, h6 {
     color: $color-main;
 }
 .text-secondary {
-    color: $color-font-secondary;
+    color: $color-font-light;
 }
 
 /* Helpers */

modules/entry/front/buy/import/index.html

@@ -179,7 +179,7 @@
                     ng-click="$ctrl.selectItem(item.id)">
                         <vn-td shrink>
                             <span
-                                ng-click="itemDescriptor.show($event, item.id)"
+                                vn-click-stop="itemDescriptor.show($event, item.id)"
                                 class="link">
                                 {{::item.id}}
                             </span>

modules/item/front/basic-data/index.html

@@ -296,7 +296,7 @@
                     ng-click="$ctrl.selectItem(item.id)">
                         <vn-td shrink>
                             <span
-                                ng-click="itemDescriptor.show($event, item.id)"
+                                vn-click-stop="itemDescriptor.show($event, item.id)"
                                 class="link">
                                 {{::item.id}}
                             </span>

modules/supplier/back/methods/supplier/getSummary.js

@@ -38,7 +38,6 @@ module.exports = Self => {
                 'payDemFk',
                 'payDay',
                 'account',
-                'isFarmer',
                 'sageTaxTypeFk',
                 'sageTransactionTypeFk',
                 'sageWithholdingFk',
@@ -102,6 +101,11 @@ module.exports = Self => {
             ]
         };
         let supplier = await Self.app.models.Supplier.findOne(filter);
+
+        const farmerCode = 2;
+        if (supplier.sageWithholdingFk == farmerCode)
+            supplier.isFarmer = true;
+
         return supplier;
     };
 };

modules/supplier/back/methods/supplier/specs/getSummary.spec.js

@@ -25,4 +25,12 @@ describe('Supplier getSummary()', () => {
 
         expect(payMethod.name).toEqual('PayMethod one');
     });
+
+    it(`should get if supplier is farmer by sageWithholdingFk`, async() => {
+        const supplier = await app.models.Supplier.findById(2);
+        const supplierSummary = await app.models.Supplier.getSummary(2);
+
+        expect(supplier.isFarmer).toBeUndefined();
+        expect(supplierSummary.isFarmer).toEqual(true);
+    });
 });

modules/supplier/back/models/supplier.json

@@ -27,9 +27,6 @@
         "nif": {
             "type": "string"
         },
-        "isFarmer": {
-            "type": "boolean"
-        },
         "phone": {
             "type": "number"
         },

modules/worker/back/methods/worker/holidays.js

@@ -112,6 +112,13 @@ module.exports = Self => {
 
         const contracts = await models.WorkerLabour.find(filter, myOptions);
 
+        let [firstContract] = contracts;
+        let payedHolidays;
+
+        if (firstContract.payedHolidays)
+            payedHolidays = firstContract.payedHolidays;
+        else payedHolidays = 0;
+
         let totalHolidays = 0;
         let holidaysEnjoyed = 0;
 
@@ -166,8 +173,7 @@ module.exports = Self => {
 
             return isLeapYear(year) ? 366 : 365;
         }
-
+        return {totalHolidays, holidaysEnjoyed, payedHolidays};
-        return {totalHolidays, holidaysEnjoyed};
     };
 
     function isLeapYear(year) {

modules/worker/back/models/worker-labour.json

@@ -9,16 +9,19 @@
     "properties": {
         "businessFk": {
             "id": true,
-            "type": "Number"
+            "type": "number"
         },
         "workerFk": {
-            "type": "Number"
+            "type": "number"
         },
         "started": {
             "type": "date"
         },
         "ended": {
             "type": "date"
+        },
+        "payedHolidays": {
+            "type": "number"
         }
     },
     "relations": {

modules/worker/front/calendar/index.html

@@ -28,6 +28,9 @@
                 {{'Used' | translate}} {{$ctrl.contractHolidays.holidaysEnjoyed}} 
                 {{'of' | translate}} {{$ctrl.contractHolidays.totalHolidays || 0}} {{'days' | translate}}
             </div>
+            <div>
+                {{'Paid holidays' | translate}} {{$ctrl.contractHolidays.payedHolidays}} {{'days' | translate}}
+            </div>
         </div>
 
         <div class="totalBox" style="text-align: center;">

modules/worker/front/calendar/index.js

@@ -71,6 +71,10 @@ class Controller extends Section {
         }
     }
 
+    get payedHolidays() {
+        return this._businessId;
+    }
+
     buildYearFilter() {
         const now = new Date();
         now.setFullYear(now.getFullYear() + 1);

modules/worker/front/calendar/locale/es.yml

@@ -8,4 +8,5 @@ days: días
 Choose an absence type from the right menu: Elige un tipo de ausencia desde el menú de la derecha
 To start adding absences, click an absence type from the right menu and then on the day you want to add an absence: Para empezar a añadir ausencias, haz clic en un tipo de ausencia desde el menu de la derecha y después en el día que quieres añadir la ausencia
 You can just add absences within the current year: Solo puedes añadir ausencias dentro del año actual
-Current day: Día actual
+Current day: Día actual
+Paid holidays: Vacaciones pagadas

package.json

@@ -9,7 +9,7 @@
         "url": "https://gitea.verdnatura.es/verdnatura/salix"
     },
     "engines": {
-        "node": ">=12"
+        "node": ">=14"
     },
     "dependencies": {
         "bmp-js": "^0.1.0",