2024-05-14 05:44:13 +00:00
168 changed files with 2093 additions and 2568 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,7 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

-## [24.18.01] - 2024-05-02
+## [24.20.01] - 2024-05-14
+
+### Fixed
+- (Worker -> time-control) Corrección de errores
+- (InvoiceOut -> Crear factura) Cuando falla al crear una factura, se devuelve un error
+- (Worker -> Ver albarán) Ya no aparece la página en blanco
+
+## [24.18.01] - 2024-05-07

 ## [24.16.01] - 2024-04-18

--- a/back/methods/vn-user/renew-token.js
+++ b/back/methods/vn-user/renew-token.js
@ -12,8 +12,8 @@ module.exports = Self => {
        http: {
            path: `/renewToken`,
            verb: 'POST'
-        }
-    });
+        },
+        accessScopes: ['DEFAULT', 'read:multimedia']});

    Self.renewToken = async function(ctx) {
        const {accessToken: token} = ctx.req;
--- a/back/model-config.json
+++ b/back/model-config.json
@ -124,6 +124,9 @@
    "Postcode": {
        "dataSource": "vn"
    },
+    "ReferenceRate": {
+        "dataSource": "vn"
+    },
    "SageWithholding": {
        "dataSource": "vn"
    },
@ -177,5 +180,11 @@
    },
    "ProductionConfig": {
        "dataSource": "vn"
+    },
+    "AgencyLog": {
+        "dataSource": "vn"
+    },
+    "AgencyWorkCenter": {
+        "dataSource": "vn"
    }
-}
+}
--- a/back/models/agency-log.json
+++ b/back/models/agency-log.json
@ -0,0 +1,9 @@
+{
+	"name": "AgencyLog",
+	"base": "Log",
+	"options": {
+		"mysql": {
+			"table": "agencyLog"
+		}
+	}
+}
--- a/back/models/agency-workCenter.js
+++ b/back/models/agency-workCenter.js
@ -0,0 +1,8 @@
+const UserError = require('vn-loopback/util/user-error');
+module.exports = Self => {
+    Self.rewriteDbError(function(err) {
+        if (err.code === 'ER_DUP_ENTRY')
+            return new UserError(`This workCenter is already assigned to this agency`);
+        return err;
+    });
+};
--- a/back/models/agency-workCenter.json
+++ b/back/models/agency-workCenter.json
@ -0,0 +1,41 @@
+{
+  "name": "AgencyWorkCenter",
+  "base": "VnModel",
+  "options": {
+    "mysql": {
+      "table": "agencyWorkCenter"
+    }
+  },
+  "properties": {
+    "id": {
+      "id": true,
+      "type": "number",
+      "forceId": false
+    },
+    "agencyFk": {
+      "type": "number",
+      "required": false
+    },
+    "workCenterFk": {
+      "type": "number",
+      "required": false
+    }
+  },
+  "relations": {
+    "agency": {
+			"type": "belongsTo",
+			"model": "WorkCenter",
+			"foreignKey": "agencyFk"
+		},
+    "workCenter": {
+			"type": "belongsTo",
+			"model": "WorkCenter",
+			"foreignKey": "workCenterFk"
+		}
+  },
+  "scope": {
+    "include":{
+       "relation": "workCenter"
+      }
+  }
+}
--- a/back/models/collection.json
+++ b/back/models/collection.json
@ -1,6 +1,11 @@
 {
    "name": "Collection",
    "base": "VnModel",
+    "options": {
+		"mysql": {
+			"table": "collection"
+		}
+	},
    "acls": [{
        "property": "validations",
        "accessType": "EXECUTE",
@ -9,4 +14,3 @@
        "permission": "ALLOW"
 	}]
 }
-  
--- a/back/models/reference-rate.json
+++ b/back/models/reference-rate.json
@ -0,0 +1,36 @@
+{
+    "name": "ReferenceRate",
+    "base": "PersistedModel",
+    "options": {
+        "mysql": {
+            "table": "referenceRate"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "currencyFk": {
+            "type": "number",
+            "required": true
+        },
+        "dated": {
+            "type": "date",
+            "required": true
+        },
+        "value": {
+            "type": "number",
+            "required": true
+        }
+    },
+    "acls": [
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        }
+    ]
+}
--- a/db/dump/fixtures.after.sql
+++ b/db/dump/fixtures.after.sql
@ -146,7 +146,7 @@ INSERT INTO `vn`.`businessReasonEnd` (`id`, `reason`)
        ('2', 'No supera PP empresa'),
        ('3', 'Despido');

-INSERT INTO `vn2008`.`payroll_categorias` (`codcategoria`, `descripcion`, `Tarifa`)
+INSERT INTO `vn`.`payrollCategories` (`id`, `description`, `rate`)
    VALUES
        ('11', 'INFORMATICA', '2'),
        ('12', 'AUX INFORMATICA', '7');
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@ -11,7 +11,6 @@ CREATE ROLE 'salix';
 GRANT 'salix' TO 'root'@'%';
 SET DEFAULT ROLE 'salix' FOR 'root'@'%';

-CREATE SCHEMA IF NOT EXISTS `vn2008`;
 CREATE SCHEMA IF NOT EXISTS `tmp`;

 UPDATE `util`.`config`
@ -160,7 +159,8 @@ INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`)
        (1, 'EUR', 'Euro',          1),
        (2, 'USD', 'Dollar USA',    1.4),
        (3, 'GBP', 'Libra',         1),
-        (4, 'JPY', 'Yen Japones',   1);
+        (4, 'JPY', 'Yen Japones',   1),
+        (5, 'CNY',  'Yuan Chino',   1.2);

 INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`, `ibanLength`, `continentFk`, `hasDailyInvoice`, `CEE`)
    VALUES
@ -371,20 +371,20 @@ INSERT INTO `vn`.`contactChannel`(`id`, `name`)
        (4, 'GCN Channel'),
        (5, 'The Newspaper');

-INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`gestdocFk`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`eypbc`, `businessTypeFk`,`typeFk`)
+INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`gestdocFk`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`businessTypeFk`,`typeFk`)
    VALUES
-        (1101,     'Bruce Wayne',        '84612325V',  'BATMAN',         'Alfred',           '1007 MOUNTAIN DRIVE, GOTHAM',                  'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
-        (1102,     'Petter Parker',      '87945234L',  'SPIDER MAN',     'Aunt May',         '20 INGRAM STREET, QUEENS, USA',                'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
-        (1103,     'Clark Kent',         '06815934E',  'SUPER MAN',      'lois lane',        '344 CLINTON STREET, APARTAMENT 3-D',           'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
-        (1104,     'Tony Stark',         '06089160W',  'IRON MAN',       'Pepper Potts',     '10880 MALIBU POINT, 90265',                    'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
-        (1105,     'Max Eisenhardt',     '251628698',  'MAGNETO',        'Rogue',            'UNKNOWN WHEREABOUTS',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
-        (1106,     'DavidCharlesHaller', '53136686Q',  'LEGION',         'Charles Xavier',   'CITY OF NEW YORK, NEW YORK, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19,   0, 1, 'florist','normal'),
-        (1107,     'Hank Pym',           '09854837G',  'ANT MAN',        'Hawk',             'ANTHILL, SAN FRANCISCO, CALIFORNIA',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19,   0, 1, 'florist','normal'),
-        (1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 5, 1, 300,  13, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19,   0, 1, 'florist','normal'),
-        (1109,     'Bruce Banner',       '16104829E',  'HULK',           'Black widow',      'SOMEWHERE IN NEW YORK',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9,    0, 1, 'florist','normal'),
-        (1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, NULL, 0, 1, 'florist','normal'),
-        (1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others','loses'),
-        (1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others','loses');
+        (1101,     'Bruce Wayne',        '84612325V',  'BATMAN',         'Alfred',           '1007 MOUNTAIN DRIVE, GOTHAM',                  'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1102,     'Petter Parker',      '87945234L',  'SPIDER MAN',     'Aunt May',         '20 INGRAM STREET, QUEENS, USA',                'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1103,     'Clark Kent',         '06815934E',  'SUPER MAN',      'lois lane',        '344 CLINTON STREET, APARTAMENT 3-D',           'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1104,     'Tony Stark',         '06089160W',  'IRON MAN',       'Pepper Potts',     '10880 MALIBU POINT, 90265',                    'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1105,     'Max Eisenhardt',     '251628698',  'MAGNETO',        'Rogue',            'UNKNOWN WHEREABOUTS',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1106,     'DavidCharlesHaller', '53136686Q',  'LEGION',         'Charles Xavier',   'CITY OF NEW YORK, NEW YORK, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19,   0, 'florist','normal'),
+        (1107,     'Hank Pym',           '09854837G',  'ANT MAN',        'Hawk',             'ANTHILL, SAN FRANCISCO, CALIFORNIA',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19,   0, 'florist','normal'),
+        (1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 5, 1, 300,  13, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19,   0, 'florist','normal'),
+        (1109,     'Bruce Banner',       '16104829E',  'HULK',           'Black widow',      'SOMEWHERE IN NEW YORK',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9,    0, 'florist','normal'),
+        (1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, NULL, 0, 'florist','normal'),
+        (1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
+        (1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses');

 INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `gestdocFk`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
    SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), UPPER(CONCAT(name, 'Social')), CONCAT(name, 'Contact'), CONCAT(name, 'Street'), 'GOTHAM', 46460, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5, util.VN_CURDATE(), 1
@ -3787,3 +3787,6 @@ INSERT INTO `vn`.`accountReconciliationConfig`(currencyFk, warehouseFk)
 INSERT INTO vn.workerTeam(id, team, workerFk)
    VALUES
        (8, 1, 19);
+
+INSERT INTO vn.workCenter (id, name, payrollCenterFk, counter, warehouseFk, street, geoFk, deliveryManAdjustment) 
+    VALUES(100, 'workCenterOne', 1, NULL, 1, 'gotham', NULL, NULL);
--- a/db/routines/bi/procedures/Greuge_Evolution_Add.sql
+++ b/db/routines/bi/procedures/Greuge_Evolution_Add.sql
@ -91,15 +91,15 @@ BEGIN
 		-- Recobro
 		UPDATE bi.Greuge_Evolution ge 
 			JOIN (
-				   SELECT cs.Id_Cliente, sum(Valor * Cantidad) as Importe
+				   SELECT a.clientFk Id_Cliente, sum(sc.value * s.quantity) as Importe
 					   FROM vn.ticket t
-					   JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.addressFk
-					   JOIN vn2008.Movimientos m on m.Id_Ticket = t.id
-					   JOIN vn2008.Movimientos_componentes mc on mc.Id_Movimiento = m.Id_Movimiento
+					   JOIN vn.address a on a.id = t.addressFk
+					   JOIN vn.sale s on s.ticketFk = t.id
+					   JOIN vn.saleComponent sc on sc.saleFk = s.id
 				   WHERE t.shipped >= datFEC 
 					   AND t.shipped < datFEC_TOMORROW
-					   AND mc.Id_Componente = 17 -- Recobro
-				   GROUP BY cs.Id_Cliente
+					   AND sc.componentFk = 17 -- Recobro
+				   GROUP BY a.clientFk
 				 ) sub using(Id_Cliente)
 			SET Recobro = Importe
 			WHERE ge.Fecha = datFEC;
--- a/db/routines/bi/procedures/analisis_ventas_evolution_add.sql
+++ b/db/routines/bi/procedures/analisis_ventas_evolution_add.sql
@ -24,7 +24,7 @@ BEGIN
 			WHERE Periodo < vMaxPeriod;

 		SELECT MIN(period) INTO vCurrentPeriod
-			FROM vn2008.time
+			FROM vn.time
 			WHERE period > vPreviousPeriod;

 		SET vYear = FLOOR(vCurrentPeriod / 100);
@ -66,7 +66,7 @@ BEGIN
 			WHERE periodo < vMaxPeriod;

 		SELECT MIN(period) INTO vCurrentPeriod
-			FROM vn2008.time
+			FROM vn.time
 			WHERE period > vPreviousPeriod;

 		SET vYear = FLOOR(vCurrentPeriod / 100);
@ -108,7 +108,7 @@ BEGIN
 			WHERE periodo < vMaxPeriod;

 		SELECT MIN(period) INTO vCurrentPeriod
-			FROM vn2008.time
+			FROM vn.time
 			WHERE period > vPreviousPeriod;

 		SET vYear = FLOOR(vCurrentPeriod / 100);
@ -156,7 +156,7 @@ BEGIN
 			WHERE periodo < vMaxPeriod;

 		SELECT MIN(period) INTO vCurrentPeriod
-			FROM vn2008.time
+			FROM vn.time
 			WHERE period > vPreviousPeriod;

 		SET vYear = FLOOR(vCurrentPeriod / 100);
@ -198,7 +198,7 @@ BEGIN
 			WHERE periodo < vMaxPeriod;

 		SELECT MIN(period) INTO vCurrentPeriod
-			FROM vn2008.time
+			FROM vn.time
 			WHERE period > vPreviousPeriod;

 		SET vYear = FLOOR(vCurrentPeriod / 100);
--- a/db/routines/bi/procedures/analisis_ventas_update.sql
+++ b/db/routines/bi/procedures/analisis_ventas_update.sql
@ -23,31 +23,31 @@ BEGIN
 			Importe
 		)
 		SELECT 
-			tp.Tipo AS Familia,
-			r.reino AS Reino,
-			tr.CodigoTrabajador AS Comercial,
-			tr2.CodigoTrabajador AS Comprador,
-			p.name AS Provincia,
-			w.name AS almacen,
-			tm.year AS Año,
-			tm.month AS Mes,
-			tm.week AS Semana,
-			dm.description AS Vista,
-			bt.importe AS Importe
+			it.name,
+			ic.name,
+			w.code,
+			w2.code,
+			p.name,
+			wa.name,
+			tm.year,
+			tm.month,
+			tm.week,
+			dm.description,
+			bt.importe
 		FROM bs.ventas bt
-			LEFT JOIN vn2008.Tipos tp ON tp.tipo_id = bt.tipo_id
-			LEFT JOIN vn2008.reinos r ON r.id = tp.reino_id
-			LEFT JOIN vn2008.Clientes c on c.Id_Cliente = bt.Id_Cliente
-			LEFT JOIN vn2008.Trabajadores tr ON tr.Id_Trabajador = c.Id_Trabajador
-			LEFT JOIN vn2008.Trabajadores tr2 ON tr2.Id_Trabajador = tp.Id_Trabajador
-			JOIN vn2008.time tm ON tm.date = bt.fecha
-			JOIN vn2008.Movimientos m ON m.Id_Movimiento = bt.Id_Movimiento
-			LEFT JOIN vn.ticket t ON t.id = m.Id_Ticket
-			JOIN vn2008.Agencias a ON a.Id_Agencia = t.agencyModeFk
-			LEFT JOIN vn.deliveryMethod dm ON dm.id = a.Vista
-			LEFT JOIN vn2008.Consignatarios cs ON cs.Id_Consigna = t.addressFk
-			LEFT JOIN vn2008.province p ON p.province_id = cs.province_id
-			LEFT JOIN vn.warehouse w ON w.id = t.warehouseFk
-		WHERE bt.fecha >= vLastMonth AND r.mercancia;
+			LEFT JOIN vn.itemType it ON it.id = bt.tipo_id
+			LEFT JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+			LEFT JOIN vn.client c on c.id = bt.Id_Cliente
+			LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
+			LEFT JOIN vn.worker w2 ON w2.id = it.workerFk
+			JOIN vn.time tm ON tm.dated = bt.fecha
+			JOIN vn.sale s ON s.id = bt.Id_Movimiento
+			LEFT JOIN vn.ticket t ON t.id = s.ticketFk
+			JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+			LEFT JOIN vn.deliveryMethod dm ON dm.id = am.deliveryMethodFk
+			LEFT JOIN vn.address a ON a.id = t.addressFk
+			LEFT JOIN vn.province p ON p.id = a.provinceFk
+			LEFT JOIN vn.warehouse wa ON wa.id = t.warehouseFk
+		WHERE bt.fecha >= vLastMonth AND ic.merchandise;
 END$$
 DELIMITER ;
--- a/db/routines/bi/procedures/claim_ratio_routine.sql
+++ b/db/routines/bi/procedures/claim_ratio_routine.sql
@ -13,46 +13,45 @@ BEGIN

 	INSERT INTO vn.greuge(shipped, clientFk, description,
 					amount, greugeTypeFk, ticketFk)
-		SELECT cm.Fecha
-			, cm.Id_Cliente
-			, concat('Claim ',cm.id,' : ', m.Concepte)
-			,round( -1 * ((sensib -1)/4) * Cantidad *
-				Preu * (100 - Descuento) / 100, 2) AS Reclamaciones
+		SELECT c.ticketCreated
+			, c.clientFk
+			, concat('Claim ', c.id,' : ', s.concept)
+			,round( -1 * ((c.responsibility -1)/4) * s.quantity *
+				s.price * (100 - s.discount) / 100, 2)
 			, 4
-			, m.Id_Ticket
-			FROM vn2008.Movimientos m
-				JOIN vn2008.cl_act ca USING(Id_Movimiento)
-				JOIN vn2008.cl_main cm ON cm.id = ca.cl_main_id
-			WHERE ca.cl_sol_id  NOT IN (1,5)
-				AND ca.greuge = 0
-				AND cm.cl_est_id = 3;
+			, s.ticketFk
+			FROM vn.sale s
+				JOIN vn.claimEnd ce ON ce.saleFk = s.id
+				JOIN vn.claim c ON c.id = ce.claimFk
+			WHERE ce.claimDestinationFk NOT IN (1,5)
+				AND NOT ce.isGreuge
+				AND c.claimStateFk = 3;

 	-- Reclamaciones que pasan a Maná

 	INSERT INTO vn.greuge(shipped, clientFk, description,
 					amount, greugeTypeFk, ticketFk)
-		SELECT cm.Fecha
-			, cm.Id_Cliente
-			, concat('Claim_mana ',cm.id,' : ', m.Concepte)
-			,round( ((sensib -1)/4) * Cantidad * Preu * (100 - Descuento) / 100, 2)
-				AS Reclamaciones
+		SELECT c.ticketCreated
+			, c.clientFk
+			, concat('Claim_mana ',c.id,' : ', s.concept)
+			,round( ((c.responsibility -1)/4) * s.quantity * s.price * (100 - s.discount) / 100, 2)
 			,3
-			,m.Id_Ticket
-			FROM vn2008.Movimientos m
-				JOIN vn2008.cl_act ca USING(Id_Movimiento)
-				JOIN vn2008.cl_main cm ON cm.id = ca.cl_main_id
-			WHERE ca.cl_sol_id  NOT IN (1,5)
-				AND ca.greuge = 0
-				AND cm.cl_est_id = 3
-				AND cm.mana;
+			,s.ticketFk
+			FROM vn.sale s
+				JOIN vn.claimEnd ce ON ce.saleFk = s.id
+				JOIN vn.claim c ON c.id = ce.claimFk
+			WHERE ce.claimDestinationFk NOT IN (1,5)
+				AND NOT ce.isGreuge
+				AND c.claimStateFk = 3
+				AND c.isChargedToMana;

 	-- Marcamos para no repetir
-	UPDATE vn2008.cl_act ca
-				JOIN vn2008.cl_main cm ON cm.id = ca.cl_main_id
-			SET greuge = 1
-			WHERE ca.cl_sol_id  NOT IN (1,5)
-				AND ca.greuge = 0
-				AND cm.cl_est_id = 3;
+	UPDATE vn.claimEnd ce
+				JOIN vn.claim c ON c.id = ce.claimFk
+			SET c.isChargedToMana = TRUE
+			WHERE ce.claimDestinationFk NOT IN (1,5)
+				AND NOT ce.isGreuge
+				AND c.claimStateFk = 3;

 	-- Recobros

@ -60,17 +59,17 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.ticket_list
 	(PRIMARY KEY (Id_Ticket))
 	SELECT DISTINCT t.id Id_Ticket
-			FROM vn2008.Movimientos_componentes mc
-				JOIN vn2008.Movimientos m ON mc.Id_Movimiento = m.Id_Movimiento
-				JOIN vn.ticket t ON t.id = m.Id_Ticket
+			FROM vn.saleComponent sc
+				JOIN vn.sale s ON sc.saleFk = s.id
+				JOIN vn.ticket t ON t.id = s.ticketFk
 				JOIN vn.ticketLastState ts ON ts.ticketFk = t.id
 				JOIN vn.ticketTracking tt ON tt.id = ts.ticketTrackingFk
-				JOIN vn.state s ON s.id = tt.stateFk
-			WHERE mc.Id_Componente = 17
-				AND mc.greuge = 0
+				JOIN vn.state st ON st.id = tt.stateFk
+			WHERE sc.componentFk = 17
+				AND sc.isGreuge = 0
 				AND t.shipped >= '2016-10-01'
 				AND t.shipped < util.VN_CURDATE()
-				AND s.alertLevel >= 3;
+				AND st.alertLevel >= 3;

 	DELETE g.*
 			FROM vn.greuge g
@ -80,24 +79,24 @@ BEGIN
 	INSERT INTO vn.greuge(clientFk, description, amount,shipped,
 					greugeTypeFk, ticketFk)
 		SELECT t.clientFk
-				,concat('recobro ', m.Id_Ticket), - round(SUM(mc.Valor*Cantidad),2)
-					AS dif
-				,date(t.shipped)
+				,concat('recobro ', s.ticketFk), - round(SUM(sc.value*s.quantity),2)
+				AS dif,
+				date(t.shipped)
 				, 2
 				,tt.Id_Ticket
-			FROM vn2008.Movimientos m
-				JOIN vn.ticket t ON t.id = m.Id_Ticket
+			FROM vn.sale s
+				JOIN vn.ticket t ON t.id = s.ticketFk
 				JOIN tmp.ticket_list tt ON tt.Id_Ticket = t.id
-				JOIN vn2008.Movimientos_componentes mc
-					ON mc.Id_Movimiento = m.Id_Movimiento AND mc.Id_Componente = 17
+				JOIN vn.saleComponent sc
+					ON sc.saleFk = s.id AND sc.componentFk = 17
 			GROUP BY t.id
 				HAVING ABS(dif) > 1;

-	UPDATE vn2008.Movimientos_componentes mc
-				JOIN vn2008.Movimientos m ON m.Id_Movimiento = mc.Id_Movimiento
-				JOIN tmp.ticket_list tt ON tt.Id_Ticket = m.Id_Ticket
-			SET greuge = 1
-			WHERE Id_Componente = 17;
+	UPDATE vn.saleComponent sc
+				JOIN vn.sale s ON s.id = sc.saleFk
+				JOIN tmp.ticket_list tt ON tt.Id_Ticket = s.ticketFk
+			SET sc.isGreuge = 1
+			WHERE sc.componentFk = 17;

 	/*
 	* Recalculamos la ratio de las reclamaciones, que luego
@ -105,26 +104,25 @@ BEGIN
 	*/

 	REPLACE bi.claims_ratio(Id_Cliente, Consumo, Reclamaciones, Ratio, recobro)
-		SELECT Id_Cliente, 0,0,0,0
-		FROM vn2008.Clientes;
+		SELECT id, 0,0,0,0
+		FROM vn.client;

 	REPLACE bi.claims_ratio(Id_Cliente, Consumo, Reclamaciones, Ratio, recobro)
 		SELECT fm.Id_Cliente, 12 * fm.Consumo, Reclamaciones,
-				round(Reclamaciones / (12*fm.Consumo),4) AS Ratio, 0
+				round(Reclamaciones / (12*fm.Consumo),4), 0
 			FROM bi.facturacion_media_anual fm
 				LEFT JOIN(
-					SELECT cm.Id_Cliente, round(sum(-1 * ((sensib -1)/4) *
-							Cantidad * Preu * (100 - Descuento) / 100))
+					SELECT c.clientFk, round(sum(-1 * ((c.responsibility -1)/4) *
+							s.quantity * s.price * (100 - s.discount) / 100))
 							AS Reclamaciones
-						FROM vn2008.Movimientos m
-							JOIN vn2008.cl_act ca
-								ON ca.Id_Movimiento = m.Id_Movimiento
-							JOIN vn2008.cl_main cm ON cm.id = ca.cl_main_id
-						WHERE ca.cl_sol_id  NOT IN (1,5)
-							AND cm.cl_est_id = 3
-							AND cm.Fecha >= TIMESTAMPADD(YEAR, -1, util.VN_CURDATE())
-						GROUP BY cm.Id_Cliente
-						) claims ON claims.Id_Cliente = fm.Id_Cliente;
+						FROM vn.sale s
+							JOIN vn.claimEnd ce ON ce.saleFk = s.id
+							JOIN vn.claim c ON c.id = ce.claimFk
+						WHERE ce.claimDestinationFk NOT IN (1,5)
+							AND c.claimStateFk = 3
+							AND c.ticketCreated >= TIMESTAMPADD(YEAR, -1, util.VN_CURDATE())
+						GROUP BY c.clientFk
+						) claims ON claims.clientFk = fm.Id_Cliente;


 	-- Calculamos el porcentaje del recobro para añadirlo al precio de venta
@ -153,7 +151,7 @@ BEGIN
 	-- CLIENTE 5523, VERDECORA
 	UPDATE bi.claims_ratio SET recobro = GREATEST(0.12, recobro) WHERE Id_Cliente = 5523;

-    -- CLIENTE 15979, SERVEIS VETERINARIS
+	-- CLIENTE 15979, SERVEIS VETERINARIS
 	UPDATE bi.claims_ratio SET recobro = GREATEST(0.05, recobro) WHERE Id_Cliente = 15979;

 	-- CLIENTE 5189 i 8942, son de CSR i son el mateix client
--- a/db/routines/bi/procedures/clean_launcher.sql
+++ b/db/routines/bi/procedures/clean_launcher.sql
@ -1,9 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`clean_launcher`()
-BEGIN
-/**
- * Borra registros de las principales tablas (excepto de "ticket").
- */
-	CALL vn2008.clean(0);
-END$$
-DELIMITER ;
--- a/db/routines/bi/procedures/comparativa_add.sql
+++ b/db/routines/bi/procedures/comparativa_add.sql
@ -1,32 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`comparativa_add`()
-BEGIN
-    DECLARE lastCOMP INT;  # Se trata de una variable para almacenar el ultimo valor del Periodo
-    DECLARE vMaxPeriod INT;
-	DECLARE vMaxWeek INT;
-
-	SELECT t.period, t.`week` INTO vMaxPeriod, vMaxWeek
-		FROM vn.`time` t 
-		WHERE t.dated = util.VN_CURDATE();
-
-    SELECT MAX(Periodo) INTO lastCOMP FROM vn2008.Comparativa;
-    -- Fijaremos las ventas con más de un mes de antiguedad en la tabla Comparativa
-
-    IF lastCOMP < vMaxPeriod - 3 AND vMaxWeek > 3 THEN
-    
-		REPLACE vn2008.Comparativa(Periodo, Id_Article, warehouse_id, Cantidad,price)
-			SELECT tm.period as Periodo, m.Id_Article, t.warehouseFk, sum(m.Cantidad), sum(v.importe)
-            FROM bs.ventas v
-            JOIN vn2008.time tm ON tm.date = v.fecha
-            JOIN vn2008.Movimientos m ON m.Id_Movimiento = v.Id_Movimiento
-            JOIN vn2008.Tipos tp ON tp.tipo_id = v.tipo_id
-            JOIN vn2008.reinos r ON r.id = tp.reino_id
-            JOIN vn.ticket t ON t.id = m.Id_Ticket
-            WHERE tm.period BETWEEN lastCOMP AND vMaxPeriod - 3
-            AND t.clientFk NOT IN(400,200)
-            AND t.warehouseFk NOT IN (0,13)		
-            GROUP BY m.Id_Article, Periodo, t.warehouseFk;
-
-    END IF;
-END$$
-DELIMITER ;
--- a/db/routines/bi/procedures/comparativa_add_manual.sql
+++ b/db/routines/bi/procedures/comparativa_add_manual.sql
@ -1,40 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`comparativa_add_manual`(IN vStarted DATE, IN vEnded DATE)
-BEGIN
-/**
- * Recalcula la tabla Comparativa para dos valores dados
- *
- * @param vStarted fecha desde
- * @param vEnded fecha hasta
- */  
-
-	DECLARE periodStart INT;
-	DECLARE periodEnd INT;
-	
-	-- Seleccionamos la fecha minima/maxima del periodo que vamos a consultar
-
-	SELECT t.period INTO periodStart
-		FROM vn.`time` t 
-		WHERE t.dated = vStarted;
-	
-	SELECT t.period INTO periodEnd
-		FROM vn.`time` t 
-		WHERE t.dated = vEnded;
-                
-	DELETE FROM vn2008.Comparativa 
-		WHERE Periodo BETWEEN periodStart AND periodEnd;
-
-	INSERT INTO vn2008.Comparativa(Periodo, Id_Article, warehouse_id, Cantidad,price)
-		SELECT tm.period as Periodo, m.Id_Article, t.warehouseFk, sum(m.Cantidad), sum(v.importe)
-			FROM bs.ventas v
-				JOIN vn2008.time tm ON tm.date = v.fecha
-				JOIN vn2008.Movimientos m ON m.Id_Movimiento = v.Id_Movimiento
-				JOIN vn2008.Tipos tp ON tp.tipo_id = v.tipo_id
-				JOIN vn2008.reinos r ON r.id = tp.reino_id
-				JOIN vn.ticket t ON t.id = m.Id_Ticket
-			WHERE tm.period BETWEEN periodStart AND periodEnd
-				AND t.clientFk NOT IN(400,200)
-				AND t.warehouseFk NOT IN (0,13)		
-			GROUP BY m.Id_Article, Periodo, t.warehouseFk;
-END$$
-DELIMITER ;
--- a/db/routines/bi/procedures/defaultersFromDate.sql
+++ b/db/routines/bi/procedures/defaultersFromDate.sql
@ -2,7 +2,7 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`defaultersFromDate`(IN vDate DATE)
 BEGIN

-	SELECT t1.*, c.Cliente, w.code AS workerCode, c.pay_met_id,c.Vencimiento
+	SELECT t1.*, c.name Cliente, w.code workerCode, c.payMethodFk pay_met_id, c.dueDay Vencimiento
 	FROM (
 	-- Filtramos aquellos clientes cuyo saldo se ha incrementado de ayer a hoy
 		select * from(
@ -18,7 +18,7 @@ BEGIN

 					having today.amount > 0 and difference <> 0
 					) newDefaulters
-	)t1 left join vn2008.Clientes c ON t1.client = c.Id_Cliente
-		left join vn.worker w ON w.id = c.Id_Trabajador;
+	)t1 left join vn.client c ON c.id = t1.client
+		left join vn.worker w ON w.id = c.salesPersonFk;
 END$$
 DELIMITER ;
--- a/db/routines/bi/procedures/defaulting.sql
+++ b/db/routines/bi/procedures/defaulting.sql
@ -2,21 +2,22 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`defaulting`(IN `vDate` DATE)
 BEGIN
 	DECLARE vDone BOOLEAN;
-    DECLARE vClient INT;
-    DECLARE vAmount INT;
-    DECLARE vDued DATE;
-    DECLARE vAmountInvoice DECIMAL(10,2);
-    DECLARE vGraceDays INT;
+	DECLARE vClient INT;
+	DECLARE vAmount INT;
+	DECLARE vDued DATE;
+	DECLARE vAmountInvoice DECIMAL(10,2);
+	DECLARE vGraceDays INT;
 	DECLARE defaulters CURSOR FOR
-		SELECT client, amount, graceDays FROM bi.defaulters d 
-				JOIN vn2008.Clientes c ON c.Id_Cliente = d.client
-                JOIN vn2008.pay_met pm ON pm.id = c.pay_met_id
-                WHERE hasChanged AND date = vDate;
-        
+		SELECT d.client, d.amount, pm.graceDays
+			FROM bi.defaulters d 
+				JOIN vn.client c ON c.id = d.client
+				JOIN vn.payMethod pm ON pm.id = c.payMethodFk
+			WHERE hasChanged AND date = vDate;
+		
 	DECLARE invoices CURSOR FOR
 		SELECT dued Vencimiento, amount importe FROM vn.invoiceOut
 			WHERE issued >= '2016-01-01' AND clientFk = vClient ORDER BY issued DESC;
-        
+		
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;

 	DELETE FROM bi.defaulters WHERE date = vDate;
@ -26,7 +27,7 @@ BEGIN
 			FROM vn.`client` c
 				LEFT JOIN bi.customerRiskOverdue cro ON c.id = cro.customer_id
 			GROUP BY c.id;
-    
+	
 	-- marcamos si ha cambiado y heredamos la fecha defaulterSince
 	UPDATE bi.defaulters d
 		LEFT JOIN (
@ -35,16 +36,16 @@ BEGIN
 					WHERE date <= TIMESTAMPADD(DAY,-1, vDate)
 					ORDER BY date DESC
 					LIMIT 10000000000000000000) t GROUP BY client
-		  ) yesterday using(client)
+		) yesterday using(client)
 	SET d.hasChanged = (IFNULL(d.amount,0) <> IFNULL(yesterday.amount,0)),
 		d.defaulterSince = yesterday.defaulterSince,
-        d.frozened = yesterday.frozened
+		d.frozened = yesterday.frozened
 	WHERE d.date = vDate ;
-     
-    OPEN defaulters;
+	
+	OPEN defaulters;
 	defaulters: LOOP
 		SET vDone = FALSE;
-        SET vAmount = 0;
+		SET vAmount = 0;
 		FETCH defaulters INTO vClient,vAmount, vGraceDays;
 		IF vDone THEN
 			LEAVE defaulters;
@ -60,7 +61,7 @@ BEGIN
 			IF TIMESTAMPADD(DAY, vGraceDays, vDued) <= vDate THEN
 				SET vAmount = vAmount - vAmountInvoice;
 				IF vAmount <= 0 THEN
-                                    
+									
 					UPDATE defaulters SET defaulterSince = vDued
 						WHERE client = vClient and date = vDate;
 						
@ -73,20 +74,20 @@ BEGIN
 	END LOOP;
 		CLOSE defaulters;
 	
-    DELETE FROM defaulters
+	DELETE FROM defaulters
 		WHERE amount = 0 
 			AND hasChanged = FALSE
-            AND `date` = vDate;
-        
-    UPDATE defaulters d
+			AND `date` = vDate;
+		
+	UPDATE defaulters d
 			JOIN vn.config ON TRUE
 		SET d.frozened = NULL
 		WHERE `date` = vDate 
 			AND d.amount <= config.defaultersMaxAmount;
-		    
-    CALL vn.clientFreeze();
-    
-    -- actualizamos defaulting
+			
+	CALL vn.clientFreeze();
+	
+	-- actualizamos defaulting
 	DELETE FROM bi.defaulting WHERE date = vDate;

 	INSERT INTO bi.defaulting(date, amount)
--- a/db/routines/bi/views/last_Id_Cubo.sql
+++ b/db/routines/bi/views/last_Id_Cubo.sql
@ -1,19 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `bi`.`last_Id_Cubo`
-AS SELECT `C`.`Id_Compra` AS `Id_Compra`,
-	`C`.`Id_Article` AS `Id_Article`,
-	`tr`.`warehouse_id` AS `warehouse_id`,
-	`C`.`Id_Cubo` AS `Id_Cubo`,
-	`C`.`Packing` AS `Packing`
-FROM (
-		(
-			`vn2008`.`Compres` `C`
-			JOIN `vn2008`.`Entradas` `E` ON(`C`.`Id_Entrada` = `E`.`Id_Entrada`)
-		)
-		JOIN `vn2008`.`travel` `tr` ON(`E`.`travel_id` = `tr`.`id`)
-	)
-WHERE `C`.`Id_Cubo` IS NOT NULL
-	AND `C`.`Id_Cubo` <> '--'
-	AND `tr`.`landing` > `util`.`VN_CURDATE`() - INTERVAL 18 MONTH
-ORDER BY `C`.`Id_Compra` DESC
--- a/db/routines/bi/views/v_ventas_contables.sql
+++ b/db/routines/bi/views/v_ventas_contables.sql
@ -1,23 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `bi`.`v_ventas_contables`
-AS SELECT `time`.`year` AS `year`,
-	`time`.`month` AS `month`,
-	cast(
-		sum(
-			`m`.`Cantidad` * `m`.`Preu` * (100 - `m`.`Descuento`) / 100
-		) AS decimal(10, 0)
-	) AS `importe`
-FROM (
-		(
-			(
-				`vn`.`ticket` `t`
-				JOIN `bi`.`f_tvc` ON(`t`.`id` = `bi`.`f_tvc`.`Id_Ticket`)
-			)
-			JOIN `vn2008`.`Movimientos` `m` ON(`t`.`id` = `m`.`Id_Ticket`)
-		)
-		JOIN `vn2008`.`time` ON(`time`.`date` = cast(`t`.`shipped` AS date))
-	)
-WHERE `t`.`shipped` >= '2014-01-01'
-GROUP BY `time`.`year`,
-	`time`.`month`
--- a/db/routines/bs/procedures/bancos_evolution_add.sql
+++ b/db/routines/bs/procedures/bancos_evolution_add.sql
@ -1,112 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`bancos_evolution_add`(vStartingDate DATE)
-BEGIN
-/**
- * Inserta en la tabla bancos_evolution los saldos acumulados de cada banco
- *
- * @param vStartingDate Fecha desde la cual se recalculan la tabla bs.bancos_evolution
- */ 
-	DECLARE vCurrentDate DATE;
-	DECLARE vMaxDate DATE DEFAULT TIMESTAMPADD(MONTH, 7, util.VN_CURDATE());
-	IF IFNULL(vStartingDate,0) < TIMESTAMPADD(YEAR, -5, util.VN_CURDATE()) THEN
-		CALL util.throw('invalid date');
-    END IF;
-	DELETE FROM bs.bancos_evolution WHERE Fecha >= vStartingDate;
-
-	SET vCurrentDate = vStartingDate;
-
-	INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo)
-		SELECT vCurrentDate, Id_Banco, deuda
-			FROM bs.bancos_evolution
-			WHERE Fecha = TIMESTAMPADD(DAY,-1,vCurrentDate);
-            
-	WHILE vCurrentDate < vMaxDate DO
-- insertar solo el dia de ayer
-		INSERT INTO bs.bancos_evolution(Fecha ,Id_Banco, saldo)
-			SELECT vCurrentDate, Id_Banco, SUM(saldo)  
-				FROM (
-					SELECT Id_Banco ,saldo
-						FROM bs.bancos_evolution
-						WHERE Fecha = TIMESTAMPADD(DAY,-1,vCurrentDate)  -- los saldos acumulados del dia anterior
-					UNION ALL
-				
-					SELECT c.Id_Banco, IFNULL(SUM(Entrada),0) - IFNULL(SUM(Salida),0) as saldo
-						FROM vn2008.Cajas c
-							JOIN vn2008.Bancos b using(Id_Banco)   -- saldos de las cajas
-							JOIN vn.accountingType at2 ON at2.id = b.cash 
-						WHERE at2.code IN ('wireTransfer','fundingLine')
-							AND Cajafecha = vCurrentDate
-							AND (Serie = 'MB' OR at2.code = 'fundingLine')
-						GROUP BY Id_Banco
-			)sub 
-			GROUP BY Id_Banco
-		ON DUPLICATE KEY UPDATE saldo = saldo + VALUES(saldo);
-                              
-		SET vCurrentDate = TIMESTAMPADD(DAY,1,vCurrentDate);
-
-	END WHILE;
-
-    -- Ahora actualizamos la quilla 
-	UPDATE bs.bancos_evolution be
-		JOIN
-		(
-			SELECT bp.Id_Banco, - sum(bp.importe) as quilla, t.dated
-			FROM vn.time t 
-				JOIN vn2008.Bancos_poliza bp ON t.dated between apertura AND IFNULL(cierre, t.dated)
-			WHERE t.dated BETWEEN vStartingDate AND vMaxDate
-			GROUP BY Id_Banco, t.dated
-		) sub ON be.Id_Banco = sub.Id_Banco AND sub.dated = be.Fecha
-		SET be.quilla = sub.quilla;                  
-
-	-- pagos futuros no concilidados
-	INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo)
-		SELECT t.dated, p.id_banco, - importe
-			FROM vn.time t 
-				join vn2008.pago p ON p.fecha <= t.dated
-		WHERE t.dated BETWEEN util.VN_CURDATE() AND vMaxDate
-			AND p.fecha BETWEEN util.VN_CURDATE() AND vMaxDate
-			AND NOT conciliado
-	ON DUPLICATE KEY UPDATE saldo = saldo + VALUES(saldo);
-
-		-- cobros futuros
-	INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo)
-		SELECT t.dated, r.Id_Banco, SUM(Entregado)
-			FROM vn.time t 
-				JOIN vn2008.Recibos r ON r.Fechacobro <= t.dated
-			WHERE r.Fechacobro > util.VN_CURDATE() AND r.Fechacobro <= vMaxDate
-				AND t.dated BETWEEN util.VN_CURDATE() AND vMaxDate
-			GROUP BY t.dated, r.Id_Banco
-	ON DUPLICATE KEY UPDATE saldo = saldo + VALUES(saldo);
-
-	-- saldos de la tabla prevision
-	INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo)
-		SELECT t.dated, sp.Id_Banco, SUM(Importe)
-			FROM vn.time t 
-				JOIN vn2008.Saldos_Prevision sp ON sp.Fecha <= t.dated
-				JOIN vn2008.Bancos b ON sp.Id_Banco = b.Id_Banco
-				JOIN vn.accountingType at2 ON at2.id = b.cash 
-		WHERE at2.code IN ('wireTransfer','fundingLine')
-			AND t.dated BETWEEN vStartingDate AND vMaxDate
-		GROUP BY t.dated, sp.Id_Banco
-	ON DUPLICATE KEY UPDATE saldo = saldo + VALUES(saldo);
-
-	-- Utilizamos el saldo_auxiliar para calcular lo dispuesto en las polizas
-	UPDATE  bs.bancos_evolution be
-		SET saldo_aux = saldo
-		WHERE Fecha >= vStartingDate;
-
-	-- Deuda
-	UPDATE bs.bancos_evolution be
-		JOIN vn2008.Bancos b using(Id_Banco)
-		JOIN vn.accountingType at2 ON at2.id = b.cash 
-		SET be.deuda =  IF(at2.code = 'fundingLine', be.saldo_aux, 0)
-		   , be.saldo = IF(at2.code = 'fundingLine', 0, be.saldo_aux)
-	WHERE Fecha >= vStartingDate;
-
-	-- Liquidez            
-	update bs.bancos_evolution set liquidez = saldo - quilla + deuda WHERE Fecha >= vStartingDate;
-   -- Disponibilidad
-   update bs.bancos_evolution set `disponibilidad ajena` = - quilla + deuda WHERE Fecha >= vStartingDate;
-
-END$$
-DELIMITER ;
--- a/db/routines/bs/procedures/comercialesCompleto.sql
+++ b/db/routines/bs/procedures/comercialesCompleto.sql
@ -1,111 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`comercialesCompleto`(IN vWorker INT, vDate DATE)
-BEGIN
-	DECLARE vAYearAgoStarted DATE DEFAULT DATE_FORMAT(TIMESTAMPADD(YEAR, - 1, vDate), '%Y-%m-01');
-	DECLARE vAYearAgoEnded DATE DEFAULT TIMESTAMPADD(YEAR, - 1, LAST_DAY(vDate));
-    
-	CALL vn.worker_GetHierarchy(vWorker);
-	
-    INSERT IGNORE INTO tmp.workerHierarchyList (workerFk)
-		SELECT wd2.workerFk
-			FROM vn.workerDepartment wd2
-				WHERE wd2.workerFk = vWorker;
-		 
-	-- Falta que en algunos casos solo tenga en cuenta los tipos afectados.
-	SELECT 
-		c.Id_Cliente id_cliente,
-		c.Cliente cliente,
-		cr.recobro * 100 tarifa,
-		c.Telefono telefono,
-		c.movil,
-		c.POBLACION poblacion,
-		p.`name` provincia,
-		ROUND(f.futur, 2) futur,
-		c.Credito credito,
-		pm.`name` forma_pago,
-		ROUND(c365 / 12, 2) consumo_medio365,
-		ROUND(c365, 2) consumo365,
-		ROUND(CmLy.peso, 2) peso_mes_año_pasado,
-		ROUND(CmLy.peso * 1.19, 2) objetivo,
-		tr.CodigoTrabajador,
-		ROUND(mes_actual.consumo, 2) consumoMes,
-		ROUND(IFNULL(mes_actual.consumo, 0) - IFNULL(CmLy.peso * 1.19, 0), 2) como_lo_llevo,
-		DATE(LastTicket) ultimo_ticket,
-		dead.muerto,
-		g.Greuge,
-		cr.recobro
-	FROM
-		vn2008.Clientes c
-			LEFT JOIN
-			(SELECT g.clientFk Id_Cliente, CAST( SUM(g.amount) as DECIMAL(12,2)) AS Greuge 
-				FROM vn.greuge g
-					JOIN vn.`client` c ON c.id = g.clientFk
-					LEFT JOIN vn.worker w ON c.salesPersonFk = w.id
-				WHERE (c.salesPersonFk = vWorker OR w.bossFk = vWorker)
-			 GROUP BY Id_Cliente
-			) g ON g.Id_Cliente = c.Id_Cliente
-			LEFT JOIN
-		vn2008.province p ON p.province_id = c.province_id
-			JOIN
-		vn2008.pay_met pm ON pm.id = c.pay_met_id
-			LEFT JOIN
-		vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
-			LEFT JOIN
-		 bi.claims_ratio cr on cr.Id_Cliente = c.Id_Cliente
-			LEFT JOIN
-		(SELECT v.Id_Cliente, SUM(importe) c365 -- optimizat de 6s /5.3s/ 4.7s a 0.3/0.4/0.3
-			FROM bs.ventas v
-				JOIN vn2008.Clientes c ON c.Id_Cliente = v.Id_Cliente
-			WHERE v.fecha BETWEEN TIMESTAMPADD(YEAR, - 1, vDate) AND vDate
-				GROUP BY v.Id_Cliente) c365 ON c365.Id_Cliente = c.Id_Cliente
-			LEFT JOIN
-		(SELECT 
-			Id_Cliente, SUM(importe) consumo
-		FROM
-			 bs.ventas v
-		INNER JOIN vn2008.Clientes c USING (Id_Cliente)
-		LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
-		WHERE
-			(c.Id_Trabajador = vWorker OR tr.boss = vWorker) 
-				AND (v.fecha BETWEEN TIMESTAMPADD(DAY, - DAY(vDate) + 1, vDate)  AND TIMESTAMPADD(DAY, - 1, vDate))
-		GROUP BY Id_Cliente) mes_actual ON mes_actual.Id_Cliente = c.Id_Cliente
-			LEFT JOIN
-		(SELECT t.clientFk Id_Cliente, SUM(m.preu * m.Cantidad * (1 - m.Descuento / 100)) futur
-				FROM vn.ticket t
-					JOIN vn2008.Clientes c ON c.Id_Cliente = t.clientFk
-					JOIN vn2008.Movimientos m ON m.Id_Ticket = t.id
-					LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
-				WHERE
-					(c.Id_Trabajador = vWorker OR tr.boss = vWorker)
-					AND t.shipped BETWEEN vDate AND util.dayEnd(LAST_DAY(vDate))
-				GROUP BY Id_Cliente) f ON c.Id_Cliente = f.Id_Cliente
-			LEFT JOIN
-		(SELECT MAX(t.shipped) LastTicket, c.Id_Cliente
-				FROM vn.ticket t
-						JOIN vn2008.Clientes c ON c.Id_cliente = t.clientFk
-						LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
-					WHERE
-						(c.Id_Trabajador = vWorker OR tr.boss = vWorker)
-					GROUP BY t.clientFk) LastTicket ON LastTicket.Id_Cliente = c.Id_Cliente
-					LEFT JOIN
-		(
-			SELECT SUM(importe) peso, c.Id_Cliente
-					FROM bs.ventas v
-						JOIN vn2008.Clientes c ON c.Id_Cliente = v.Id_Cliente
-						LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
-				WHERE fecha BETWEEN vAYearAgoStarted and vAYearAgoEnded
-					AND (c.Id_Trabajador = vWorker OR tr.boss = vWorker)
-				GROUP BY c.Id_Cliente) CmLy ON CmLy.Id_Cliente = c.Id_Cliente
-			LEFT JOIN
-		(SELECT c.Id_Cliente,
-				IF(MAX(io.issued) < DATE_FORMAT(TIMESTAMPADD(MONTH, - 1, vDate), '%Y- %m-01'), TRUE, FALSE) muerto
-			FROM vn.invoiceOut io
-				JOIN vn2008.Clientes c ON c.Id_cliente = io.clientFk
-				LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
-			WHERE (c.Id_Trabajador = vWorker OR tr.boss = vWorker)
-		GROUP BY Id_Cliente) dead ON dead.Id_Cliente = c.Id_Cliente
-		JOIN tmp.workerHierarchyList s ON s.workerFk = c.Id_Trabajador;
-
-	DROP TEMPORARY TABLE tmp.workerHierarchyList;
-END$$
-DELIMITER ;
--- a/db/routines/bs/procedures/indicatorsUpdate.sql
+++ b/db/routines/bs/procedures/indicatorsUpdate.sql
@ -15,10 +15,10 @@ BEGIN
 		SET lastYearSales = 
 			(SELECT SUM(importe + recargo)
 				FROM ventas v
-					JOIN vn2008.empresa e ON e.id = v.empresa_id
-					JOIN vn2008.empresa_grupo eg ON eg.empresa_grupo_id = e.empresa_grupo
+					JOIN vn.company c ON c.id = v.empresa_id
+					JOIN vn.companyGroup cg ON cg.id = c.companyGroupFk
 				WHERE fecha BETWEEN oneYearBefore AND vDated
-					AND eg.grupo = 'Verdnatura'
+					AND cg.code = 'Verdnatura'
 			) 
 		WHERE updated = vDated;
 
--- a/db/routines/bs/procedures/manaCustomerUpdate.sql
+++ b/db/routines/bs/procedures/manaCustomerUpdate.sql
@ -67,20 +67,20 @@ BEGIN
                    vToDated 
                FROM 
                (
-                    SELECT cs.Id_Cliente, Cantidad * Valor as mana
+                    SELECT a.clientFk Id_Cliente, s.quantity * sc.value as mana
                        FROM vn.ticket t
-                            JOIN vn2008.Consignatarios cs using(Id_Consigna)
-                            JOIN vn2008.Movimientos m on m.Id_Ticket = t.id
-                            JOIN vn2008.Movimientos_componentes mc on mc.Id_Movimiento = m.Id_Movimiento
-                        WHERE Id_Componente IN (vManaAutoId, vManaId, vClaimManaId)
+                            JOIN vn.address a ON a.id = t.addressFk
+                            JOIN vn.sale s on s.ticketFk = t.id
+                            JOIN vn.saleComponent sc on sc.saleFk = s.id
+                        WHERE sc.componentFk IN (vManaAutoId, vManaId, vClaimManaId)
                            AND t.shipped > vFromDated 
                            AND date(t.shipped) <= vToDated
                    UNION ALL
-                    SELECT r.Id_Cliente, - Entregado
-                        FROM vn2008.Recibos r
-                        WHERE Id_Banco = vManaBankId
-                            AND Fechacobro > vFromDated 
-                            AND Fechacobro <= vToDated
+                    SELECT clientFk, - amountPaid
+                        FROM vn.receipt
+                        WHERE bankFk = vManaBankId
+                            AND payed > vFromDated 
+                            AND payed <= vToDated
                    UNION ALL
                    SELECT clientFk, amount
                        FROM vn.greuge
--- a/db/routines/bs/procedures/sale_add.sql
+++ b/db/routines/bs/procedures/sale_add.sql
@ -0,0 +1,72 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`sale_add`(
+	IN vStarted DATE,
+	IN vEnded DATE)
+BEGIN
+/**
+ * Añade las ventas que se realizaron entre 2 fechas a la tabla bs.sale
+ * 
+ * @param vStarted Fecha de inicio
+ * @param vEnded Fecha de fin
+ *
+ */
+	DECLARE vLoopDate DATE;
+	DECLARE vLoopDateTime DATETIME; 
+	
+	IF vStarted < (util.VN_CURDATE() - INTERVAL 5 YEAR) OR vStarted > vEnded THEN
+		CALL util.throw('Wrong date');
+	END IF;
+	
+	SET vLoopDate = vStarted;
+
+	DELETE FROM sale 
+		WHERE dated BETWEEN vStarted AND vEnded;
+
+	WHILE vLoopDate <= vEnded DO
+		SET vLoopDateTime = util.dayEnd(vLoopDate);
+		
+		REPLACE sale(
+			saleFk,
+			amount,
+			surcharge,
+			dated,
+			typeFk,
+			clientFk,
+			companyFk,
+			margin
+		)WITH calculatedSales AS(
+		SELECT s.id saleFk,
+				SUM(IF(ct.isBase, s.quantity * sc.value, 0)) amount,
+				SUM(IF(ct.isBase, 0, s.quantity * sc.value)) surcharge,
+				s.total pvp,
+				DATE(t.shipped) dated,
+				i.typeFk,
+				t.clientFk,
+				t.companyFk,
+				SUM(IF(ct.isMargin, s.quantity * sc.value, 0 )) marginComponents
+			FROM vn.ticket t
+				STRAIGHT_JOIN vn.sale s ON s.ticketFk = t.id
+				JOIN vn.item i ON i.id = s.itemFk
+				JOIN vn.itemType it ON it.id = i.typeFk
+				JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+				JOIN vn.saleComponent sc ON sc.saleFk = s.id 
+				JOIN vn.component c ON c.id = sc.componentFk
+				JOIN vn.componentType ct ON ct.id = c.typeFk
+			WHERE t.shipped BETWEEN vLoopDate AND vLoopDateTime
+				AND s.quantity <> 0
+				AND ic.merchandise 
+			GROUP BY s.id
+		)SELECT saleFk, 
+				amount, 
+				surcharge, 
+				dated, 
+				typeFk, 
+				clientFk, 
+				companyFk, 
+				marginComponents + amount + surcharge - pvp
+			FROM calculatedSales;
+
+		SET vLoopDate = vLoopDate + INTERVAL 1 DAY;
+	END WHILE;
+END$$
+DELIMITER ;
--- a/db/routines/bs/procedures/ventas_add_launcher.sql
+++ b/db/routines/bs/procedures/ventas_add_launcher.sql
@ -1,13 +1,12 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_add_launcher`()
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`sales_addLauncher`()
 BEGIN
 /**
 * Añade las ventas a la tabla bs.sale que se realizaron desde hace un mes hasta hoy
 * 
 */
-
 	DECLARE vCurDate DATE DEFAULT util.VN_CURDATE();
-	CALL ventas_add(vCurDate - INTERVAL 1 MONTH, vCurDate);
-
+	
+	CALL sale_add(vCurDate - INTERVAL 1 MONTH, vCurDate);
 END$$
 DELIMITER ;
--- a/db/routines/bs/procedures/ventas_add.sql
+++ b/db/routines/bs/procedures/ventas_add.sql
@ -1,78 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_add`(
-	IN vStarted DATETIME,
-	IN vEnded DATETIME)
-BEGIN
-/**
-* Añade las ventas que se realizaron entre
-* vStarted y vEnded
-* 
-* @param vStarted Fecha de inicio
-* @param vEnded Fecha de finalizacion
-*
-**/
-	DECLARE vStartingDate DATETIME;
-	DECLARE vEndingDate DATETIME;
-
-	IF vStarted < TIMESTAMPADD(YEAR,-5,util.VN_CURDATE()) 
-		OR vEnded < TIMESTAMPADD(YEAR,-5,util.VN_CURDATE()) THEN
-		CALL util.throw('fechaDemasiadoAntigua');
-	END IF;
-
-	SET vEnded = util.dayEnd(vEnded);
-	SET vStartingDate = vStarted ;
-	SET vEndingDate = util.dayEnd(vStartingDate);
-
-	DELETE 
-		FROM sale 
-		WHERE dated BETWEEN vStartingDate AND vEnded;
-
-	WHILE vEndingDate <= vEnded DO
-
-		REPLACE ventas(Id_Movimiento, importe, recargo, fecha, tipo_id, Id_Cliente, empresa_id)
-			SELECT saleFk,
-					SUM(IF(ct.isBase, s.quantity * sc.value, 0)) importe,
-					SUM(IF(ct.isBase, 0, s.quantity * sc.value)) recargo,
-					vStartingDate,
-					i.typeFk,
-					a.clientFk,
-					t.companyFk
-				FROM vn.saleComponent sc
-					JOIN vn.component c ON c.id = sc.componentFk
-					JOIN vn.componentType ct ON ct.id = c.typeFk
-					JOIN vn.sale s ON s.id = sc.saleFk
-					JOIN vn.item i ON i.id = s.itemFk
-					JOIN vn.itemType it ON it.id = i.typeFk
-					JOIN vn.itemCategory ic ON ic.id = it.categoryFk
-					JOIN vn.ticket t ON t.id = s.ticketFk
-					JOIN vn.address a ON a.id = t.addressFk 
-					JOIN vn.client cl ON cl.id = a.clientFk
-				WHERE t.shipped BETWEEN vStartingDate AND vEndingDate
-					AND s.quantity <> 0
-					AND s.discount <> 100
-					AND ic.merchandise 
-				GROUP BY sc.saleFk
-				HAVING IFNULL(importe,0) <> 0 OR IFNULL(recargo,0) <> 0;
-
-		UPDATE sale s
-				JOIN (
-					SELECT s.id, 
-							SUM(s.quantity * sc.value ) margen,
-							s.quantity * s.price * (100 - s.discount ) / 100 pvp
-						FROM vn.sale s
-							JOIN vn.ticket t ON t.id = s.ticketFk 
-							JOIN vn.saleComponent sc ON sc.saleFk = s.id
-							JOIN vn.component c ON c.id = sc.componentFk 
-							JOIN vn.componentType ct ON ct.id = c.typeFk 
-						WHERE t.shipped BETWEEN vStartingDate AND vEndingDate
-							AND ct.isMargin = TRUE
-						GROUP BY s.id) sub ON sub.id = s.saleFk 
-			SET s.margin = sub.margen + s.amount + s.surcharge - sub.pvp;
-
-		SET vStartingDate = TIMESTAMPADD(DAY,1, vStartingDate);
-		SET vEndingDate = util.dayEnd(vStartingDate);
-
-	END WHILE;
-
-END$$
-DELIMITER ;
--- a/db/routines/bs/procedures/ventas_contables_add.sql
+++ b/db/routines/bs/procedures/ventas_contables_add.sql
@ -38,35 +38,35 @@ BEGIN

 		SELECT  vYear
 			  , vMonth
-			  , round(sum(Cantidad * Preu * (100 - m.Descuento)/100))
+			  , round(sum(s.quantity * s.price * (100 - s.discount)/100))
 			  , IF(
-				   e.empresa_grupo = e2.empresa_grupo
+				   co.companyGroupFk = co2.companyGroupFk
 				  ,1
-				  ,IF(e2.empresa_grupo,2,0)
+				  ,IF(co2.companyGroupFk,2,0)
 				  ) as grupo
-			  , tp.reino_id
-			  , a.tipo_id
+			  , it.categoryFk
+			  , i.typeFk
 			  , t.companyFk
-			  , a.expenseFk
-				+ IF(e.empresa_grupo = e2.empresa_grupo
+			  , i.expenseFk
+				+ IF(co.companyGroupFk = co2.companyGroupFk
 									  ,1
-									  ,IF(e2.empresa_grupo,2,0)
+									  ,IF(co2.companyGroupFk,2,0)
 									  ) * 100000
-				+ tp.reino_id * 1000 as Gasto
-			FROM vn2008.Movimientos m
-				JOIN vn.ticket t ON t.id = m.Id_Ticket
-				JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.addressFk
-				JOIN vn2008.Clientes c on c.Id_Cliente = cs.Id_Cliente
+				+ it.categoryFk * 1000 as Gasto
+			FROM vn.sale s
+				JOIN vn.ticket t ON t.id = s.ticketFk
+				JOIN vn.address a on a.id = t.addressFk
+				JOIN vn.client c on c.id = a.clientFk
 				JOIN tmp.ticket_list tt on tt.id = t.id
-				JOIN vn2008.Articles a on m.Id_Article = a.Id_Article
-				JOIN vn2008.empresa e on e.id = t.companyFk
-				LEFT JOIN vn2008.empresa e2 on e2.Id_Cliente = c.Id_Cliente
-				JOIN vn2008.Tipos tp on tp.tipo_id = a.tipo_id
-			WHERE Cantidad <> 0
-				AND Preu <> 0
-				AND m.Descuento <> 100
-				AND a.tipo_id != TIPO_PATRIMONIAL
-			GROUP BY grupo, reino_id, tipo_id, companyFk, Gasto;
+				JOIN vn.item i on s.itemFk = i.id
+				JOIN vn.company co on co.id = t.companyFk
+				LEFT JOIN vn.company co2 on co2.clientFk = c.id
+				JOIN vn.itemType it on it.id = i.typeFk
+			WHERE s.quantity <> 0
+				AND s.price <> 0
+				AND s.discount <> 100
+				AND i.typeFk <> TIPO_PATRIMONIAL
+			GROUP BY grupo, it.categoryFk, i.typeFk, t.companyFk, Gasto;

 	INSERT INTO bs.ventas_contables(year
 								  , month
--- a/db/routines/bs/procedures/ventas_contables_por_cliente.sql
+++ b/db/routines/bs/procedures/ventas_contables_por_cliente.sql
@ -1,47 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_contables_por_cliente`(IN vYear INT, IN vMonth INT)
-BEGIN
-	
-	/**
-	 * Muestra las ventas (€) de cada cliente
-	 * dependiendo del año
-	 */
-	
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
-
-	CREATE TEMPORARY TABLE tmp.ticket_list
-		(PRIMARY KEY (id))
-		SELECT t.id
-			FROM vn.ticket t
-				JOIN vn.invoiceOut io ON io.id = t.refFk
-			WHERE year(io.issued) = vYear
-				AND month(io.issued) = vMonth;
-
-	SELECT vYear Año,
-			vMonth Mes,
-			t.clientFk Id_Cliente,
-			round(sum(Cantidad * Preu * (100 - m.Descuento)/100)) Venta,
-			IF(e.empresa_grupo = e2.empresa_grupo,
-				1,
-				IF(e2.empresa_grupo,2,0))
-			AS grupo,
-			t.companyFk empresa
-		FROM vn2008.Movimientos m 
-			JOIN vn.ticket t ON t.id = m.Id_Ticket
-			JOIN vn2008.Consignatarios cs ON cs.Id_Consigna = t.addressFk
-			JOIN vn2008.Clientes c ON c.Id_Cliente = cs.Id_Cliente
-			JOIN tmp.ticket_list tt ON tt.id = t.id
-			JOIN vn2008.Articles a ON m.Id_Article = a.Id_Article
-			JOIN vn2008.empresa e ON e.id = t.companyFk
-			LEFT JOIN vn2008.empresa e2 ON e2.Id_Cliente = c.Id_Cliente
-			JOIN vn2008.Tipos tp ON tp.tipo_id = a.tipo_id
-		WHERE Cantidad <> 0
-			AND Preu <> 0
-			AND m.Descuento <> 100
-			AND a.tipo_id != 188
-		GROUP BY t.clientFk, grupo,t.companyFk;
-
-	DROP TEMPORARY TABLE tmp.ticket_list;
-
-END$$
-DELIMITER ;
--- a/db/routines/bs/procedures/vivosMuertos.sql
+++ b/db/routines/bs/procedures/vivosMuertos.sql
@ -1,63 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`vivosMuertos`()
-BEGIN
-	
-	/**
-	 * Devuelve el número de clientes nuevos y muertos,
-	 * dependiendo de la fecha actual.
-	 *
-	 * @param @datSTART Fecha de inicio a buscar
-	 * @param @datEND Fecha de finalización a buscar
-	 */
-
-		SET @datSTART = TIMESTAMPADD(YEAR,-2,util.VN_CURDATE());
-		SET @datEND = TIMESTAMPADD(DAY,-DAY(util.VN_CURDATE()),util.VN_CURDATE());
-	
-	DROP TEMPORARY TABLE IF EXISTS tmp.VivosMuertos;
-	
-	CREATE TEMPORARY TABLE tmp.VivosMuertos
-		SELECT c.Id_Cliente, tm.yearMonth, f.Compra, 0 as Nuevo, 0 as Muerto
-		FROM vn2008.Clientes c
-			JOIN
-				(SELECT DISTINCT yearMonth
-				FROM vn2008.time
-				WHERE date BETWEEN @datSTART
-					AND @datEND ) tm
-			LEFT JOIN
-				(SELECT DISTINCT tm.yearMonth, io.clientFk Id_Cliente , 1 as Compra
-					FROM vn.invoiceOut io
-			        	JOIN vn2008.time tm ON tm.date = io.issued
-					WHERE io.issued BETWEEN @datSTART
-						AND @datEND) f ON f.yearMonth = tm.yearMonth
-						AND f.Id_Cliente = c.Id_Cliente;
-	
-	UPDATE tmp.VivosMuertos vm
-		JOIN
-			(SELECT MIN(tm.yearMonth) firstMonth, io.clientFk Id_Cliente 
-			FROM vn.invoiceOut io
-		        JOIN vn2008.time tm ON tm.date = io.issued
-			WHERE io.issued BETWEEN @datSTART AND @datEND
-		    GROUP BY io.clientFk) fm ON fm.firstMonth = vm.yearMonth
-		    	AND fm.Id_Cliente = vm.Id_Cliente
-
-	SET Nuevo = 1;
-	  
-	SELECT max(yearMonth) INTO @lastYearMonth FROM tmp.VivosMuertos;
-	 
-	UPDATE tmp.VivosMuertos vm
-	JOIN (
-	  SELECT MAX(tm.yearMonth) firstMonth, io.clientFk Id_Cliente
-			FROM vn.invoiceOut io
-	        	JOIN vn2008.time tm ON tm.date = io.issued
-			WHERE io.issued BETWEEN @datSTART AND @datEND
-	        GROUP BY io.clientFk) fm ON fm.firstMonth = vm.yearMonth
-				AND fm.Id_Cliente = vm.Id_Cliente
-
-	SET Muerto = 1
-
-	WHERE yearMonth < @lastYearMonth;
-
-	SELECT * FROM tmp.VivosMuertos;
-
-END$$
-DELIMITER ;
--- a/db/routines/bs/views/VentasPorCliente.sql
+++ b/db/routines/bs/views/VentasPorCliente.sql
@ -1,14 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `bs`.`VentasPorCliente`
-AS SELECT `v`.`Id_Cliente` AS `Id_Cliente`,
-	round(sum(`v`.`importe`), 0) AS `VentaBasica`,
-	`t`.`year` AS `year`,
-	`t`.`month` AS `month`
-FROM (
-		`vn2008`.`time` `t`
-		JOIN `bs`.`ventas` `v` ON(`v`.`fecha` = `t`.`date`)
-	)
-GROUP BY `v`.`Id_Cliente`,
-	`t`.`year`,
-	`t`.`month`
--- a/db/routines/bs/views/bajasLaborales.sql
+++ b/db/routines/bs/views/bajasLaborales.sql
@ -1,31 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `bs`.`bajasLaborales`
-AS SELECT `w`.`firstName` AS `firstname`,
-	`w`.`lastName` AS `name`,
-	`b`.`id` AS `businessFk`,
-	max(`c`.`dated`) AS `lastDate`,
-	max(IFNULL(`b`.`ended`, `util`.`VN_CURDATE`())) AS `endContract`,
-	`at`.`name` AS `type`,
-	cast(COUNT(0) AS decimal(10, 0)) AS `dias`,
-	`w`.`id` AS `userFk`
-FROM (
-		(
-			(
-				`vn`.`calendar` `c`
-				JOIN `vn`.`business` `b` ON(`b`.`id` = `c`.`businessFk`)
-			)
-			JOIN `vn`.`worker` `w` ON(`w`.`id` = `b`.`workerFk`)
-		)
-		JOIN `vn`.`absenceType` `at` ON(`at`.`id` = `c`.`dayOffTypeFk`)
-	)
-WHERE `c`.`dated` >= `util`.`VN_CURDATE`() + INTERVAL -1 year
-	AND `at`.`name` NOT IN (
-		'Vacaciones',
-		'Vacaciones 1/2 día',
-		'Compensar',
-		'Festivo'
-	)
-GROUP BY `w`.`id`,
-	`at`.`id`
-HAVING `endContract` >= `util`.`VN_CURDATE`()
--- a/db/routines/bs/views/horasSilla.sql
+++ b/db/routines/bs/views/horasSilla.sql
@ -1,27 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `bs`.`horasSilla`
-AS SELECT `wj`.`dated` AS `Fecha`,
-	`d`.`name` AS `Departamento`,
-	cast(sum(`wj`.`total`) AS decimal(10, 2)) AS `Horas`,
-	cast(
-		sum(
-			(`wj`.`total` + `wj`.`lunch`) * `wj`.`priceOrdinaryHour`
-		) AS decimal(10, 2)
-	) AS `Salarios`
-FROM (
-		(
-			`vn`.`workerJourney` `wj`
-			JOIN `vn`.`business` `b` ON(`b`.`id` = `wj`.`businessFk`)
-		)
-		JOIN `vn`.`department` `d` ON(`d`.`id` = `b`.`departmentFk`)
-	)
-WHERE `d`.`name` IN (
-		'CAMARA',
-		'ENCAJADO',
-		'PALETIZADORES',
-		'PRODUCCION',
-		'SACADORES'
-	)
-GROUP BY `wj`.`dated`,
-	`d`.`name`
--- a/db/routines/bs/views/s1_ticketDetail.sql
+++ b/db/routines/bs/views/s1_ticketDetail.sql
@ -1,19 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `bs`.`s1_ticketDetail`
-AS SELECT `s`.`ticketFk` AS `ticketFk`,
-	cast(
-		sum(`s`.`price` * `s`.`quantity`) AS decimal(10, 2)
-	) AS `ticketAmount`,
-	COUNT(`s`.`id`) AS `ticketLines`,
-	cast(sum(`sv`.`volume`) AS decimal(10, 2)) AS `ticketM3`,
-	cast(`t`.`shipped` AS date) AS `shipped`
-FROM (
-		(
-			`vn`.`ticket` `t`
-			JOIN `vn`.`sale` `s` ON(`s`.`ticketFk` = `t`.`id`)
-		)
-		JOIN `vn`.`saleVolume` `sv` ON(`sv`.`saleFk` = `s`.`id`)
-	)
-WHERE `t`.`shipped` BETWEEN '2021-09-01' AND '2021-10-31 23:59'
-GROUP BY `s`.`ticketFk`
--- a/db/routines/bs/views/s21_saleDetail.sql
+++ b/db/routines/bs/views/s21_saleDetail.sql
@ -1,42 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `bs`.`s21_saleDetail`
-AS SELECT dayofmonth(`t`.`shipped`) AS `dia`,
-	year(`t`.`shipped`) AS `año`,
-	MONTH(`t`.`shipped`) AS `mes`,
-	`s`.`concept` AS `concepto`,
-	`s`.`quantity` AS `unidades`,
-	`s`.`price` AS `precio`,
-	`s`.`quantity` * `s`.`price` AS `venta`,
-	`it`.`name` AS `familia`,
-	`w`.`code` AS `comprador`,
-	`s`.`itemFk` AS `itemFk`,
-	`s`.`ticketFk` AS `ticketFk`,
-	`sv`.`volume` AS `volume`
-FROM (
-		(
-			(
-				(
-					(
-						(
-							`vn`.`sale` `s`
-							JOIN `vn`.`item` `i` ON(`i`.`id` = `s`.`itemFk`)
-						)
-						JOIN `vn`.`itemType` `it` ON(`it`.`id` = `i`.`typeFk`)
-					)
-					JOIN `vn`.`worker` `w` ON(`w`.`id` = `it`.`workerFk`)
-				)
-				JOIN `vn`.`ticket` `t` ON(`t`.`id` = `s`.`ticketFk`)
-			)
-			JOIN `vn`.`client` `c` ON(`c`.`id` = `t`.`clientFk`)
-		)
-		JOIN `vn`.`saleVolume` `sv` ON(`sv`.`saleFk` = `s`.`id`)
-	)
-WHERE (
-		`t`.`shipped` BETWEEN '2020-10-21' AND '2020-10-28'
-		OR `t`.`shipped` BETWEEN '2019-10-21' AND '2019-10-28'
-		OR `t`.`shipped` BETWEEN '2021-09-1' AND '2021-10-28'
-	)
-	AND `t`.`warehouseFk` IN (1, 60)
-	AND `c`.`isRelevant` <> 0
-	AND `s`.`quantity` > 0
--- a/db/routines/cache/procedures/prod_graphic_refresh.sql
+++ b/db/routines/cache/procedures/prod_graphic_refresh.sql
@ -1,36 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`prod_graphic_refresh`(v_refresh BOOL, wh_id INT)
-proc: BEGIN
-	DECLARE datEQ DATETIME;
-	DECLARE timDIF TIME;
-    DECLARE v_calc INT;
-    
-    CALL cache_calc_start (v_calc, v_refresh, 'prod_graphic', wh_id);
-    
-    IF !v_refresh
-    THEN
-		LEAVE proc;
-	END IF;
-    
-    CALL vn2008.production_control_source(wh_id, 0);
-
-	DELETE FROM prod_graphic_source;
-
-	INSERT INTO prod_graphic_source (warehouse_id,  graphCategory, m3, hora, `order`, Agencia)
-	SELECT
-		wh_id,
-        st.graphCategory,
-        CAST(SUM(m3) AS DECIMAL(10,0)) as m3,
-        pb.Hora,
-        pb.state_order,
-        pb.Agencia
-	FROM tmp.production_buffer pb
-		JOIN vn.state st ON st.id = pb.state
-    WHERE Fecha = util.VN_CURDATE()
-    GROUP BY wh_id, graphCategory
-    ;
-    
-    
-    CALL cache_calc_end (v_calc);
-END$$
-DELIMITER ;
--- a/db/routines/edi/procedures/ekt_load.sql
+++ b/db/routines/edi/procedures/ekt_load.sql
@ -70,16 +70,16 @@ proc:BEGIN
 	
 	ELSE
 	
-		INSERT IGNORE INTO vn2008.Cubos (Id_Cubo, X, Y, Z)
+		INSERT IGNORE INTO vn.packaging (id, width, depth, height)
 			SELECT bucket_id, ROUND(x_size/10), ROUND(y_size/10), ROUND(z_size/10)
 				FROM bucket WHERE bucket_id = vPackage;
 		
 		IF ROW_COUNT() > 0
 		THEN
-			INSERT INTO vn2008.mail SET
+			INSERT INTO vn.mail SET
 				`subject` = 'Cubo añadido',
-				`text` = CONCAT('Se ha añadido el cubo: ', vPackage),
-				`to` = 'ekt@verdnatura.es';
+				`body` = CONCAT('Se ha añadido el cubo: ', vPackage),
+				`receiver` = 'ekt@verdnatura.es';
 		END IF;
 	END IF;
 	
--- a/db/routines/vn/functions/getAlert3StateTest.sql
+++ b/db/routines/vn/functions/getAlert3StateTest.sql
@ -1,40 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`getAlert3StateTest`(vTicket INT)
-	RETURNS varchar(45) CHARSET latin1 COLLATE latin1_swedish_ci
-	NOT DETERMINISTIC
-	READS SQL DATA
-BEGIN
-	DECLARE vDeliveryType INTEGER DEFAULT 0;
-		DECLARE isWaitingForPickUp BOOLEAN DEFAULT FALSE;
-		DECLARE vCode VARCHAR(45);
-		
-	SELECT 
-		a.Vista
-	INTO vDeliveryType 
-		FROM ticket t
-			JOIN vn2008.Agencias a ON a.Id_Agencia = t.agencyModeFk
-	WHERE t.id = vTicket;
-		
-		CASE vDeliveryType
-			WHEN 1 THEN -- AGENCIAS
-				SET vCode = 'DELIVERED';
-					   
-			WHEN 2 THEN -- REPARTO
-				SET vCode = 'ON_DELIVERY';
-					
-			ELSE -- MERCADO, OTROS
-				SELECT t.warehouseFk <> w.warehouse_id INTO isWaitingForPickUp
-					FROM ticket t 
-						LEFT JOIN vn2008.warehouse_pickup w 
-							ON w.agency_id = t.agencyModeFk AND w.warehouse_id = t.warehouseFk
-					WHERE t.id = vTicket;
-						
-			IF isWaitingForPickUp THEN
-				SET vCode = 'WAITING_FOR_PICKUP';
-					ELSE
-				SET vCode = 'DELIVERED';
-			END IF;
-		END CASE;
-	RETURN vCode;
-END$$
-DELIMITER ;
--- a/db/routines/vn/functions/ticketPositionInPath.sql
+++ b/db/routines/vn/functions/ticketPositionInPath.sql
@ -26,11 +26,11 @@ SELECT t.routeFk, t.warehouseFk, IFNULL(ts.productionOrder,0)
   LEFT JOIN ticketState ts on ts.ticketFk = t.id
  WHERE t.id = vTicketId;

-SELECT (ag.`name` = 'VN_VALENCIA') 
+SELECT (a.`name` = 'VN_VALENCIA') 
 INTO vIsValenciaPath
  FROM `route` r
-   JOIN vn2008.Agencias a on a.Id_Agencia = r.agencyModeFk
-   JOIN vn2008.agency ag on ag.agency_id = a.agency_id
+   JOIN agencyMode am on am.id = r.agencyModeFk
+   JOIN agency a on a.id = am.agencyFk
  WHERE r.id = vMyPath;

 IF vIsValenciaPath THEN -- Rutas Valencia
--- a/db/routines/vn/functions/ticketSplitCounter.sql
+++ b/db/routines/vn/functions/ticketSplitCounter.sql
@ -9,9 +9,9 @@ BEGIN
 	SELECT CONCAT(printedStickers,'/',Total, IF(printedStickers = Total ,' LS','')) INTO vSplitCounter
 		FROM
 		(
-			SELECT count(l.Id_Movimiento) as printedStickers, COUNT(*) as Total
-				FROM vn.sale s
-					LEFT JOIN vn2008.movement_label l ON l.Id_Movimiento = s.id
+			SELECT count(sl.saleFk) as printedStickers, COUNT(*) as Total
+				FROM sale s
+					LEFT JOIN saleLabel sl ON sl.saleFk = s.id
 				WHERE ticketFk = vTicketFk
 		) sub;
        
--- a/db/routines/vn/procedures/available_traslate.sql
+++ b/db/routines/vn/procedures/available_traslate.sql
@ -0,0 +1,138 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`available_traslate`(
+	vWarehouseLanding INT,
+	vDated DATE,
+	vWarehouseShipment INT)
+proc: BEGIN
+/**
+ * Calcular la disponibilidad dependiendo del almacen 
+ * de origen y destino según la fecha.
+ *
+ * @param vWarehouseLanding Almacén de llegada
+ * @param vDated Fecha del calculo para la disponibilidad de articulos
+ * @param vWarehouseShipment Almacén de destino
+ */
+	DECLARE vDatedFrom DATE;
+	DECLARE vDatedTo DATETIME;
+	DECLARE vDatedReserve DATETIME;
+	DECLARE vDatedInventory DATE;
+
+	IF vDated < util.VN_CURDATE() THEN
+		LEAVE proc;
+	END IF;
+
+	CALL item_getStock (vWarehouseLanding, vDated, NULL);
+
+	-- Calcula algunos parámetros necesarios.
+	SET vDatedFrom = vDated;
+	SET vDatedTo = util.dayEnd (vDated + INTERVAL 4 DAY);
+	SELECT inventoried INTO vDatedInventory FROM config;
+	SELECT SUBTIME(util.VN_NOW(), reserveTime) INTO vDatedReserve
+		FROM hedera.orderConfig;
+
+	-- Calcula el ultimo dia de vida para cada producto.
+	CREATE OR REPLACE TEMPORARY TABLE tItemRange
+		(PRIMARY KEY (itemFk))
+		ENGINE = MEMORY
+		SELECT c.itemFk, MAX(t.landed) dated
+			FROM buy c
+				JOIN entry e ON c.entryFk = e.id
+				JOIN travel t ON t.id = e.travelFk
+				JOIN warehouse w ON w.id = t.warehouseInFk
+			WHERE t.landed BETWEEN vDatedInventory AND vDatedFrom
+				AND t.warehouseInFk = vWarehouseLanding
+				AND NOT e.isExcludedFromAvailable
+				AND NOT e.isRaid
+			GROUP BY c.itemFk;
+
+	-- Tabla con el ultimo dia de last_buy para cada producto 
+	-- que hace un replace de la anterior.
+	CALL buyUltimate(vWarehouseShipment, util.VN_CURDATE());
+
+	INSERT INTO tItemRange
+		SELECT t.itemFk, tr.landed
+			FROM tmp.buyUltimate t
+				JOIN buy b ON b.id = t.buyFk
+				JOIN entry e ON e.id = b.entryFk
+				JOIN travel tr ON tr.id = e.travelFk
+				LEFT JOIN tItemRange i ON t.itemFk = i.itemFk
+			WHERE t.warehouseFk = vWarehouseShipment
+				AND NOT e.isRaid
+	ON DUPLICATE KEY UPDATE tItemRange.dated = GREATEST(tItemRange.dated,
+	tr.landed);
+
+	CREATE OR REPLACE TEMPORARY TABLE tItemRangeLive
+		(PRIMARY KEY (itemFk))
+		ENGINE = MEMORY
+		SELECT ir.itemFk, util.dayEnd(ir.dated + INTERVAL it.life DAY) dated
+			FROM tItemRange ir
+				JOIN item i ON i.id = ir.itemFk
+				JOIN itemType it ON it.id = i.typeFk
+			HAVING dated >= vDatedFrom OR dated IS NULL;
+
+	-- Calcula el ATP.
+	CREATE OR REPLACE TEMPORARY TABLE tmp.itemCalc
+		(INDEX (itemFk,warehouseFk))
+		ENGINE = MEMORY
+		SELECT i.itemFk,
+				vWarehouseLanding warehouseFk,
+				i.shipped dated,
+				i.quantity
+			FROM itemTicketOut i
+				JOIN tItemRangeLive ir ON ir.itemFK = i.itemFk
+			WHERE i.shipped >= vDatedFrom
+				AND (ir.dated IS NULL OR i.shipped <= ir.dated)
+				AND i.warehouseFk = vWarehouseLanding
+		UNION ALL
+		SELECT b.itemFk,
+				vWarehouseLanding,
+				t.landed,
+				b.quantity
+			FROM buy b
+				JOIN entry e ON b.entryFk = e.id
+				JOIN travel t ON t.id = e.travelFk
+				JOIN tItemRangeLive ir ON ir.itemFk = b.itemFk
+			WHERE NOT e.isExcludedFromAvailable
+				AND b.quantity <> 0
+				AND NOT e.isRaid
+				AND t.warehouseInFk = vWarehouseLanding
+				AND t.landed >= vDatedFrom
+				AND (ir.dated IS NULL OR t.landed <= ir.dated)
+		UNION ALL
+		SELECT i.itemFk, vWarehouseLanding, i.shipped, i.quantity
+			FROM itemEntryOut i
+				JOIN tItemRangeLive ir ON ir.itemFk = i.itemFk
+			WHERE i.shipped >= vDatedFrom
+				AND (ir.dated IS NULL OR i.shipped <= ir.dated)
+				AND i.warehouseOutFk = vWarehouseLanding
+		UNION ALL
+		SELECT r.item_id, vWarehouseLanding, r.shipment, -r.amount
+			FROM hedera.order_row r
+				JOIN hedera.`order` o ON o.id = r.order_id
+				JOIN tItemRangeLive ir ON ir.itemFk = r.item_id
+			WHERE r.shipment >= vDatedFrom
+				AND (ir.dated IS NULL OR r.shipment <= ir.dated)
+				AND r.warehouse_id = vWarehouseLanding
+				AND r.created >= vDatedReserve
+				AND NOT o.confirmed;
+
+	CALL item_getAtp(vDated);
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.availableTraslate
+		(PRIMARY KEY (item_id))
+		ENGINE = MEMORY
+		SELECT t.item_id, SUM(stock) available
+			FROM (
+				SELECT ti.itemFk item_id, stock
+					FROM tmp.itemList ti
+						JOIN tItemRange ir ON ir.itemFk = ti.itemFk
+				UNION ALL
+				SELECT itemFk, quantity
+					FROM tmp.itemAtp
+				) t
+			GROUP BY t.item_id
+			HAVING available <> 0;
+
+	DROP TEMPORARY TABLE tmp.itemList, tItemRange, tItemRangeLive;
+END$$
+DELIMITER ;
--- a/db/routines/vn/procedures/balance_create.sql
+++ b/db/routines/vn/procedures/balance_create.sql
@ -0,0 +1,217 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balance_create`(
+	IN vStartingMonth INT,
+	IN vEndingMonth INT,
+	IN vCompany INT,
+	IN vIsConsolidated BOOLEAN,
+	IN vInterGroupSalesIncluded BOOLEAN)
+BEGIN
+/**
+ * Crea un balance financiero para una empresa durante 
+ * un período de tiempo determinado.
+ *
+ * @param vStartingMonth Mes de inicio del período
+ * @param vEndingMonth Mes de finalización del período
+ * @param vCompany Identificador de la empresa
+ * @param vIsConsolidated Indica si se trata de un balance consolidado
+ * @param vInterGroupSalesIncluded Indica si se incluyen las ventas del grupo
+ */
+	DECLARE intGAP INT DEFAULT 7;
+	DECLARE vYears INT DEFAULT 2;
+	DECLARE vYear TEXT;
+	DECLARE vOneYearAgo TEXT;
+	DECLARE vTwoYearsAgo TEXT;
+	DECLARE vQuery TEXT;
+	DECLARE vConsolidatedGroup INT;
+	DECLARE vStartingDate DATE DEFAULT '2020-01-01';
+	DECLARE vCurYear INT DEFAULT YEAR(util.VN_CURDATE());
+	DECLARE vStartingYear INT DEFAULT vCurYear - 2;
+	DECLARE vTable TEXT;
+
+	SET vTable = util.quoteIdentifier('balanceNestTree');
+	SET vYear = util.quoteIdentifier(vCurYear);
+	SET vOneYearAgo = util.quoteIdentifier(vCurYear-1);
+	SET vTwoYearsAgo = util.quoteIdentifier(vCurYear-2);
+
+	-- Solicitamos la tabla tmp.nest, como base para el balance.
+	DROP TEMPORARY TABLE IF EXISTS tmp.nest;
+
+	EXECUTE IMMEDIATE CONCAT(
+		'CREATE TEMPORARY TABLE tmp.nest
+			SELECT node.id
+					,CONCAT( REPEAT(REPEAT(" ",?), COUNT(parent.id) - 1), 
+					node.name) name,
+					node.lft,
+					node.rgt,
+					COUNT(parent.id) - 1 depth,
+					CAST((node.rgt - node.lft - 1) / 2 AS DECIMAL) sons
+				FROM ', vTable, ' node,
+					', vTable, ' parent
+				WHERE node.lft BETWEEN parent.lft AND parent.rgt
+				GROUP BY node.id
+				ORDER BY node.lft')
+		USING intGAP;
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.balance
+		SELECT * FROM tmp.nest;
+
+		SELECT companyGroupFk INTO vConsolidatedGroup
+			FROM company
+			WHERE id = vCompany;
+
+	CREATE OR REPLACE TEMPORARY TABLE tCompanyReceiving
+		SELECT id companyFk
+			FROM company
+			WHERE id = vCompany
+				OR companyGroupFk = IF(vIsConsolidated, vConsolidatedGroup, NULL);
+
+	CREATE OR REPLACE TEMPORARY TABLE tCompanyIssuing
+		SELECT id companyFk
+			FROM supplier p;
+
+		IF NOT vInterGroupSalesIncluded THEN
+
+			DELETE ci
+				FROM tCompanyIssuing ci
+					JOIN company e on e.id = ci.companyFk
+				WHERE e.companyGroupFk = vConsolidatedGroup;
+
+		END IF;
+
+	-- Se calculan las facturas que intervienen, 
+	-- para luego poder servir el desglose desde aqui.
+	CREATE OR REPLACE TEMPORARY TABLE tmp.balanceDetail
+		SELECT cr.companyFk receivingId,
+				ci.companyFk issuingId,
+				YEAR(IFNULL(r.bookEntried,IFNULL(r.booked, r.issued))) `year`,
+				MONTH(IFNULL(r.bookEntried,IFNULL(r.booked, r.issued))) `month`,
+				expenseFk,
+				SUM(taxableBase) amount
+			FROM invoiceIn r
+				JOIN invoiceInTax ri on ri.invoiceInFk = r.id
+				JOIN tCompanyReceiving cr on cr.companyFk = r.companyFk
+				JOIN tCompanyIssuing ci ON ci.companyFk = r.supplierFk
+			WHERE COALESCE(r.bookEntried, r.booked, r.issued) >= vStartingDate
+				AND r.isBooked
+			GROUP BY expenseFk, `year`, `month`, ci.companyFk, cr.companyFk;
+
+	INSERT INTO tmp.balanceDetail(
+			receivingId,
+			issuingId,
+			`year`,
+			`month`,
+			expenseFk,
+			amount)
+		SELECT em.companyFk,
+				em.companyFk,
+				`year`,
+				`month`,
+				expenseFk,
+				SUM(em.amount)
+			FROM expenseManual em
+				JOIN tCompanyReceiving er ON er.companyFk = em.companyFk
+			WHERE `year` >= vStartingYear
+				AND `month` BETWEEN vStartingMonth AND vEndingMonth
+			GROUP BY expenseFk, `year`, `month`, em.companyFk;
+
+	DELETE FROM tmp.balanceDetail
+		WHERE `month` < vStartingMonth
+			OR `month` > vEndingMonth;
+
+	-- Ahora el balance
+	EXECUTE IMMEDIATE CONCAT(
+		'ALTER TABLE tmp.balance
+			ADD COLUMN ', vTwoYearsAgo ,' INT(10) NULL ,
+			ADD COLUMN ', vOneYearAgo ,' INT(10) NULL ,
+			ADD COLUMN ', vYear,' INT(10) NULL ,
+			ADD COLUMN expenseFk VARCHAR(10) NULL,
+			ADD COLUMN expenseName VARCHAR(45) NULL');
+
+	-- Añadimos los gastos, para facilitar el formulario
+	UPDATE tmp.balance b
+			JOIN balanceNestTree bnt on bnt.id = b.id
+			JOIN expense e ON e.id = bnt.expenseFk COLLATE utf8_general_ci
+		SET b.expenseFk = e.id COLLATE utf8_general_ci,
+			b.expenseName = e.name COLLATE utf8_general_ci ;
+
+	-- Rellenamos los valores de primer nivel, los que corresponden 
+	-- a los gastos simples.
+	WHILE vYears >= 0 DO
+		SET vQuery = CONCAT(
+			'UPDATE tmp.balance b
+					JOIN (
+						SELECT expenseFk, SUM(amount) amount
+							FROM tmp.balanceDetail
+							WHERE year = ?
+							GROUP BY expenseFk
+					) sub on sub.expenseFk = b.expenseFk COLLATE utf8_general_ci
+				SET ', util.quoteIdentifier(vCurYear - vYears), ' = - amount');
+
+		EXECUTE IMMEDIATE vQuery
+			USING vCurYear - vYears;
+
+		SET vYears = vYears - 1;
+	END WHILE;
+
+	-- Añadimos las ventas.
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE tmp.balance b
+				JOIN (
+					SELECT SUM(IF(year = ?, venta, 0)) y2,
+							SUM(IF(year = ?, venta, 0)) y1,
+							SUM(IF(year = ?, venta, 0)) y0,
+							c.Gasto
+						FROM bs.ventas_contables c
+							JOIN tCompanyReceiving cr ON cr.companyFk = c.empresa_id
+						WHERE month BETWEEN ? AND ?
+						GROUP BY c.Gasto
+				) sub ON sub.gasto = b.expenseFk COLLATE utf8_general_ci
+			SET b.', vTwoYearsAgo, '= IFNULL(b.', vTwoYearsAgo, ', 0) + sub.y2,
+				b.', vOneYearAgo, '= IFNULL(b.', vOneYearAgo, ', 0) + sub.y1,
+				b.', vYear, '= IFNULL(b.', vYear, ', 0) + sub.y0')
+		USING vCurYear-2,
+			vCurYear-1,
+			vCurYear,
+			vStartingMonth,
+			vEndingMonth;
+
+	-- Ventas intra grupo.
+	IF NOT vInterGroupSalesIncluded THEN
+
+		SELECT lft, rgt INTO @groupLft, @groupRgt
+			FROM tmp.balance b
+			WHERE TRIM(b.`name`) = 'Grupo';
+
+		DELETE
+			FROM tmp.balance
+			WHERE lft BETWEEN @groupLft AND @groupRgt;
+
+	END IF;
+
+	-- Rellenamos el valor de los padres con la suma de los hijos.
+	CREATE OR REPLACE TEMPORARY TABLE tmp.balance_aux
+		SELECT * FROM tmp.balance;
+
+	EXECUTE IMMEDIATE
+		CONCAT('UPDATE tmp.balance b
+			JOIN (
+				SELECT b1.id,
+						b1.name,
+						SUM(b2.', vYear,') thisYear,
+						SUM(b2.', vOneYearAgo,') oneYearAgo,
+						SUM(b2.', vTwoYearsAgo,') twoYearsAgo
+					FROM tmp.nest b1
+						JOIN tmp.balance_aux b2 on b2.lft BETWEEN b1.lft and b1.rgt
+					GROUP BY b1.id
+				)sub ON sub.id = b.id
+			SET b.', vYear, ' = thisYear,
+				b.', vOneYearAgo, ' = oneYearAgo,
+				b.', vTwoYearsAgo, ' = twoYearsAgo');
+
+	SELECT *, CONCAT('',IFNULL(expenseFk,'')) newgasto
+		FROM tmp.balance;
+
+	DROP TEMPORARY TABLE IF EXISTS tCompanyReceiving, tCompanyIssuing;
+	
+END$$
+DELIMITER ;
--- a/db/routines/vn/procedures/entry_getTransfer.sql
+++ b/db/routines/vn/procedures/entry_getTransfer.sql
@ -68,19 +68,19 @@ BEGIN
 					AND v.`visible`
 			ON DUPLICATE KEY UPDATE visibleLanding = v.`visible`;

-		CALL vn2008.availableTraslate(vWarehouseOut, vDateShipped, NULL);
+		CALL available_traslate(vWarehouseOut, vDateShipped, NULL);

 		INSERT INTO tItem(itemFk, available)
 			SELECT a.item_id, a.available
-				FROM vn2008.availableTraslate a
+				FROM tmp.availableTraslate a
 				WHERE a.available
 			ON DUPLICATE KEY UPDATE available = a.available;

-		CALL vn2008.availableTraslate(vWarehouseIn, vDateLanded, vWarehouseOut);
+		CALL available_traslate(vWarehouseIn, vDateLanded, vWarehouseOut);

 		INSERT INTO tItem(itemFk, availableLanding)
 			SELECT a.item_id, a.available
-				FROM vn2008.availableTraslate a
+				FROM tmp.availableTraslate a
 				WHERE a.available
 			ON DUPLICATE KEY UPDATE availableLanding = a.available;
 	ELSE
--- a/db/routines/vn/procedures/entry_recalc.sql
+++ b/db/routines/vn/procedures/entry_recalc.sql
@ -26,7 +26,7 @@ BEGIN
 			LEAVE l;
 		END IF;
 		
-		CALL vn2008.buy_tarifas_entry(vEntryFk);
+		CALL buy_recalcPricesByEntry(vEntryFk);
 	END LOOP;

 	CLOSE vCur;
--- a/db/routines/vn/procedures/inventoryMake.sql
+++ b/db/routines/vn/procedures/inventoryMake.sql
@ -21,7 +21,7 @@ BEGIN
 		SELECT id
 			FROM warehouse
 			WHERE isInventory;
-	
+
 	DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
 	BEGIN
 		ROLLBACK;
@ -38,18 +38,18 @@ BEGIN
 			INTO vMaxRecentInventories,
 				vWarehouseOutFkInventory,
 				vAgencyModeFkInventory
-		FROM inventoryConfig 
+		FROM inventoryConfig
 		LIMIT 1;

-	IF vDateLastInventory IS NULL 
+	IF vDateLastInventory IS NULL
 		OR vInventorySupplierFk IS NULL
-		OR vMaxRecentInventories IS NULL 
-		OR vInventoryDate IS NULL 
+		OR vMaxRecentInventories IS NULL
+		OR vInventoryDate IS NULL
 		OR vWarehouseOutFkInventory IS NULL
 		OR vAgencyModeFkInventory IS NULL THEN
 		CALL util.throw('Some config parameters are not set');
 	END IF;
-	
+
 	START TRANSACTION;

 	OPEN cWarehouses;
@ -77,7 +77,7 @@ BEGIN
 			LIMIT 1;

 		IF vTravelFk IS NULL THEN
-			INSERT INTO travel 
+			INSERT INTO travel
 				SET warehouseOutFk = vWarehouseOutFkInventory,
 					warehouseInFk = vWarehouseFk,
 					shipped = vInventoryDate,
@ -94,15 +94,16 @@ BEGIN
 		SELECT id INTO vEntryFk
 			FROM entry
 			WHERE supplierFk = vInventorySupplierFk
-			AND travelFk = vTravelFk;
+				AND travelFk = vTravelFk
+				AND typeFk = 'inventory';

 		IF vEntryFk IS NULL THEN
-			INSERT INTO entry 
+			INSERT INTO entry
 				SET supplierFk = vInventorySupplierFk,
 					isConfirmed = TRUE,
 					isOrdered = TRUE,
-					travelFk = vTravelFk;
-
+					travelFk = vTravelFk,
+					typeFk = 'inventory';
 			SELECT LAST_INSERT_ID() INTO vEntryFk;
 		ELSE
 			DELETE FROM buy WHERE entryFk = vEntryFk;
@ -224,15 +225,15 @@ BEGIN
 				JOIN tInventory i2 ON i2.itemFk = i.id
 			SET i.lastUsed = NOW()
 			WHERE i2.quantity;
-	
+
 		DROP TEMPORARY TABLE tInventory;

 	END LOOP;
-	
+
 	CLOSE cWarehouses;

 	UPDATE config SET inventoried = vInventoryDate;
-	
+
 	CREATE OR REPLACE TEMPORARY TABLE tEntryToDelete
 		(INDEX(entryId)) ENGINE = MEMORY
 		SELECT e.id entryId,
@ -252,7 +253,7 @@ BEGIN
 			WHERE e.supplierFk = vInventorySupplierFk
 				AND t.shipped IN (sub.shipped);

-	DELETE e 
+	DELETE e
 		FROM `entry` e
 			JOIN tEntryToDelete tmp ON tmp.entryId = e.id;

--- a/db/routines/vn/procedures/itemShelvingProblem.sql
+++ b/db/routines/vn/procedures/itemShelvingProblem.sql
@ -20,17 +20,17 @@ BEGIN
        GREATEST(0,iss.visible - IFNULL(sub3.transit,0)) as Altillo, 
        s.id as saleFk,
        IFNULL(sub3.transit,0)  transit,
-        v.visible, s.isPicked, s.reserved, t.shipped, tst.productionOrder, mm.Id_Movimiento
-		FROM vn.ticket t 
-			JOIN vn.ticketState tst ON tst.ticketFk = t.id
-			JOIN vn.sale s ON s.ticketFk = t.id
-			JOIN vn.item i ON i.id = s.itemFk
+        v.visible, s.isPicked, s.reserved, t.shipped, tst.productionOrder, st.saleFk
+		FROM ticket t 
+			JOIN ticketState tst ON tst.ticketFk = t.id
+			JOIN sale s ON s.ticketFk = t.id
+			JOIN item i ON i.id = s.itemFk
 			JOIN cache.visible v ON s.itemFk = v.item_id AND v.calc_id = vVisibleCache
-			LEFT JOIN vn2008.Movimientos_mark mm ON mm.Id_Movimiento = s.id AND mm.stateFk = 26
-			JOIN vn.itemShelvingStock iss ON iss.itemFk = v.item_id    
+			LEFT JOIN saleTracking st ON st.saleFk = s.id AND st.stateFk = 26
+			JOIN itemShelvingStock iss ON iss.itemFk = v.item_id    
            LEFT JOIN
 			(SELECT itemFk, sum(saldo) as transit 
-				FROM vn.itemPlacementSupplyList 
+				FROM itemPlacementSupplyList 
                WHERE saldo > 0 
 					AND sectorFk = vSectorFk
                GROUP BY itemFk) sub3 ON sub3.itemFk = i.id
@ -42,7 +42,7 @@ BEGIN
 			AND tst.isPreviousPreparable = TRUE
 			AND t.warehouseFk = vWarehouseFk
            AND iss.sectorFk = vSectorFk
-			AND mm.Id_Movimiento IS NULL
+			AND st.saleFk IS NULL
 		ORDER BY itemFk;
                    
 END$$
--- a/db/routines/vn/procedures/itemShelving_add.sql
+++ b/db/routines/vn/procedures/itemShelving_add.sql
@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelving_add`(IN vShelvingFk VARCHAR(8), IN vBarcode VARCHAR(22), IN vQuantity INT, IN vPackagingFk VARCHAR(10), IN vGrouping INT, IN vPacking INT, IN vWarehouseFk INT)
 BEGIN
-	
+

 /**
 * Añade registro o lo actualiza si ya existe.
@ -13,34 +13,24 @@ BEGIN
 * @param vGrouping el grouping del producto en itemShelving, NULL para coger el de la ultima compra
 * @param vPacking el packing del producto, NULL para coger el de la ultima compra
 * @param vWarehouseFk indica el sector
- * 
+ *
 **/

 	DECLARE vItemFk INT;

 	SELECT barcodeToItem(vBarcode) INTO vItemFk;
-	
+
 	SET vPacking = COALESCE(vPacking, GREATEST(vn.itemPacking(vBarcode,vWarehouseFk), 1));
 	SET vQuantity = vQuantity * vPacking;

-	IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN
-
-		INSERT IGNORE INTO parking(code) VALUES(vShelvingFk);
-		INSERT INTO shelving(code, parkingFk) 
-			SELECT vShelvingFk, id
-				FROM parking 
-				WHERE `code` = vShelvingFk COLLATE utf8_unicode_ci;
-
-	END IF;
-
-	IF (SELECT COUNT(*) FROM itemShelving 
-			WHERE shelvingFk COLLATE utf8_unicode_ci  = vShelvingFk 
-				AND itemFk  = vItemFk 
+	IF (SELECT COUNT(*) FROM itemShelving
+			WHERE shelvingFk COLLATE utf8_unicode_ci  = vShelvingFk
+				AND itemFk  = vItemFk
 				AND packing  = vPacking) = 1 THEN

 		UPDATE itemShelving
 			SET visible = visible+vQuantity
-			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking; 
+			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking;

 	ELSE
 		CALL cache.last_buy_refresh(FALSE);
--- a/db/routines/vn/procedures/item_cleanFloramondo.sql
+++ b/db/routines/vn/procedures/item_cleanFloramondo.sql
@ -101,9 +101,6 @@ BEGIN
 		DELETE FROM itemCost
 			WHERE itemFk = vItemOld;

-		DELETE FROM vn2008.rec_translator
-			WHERE Id_Article = vItemOld;
-
 		DELETE FROM bs.waste
 			WHERE itemFk = vItemOld;

--- a/db/routines/vn/procedures/item_getBalance.sql
+++ b/db/routines/vn/procedures/item_getBalance.sql
@ -155,30 +155,31 @@ BEGIN
 		SET @currentLineFk := 0;
 		SET @shipped := '';

-		SELECT DATE(@shipped:= shipped) shipped,
-			alertLevel,
-			stateName,
-			origin,
-			reference,
-			clientFk,
-			name,
-			`in` invalue,
-			`out`,
-			@a := @a + IFNULL(`in`, 0) - IFNULL(`out`, 0) balance,
+		SELECT DATE(@shipped:= t.shipped) shipped,
+			t.alertLevel,
+			t.stateName,
+			t.origin,
+			t.reference,
+			t.clientFk,
+			t.name,
+			t.`in` invalue,
+			t.`out`,
+			@a := @a + IFNULL(t.`in`, 0) - IFNULL(t.`out`, 0) balance,
 			@currentLineFk := IF (@shipped < util.VN_CURDATE() 
-								OR (@shipped = util.VN_CURDATE() AND (isPicked OR a.`code` >= 'ON_PREPARATION')),
-									lineFk, 
+								OR (@shipped = util.VN_CURDATE() AND (t.isPicked OR a.`code` >= 'ON_PREPARATION')),
+									t.lineFk, 
 									@currentLineFk) lastPreparedLineFk,
-			isTicket,
-			lineFk,
-			isPicked,
-			clientType,
-			claimFk
-			FROM tItemDiary
-				LEFT JOIN alertLevel a ON a.id = tItemDiary.alertLevel;
+			t.isTicket,
+			t.lineFk,
+			t.isPicked,
+			t.clientType,
+			t.claimFk,
+			t.`order`
+			FROM tItemDiary t
+				LEFT JOIN alertLevel a ON a.id = t.alertLevel;

 	ELSE
-		SELECT SUM(`in`) - SUM(`out`) INTO @a
+		SELECT IFNULL(SUM(IFNULL(`in`, 0)) - SUM(IFNULL(`out`, 0)), 0) INTO @a
 			FROM tItemDiary
 			WHERE shipped < vDate;

@ -197,7 +198,8 @@ BEGIN
 			0 lineFk,
 			0 isPicked,
 			0 clientType,
-			0 claimFk
+			0 claimFk,
+			NULL `order`
 		UNION ALL
 		SELECT shipped, 
 				alertlevel, 
@ -213,7 +215,8 @@ BEGIN
 				lineFk, 
 				isPicked, 
 				clientType, 
-				claimFk
+				claimFk,
+				`order`
 			FROM tItemDiary
 				WHERE shipped >= vDate;
 	END IF;
--- a/db/routines/vn/procedures/packingListPrinted.sql
+++ b/db/routines/vn/procedures/packingListPrinted.sql
@ -1,13 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`packingListPrinted`(ticketFk INT)
-BEGIN
-
-	UPDATE vn2008.Movimientos_mark mm
-		JOIN vn2008.Movimientos m ON m.Id_Movimiento = mm.Id_Movimiento
-        SET mm.valor = 2 -- Impreso
-        WHERE mm.valor = 1 -- Listo para imprimir
-        AND mm.stateFk = 9 -- Encajando
-        AND m.Id_Ticket = ticketFk;
-        
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/packingListSwitch.sql
+++ b/db/routines/vn/procedures/packingListSwitch.sql
@ -5,14 +5,14 @@ BEGIN
 	DECLARE valueFk INT;
    DECLARE encajando INT DEFAULT 9;
    
-    SELECT valor INTO valueFk 
-		FROM vn2008.Movimientos_mark 
-		WHERE Id_Movimiento = saleFk 
+    SELECT isChecked INTO valueFk 
+		FROM saleTracking
+		WHERE saleFk = saleFk 
 			AND stateFk = encajando;
            
 	SET valueFk = (IFNULL(valueFk,0) + 1) MOD 3;
 	
-	REPLACE vn2008.Movimientos_mark(Id_Movimiento, valor, Id_Trabajador, stateFk) 
+	REPLACE saleTracking(saleFk, isChecked, workerFk, stateFk) 
 		VALUES(saleFk,valueFk,account.myUser_getId(),encajando);


--- a/db/routines/vn/procedures/recipe_Cook.sql
+++ b/db/routines/vn/procedures/recipe_Cook.sql
@ -1,74 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`recipe_Cook`(vItemFk INT, vBunchesQuantity INT, vDate DATE)
-BEGIN
-
-	DECLARE vCalc INT;
-    DECLARE vWarehouseFk INT DEFAULT 1; -- Silla FV
-
-	SET @element := '';
-    SET @counter := 0;
-
-	CALL cache.available_refresh(vCalc, FALSE, vWarehouseFk, vDate);
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.recipeCook;
-    
-    CREATE TEMPORARY TABLE tmp.recipeCook
-    SELECT *,
-            @counter := IF(@element = element COLLATE utf8_general_ci , @counter + 1, 1) as counter,
-            @element := element COLLATE utf8_general_ci
-		FROM
-			(
-			SELECT 	i.id itemFk,
-					CONCAT(i.longName, ' (ref: ',i.id,')') longName,
-					i.size,
-					i.inkFk,
-					a.available,
-					r.element,
-					vBunchesQuantity * r.quantity as quantity,
-					r.itemFk as bunchItemFk,
-					IFNULL((i.inkFk = r.inkFk ) ,0)
-						+ IFNULL((i.size = r.size) ,0)
-                        + IFNULL((i.name LIKE CONCAT('%',r.name,'%')) ,0)
-                        + IFNULL((i.longName LIKE CONCAT('%',r.longName,'%')),0) 
-                        + IFNULL((i.typeFk = r.typeFk),0) as matches,
-                    i.typeFk,
-                    rl.previousSelected
-				FROM vn.recipe r 
-					JOIN vn.item i ON (IFNULL(i.name LIKE CONCAT('%',r.name,'%'), 0)
-									OR IFNULL(i.longName LIKE CONCAT('%',r.longName,'%'),0))
-									OR i.typeFk <=> r.typeFk
-					JOIN cache.available a ON a.item_id = i.id AND a.calc_id = vCalc
-                    LEFT JOIN (SELECT recipe_ItemFk, element as log_element, selected_ItemFk, count(*) as previousSelected
-									FROM vn.recipe_log
-                                    GROUP BY recipe_ItemFk, element, selected_ItemFk) rl ON rl.recipe_ItemFk = r.itemFk 
-																						AND rl.log_element = r.element
-                                                                                        AND rl.selected_ItemFk = i.id
-				WHERE r.itemFk = vItemFk
-					AND a.available > vBunchesQuantity * r.quantity 
-			 UNION ALL
-				 SELECT 100 itemFk,
-							CONCAT('? ',r.element,' ',IFNULL(r.size,''),' ',IFNULL(r.inkFk,'')) as longName,
-							NULL,
-							NULL,
-							0,
-							r.element,
-							vBunchesQuantity * r.quantity as quantity,
-							r.itemFk as bunchItemFk,
-					  -1 as matches,
-                      r.typeFk,
-                      NULL
-					FROM vn.recipe r
-					WHERE r.itemFk = vItemFk
-                    GROUP BY r.element
-			) sub
-             
-            ORDER BY element, matches DESC, previousSelected DESC;
- 
-		SELECT * 
-			FROM tmp.recipeCook
-			WHERE counter < 6
-            OR itemFk = 100 
-            ;
-    
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/ticketCalculateClon.sql
+++ b/db/routines/vn/procedures/ticketCalculateClon.sql
@ -29,7 +29,7 @@ BEGIN
 				FROM sale
 				WHERE ticketFk = vTicketNew AND price > 0;

-	CALL sale_recalcComponent('imbalance');
+	CALL sale_recalcComponent('buyerDiscount');

 	DROP TEMPORARY TABLE IF EXISTS tmp.recalculateSales;

--- a/db/routines/vn/procedures/ticketRequest_Add.sql
+++ b/db/routines/vn/procedures/ticketRequest_Add.sql
@ -1,19 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticketRequest_Add`(vDescription VARCHAR(255), vQuantity INT, vPrice DOUBLE, vTicketFk INT, vBuyerCode VARCHAR(3))
-BEGIN
-
-	INSERT INTO vn.ticketRequest(description, 
-								quantity, 
-                                price, 
-                                ticketFk, 
-                                buyerCode, 
-                                requesterFk)
-		VALUES(vDescription,
-				vQuantity,
-                vPrice,
-                vTicketFk,
-                vBuyerCode,
-                vn.getUser());
-                
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/workerTimeControl_clockIn.sql
+++ b/db/routines/vn/procedures/workerTimeControl_clockIn.sql
@ -121,15 +121,17 @@ BEGIN
 		CALL util.throw(vErrorCode);
 	END IF;

+
 	-- DIRECCION CORRECTA
 	CALL workerTimeControl_direction(vWorkerFk, vTimed);
 	IF (SELECT
-			IF(IF(option1 IN ('inMiddle', 'outMiddle'),
+			IF((IF(option1 IN ('inMiddle', 'outMiddle'),
 					'middle',
 					option1) <> vDirection
 				AND IF(option2 IN ('inMiddle', 'outMiddle'),
 					'middle',
-					IFNULL(option2, '')) <> vDirection,
+					IFNULL(option2, '')) <> vDirection)
+				OR (option1 IS NULL AND option2 IS NULL),
 				TRUE ,
 				FALSE)
 			FROM tmp.workerTimeControlDirection
@ -137,12 +139,17 @@ BEGIN
 		SET vIsError = TRUE;
 	END IF;
 	
-	DROP TEMPORARY TABLE tmp.workerTimeControlDirection;
+	
 	IF vIsError THEN
 		SET vErrorCode = 'WRONG_DIRECTION';
+		IF(SELECT option1 IS NULL AND option2 IS NULL
+			FROM tmp.workerTimeControlDirection) THEN
+			
+			SET vErrorCode = 'DAY_MAX_TIME';
+		END IF;
 		CALL util.throw(vErrorCode);
 	END IF;
-
+	DROP TEMPORARY TABLE tmp.workerTimeControlDirection;
 	-- FICHADAS IMPARES
 	SELECT timed INTO vLastIn
 		FROM workerTimeControl
--- a/db/routines/vn/triggers/agency_beforeInsert.sql
+++ b/db/routines/vn/triggers/agency_beforeInsert.sql
@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`agency_beforeInsert`
+	BEFORE INSERT ON `agency`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
--- a/db/routines/vn/triggers/entry_beforeUpdate.sql
+++ b/db/routines/vn/triggers/entry_beforeUpdate.sql
@ -6,9 +6,19 @@ BEGIN
 	DECLARE vIsVirtual BOOL;
 	DECLARE vPrintedCount INT;
 	DECLARE vHasDistinctWarehouses BOOL;
+	DECLARE vTotalBuy INT;
 	
 	IF NEW.isBooked = OLD.isBooked THEN
 		CALL entry_checkBooked(OLD.id);
+	ELSE
+		IF NEW.isBooked THEN
+			SELECT COUNT(*) INTO vTotalBuy
+				FROM buy
+				WHERE entryFk = NEW.id;
+			IF NOT vTotalBuy THEN
+				CALL util.throw('Entry must have lines to be marked booked');
+			END IF;
+		END IF;
 	END IF;

 	SET NEW.editorFk = account.myUser_getId();
@ -16,7 +26,7 @@ BEGIN
 	IF NOT (NEW.travelFk <=> OLD.travelFk) THEN

 		IF NEW.travelFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.travelFk) THEN
-			CALL util.throw('The travel is incorrect, there is a different AWB in the associated entries');	
+			CALL util.throw('The travel is incorrect, there is a different AWB in the associated entries');
 		END IF;
 	
 		SELECT COUNT(*) > 0 INTO vIsVirtual
--- a/db/routines/vn/triggers/solunionCAP_afterInsert.sql
+++ b/db/routines/vn/triggers/solunionCAP_afterInsert.sql
@ -3,8 +3,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`solunionCAP_afterInse
 	AFTER INSERT ON `solunionCAP`
 	FOR EACH ROW
 BEGIN
-	UPDATE vn2008.Clientes c
-		JOIN creditClassification cc ON c.Id_Cliente = cc.client 
+	UPDATE client c
+		JOIN creditClassification cc ON cc.client = c.id
 		JOIN creditInsurance ci ON ci.creditClassification = cc.id
 	SET creditInsurance = ci.credit * 2 WHERE ci.id = NEW.creditInsurance;
 END$$
--- a/db/routines/vn/triggers/solunionCAP_afterUpdate.sql
+++ b/db/routines/vn/triggers/solunionCAP_afterUpdate.sql
@ -4,13 +4,13 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`solunionCAP_afterUpda
 	FOR EACH ROW
 BEGIN
 	IF NEW.dateLeaving IS NOT NULL THEN
-		UPDATE vn2008.Clientes c
-			JOIN creditClassification cc ON c.Id_Cliente = cc.client 
+		UPDATE client c
+			JOIN creditClassification cc ON cc.client = c.id
 			JOIN creditInsurance ci ON ci.creditClassification = cc.id
 		SET creditInsurance = ci.credit WHERE ci.id = OLD.creditInsurance;
 	ELSE
-		UPDATE vn2008.Clientes c
-			JOIN creditClassification cc ON c.Id_Cliente = cc.client 
+		UPDATE client c
+			JOIN creditClassification cc ON cc.client = c.id
 			JOIN creditInsurance ci ON ci.creditClassification = cc.id
 		SET creditInsurance = ci.credit * 2 WHERE ci.id = OLD.creditInsurance;
 	END IF;
--- a/db/routines/vn/triggers/solunionCAP_beforeDelete.sql
+++ b/db/routines/vn/triggers/solunionCAP_beforeDelete.sql
@ -3,8 +3,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`solunionCAP_beforeDel
 	BEFORE DELETE ON `solunionCAP`
 	FOR EACH ROW
 BEGIN
-	UPDATE vn2008.Clientes c
-		JOIN creditClassification cc ON c.Id_Cliente = cc.client 
+	UPDATE client c
+		JOIN creditClassification cc ON cc.client = c.id
 		JOIN creditInsurance ci ON ci.creditClassification = cc.id
 	SET creditInsurance = ci.credit  WHERE ci.id = OLD.creditInsurance;
 END$$
--- a/db/routines/vn/triggers/ticketRequest_beforeInsert.sql
+++ b/db/routines/vn/triggers/ticketRequest_beforeInsert.sql
@ -14,7 +14,7 @@ BEGIN
 	END IF;

 	IF NEW.attenderFk IS NULL THEN
-		SET NEW.attenderFk = (SELECT w.id FROM worker w WHERE w.code = NEW.buyerCode);
+		SET NEW.attenderFk = (SELECT defaultAttenderFk FROM ticketConfig LIMIT 1);
 	END IF;
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/ticketRequest_beforeUpdate.sql
+++ b/db/routines/vn/triggers/ticketRequest_beforeUpdate.sql
@ -12,9 +12,5 @@ BEGIN
 	IF NEW.salesPersonCode <> OLD.salesPersonCode THEN
 		SET NEW.requesterFk = (SELECT w.id FROM worker w WHERE w.code = NEW.salesPersonCode);
 	END IF;
-
-	IF NEW.buyerCode <> OLD.buyerCode THEN
-		SET NEW.attenderFk = (SELECT w.id FROM worker w WHERE w.code = NEW.buyerCode);
-	END IF;
 END$$
 DELIMITER ;
--- a/db/routines/vn/views/especialPrice.sql
+++ b/db/routines/vn/views/especialPrice.sql
@ -1,8 +1,8 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`especialPrice`
-AS SELECT `p`.`Id_PrecioEspecial` AS `id`,
-	`p`.`Id_Cliente` AS `clientFk`,
-	`p`.`Id_Article` AS `itemFk`,
-	`p`.`PrecioEspecial` AS `value`
-FROM `vn2008`.`PreciosEspeciales` `p`
+AS SELECT `sp`.`id` AS `id`,
+	`sp`.`clientFk` AS `clientFk`,
+	`sp`.`itemFk` AS `itemFk`,
+	`sp`.`value` AS `value`
+FROM `vn`.`specialPrice` `sp`
--- a/db/routines/vn/views/exchangeInsurance.sql
+++ b/db/routines/vn/views/exchangeInsurance.sql
@ -1,16 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`exchangeInsurance`
-AS SELECT `vn2008`.`pago_sdc`.`pago_sdc_id` AS `id`,
-	`vn2008`.`pago_sdc`.`importe` AS `amount`,
-	`vn2008`.`pago_sdc`.`fecha` AS `dated`,
-	`vn2008`.`pago_sdc`.`vencimiento` AS `finished`,
-	`vn2008`.`pago_sdc`.`entity_id` AS `entityFk`,
-	`vn2008`.`pago_sdc`.`ref` AS `ref`,
-	`vn2008`.`pago_sdc`.`rate` AS `rate`,
-	`vn2008`.`pago_sdc`.`empresa_id` AS `companyFk`,
-	`vn2008`.`pago_sdc`.`financialProductTypefk` AS `financialProductTypefk`,
-	`vn2008`.`pago_sdc`.`upperBarrier` AS `upperBarrier`,
-	`vn2008`.`pago_sdc`.`lowerBarrier` AS `lowerBarrier`,
-	`vn2008`.`pago_sdc`.`strike` AS `strike`
-FROM `vn2008`.`pago_sdc`
--- a/db/routines/vn/views/paymentExchangeInsurance.sql
+++ b/db/routines/vn/views/paymentExchangeInsurance.sql
@ -1,16 +1,16 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`paymentExchangeInsurance`
-AS SELECT `p`.`pago_sdc_id` AS `id`,
-	`p`.`importe` AS `amount`,
-	`p`.`fecha` AS `created`,
-	`p`.`vencimiento` AS `dueDay`,
-	`p`.`entity_id` AS `entityFk`,
-	`p`.`ref` AS `ref`,
-	`p`.`rate` AS `rate`,
-	`p`.`empresa_id` AS `companyFk`,
-	`p`.`financialProductTypefk` AS `financialProductTypefk`,
-	`p`.`upperBarrier` AS `upperBarrier`,
-	`p`.`lowerBarrier` AS `lowerBarrier`,
-	`p`.`strike` AS `strike`
-FROM `vn2008`.`pago_sdc` `p`
+AS SELECT `ei`.`id` AS `pago_sdc_id`,
+	`ei`.`amount` AS `importe`,
+	`ei`.`dated` AS `fecha`,
+	`ei`.`dueDated` AS `vencimiento`,
+	`ei`.`entityFk` AS `entity_id`,
+	`ei`.`ref` AS `ref`,
+	`ei`.`rate` AS `rate`,
+	`ei`.`companyFk` AS `empresa_id`,
+	`ei`.`financialProductTypefk` AS `financialProductTypefk`,
+	`ei`.`upperBarrier` AS `upperBarrier`,
+	`ei`.`lowerBarrier` AS `lowerBarrier`,
+	`ei`.`strike` AS `strike`
+FROM `vn`.`exchangeInsurance` `ei`
--- a/db/routines/vn/views/promissoryNote.sql
+++ b/db/routines/vn/views/promissoryNote.sql
@ -1,7 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`promissoryNote`
-AS SELECT `p`.`Id_Pagare` AS `id`,
-	`p`.`Concepto` AS `Concept`,
-	`p`.`pago_id` AS `paymentFk`
-FROM `vn2008`.`Pagares` `p`
--- a/db/routines/vn/views/saleLabel.sql
+++ b/db/routines/vn/views/saleLabel.sql
@ -1,8 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`saleLabel`
-AS SELECT `ml`.`Id_movimiento` AS `saleFk`,
-	`ml`.`label` AS `label`,
-	`ml`.`stem` AS `stem`,
-	`ml`.`created` AS `created`
-FROM `vn2008`.`movement_label` `ml`
--- a/db/routines/vn/views/ticketMRW.sql
+++ b/db/routines/vn/views/ticketMRW.sql
@ -1,47 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`ticketMRW`
-AS SELECT `ticket`.`agencyModeFk` AS `id_Agencia`,
-	`ticket`.`companyFk` AS `empresa_id`,
-	`Consignatarios`.`consignatario` AS `Consignatario`,
-	`Consignatarios`.`domicilio` AS `DOMICILIO`,
-	`Consignatarios`.`poblacion` AS `POBLACION`,
-	`Consignatarios`.`codPostal` AS `CODPOSTAL`,
-	`Consignatarios`.`telefono` AS `telefono`,
-	IFNULL(
-		IFNULL(
-			IFNULL(
-				IFNULL(`Consignatarios`.`movil`, `Clientes`.`movil`),
-				`Consignatarios`.`telefono`
-			),
-			`Clientes`.`telefono`
-		),
-		0
-	) AS `movil`,
-	`Clientes`.`if` AS `IF`,
-	`ticket`.`id` AS `Id_Ticket`,
-	`ticket`.`warehouseFk` AS `warehouse_id`,
-	`Consignatarios`.`id_consigna` AS `Id_Consigna`,
-	`Paises`.`Codigo` AS `CodigoPais`,
-	`ticket`.`shipped` AS `Fecha`,
-	`province`.`province_id` AS `province_id`,
-	`ticket`.`landed` AS `landing`
-FROM (
-		(
-			(
-				(
-					`vn2008`.`Clientes`
-					JOIN `vn2008`.`Consignatarios` ON(
-						`Clientes`.`id_cliente` = `Consignatarios`.`Id_cliente`
-					)
-				)
-				JOIN `vn`.`ticket` ON(
-					`Consignatarios`.`id_consigna` = `ticket`.`addressFk`
-				)
-			)
-			JOIN `vn2008`.`province` ON(
-				`Consignatarios`.`province_id` = `province`.`province_id`
-			)
-		)
-		JOIN `vn2008`.`Paises` ON(`province`.`Paises_Id` = `Paises`.`Id`)
-	);
--- a/db/routines/vn/views/ticketToPrepare.sql
+++ b/db/routines/vn/views/ticketToPrepare.sql
@ -1,58 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`ticketToPrepare`
-AS SELECT `m`.`Id_Ticket` AS `Id_Ticket`,
-	`mk`.`Id_Movimiento` AS `Id_Movimiento`,
-	`mk`.`Id_Movimiento_mark` AS `Id_Movimiento_mark`,
-	`mk`.`Id_Trabajador` AS `Id_Trabjador`,
-	`m`.`Id_Article` AS `Id_Article`,
-	`m`.`Concepte` AS `Concepte`,
-	`art`.`subName` AS `subName`,
-	`mk`.`original_quantity` - IFNULL(`is`.`quantity`, 0) AS `Cantidad`,
-	`mk`.`original_quantity` AS `original_quantity`,
-	IF(
-		HOUR(`t`.`shipped`),
-		HOUR(`t`.`shipped`),
-		HOUR(`z`.`hour`)
-	) AS `Hora`,
-	HOUR(`t`.`shipped`) AS `Departure`,
-	MINUTE(`t`.`shipped`) AS `Minuto`,
-	`am`.`agencyFk` AS `agency_id`,
-	`t`.`warehouseFk` AS `warehouse_id`,
-	`a`.`provinceFk` AS `province_id`,
-	`is`.`quantity` AS `picked`,
-	`t`.`zoneFk` AS `zoneFk`,
-	`p`.`sectorFk` AS `sectorFk`
-FROM (
-		(
-			(
-				(
-					(
-						(
-							(
-								(
-									(
-										(
-											`vn2008`.`Movimientos_mark` `mk`
-											JOIN `vn2008`.`Movimientos` `m` ON(`m`.`Id_Movimiento` = `mk`.`Id_Movimiento`)
-										)
-										JOIN `vn`.`ticket` `t` ON(`m`.`Id_Ticket` = `t`.`id`)
-									)
-									JOIN `vn`.`agencyMode` `am` ON(`am`.`id` = `t`.`agencyModeFk`)
-								)
-								JOIN `vn`.`address` `a` ON(`a`.`id` = `t`.`addressFk`)
-							)
-							LEFT JOIN `vn`.`itemShelvingSale` `is` ON(`is`.`saleFk` = `mk`.`Id_Movimiento`)
-						)
-						LEFT JOIN `vn`.`itemShelving` `ish` ON(`ish`.`id` = `is`.`itemShelvingFk`)
-					)
-					LEFT JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`)
-				)
-				LEFT JOIN `vn`.`parking` `p` ON(`p`.`id` = `sh`.`parkingFk`)
-			)
-			LEFT JOIN `vn2008`.`Articles` `art` ON(`art`.`Id_Article` = `m`.`Id_Article`)
-		)
-		LEFT JOIN `vn`.`zone` `z` ON(`z`.`id` = `t`.`zoneFk`)
-	)
-WHERE `mk`.`stateFk` = 26
-	AND `mk`.`valor` <> 1
--- a/db/routines/vn/views/ticketeToPreparePrepared.sql
+++ b/db/routines/vn/views/ticketeToPreparePrepared.sql
@ -1,47 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`ticketeToPreparePrepared`
-AS SELECT `m`.`Id_Ticket` AS `Id_Ticket`,
-	`mk`.`Id_Movimiento` AS `Id_Movimiento`,
-	`mk`.`Id_Movimiento_mark` AS `Id_Movimiento_mark`,
-	`mk`.`Id_Trabajador` AS `Id_Trabjador`,
-	`m`.`Id_Article` AS `Id_Article`,
-	`m`.`Concepte` AS `Concepte`,
-	`art`.`subName` AS `subName`,
-	`mk`.`original_quantity` - IFNULL(`is`.`quantity`, 0) AS `Cantidad`,
-	`mk`.`original_quantity` AS `original_quantity`,
-	HOUR(`t`.`shipped`) AS `Hora`,
-	HOUR(`t`.`shipped`) AS `Departure`,
-	MINUTE(`t`.`shipped`) AS `Minuto`,
-	`am`.`agencyFk` AS `agency_id`,
-	`t`.`warehouseFk` AS `warehouse_id`,
-	`a`.`provinceFk` AS `province_id`,
-	`is`.`quantity` AS `picked`,
-	`t`.`CodigoTrabajador` AS `trabajador`,
-	`is`.`sectorFk` AS `sectorFk`
-FROM (
-		(
-			(
-				(
-					(
-						(
-							(
-								(
-									`vn2008`.`Movimientos_mark` `mk`
-									JOIN `vn`.`state` `st` ON(`st`.`id` = `mk`.`stateFk`)
-								)
-								JOIN `vn2008`.`Movimientos` `m` ON(`m`.`Id_Movimiento` = `mk`.`Id_Movimiento`)
-							)
-							JOIN `vn`.`ticket` `t` ON(`m`.`Id_Ticket` = `t`.`id`)
-						)
-						JOIN `vn`.`agencyMode` `am` ON(`am`.`id` = `t`.`agencyModeFk`)
-					)
-					JOIN `vn`.`address` `a` ON(`a`.`id` = `t`.`addressFk`)
-				)
-				LEFT JOIN `vn`.`itemShelvingSaleSum` `is` ON(`is`.`saleFk` = `mk`.`Id_Movimiento`)
-			)
-			JOIN `vn2008`.`Articles` `art` ON(`art`.`Id_Article` = `m`.`Id_Article`)
-		)
-		LEFT JOIN `vn2008`.`Trabajadores` `t` ON(`t`.`Id_Trabajador` = `mk`.`Id_Trabajador`)
-	)
-WHERE `st`.`code` LIKE 'PREVIOUS_PREPARATION'
--- a/db/routines/vn2008/procedures/article_multiple_buy.sql
+++ b/db/routines/vn2008/procedures/article_multiple_buy.sql
@ -1,6 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`article_multiple_buy`(v_date DATETIME, wh INT)
-BEGIN
-	CALL vn.item_multipleBuy(v_date, wh);
-END$$
-DELIMITER ;
--- a/db/routines/vn2008/procedures/article_multiple_buy_date.sql
+++ b/db/routines/vn2008/procedures/article_multiple_buy_date.sql
@ -1,9 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`article_multiple_buy_date`(
-	IN vDated DATETIME,
-	IN vWarehouseFk TINYINT(3)
-)
-BEGIN
-	CALL vn.item_multipleBuyByDate(vDated, vWarehouseFk);
-END$$
-DELIMITER ;
--- a/db/routines/vn2008/procedures/availableTraslate.sql
+++ b/db/routines/vn2008/procedures/availableTraslate.sql
@ -1,126 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`availableTraslate`(
-	vWarehouseLanding INT,
-	vDated DATE,
-	vWarehouseShipment INT)
-proc: BEGIN
-	DECLARE vDatedFrom DATE;
-	DECLARE vDatedTo DATETIME;
-	DECLARE vDatedReserve DATETIME;
-	DECLARE vDatedInventory DATE;
-
-	IF vDated < util.VN_CURDATE() THEN
-		LEAVE proc;
-	END IF;
-
-	CALL vn.item_getStock (vWarehouseLanding, vDated, NULL);
-
-	-- Calcula algunos parámetros necesarios
-	SET vDatedFrom = TIMESTAMP(vDated, '00:00:00');
-	SET vDatedTo = TIMESTAMP(TIMESTAMPADD(DAY, 4, vDated), '23:59:59');
-	SELECT inventoried INTO vDatedInventory FROM vn.config;
-	SELECT SUBTIME(util.VN_NOW(), reserveTime) INTO vDatedReserve
-		FROM hedera.orderConfig;
-
-	-- Calcula el ultimo dia de vida para cada producto
-	DROP TEMPORARY TABLE IF EXISTS itemRange;
-	CREATE TEMPORARY TABLE itemRange
-		(PRIMARY KEY (itemFk))
-		ENGINE = MEMORY
-		SELECT c.itemFk, MAX(t.landed) dated
-			FROM vn.buy c
-				JOIN vn.entry e ON c.entryFk = e.id
-				JOIN vn.travel t ON t.id = e.travelFk
-				JOIN vn.warehouse w ON w.id = t.warehouseInFk
-			WHERE t.landed BETWEEN vDatedInventory AND vDatedFrom
-				AND t.warehouseInFk = vWarehouseLanding
-				AND NOT e.isExcludedFromAvailable
-				AND NOT e.isRaid
-			GROUP BY c.itemFk;
-
-	-- Tabla con el ultimo dia de last_buy para cada producto que hace un replace de la anterior
-	CALL vn.buyUltimate(vWarehouseShipment, util.VN_CURDATE());
-
-	INSERT INTO itemRange
-		SELECT t.itemFk, tr.landed
-			FROM tmp.buyUltimate t
-				JOIN vn.buy b ON b.id = t.buyFk
-				JOIN vn.entry e ON e.id = b.entryFk
-				JOIN vn.travel tr ON tr.id = e.travelFk
-				LEFT JOIN itemRange i ON t.itemFk = i.itemFk
-			WHERE t.warehouseFk = vWarehouseShipment
-				AND NOT e.isRaid
-	ON DUPLICATE KEY UPDATE itemRange.dated = GREATEST(itemRange.dated, tr.landed);
-
-	DROP TEMPORARY TABLE IF EXISTS itemRangeLive;
-	CREATE TEMPORARY TABLE itemRangeLive
-		(PRIMARY KEY (itemFk))
-		ENGINE = MEMORY
-		SELECT ir.itemFk, TIMESTAMP(TIMESTAMPADD(DAY, it.life, ir.dated), '23:59:59') dated
-			FROM itemRange ir
-				JOIN vn.item i ON i.id = ir.itemFk
-				JOIN vn.itemType it ON it.id = i.typeFk
-			HAVING dated >= vDatedFrom OR dated IS NULL;
-
-	-- Calcula el ATP
-	DROP TEMPORARY TABLE IF EXISTS tmp.itemCalc;
-	CREATE TEMPORARY TABLE tmp.itemCalc
-		(INDEX (itemFk,warehouseFk))
-		ENGINE = MEMORY
-		SELECT i.itemFk, vWarehouseLanding warehouseFk, i.shipped dated, i.quantity
-			FROM vn.itemTicketOut i
-				JOIN itemRangeLive ir ON ir.itemFK = i.itemFk
-			WHERE i.shipped >= vDatedFrom
-				AND (ir.dated IS NULL OR i.shipped <= ir.dated)
-				AND i.warehouseFk = vWarehouseLanding
-		UNION ALL
-		SELECT b.itemFk, vWarehouseLanding, t.landed, b.quantity
-			FROM vn.buy b
-			JOIN vn.entry e ON b.entryFk = e.id
-			JOIN vn.travel t ON t.id = e.travelFk
-			JOIN itemRangeLive ir ON ir.itemFk = b.itemFk
-		WHERE NOT e.isExcludedFromAvailable
-			AND b.quantity <> 0
-			AND NOT e.isRaid
-			AND t.warehouseInFk = vWarehouseLanding
-			AND t.landed >= vDatedFrom
-			AND (ir.dated IS NULL OR t.landed <= ir.dated)
-		UNION ALL
-		SELECT i.itemFk, vWarehouseLanding, i.shipped, i.quantity
-			FROM vn.itemEntryOut i
-				JOIN itemRangeLive ir ON ir.itemFk = i.itemFk
-			WHERE i.shipped >= vDatedFrom
-				AND (ir.dated IS NULL OR i.shipped <= ir.dated)
-				AND i.warehouseOutFk = vWarehouseLanding
-		UNION ALL
-		SELECT r.item_id, vWarehouseLanding, r.shipment, -r.amount
-			FROM hedera.order_row r
-				JOIN hedera.`order` o ON o.id = r.order_id
-				JOIN itemRangeLive ir ON ir.itemFk = r.item_id
-			WHERE r.shipment >= vDatedFrom
-				AND (ir.dated IS NULL OR r.shipment <= ir.dated)
-				AND r.warehouse_id = vWarehouseLanding
-				AND r.created >= vDatedReserve
-				AND NOT o.confirmed;
-
-	CALL vn.item_getAtp(vDated);
-
-	DROP TEMPORARY TABLE IF EXISTS availableTraslate;
-	CREATE TEMPORARY TABLE availableTraslate
-		(PRIMARY KEY (item_id))
-		ENGINE = MEMORY
-		SELECT t.item_id, SUM(stock) available
-			FROM (
-				SELECT ti.itemFk item_id, stock
-					FROM tmp.itemList ti
-						JOIN itemRange ir ON ir.itemFk = ti.itemFk
-				UNION ALL
-				SELECT itemFk, quantity
-					FROM tmp.itemAtp
-				) t
-			GROUP BY t.item_id
-			HAVING available <> 0;
-
-	DROP TEMPORARY TABLE tmp.itemList, itemRange, itemRangeLive;
-END$$
-DELIMITER ;
--- a/db/routines/vn2008/procedures/balance_create.sql
+++ b/db/routines/vn2008/procedures/balance_create.sql
@ -1,207 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`balance_create`(
-	IN vStartingMonth INT,
-	IN vEndingMonth INT,
-	IN vCompany INT,
-	IN vIsConsolidated BOOLEAN,
-	IN vInterGroupSalesIncluded BOOLEAN)
-BEGIN
-	DECLARE intGAP INT DEFAULT 7;
-	DECLARE vYears INT DEFAULT 2;
-	DECLARE vYear TEXT;
-	DECLARE vOneYearAgo TEXT;
-	DECLARE vTwoYearsAgo TEXT;
-	DECLARE vQuery TEXT;
-	DECLARE vConsolidatedGroup INT;
-	DECLARE vStartingDate DATE DEFAULT '2020-01-01';
-	DECLARE vCurYear INT DEFAULT YEAR(util.VN_CURDATE());
-	DECLARE vStartingYear INT DEFAULT vCurYear - 2;
-	DECLARE vTable TEXT;
-
-	SET vTable = util.quoteIdentifier('balance_nest_tree');
-	SET vYear = util.quoteIdentifier(vCurYear);
-	SET vOneYearAgo = util.quoteIdentifier(vCurYear-1);
-	SET vTwoYearsAgo = util.quoteIdentifier(vCurYear-2);
-
-	-- Solicitamos la tabla tmp.nest, como base para el balance
-	DROP TEMPORARY TABLE IF EXISTS tmp.nest;
-
-	EXECUTE IMMEDIATE CONCAT(
-		'CREATE TEMPORARY TABLE tmp.nest
-			SELECT node.id
-					,CONCAT( REPEAT(REPEAT(" ",?), COUNT(parent.id) - 1), node.name) AS name
-					,node.lft
-					,node.rgt
-					,COUNT(parent.id) - 1 as depth
-					,cast((node.rgt - node.lft - 1) / 2 as DECIMAL) as sons
-				FROM ', vTable, ' AS node,
-					', vTable, ' AS parent
-				WHERE node.lft BETWEEN parent.lft AND parent.rgt
-				GROUP BY node.id
-				ORDER BY node.lft')
-		USING intGAP;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.balance;
-	CREATE TEMPORARY TABLE tmp.balance
-		SELECT * FROM tmp.nest;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.empresas_receptoras;
-	DROP TEMPORARY TABLE IF EXISTS tmp.empresas_emisoras;
-
-	SELECT empresa_grupo INTO vConsolidatedGroup
-		FROM empresa
-		WHERE id = vCompany;
-
-	CREATE TEMPORARY TABLE tmp.empresas_receptoras
-		SELECT id as empresa_id
-			FROM vn2008.empresa
-			WHERE id = vCompany
-				OR empresa_grupo = IF(vIsConsolidated, vConsolidatedGroup, NULL);
-
-	CREATE TEMPORARY TABLE tmp.empresas_emisoras
-		SELECT Id_Proveedor as empresa_id FROM vn2008.Proveedores p;
-
-		IF vInterGroupSalesIncluded = FALSE THEN
-
-			DELETE ee.*
-				FROM tmp.empresas_emisoras ee
-					JOIN vn2008.empresa e on e.id = ee.empresa_id
-				WHERE e.empresa_grupo = vConsolidatedGroup;
-
-		END IF;
-
-	-- Se calculan las facturas que intervienen, para luego poder servir el desglose desde aqui
-	DROP TEMPORARY TABLE IF EXISTS tmp.balance_desglose;
-	CREATE TEMPORARY TABLE tmp.balance_desglose
-		SELECT er.empresa_id  receptora_id,
-				ee.empresa_id  emisora_id,
-				year(IFNULL(r.bookEntried,IFNULL(r.dateBooking, r.Fecha))) `year`,
-				month(IFNULL(r.bookEntried,IFNULL(r.dateBooking, r.Fecha))) `month`,
-				gastos_id Id_Gasto,
-				SUM(bi) importe
-			FROM recibida r
-				JOIN recibida_iva ri on ri.recibida_id = r.id
-				JOIN tmp.empresas_receptoras er on er.empresa_id = r.empresa_id
-				JOIN tmp.empresas_emisoras ee ON ee.empresa_id = r.proveedor_id
-			WHERE IFNULL(r.bookEntried,IFNULL(r.dateBooking, r.Fecha)) >= vStartingDate
-				AND r.contabilizada
-			GROUP BY Id_Gasto, year, month, emisora_id, receptora_id;
-
-	INSERT INTO tmp.balance_desglose(
-			receptora_id,
-			emisora_id,
-			year,
-			month,
-			Id_Gasto,
-			importe)
-		SELECT gr.empresa_id,
-				gr.empresa_id,
-				year,
-				month,
-				Id_Gasto,
-				SUM(importe)
-			FROM gastos_resumen gr
-				JOIN tmp.empresas_receptoras er on gr.empresa_id = er.empresa_id
-			WHERE year >= vStartingYear
-				AND month BETWEEN vStartingMonth AND vEndingMonth
-			GROUP BY Id_Gasto, year, month, gr.empresa_id;
-
-	DELETE FROM tmp.balance_desglose
-		WHERE month < vStartingMonth
-			OR month > vEndingMonth;
-
-	-- Ahora el balance
-	EXECUTE IMMEDIATE CONCAT(
-		'ALTER TABLE tmp.balance
-			ADD COLUMN ', vTwoYearsAgo ,' INT(10) NULL ,
-			ADD COLUMN ', vOneYearAgo ,' INT(10) NULL ,
-			ADD COLUMN ', vYear,' INT(10) NULL ,
-			ADD COLUMN Id_Gasto VARCHAR(10) NULL,
-			ADD COLUMN Gasto VARCHAR(45) NULL');
-
-	-- Añadimos los gastos, para facilitar el formulario
-	UPDATE tmp.balance b
-			JOIN vn2008.balance_nest_tree bnt on bnt.id = b.id
-			JOIN (SELECT id Id_Gasto, name Gasto
-					FROM vn.expense
-					GROUP BY id) g ON g.Id_Gasto = bnt.Id_Gasto COLLATE utf8_general_ci
-		SET b.Id_Gasto = g.Id_Gasto COLLATE utf8_general_ci
-			, b.Gasto = g.Gasto COLLATE utf8_general_ci ;
-
-	-- Rellenamos los valores de primer nivel, los que corresponden a los gastos simples
-	WHILE vYears >= 0 DO
-		SET vQuery = CONCAT(
-			'UPDATE tmp.balance b
-						JOIN
-						(SELECT Id_Gasto, SUM(Importe) as Importe
-							FROM tmp.balance_desglose
-							WHERE year = ?
-							GROUP BY Id_Gasto
-						) sub on sub.Id_Gasto = b.Id_Gasto COLLATE utf8_general_ci
-					SET ', util.quoteIdentifier(vCurYear - vYears), ' =  - Importe');
-
-		EXECUTE IMMEDIATE vQuery
-			USING vCurYear - vYears;
-
-		SET vYears = vYears - 1;
-	END WHILE;
-
-	-- Añadimos las ventas
-	EXECUTE IMMEDIATE CONCAT(
-		'UPDATE tmp.balance b
-				JOIN (
-					SELECT SUM(IF(year = ?, venta, 0)) y2,
-							SUM(IF(year = ?, venta, 0)) y1,
-							SUM(IF(year = ?, venta, 0)) y0,
-							c.Gasto
-						FROM bs.ventas_contables c
-							JOIN tmp.empresas_receptoras er on er.empresa_id = c.empresa_id
-						WHERE  month BETWEEN ? AND ?
-						GROUP BY c.Gasto
-				) sub ON sub.Gasto = b.Id_Gasto COLLATE utf8_general_ci
-			SET b.', vTwoYearsAgo, '= IFNULL(b.', vTwoYearsAgo, ', 0) + sub.y2,
-				b.', vOneYearAgo, '= IFNULL(b.', vOneYearAgo, ', 0) + sub.y1,
-				b.', vYear, '= IFNULL(b.', vYear, ', 0) + sub.y0')
-		USING vCurYear-2,
-			vCurYear-1,
-			vCurYear,
-			vStartingMonth,
-			vEndingMonth;
-
-	-- Ventas intra grupo
-	IF NOT vInterGroupSalesIncluded THEN
-
-		SELECT lft, rgt INTO @grupoLft, @grupoRgt
-			FROM tmp.balance b
-			WHERE TRIM(b.`name`) = 'Grupo';
-
-		DELETE
-			FROM tmp.balance
-			WHERE lft BETWEEN @grupoLft AND @grupoRgt;
-
-	END IF;
-
-	-- Rellenamos el valor de los padres con la suma de los hijos
-	DROP TEMPORARY TABLE IF EXISTS tmp.balance_aux;
-	CREATE TEMPORARY TABLE tmp.balance_aux
-		SELECT * FROM tmp.balance;
-
-	EXECUTE IMMEDIATE
-		CONCAT('UPDATE tmp.balance b
-			JOIN (
-				SELECT b1.id,
-						b1.name,
-						SUM(b2.', vYear,') thisYear,
-						SUM(b2.', vOneYearAgo,') oneYearAgo,
-						SUM(b2.', vTwoYearsAgo,') twoYearsAgo
-					FROM tmp.nest b1
-						JOIN tmp.balance_aux b2 on b2.lft BETWEEN b1.lft and b1.rgt
-					GROUP BY b1.id)sub ON sub.id = b.id
-			SET b.', vYear, ' = thisYear,
-				b.', vOneYearAgo, ' = oneYearAgo,
-				b.', vTwoYearsAgo, ' = twoYearsAgo');
-
-	SELECT *, CONCAT('',ifnull(Id_Gasto,'')) newgasto
-		FROM tmp.balance;
-END$$
-DELIMITER ;
--- a/db/routines/vn2008/procedures/buy_tarifas.sql
+++ b/db/routines/vn2008/procedures/buy_tarifas.sql
@ -1,6 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`buy_tarifas`(vBuyFk INT)
-BEGIN
-	CALL vn.buy_recalcPricesByBuy(vBuyFk);
-END$$
-DELIMITER ;
--- a/db/routines/vn2008/procedures/buy_tarifas_entry.sql
+++ b/db/routines/vn2008/procedures/buy_tarifas_entry.sql
@ -1,11 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`buy_tarifas_entry`(IN vEntryFk INT(11))
-BEGIN
-/**
- * Recalcula los precios de una entrada
- *
- * @param vEntryFk
- */
-	CALL vn.buy_recalcPricesByEntry(vEntryFk);
-END$$
-DELIMITER ;
--- a/db/routines/vn2008/views/Clientes.sql
+++ b/db/routines/vn2008/views/Clientes.sql
@ -42,7 +42,6 @@ AS SELECT `c`.`id` AS `id_cliente`,
 	`c`.`hasInvoiceSimplified` AS `hasInvoiceSimplified`,
 	`c`.`salesPersonFk` AS `Id_Trabajador`,
 	`c`.`isVies` AS `vies`,
-	`c`.`eypbc` AS `EYPBC`,
 	`c`.`bankEntityFk` AS `bankEntityFk`,
 	`c`.`typeFk` AS `typeFk`
 FROM `vn`.`client` `c`
--- a/db/versions/10859-pinkGerbera/00-firstScript.sql
+++ b/db/versions/10859-pinkGerbera/00-firstScript.sql
@ -0,0 +1,7 @@
+CREATE OR REPLACE PROCEDURE `vn`.`balance_create`() BEGIN END;
+CREATE OR REPLACE PROCEDURE `vn`.`buy_recalcPricesByEntry`() BEGIN END;
+CREATE OR REPLACE PROCEDURE `vn`.`buy_recalcPricesByBuy`() BEGIN END;
+
+GRANT EXECUTE ON PROCEDURE vn.balance_create TO `financialBoss`, `hrBoss`;
+GRANT EXECUTE ON PROCEDURE vn.buy_recalcPricesByEntry TO `buyer`, `claimManager`, `employee`;
+GRANT EXECUTE ON PROCEDURE vn.buy_recalcPricesByBuy TO `buyer`, `entryEditor`, `claimManager`, `employee`;
--- a/db/versions/10991-greenAsparagus/00-firstScript.sql
+++ b/db/versions/10991-greenAsparagus/00-firstScript.sql
@ -0,0 +1,2 @@
+ALTER TABLE vn.productionConfig MODIFY COLUMN id INT(10) UNSIGNED FIRST;
+ALTER TABLE vn.productionConfig ADD scannableCodeType enum('qr','barcode') DEFAULT 'barcode' NOT NULL;
--- a/db/versions/10992-goldenIvy/00-acl.sql
+++ b/db/versions/10992-goldenIvy/00-acl.sql
@ -0,0 +1,2 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES ('InvoiceIn', 'exchangeRateUpdate', '*', 'ALLOW', 'ROLE', 'employee');
--- a/db/versions/10992-goldenIvy/00-referenceRate.sql
+++ b/db/versions/10992-goldenIvy/00-referenceRate.sql
@ -0,0 +1,4 @@
+ALTER TABLE vn.referenceRate DROP INDEX `PRIMARY`;
+ALTER TABLE vn.referenceRate ADD id INT auto_increment PRIMARY KEY;
+ALTER TABLE vn.referenceRate CHANGE id id int(11) auto_increment NOT NULL FIRST;
+CREATE UNIQUE INDEX referenceRate_currencyFk_IDX USING BTREE ON vn.referenceRate (currencyFk,dated);
--- a/db/versions/10995-navyErica/01-agencyLogCreate.sql
+++ b/db/versions/10995-navyErica/01-agencyLogCreate.sql
@ -0,0 +1,24 @@
+-- vn.agencyLog definition
+ALTER TABLE vn.agency ADD IF NOT EXISTS editorFk int(10) unsigned DEFAULT NULL NULL;
+
+ALTER TABLE vn.agency ADD CONSTRAINT agency_user_FK FOREIGN KEY (editorFk) REFERENCES `account`.`user`(id);
+
+CREATE TABLE IF NOT EXISTS `vn`.`agencyLog` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `originFk` smallint(5) unsigned DEFAULT NULL,
+  `userFk` int(10) unsigned DEFAULT NULL,
+  `action` set('insert','update','delete','select') NOT NULL,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
+  `description` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
+  `changedModel` enum('agency','agencyMode') NOT NULL DEFAULT 'agency',
+  `oldInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`oldInstance`)),
+  `newInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`newInstance`)),
+  `changedModelId` int(11) NOT NULL,
+  `changedModelValue` varchar(45) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `logAgencyUserFk` (`userFk`),
+  KEY `agencyLog_changedModel` (`changedModel`,`changedModelId`,`creationDate`),
+  KEY `agencyLog_originFk` (`originFk`,`creationDate`),
+  CONSTRAINT `agencyOriginFk` FOREIGN KEY (`originFk`) REFERENCES `agency` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `agencyUserFk` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
--- a/db/versions/10995-navyErica/02-agencyWorkCenterCreate.sql
+++ b/db/versions/10995-navyErica/02-agencyWorkCenterCreate.sql
@ -0,0 +1,18 @@
+CREATE TABLE IF NOT EXISTS `vn`.`agencyWorkCenter` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `agencyFk` smallint(5) unsigned NOT NULL,
+  `workCenterFk` int(11) NOT NULL,
+  `editorFk` int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `agencyWorkCenter_unique` (`agencyFk`,`workCenterFk`),
+  KEY `agencyWorkCenter_workCenter_FK` (`workCenterFk`),
+  KEY `agencyWorkCenter_user_FK` (`editorFk`),
+  CONSTRAINT `agencyWorkCenter_agency_FK` FOREIGN KEY (`agencyFk`) REFERENCES `agency` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `agencyWorkCenter_user_FK` FOREIGN KEY (`editorFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `agencyWorkCenter_workCenter_FK` FOREIGN KEY (`workCenterFk`) REFERENCES `workCenter` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='refs #4988';
+
+INSERT INTO vn.agencyWorkCenter (agencyFk, workCenterFk) 
+    SELECT id, workCenterFk 
+        FROM vn.agency 
+        WHERE workCenterFk IS NOT NULL;
--- a/db/versions/10995-navyErica/03-tableAcl.sql
+++ b/db/versions/10995-navyErica/03-tableAcl.sql
@ -0,0 +1,19 @@
+-- Place your SQL code here
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('AgencyLog','*','READ','ALLOW','ROLE','employee');
+
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('AgencyWorkCenter','*','READ','ALLOW','ROLE','employee');
+
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) 
+    VALUES('AgencyMode', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
+
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) 
+    VALUES('Agency', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
+
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Agency','*','WRITE','ALLOW','ROLE','deliveryAssistant');
+
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('AgencyWorkCenter','*','WRITE','ALLOW','ROLE','deliveryAssistant');
+
--- a/db/versions/11001-blackPalmetto/00-firstScript.sql
+++ b/db/versions/11001-blackPalmetto/00-firstScript.sql
--- a/db/versions/11002-limeCarnation/00-firstScript.sql
+++ b/db/versions/11002-limeCarnation/00-firstScript.sql
@ -0,0 +1,7 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`ticketRequest`
+    CHANGE IF EXISTS `buyerCode` `buyerCode__` varchar(3) NOT NULL COMMENT '@deprecated 2024-04-23 refs #6731 field not used';
+
+ALTER TABLE `vn`.`ticketConfig` ADD COLUMN  IF NOT EXISTS `defaultAttenderFk` int unsigned;
+
+ALTER TABLE vn.ticketConfig ADD CONSTRAINT ticketConfig_worker_FK FOREIGN KEY (defaultAttenderFk) REFERENCES vn.worker(id);
--- a/db/versions/11008-orangeCarnation/00-alter.sql
+++ b/db/versions/11008-orangeCarnation/00-alter.sql
@ -0,0 +1,7 @@
+ALTER TABLE vn.parking
+ADD CONSTRAINT chkParkingCodeFormat CHECK (CHAR_LENGTH(code) > 4 AND code LIKE '%-%');
+
+ALTER TABLE vn.parking MODIFY COLUMN sectorFk int(11) NOT NULL;
+
+ALTER TABLE vn.shelving
+ADD CONSTRAINT chkShelvingCodeFormat CHECK (CHAR_LENGTH(code) <= 4 AND code NOT LIKE '%-%');
--- a/db/versions/11012-silverRuscus/00-firstScript.sql
+++ b/db/versions/11012-silverRuscus/00-firstScript.sql
@ -0,0 +1,5 @@
+DROP TABLE cache.prod_graphic_source;
+RENAME TABLE vn2008.unary TO vn2008.unary__;
+ALTER TABLE vn2008.unary__ COMMENT='refs #7258 @deprecated 2023-12-13';
+RENAME TABLE vn2008.jerarquia TO vn2008.jerarquia__;
+ALTER TABLE vn2008.jerarquia__ COMMENT='refs #7258 @deprecated 2023-12-13';
--- a/db/versions/11014-orangePalmetto/00-firstScript.sql
+++ b/db/versions/11014-orangePalmetto/00-firstScript.sql
@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.claimBeginning MODIFY COLUMN quantity double DEFAULT 0 NULL;
--- a/db/versions/11026-brownAralia/00-entryAlter.sql
+++ b/db/versions/11026-brownAralia/00-entryAlter.sql
@ -0,0 +1 @@
+ALTER TABLE vn.entryType ADD isInformal TINYINT DEFAULT 0 NOT NULL;
--- a/db/versions/11026-brownAralia/01-entryUpdate.sql
+++ b/db/versions/11026-brownAralia/01-entryUpdate.sql
@ -0,0 +1,3 @@
+UPDATE vn.entryType
+	SET description='Interna', code='internal'
+	WHERE code='supplies'
--- a/db/versions/11026-brownAralia/02-entryInternal.sql
+++ b/db/versions/11026-brownAralia/02-entryInternal.sql
@ -0,0 +1,3 @@
+UPDATE vn.entryType
+	SET isInformal = TRUE
+	WHERE code IN ('inventory', 'life', 'regularization', 'internal')
--- a/db/versions/11029-tealAnthurium/00-firstScript.sql
+++ b/db/versions/11029-tealAnthurium/00-firstScript.sql
@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.productionConfig ADD defaultSectorFk INT UNSIGNED DEFAULT 37 NOT NULL COMMENT 'Default sector';
--- a/db/versions/11031-aquaPalmetto/00-firstScript.sql
+++ b/db/versions/11031-aquaPalmetto/00-firstScript.sql
@ -0,0 +1,4 @@
+
+UPDATE bs.nightTask 
+    SET `procedure` = 'sales_addLauncher'
+    WHERE `procedure` = 'ventas_add_launcher';
--- a/e2e/paths/09-invoice-out/03_manualInvoice.spec.js
+++ b/e2e/paths/09-invoice-out/03_manualInvoice.spec.js
@ -40,7 +40,7 @@ describe('InvoiceOut manual invoice path', () => {
        await page.waitToClick(selectors.invoiceOutIndex.createInvoice);
        await page.waitForSelector(selectors.invoiceOutIndex.manualInvoiceForm);

-        await page.autocompleteSearch(selectors.invoiceOutIndex.manualInvoiceClient, 'Max Eisenhardt');
+        await page.autocompleteSearch(selectors.invoiceOutIndex.manualInvoiceClient, 'Petter Parker');
        await page.autocompleteSearch(selectors.invoiceOutIndex.manualInvoiceSerial, 'Global nacional');
        await page.autocompleteSearch(selectors.invoiceOutIndex.manualInvoiceTaxArea, 'national');
        await page.waitToClick(selectors.invoiceOutIndex.saveInvoice);
--- a/front/core/services/token.js
+++ b/front/core/services/token.js
@ -1,5 +1,6 @@
 import ngModule from '../module';
-
+const TOKEN_MULTIMEDIA = 'vnTokenMultimedia';
+const TOKEN = 'vnToken';
 /**
 * Saves and loads the token for the current logged in user.
 *
@ -58,8 +59,8 @@ export default class Token {
    }

    getStorage(storage) {
-        this.token = storage.getItem('vnToken');
-        this.tokenMultimedia = storage.getItem('vnTokenMultimedia');
+        this.token = storage.getItem(TOKEN);
+        this.tokenMultimedia = storage.getItem(TOKEN_MULTIMEDIA);
        if (!this.token) return;
        const created = storage.getItem('vnTokenCreated');
        this.created = created && new Date(created);
@ -67,15 +68,15 @@ export default class Token {
    }

    setStorage(storage, token, tokenMultimedia, created, ttl) {
-        storage.setItem('vnTokenMultimedia', tokenMultimedia);
-        storage.setItem('vnToken', token);
+        storage.setItem(TOKEN_MULTIMEDIA, tokenMultimedia);
+        storage.setItem(TOKEN, token);
        storage.setItem('vnTokenCreated', created.toJSON());
        storage.setItem('vnTokenTtl', ttl);
    }

    removeStorage(storage) {
-        storage.removeItem('vnToken');
-        storage.removeItem('vnTokenMultimedia');
+        storage.removeItem(TOKEN);
+        storage.removeItem(TOKEN_MULTIMEDIA);
        storage.removeItem('vnTokenCreated');
        storage.removeItem('vnTokenTtl');
    }
@ -96,9 +97,9 @@ export default class Token {
        this.checking = true;
        const renewPeriod = Math.min(this.ttl, this.renewPeriod) * 1000;
        const maxDate = this.created.getTime() + renewPeriod;
-        const now = new Date();
+        const now = new Date().getTime();

-        if (now.getTime() <= maxDate) {
+        if (now <= maxDate) {
            this.checking = false;
            return;
        }
@ -106,7 +107,17 @@ export default class Token {
        this.$http.post('VnUsers/renewToken')
            .then(res => {
                const token = res.data;
-                this.set(token.id, now, token.ttl, this.remember);
+                const tokenMultimedia =
+                    localStorage.getItem(TOKEN_MULTIMEDIA)
+                    ?? sessionStorage.getItem(TOKEN_MULTIMEDIA);
+
+                return this.$http.post('VnUsers/renewToken', null, {
+                    headers: {Authorization: tokenMultimedia}
+                })
+                    .then(({data}) => {
+                        const tokenMultimedia = data;
+                        this.set(token.id, tokenMultimedia.id, new Date(), token.ttl, this.remember);
+                    });
            })
            .finally(() => {
                this.checking = false;
@ -119,4 +130,4 @@ export default class Token {
 }
 Token.$inject = ['vnInterceptor', '$http', '$rootScope'];

-ngModule.service('vnToken', Token);
+ngModule.service(TOKEN, Token);
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@ -223,7 +223,7 @@
 	"printerNotExists": "The printer does not exist",
 	"There are not picking tickets": "There are not picking tickets",
 	"ticketCommercial": "The ticket {{ ticket }} for the salesperson {{ salesMan }} is in preparation. (automatically generated message)",
-	"This password can only be changed by the user themselves": "This password can only be changed by the user themselves",
-	"They're not your subordinate": "They're not your subordinate",
+    "This password can only be changed by the user themselves": "This password can only be changed by the user themselves",
+    "They're not your subordinate": "They're not your subordinate",
 	"InvoiceIn is already booked": "InvoiceIn is already booked"
 }
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@ -277,7 +277,7 @@
 	"Collection does not exist": "La colección no existe",
 	"Cannot obtain exclusive lock": "No se puede obtener un bloqueo exclusivo",
 	"Insert a date range": "Inserte un rango de fechas",
-	"Added observation": "{{user}} añadió esta observacion: {{text}}",
+	"Added observation": "{{user}} añadió esta observacion: {{text}} {{defaulterId}} ({{{defaulterUrl}}})",
 	"Comment added to client": "Observación añadida al cliente {{clientFk}}",
 	"Invalid auth code": "Código de verificación incorrecto",
 	"Invalid or expired verification code": "Código de verificación incorrecto o expirado",
@ -353,5 +353,8 @@
 	"This password can only be changed by the user themselves": "Esta contraseña solo puede ser modificada por el propio usuario",
 	"They're not your subordinate": "No es tu subordinado/a.",
 	"No results found": "No se han encontrado resultados",
-	"InvoiceIn is already booked": "La factura recibida está contabilizada"
-}
+	"InvoiceIn is already booked": "La factura recibida está contabilizada",
+	"This workCenter is already assigned to this agency": "Este centro de trabajo ya está asignado a esta agencia",
+    "Select ticket or client": "Elija un ticket o un client",
+	"It was not able to create the invoice": "No se pudo crear la factura"
+}
--- a/loopback/locale/fr.json
+++ b/loopback/locale/fr.json
@ -0,0 +1,360 @@
+{
+	"Phone format is invalid": "O formato do telefone é inválido",
+	"You are not allowed to change the credit": "Você não tem permissão para alterar o crédito",
+	"Unable to mark the equivalence surcharge": "Não é possível marcar a sobretaxa de equivalência",
+	"The default consignee can not be unchecked": "Não é possível desmarcar o destinatário padrão",
+	"Unable to default a disabled consignee": "Não é possível definir um destinatário desativado como padrão",
+	"Can't be blank": "Não pode ficar em branco",
+	"Invalid TIN": "NIF/CIF inválido",
+	"TIN must be unique": "O NIF/CIF deve ser único",
+	"A client with that Web User name already exists": "Já existe um cliente com esse nome de usuário da web",
+	"Is invalid": "É inválido",
+	"Quantity cannot be zero": "A quantidade não pode ser zero",
+	"Enter an integer different to zero": "Digite um inteiro diferente de zero",
+	"Package cannot be blank": "A embalagem não pode ficar em branco",
+	"The company name must be unique": "O nome da empresa deve ser único",
+	"Invalid email": "E-mail inválido",
+	"The IBAN does not have the correct format": "O IBAN não tem o formato correto",
+	"That payment method requires an IBAN": "Este método de pagamento requer um IBAN",
+	"That payment method requires a BIC": "Este método de pagamento requer um BIC",
+	"State cannot be blank": "O estado não pode ficar em branco",
+	"Worker cannot be blank": "O trabalhador não pode ficar em branco",
+	"Cannot change the payment method if no salesperson": "Não é possível alterar o método de pagamento se não houver vendedor",
+	"can't be blank": "Não pode ficar em branco",
+	"Observation type must be unique": "O tipo de observação deve ser único",
+	"The credit must be an integer greater than or equal to zero": "O crédito deve ser um inteiro maior ou igual a zero",
+	"The grade must be similar to the last one": "A nota deve ser semelhante à última",
+	"Only manager can change the credit": "Apenas o gerente pode alterar o crédito deste cliente",
+	"Name cannot be blank": "O nome não pode ficar em branco",
+	"Phone cannot be blank": "O telefone não pode ficar em branco",
+	"Period cannot be blank": "O período não pode ficar em branco",
+	"Choose a company": "Escolha uma empresa",
+	"Se debe rellenar el campo de texto": "O campo de texto deve ser preenchido",
+	"Description should have maximum of 45 characters": "A descrição deve ter no máximo 45 caracteres",
+	"Cannot be blank": "Não pode ficar em branco",
+	"The grade must be an integer greater than or equal to zero": "A nota deve ser um inteiro maior ou igual a zero",
+	"Sample type cannot be blank": "O tipo de amostra não pode ficar em branco",
+	"Description cannot be blank": "A descrição não pode ficar em branco",
+	"The price of the item changed": "O preço do item mudou",
+	"The value should not be greater than 100%": "O valor não deve ser maior que 100%",
+	"The value should be a number": "O valor deve ser um número",
+	"This order is not editable": "Esta ordem não é editável",
+	"You can't create an order for a frozen client": "Você não pode criar uma ordem para um cliente congelado",
+	"You can't create an order for a client that has a debt": "Você não pode criar uma ordem para um cliente que tem uma dívida",
+	"is not a valid date": "não é uma data válida",
+	"Barcode must be unique": "O código de barras deve ser único",
+	"The warehouse can't be repeated": "O armazém não pode ser repetido",
+	"The tag or priority can't be repeated for an item": "A tag ou prioridade não podem ser repetidas para um item",
+	"The observation type can't be repeated": "O tipo de observação não pode ser repetido",
+	"A claim with that sale already exists": "Já existe uma reclamação com essa venda",
+	"You don't have enough privileges to change that field": "Você não tem privilégios suficientes para alterar esse campo",
+	"Warehouse cannot be blank": "O armazém não pode ficar em branco",
+	"Agency cannot be blank": "A agência não pode ficar em branco",
+	"Not enough privileges to edit a client with verified data": "Não há privilégios suficientes para editar um cliente com dados verificados",
+	"This address doesn't exist": "Este endereço não existe",
+	"You must delete the claim id %d first": "Você deve excluir primeiro a reclamação %d",
+	"You don't have enough privileges": "Você não tem privilégios suficientes",
+	"Cannot check Equalization Tax in this NIF/CIF": "Não é possível verificar o Imposto de Equalização neste NIF/CIF",
+	"You can't make changes on the basic data of an confirmed order or with rows": "Você não pode fazer alterações nos dados básicos de um pedido confirmado ou com linhas",
+	"INVALID_USER_NAME": "Le nom d'utilisateur ne doit contenir que des lettres minuscules ou, à partir du deuxième caractère, des chiffres ou des tirets bas, l'utilisation de la lettre ñ n'est pas autorisée",
+	"You can't create a ticket for a frozen client": "Vous ne pouvez pas créer un ticket pour un client gelé",
+	"You can't create a ticket for an inactive client": "Vous ne pouvez pas créer un ticket pour un client inactif",
+	"Tag value cannot be blank": "La valeur du tag ne peut pas être vide",
+	"ORDER_EMPTY": "Panier vide",
+	"You don't have enough privileges to do that": "Vous n'avez pas les privilèges nécessaires pour faire cela",
+	"NO SE PUEDE DESACTIVAR EL CONSIGNAT": "LE CONSIGNATAIRE NE PEUT PAS ÊTRE DÉSACTIVÉ",
+	"Error. El NIF/CIF está repetido": "Erreur. Le NIF/CIF est répété",
+	"Street cannot be empty": "L'adresse ne peut pas être vide",
+	"City cannot be empty": "La ville ne peut pas être vide",
+	"Code cannot be blank": "Le code ne peut pas être vide",
+	"You cannot remove this department": "Vous ne pouvez pas supprimer ce département",
+	"The extension must be unique": "L'extension doit être unique",
+	"The secret can't be blank": "Le mot de passe ne peut pas être vide",
+	"We weren't able to send this SMS": "Nous n'avons pas pu envoyer ce SMS",
+	"This client can't be invoiced": "Ce client ne peut pas être facturé",
+	"You must provide the correction information to generate a corrective invoice": "Vous devez fournir les informations de correction pour générer une facture corrective",
+	"This ticket can't be invoiced": "Ce ticket ne peut pas être facturé",
+	"You cannot add or modify services to an invoiced ticket": "Vous ne pouvez pas ajouter ou modifier des services à un ticket facturé",
+	"This ticket can not be modified": "Ce ticket ne peut pas être modifié",
+	"The introduced hour already exists": "Cette heure a déjà été introduite",
+	"INFINITE_LOOP": "Il existe une dépendance entre deux chefs",
+	"The sales of the receiver ticket can't be modified": "Les lignes du ticket auquel vous envoyez ne peuvent pas être modifiées",
+	"NO_AGENCY_AVAILABLE": "Il n'y a pas de zone de livraison disponible avec ces paramètres",
+	"ERROR_PAST_SHIPMENT": "Vous ne pouvez pas sélectionner une date d'envoi dans le passé",
+	"The current ticket can't be modified": "Le ticket actuel ne peut pas être modifié",
+	"The current claim can't be modified": "La réclamation actuelle ne peut pas être modifiée",
+	"The sales of this ticket can't be modified": "Les lignes de ce ticket ne peuvent pas être modifiées",
+	"The sales do not exists": "Les lignes sélectionnées n'existent pas",
+	"Please select at least one sale": "Veuillez sélectionner au moins une ligne",
+	"All sales must belong to the same ticket": "Toutes les lignes doivent appartenir au même ticket",
+	"NO_ZONE_FOR_THIS_PARAMETERS": "Il n'y a pas de zone configurée pour ce jour",
+	"This item doesn't exists": "Cet article n'existe pas",
+	"NOT_ZONE_WITH_THIS_PARAMETERS": "Il n'y a pas de zone configurée pour ce jour",
+	"Extension format is invalid": "Le format de l'extension est invalide",
+	"Invalid parameters to create a new ticket": "Paramètres invalides pour créer un nouveau ticket",
+	"This item is not available": "Cet article n'est pas disponible",
+	"This postcode already exists": "Ce code postal existe déjà",
+	"Concept cannot be blank": "Le concept ne peut pas être vide",
+	"File doesn't exists": "Le fichier n'existe pas",
+	"You don't have privileges to change the zone": "Vous n'avez pas les privilèges pour changer la zone ou pour ces paramètres, il y a plus d'une option de livraison, parlez avec les agences",
+	"This ticket is already on weekly tickets": "Ce ticket est déjà sur les tickets hebdomadaires",
+	"Ticket id cannot be blank": "L'id du ticket ne peut pas être vide",
+	"Weekday cannot be blank": "Le jour de la semaine ne peut pas être vide",
+	"You can't delete a confirmed order": "Vous ne pouvez pas supprimer une commande confirmée",
+	"The social name has an invalid format": "Le nom fiscal a un format incorrect",
+	"Invalid quantity": "Quantité invalide",
+	"This postal code is not valid": "Ce code postal n'est pas valide",
+	"is invalid": "est invalide",
+	"The postcode doesn't exist. Please enter a correct one": "Le code postal n'existe pas. Veuillez entrer un code correct",
+	"The department name can't be repeated": "Le nom du département ne peut pas être répété",
+	"This phone already exists": "Ce téléphone existe déjà",
+	"You cannot move a parent to its own sons": "Vous ne pouvez pas déplacer un élément parent à un de ses fils",
+	"You can't create a claim for a removed ticket": "Vous ne pouvez pas créer une réclamation pour un ticket supprimé",
+	"You cannot delete a ticket that part of it is being prepared": "Vous ne pouvez pas supprimer un ticket dont une partie est en préparation",
+	"You must delete all the buy requests first": "Vous devez supprimer toutes les demandes d'achat en premier",
+	"You should specify a date": "Vous devez spécifier une date",
+	"You should specify at least a start or end date": "Vous devez spécifier au moins une date de début ou de fin",
+	"Start date should be lower than end date": "La date de début doit être inférieure à la date de fin",
+	"You should mark at least one week day": "Vous devez marquer au moins un jour de la semaine",
+	"Swift / BIC can't be empty": "Swift / BIC ne peut pas être vide",
+	"Customs agent is required for a non UEE member": "Un agent des douanes est requis pour les clients non membres de l'UEE",
+	"Incoterms is required for a non UEE member": "Les incoterms sont requis pour les clients non membres de l'UEE",
+	"Deleted sales from ticket": "J'ai supprimé les lignes suivantes du ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
+	"Added sale to ticket": "J'ai ajouté la ligne suivante au ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
+	"Changed sale discount": "J'ai changé le rabais des lignes suivantes du ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+	"Created claim": "J'ai créé la réclamation [{{claimId}}]({{{claimUrl}}}) des lignes suivantes du ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+	"Changed sale price": "J'ai changé le prix de [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) de {{oldPrice}}€ ➔ *{{newPrice}}€* du ticket [{{ticketId}}]({{{ticketUrl}}})",
+	"Changed sale quantity": "J'ai changé la quantité de {{itemId}} {{concept}} de {{oldQuantity}} ➔ {{newQuantity}} du ticket [{{ticketId}}]({{{ticketUrl}}})",
+	"State": "État",
+	"regular": "normal",
+	"reserved": "réservé",
+	"Changed sale reserved state": "J'ai changé l'état réservé des lignes suivantes du ticket[{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+	"Bought units from buy request": "{{quantity}} unités ont été achetées de [{{itemId}} {{concept}}]({{{urlItem}}}) pour le ticket id [{{ticketId}}]({{{url}}})",
+	"Deny buy request": "La demande d'achat pour le ticket id {{ticketId}} a été rejetée. Raison : {{observation}}",
+	"MESSAGE_INSURANCE_CHANGE": "J'ai changé le crédit assuré du client  [{{clientName}} ({{clientId}})]({{{url}}}) a *{{credit}} €*",
+	"Changed client paymethod": "J'ai changé la méthode de paiement du client [{{clientName}} ({{clientId}})]({{{url}}})",
+	"Sent units from ticket": "Envoi *{{quantity}}* unités de [{{concept}} ({{itemId}})]({{{itemUrl}}}) a *\"{{nickname}}\"* provenant du ticket id [{{ticketId}}]({{{ticketUrl}}})",
+	"Change quantity": "{{concept}} change de {{oldQuantity}} à {{newQuantity}}",
+	"Claim will be picked": "Le produit de la réclamation [({{claimId}})]({{{claimUrl}}}) du client *{{clientName}}*, avec le type de ramassage *{{claimPickup}}* sera récupéré",
+	"Claim state has changed to": "L'état de la réclamation [({{claimId}})]({{{claimUrl}}}) du client *{{clientName}}* a été changé à *{{newState}}*",
+	"Client checked as validated despite of duplication": "Le client a été vérifié malgré l'existence du client id {{clientId}}",
+	"ORDER_ROW_UNAVAILABLE": "Il n'y a pas de disponibilité pour ce produit",
+	"Distance must be lesser than 4000": "La distance doit être inférieure à 4000",
+	"This ticket is deleted": "Ce ticket est supprimé",
+	"Unable to clone this travel": "Il n'a pas été possible de cloner ce voyage",
+	"This thermograph id already exists": "L'id du thermographe existe déjà",
+	"Choose a date range or days forward": "Sélectionnez une plage de dates ou des jours à venir",
+	"ORDER_ALREADY_CONFIRMED": "COMMANDE DÉJÀ CONFIRMÉE",
+	"Invalid password": "Mot de passe invalide",
+	"Password does not meet requirements": "Le mot de passe ne répond pas aux exigences",
+	"Role already assigned": "Rôle déjà attribué",
+	"Invalid role name": "Nom de rôle invalide",
+	"Role name must be written in camelCase": "Le nom du rôle doit être écrit en camelCase",
+	"Email already exists": "L'email existe déjà",
+	"User already exists": "L'utilisateur existe déjà",
+	"Absence change notification on the labour calendar": "Notification de changement d'absence sur le calendrier de travail",
+	"Record of hours week": "Enregistrement des heures semaine {{week}} année {{year}}",
+	"Created absence": "L'employé <strong>{{author}}</strong> a ajouté une absence de type '{{absenceType}}' à <a href='{{{workerUrl}}}'> <strong>{{employee}}</strong></a> pour le jour {{dated}}.",
+	"Deleted absence": "L'employé <strong>{{author}}</strong> a supprimé une absence de type '{{absenceType}}' à <a href='{{{workerUrl}}}'> <strong>{{employee}}</strong></a> du jour {{dated}}.",
+	"I have deleted the ticket id": "J'ai supprimé le ticket id [{{id}}]({{{url}}})",
+	"I have restored the ticket id": "J'ai restauré le ticket id [{{id}}]({{{url}}})",
+	"You can only restore a ticket within the first hour after deletion": "Vous pouvez uniquement restaurer un ticket dans la première heure après sa suppression",
+	"Changed this data from the ticket": "J'ai modifié ces données du ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+	"agencyModeFk": "Agence",
+	"clientFk": "Client",
+	"zoneFk": "Zone",
+	"warehouseFk": "Entrepôt",
+	"shipped": "Date d'envoi",
+	"landed": "Date de livraison",
+	"addressFk": "Consignataire",
+	"companyFk": "Entreprise",
+	"agency": "Agence",
+	"delivery": "Livraison",
+	"The social name cannot be empty": "La raison sociale ne peut pas être vide",
+	"The nif cannot be empty": "Le NIF ne peut pas être vide",
+	"You need to fill sage information before you check verified data": "Vous devez remplir les informations de sage avant de vérifier les données",
+	"ASSIGN_ZONE_FIRST": "Assignez une zone d'abord",
+	"Amount cannot be zero": "Le montant ne peut pas être zéro",
+	"Company has to be official": "L'entreprise doit être officielle",
+	"You can not select this payment method without a registered bankery account": "Vous ne pouvez pas utiliser cette méthode de paiement sans avoir enregistré un compte bancaire",
+	"Action not allowed on the test environment": "Cette action n'est pas autorisée dans l'environnement de test",
+	"The selected ticket is not suitable for this route": "Le ticket sélectionné n'est pas adapté à cet itinéraire",
+	"New ticket request has been created with price": "Une nouvelle demande de ticket '{{description}}' a été créée pour le jour {{shipped}}, avec une quantité de {{quantity}} et un prix de {{price}} €",
+	"New ticket request has been created": "Une nouvelle demande de ticket '{{description}}' a été créée pour le jour {{shipped}}, avec une quantité de {{quantity}}",
+	"Swift / BIC cannot be empty": "Swift / BIC ne peut pas être vide",
+	"This BIC already exist.": "Ce BIC existe déjà.",
+	"That item doesn't exists": "Cet article n'existe pas",
+	"There's a new urgent ticket:": "Il y a un nouveau ticket urgent :",
+	"Invalid account": "Compte invalide",
+	"Compensation account is empty": "Le compte de compensation est vide",
+	"This genus already exist": "Ce genre existe déjà",
+	"This specie already exist": "Cette espèce existe déjà",
+	"Client assignment has changed": "J'ai changé le commercial ~*\"<{{previousWorkerName}}>\"*~ pour *\"<{{currentWorkerName}}>\"* du client [{{clientName}} ({{clientId}})]({{{url}}})",
+	"None": "Aucun",
+	"The contract was not active during the selected date": "Le contrat n'était pas actif pendant la date sélectionnée",
+	"Cannot add more than one '1/2 day vacation'": "Vous ne pouvez pas ajouter plus d'un 'Vacances 1/2 jour'",
+	"This document already exists on this ticket": "Ce document existe déjà dans ce ticket",
+	"Some of the selected tickets are not billable": "Certains des tickets sélectionnés ne sont pas facturables",
+	"You can't invoice tickets from multiple clients": "Vous ne pouvez pas facturer des tickets de plusieurs clients",
+	"nickname": "surnom",
+	"INACTIVE_PROVIDER": "Fournisseur inactif",
+	"This client is not invoiceable": "Ce client n'est pas facturable",
+	"serial non editable": "Cette série ne permet pas d'assigner la référence",
+	"Max shipped required": "La date limite est requise",
+	"Can't invoice to future": "Vous ne pouvez pas facturer pour l'avenir",
+	"Can't invoice to past": "Vous ne pouvez pas facturer pour le passé",
+	"This ticket is already invoiced": "Ce ticket est déjà facturé",
+	"A ticket with an amount of zero can't be invoiced": "Un ticket avec un montant de zéro ne peut pas être facturé",
+	"A ticket with a negative base can't be invoiced": "Un ticket avec une base négative ne peut pas être facturé",
+	"Global invoicing failed": "[Facturation globale] Certains clients n'ont pas pu être facturés",
+	"Wasn't able to invoice the following clients": "Les clients suivants n'ont pas pu être facturés",
+	"Can't verify data unless the client has a business type": "Vous ne pouvez pas vérifier les données d'un client qui n'a pas de type d'entreprise",
+	"You don't have enough privileges to set this credit amount": "Vous n'avez pas suffisamment de privilèges pour établir ce montant de crédit",
+	"You can't change the credit set to zero from a financialBoss": "Vous ne pouvez pas modifier le crédit établi à zéro par un chef financier",
+	"Amounts do not match": "Les montants ne correspondent pas",
+	"The PDF document does not exist": "Le document PDF n'existe pas. Essayez de le régénérer depuis l'option 'Regénérer PDF facture'",
+	"The type of business must be filled in basic data": "Le type d'entreprise doit être rempli dans les données de base",
+	"You can't create a claim from a ticket delivered more than seven days ago": "Vous ne pouvez pas créer une réclamation pour un ticket livré il y a plus de sept jours",
+	"The worker has hours recorded that day": "Le travailleur a des heures enregistrées ce jour-là",
+	"The worker has a marked absence that day": "Le travailleur a une absence marquée ce jour-là",
+	"You can not modify is pay method checked": "Vous ne pouvez pas modifier le champ méthode de paiement validé",
+	"The account size must be exactly 10 characters": "La taille du compte doit être exactement de 10 caractères",
+	"Can't transfer claimed sales": "Vous ne pouvez pas transférer des lignes réclamées",
+	"You don't have privileges to create refund": "Vous n'avez pas les privilèges pour créer un abonnement",
+	"The item is required": "L'article est requis",
+	"The agency is already assigned to another autonomous": "L'agence est déjà assignée à un autre autonome",
+	"date in the future": "Date dans le futur",
+	"reference duplicated": "Référence dupliquée",
+	"This ticket is already a refund": "Ce ticket est déjà un abonnement",
+	"isWithoutNegatives": "Sans négatifs",
+	"routeFk": "routeFk",
+	"Can't change the password of another worker": "Vous ne pouvez pas changer le mot de passe d'un autre travailleur",
+	"No hay un contrato en vigor": "Il n'y a pas de contrat en vigueur",
+	"No se permite fichar a futuro": "Il n'est pas permis de pointer pour l'avenir",
+	"No está permitido trabajar": "Il n'est pas permis de travailler",
+	"Fichadas impares": "Pointages impairs",
+	"Descanso diario 12h.": "Repos quotidien de 12h.",
+	"Descanso semanal 36h. / 72h.": "Repos hebdomadaire de 36h / 72h.",
+	"Dirección incorrecta": "Adresse incorrecte",
+	"Modifiable user details only by an administrator": "Détails de l'utilisateur modifiables uniquement par un administrateur",
+	"Modifiable password only via recovery or by an administrator": "Mot de passe modifiable uniquement via la récupération ou par un administrateur",
+	"Not enough privileges to edit a client": "Vous n'avez pas suffisamment de privilèges pour éditer un client",
+	"This route does not exists": "Cette route n'existe pas",
+	"Claim pickup order sent": "Ordre de ramassage de la réclamation envoyé [{{claimId}}]({{{claimUrl}}}) au client *{{clientName}}*",
+	"You don't have grant privilege": "Vous n'avez pas le privilège de donner des privilèges",
+	"You don't own the role and you can't assign it to another user": "Vous n'êtes pas le propriétaire du rôle et vous ne pouvez pas l'assigner à un autre utilisateur",
+	"Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) fusionné avec [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
+	"Already has this status": "A déjà cet état",
+	"There aren't records for this week": "Il n'y a pas d'enregistrements pour cette semaine",
+	"Empty data source": "Source de données vide",
+	"App locked": "Application verrouillée par l'utilisateur {{userId}}",
+	"Email verify": "Vérification de courriel",
+	"Landing cannot be lesser than shipment": "L'arrivée ne peut pas être inférieure à l'expédition",
+	"Receipt's bank was not found": "La banque du reçu n'a pas été trouvée",
+	"This receipt was not compensated": "Ce reçu n'a pas été compensé",
+	"Client's email was not found": "L'email du client n'a pas été trouvé",
+	"Negative basis": "Base négative",
+	"This worker code already exists": "Ce code de travailleur existe déjà",
+	"This personal mail already exists": "Ce courriel personnel existe déjà",
+	"This worker already exists": "Ce travailleur existe déjà",
+	"App name does not exist": "Le nom de l'application n'est pas valide",
+	"Try again": "Réessayez",
+	"Aplicación bloqueada por el usuario 9": "Application bloquée par l'utilisateur 9",
+	"Failed to upload delivery note": "Échec du téléchargement du bon de livraison {{id}}",
+	"The DOCUWARE PDF document does not exists": "Le document PDF Docuware n'existe pas",
+	"It is not possible to modify tracked sales": "Il n'est pas possible de modifier des lignes de commande qui ont commencé à être préparées",
+	"It is not possible to modify sales that their articles are from Floramondo": "Il n'est pas possible de modifier des lignes de commande dont les articles proviennent de Floramondo",
+	"It is not possible to modify cloned sales": "Il n'est pas possible de modifier des lignes de commande clonées",
+	"A supplier with the same name already exists. Change the country.": "Un fournisseur avec le même nom existe déjà. Changez le pays.",
+	"There is no assigned email for this client": "Il n'y a pas d'email assigné pour ce client",
+	"Exists an invoice with a future date": "Il existe une facture avec une date future",
+	"Invoice date can't be less than max date": "La date de la facture ne peut pas être inférieure à la date limite",
+	"Warehouse inventory not set": "L'inventaire de l'entrepôt n'est pas établi",
+	"This locker has already been assigned": "Ce casier a déjà été assigné",
+	"Tickets with associated refunds": "Vous ne pouvez pas supprimer des tickets avec des remboursements associés. Ce ticket est associé au remboursement Nº %d",
+	"Not exist this branch": "La branche n'existe pas",
+	"This ticket cannot be signed because it has not been boxed": "Ce ticket ne peut pas être signé car il n'a pas été emballé",
+	"Collection does not exist": "La collection n'existe pas",
+	"Cannot obtain exclusive lock": "Impossible d'obtenir un verrou exclusif",
+	"Insert a date range": "Insérez une plage de dates",
+	"Added observation": "{{user}} a ajouté cette observation : {{text}}",
+	"Comment added to client": "Observation ajoutée au client {{clientFk}}",
+	"Invalid auth code": "Code de vérification incorrect",
+	"Invalid or expired verification code": "Code de vérification incorrect ou expiré",
+	"Cannot create a new claimBeginning from a different ticket": "Vous ne pouvez pas créer une ligne de réclamation d'un ticket différent de l'origine",
+	"company": "Compagnie",
+	"country": "Pays",
+	"clientId": "Id client",
+	"clientSocialName": "Client",
+	"amount": "Montant",
+	"taxableBase": "Base",
+	"ticketFk": "Id ticket",
+	"isActive": "Actif",
+	"hasToInvoice": "Facturer",
+	"isTaxDataChecked": "Données vérifiées",
+	"comercialId": "Id commercial",
+	"comercialName": "Commercial",
+	"Pass expired": "Le mot de passe a expiré, changez-le depuis Salix",
+	"Invalid NIF for VIES": "NIF invalide pour VIES",
+	"Ticket does not exist": "Ce ticket n'existe pas",
+	"Ticket is already signed": "Ce ticket a déjà été signé",
+	"Authentication failed": "Échec de l'authentification",
+	"You can't use the same password": "Vous ne pouvez pas utiliser le même mot de passe",
+	"You can only add negative amounts in refund tickets": "Vous ne pouvez ajouter que des montants négatifs dans les tickets de remboursement",
+	"Fecha fuera de rango": "Date hors plage",
+	"Error while generating PDF": "Erreur lors de la génération du PDF",
+	"Error when sending mail to client": "Erreur lors de l'envoi du courrier au client",
+	"Mail not sent": "Une erreur est survenue lors de l'envoi de la facture au client [{{clientId}}]({{{clientUrl}}}), veuillez vérifier l'adresse électronique",
+	"The renew period has not been exceeded": "La période de renouvellement n'a pas été dépassée",
+	"Valid priorities": "Priorités valides : %d",
+	"hasAnyNegativeBase": "Base négative pour les tickets : {{ticketsIds}}",
+	"hasAnyPositiveBase": "Base positives pour les tickets : {{ticketsIds}}",
+	"You cannot assign an alias that you are not assigned to": "Vous ne pouvez pas attribuer un alias que vous n'avez pas reçu",
+	"This ticket cannot be left empty.": "Ce ticket ne peut pas être laissé vide. %s",
+	"The company has not informed the supplier account for bank transfers": "L'entreprise n'a pas informé le compte du fournisseur pour les transferts bancaires",
+	"You cannot assign/remove an alias that you are not assigned to": "Vous ne pouvez pas attribuer/supprimer un alias que vous n'avez pas reçu",
+	"This invoice has a linked vehicle.": "Cette facture a un véhicule lié",
+	"You don't have enough privileges.": "Vous n'avez pas suffisamment de privilèges.",
+	"This ticket is locked": "Ce ticket est bloqué.",
+	"This ticket is not editable.": "Ce ticket n'est pas modifiable.",
+	"The ticket doesn't exist.": "Le ticket n'existe pas.",
+	"Social name should be uppercase": "La raison sociale doit être en majuscules",
+	"Street should be uppercase": "L'adresse fiscale doit être en majuscules",
+	"Ticket without Route": "Ticket sans itinéraire",
+	"Select a different client": "Sélectionnez un client différent",
+	"Fill all the fields": "Remplissez tous les champs",
+	"The response is not a PDF": "La réponse n'est pas un PDF",
+	"Booking completed": "Réservation terminée",
+	"The ticket is in preparation": "Le ticket [{{ticketId}}]({{{ticketUrl}}}) du commercial {{salesPersonId}} est en préparation",
+	"The notification subscription of this worker cant be modified": "L'abonnement à la notification de ce travailleur ne peut pas être modifié",
+	"User disabled": "Utilisateur désactivé",
+	"The amount cannot be less than the minimum": "La quantité ne peut pas être inférieure à la quantité minimale",
+	"quantityLessThanMin": "La quantité ne peut pas être inférieure à la quantité minimale",
+	"Cannot past travels with entries": "Vous ne pouvez pas passer des envois avec des entrées",
+	"It was not able to remove the next expeditions:": "Il n'a pas été possible de supprimer les expéditions suivantes : {{expeditions}}",
+	"This claim has been updated": "La réclamation avec l'Id : {{claimId}}, a été mise à jour",
+	"This user does not have an assigned tablet": "Cet utilisateur n'a pas de tablette assignée",
+	"Field are invalid": "Le champ '{{tag}}' n'est pas valide",
+	"Incorrect pin": "Pin incorrect.",
+	"You already have the mailAlias": "Vous avez déjà cet alias de courrier",
+	"The alias cant be modified": "Cet alias de courrier ne peut pas être modifié",
+	"No tickets to invoice": "Pas de tickets à facturer",
+	"this warehouse has not dms": "L'entrepôt n'accepte pas les documents",
+	"This ticket already has a cmr saved": "Ce ticket a déjà un cmr enregistré",
+	"Name should be uppercase": "Le nom doit être en majuscules",
+	"Bank entity must be specified": "L'entité bancaire doit être spécifiée",
+	"An email is necessary": "Un email est nécessaire",
+	"You cannot update these fields": "Vous ne pouvez pas mettre à jour ces champs",
+	"CountryFK cannot be empty": "Le pays ne peut pas être vide",
+	"Cmr file does not exist": "Le fichier cmr n'existe pas",
+	"You are not allowed to modify the alias": "Vous n'êtes pas autorisé à modifier l'alias",
+	"The address of the customer must have information about Incoterms and Customs Agent": "L'adresse du client doit contenir des informations sur les Incoterms et l'agent des douanes",
+	"The line could not be marked": "La ligne ne peut pas être marquée",
+	"This password can only be changed by the user themselves": "Ce mot de passe ne peut être modifié que par l'utilisateur lui-même",
+	"They're not your subordinate": "Ce n'est pas votre subordonné.",
+	"No results found": "Aucun résultat trouvé",
+	"InvoiceIn is already booked": "La facture reçue est déjà comptabilisée",
+	"This workCenter is already assigned to this agency": "Ce centre de travail est déjà assigné à cette agence",
+	"Select ticket or client": "Choisissez un ticket ou un client",
+	"It was not able to create the invoice": "Il n'a pas été possible de créer la facture"
+}
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`ALTER TABLE vn.entryType ADD isInformal TINYINT DEFAULT 0 NOT NULL;`