Merge branch 'dev' into 4789-search-ticket-without-invoice

db/changes/10503-november/00-alter_expedition_itemFk.sql

@@ -0,0 +1 @@
+Alter table `vn`.`expedition` RENAME COLUMN itemFk TO itemFk__;

db/changes/10503-november/00-isCompensationACL.sql

@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Receipt', 'balanceCompensationEmail', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Receipt', 'balanceCompensationPdf', 'READ', 'ALLOW', 'ROLE', 'employee');

db/dump/fixtures.sql

@@ -921,7 +921,7 @@ INSERT INTO `vn`.`expeditionStateType`(`id`, `description`, `code`)
         (3, 'Perdida', 'LOST');
 
 
-INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `freightItemFk`, `created`, `itemFk`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`)
+INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `freightItemFk`, `created`, `itemFk__`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`)
     VALUES
         (1,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  15,      1,  18, 'UR9000006041',   94, 1,   'pc1'),
         (2,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  16,      2,  18, 'UR9000006041',   94, 1,   NULL),
@@ -1859,7 +1859,8 @@ INSERT INTO `vn`.`receipt`(`id`, `invoiceFk`, `amountPaid`, `payed`, `workerFk`,
         (1, 'Cobro web',            100.50, util.VN_CURDATE(),                             9, 1, 1101, util.VN_CURDATE(),                             442, 1),
         (2, 'Cobro web',            200.50, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY),  9, 1, 1101, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY),  442, 1),
         (3, 'Cobro en efectivo',    300.00, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), 9, 1, 1102, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), 442, 0),
-        (4, 'Cobro en efectivo',    400.00, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 9, 1, 1103, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 442, 0);
+        (4, 'Cobro en efectivo',    400.00, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 9, 1, 1103, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 442, 0),
+        (5, 'Compensación',         400.00, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 9, 3, 1103, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 442, 0);
 
 INSERT INTO `vn`.`workerTeam`(`id`, `team`, `workerFk`)
     VALUES

e2e/helpers/selectors.js

@@ -324,7 +324,8 @@ export default {
         anyBalanceLine: 'vn-client-balance-index vn-tbody > vn-tr',
         firstLineBalance: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(8)',
         firstLineReference: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td-editable',
-        firstLineReferenceInput: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td-editable > div > field > vn-textfield'
+        firstLineReferenceInput: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td-editable > div > field > vn-textfield',
+        compensationButton: 'vn-client-balance-index vn-icon-button[vn-dialog="send_compensation"]'
     },
     webPayment: {
         confirmFirstPaymentButton: 'vn-client-web-payment vn-tr:nth-child(1) vn-icon-button[icon="done_all"]',
@@ -1038,6 +1039,17 @@ export default {
         booked: 'vn-invoice-in-basic-data vn-date-picker[ng-model="$ctrl.invoiceIn.booked"]',
         currency: 'vn-invoice-in-basic-data vn-autocomplete[ng-model="$ctrl.invoiceIn.currencyFk"]',
         company: 'vn-invoice-in-basic-data vn-autocomplete[ng-model="$ctrl.invoiceIn.companyFk"]',
+        dms: 'vn-invoice-in-basic-data vn-textfield[ng-model="$ctrl.invoiceIn.dmsFk"]',
+        download: 'vn-invoice-in-basic-data vn-textfield[ng-model="$ctrl.invoiceIn.dmsFk"] > div.container > div.prepend > prepend > vn-icon-button',
+        edit: 'vn-invoice-in-basic-data vn-textfield[ng-model="$ctrl.invoiceIn.dmsFk"] > div.container > div.append > append > vn-icon-button[icon="edit"]',
+        create: 'vn-invoice-in-basic-data vn-textfield[ng-model="$ctrl.invoiceIn.dmsFk"] > div.container > div.append > append > vn-icon-button[icon="add_circle"]',
+        reference: 'vn-textfield[ng-model="$ctrl.dms.reference"]',
+        companyId: 'vn-autocomplete[ng-model="$ctrl.dms.companyId"]',
+        warehouseId: 'vn-autocomplete[ng-model="$ctrl.dms.warehouseId"]',
+        dmsTypeId: 'vn-autocomplete[ng-model="$ctrl.dms.dmsTypeId"]',
+        description: 'vn-textarea[ng-model="$ctrl.dms.description"]',
+        inputFile: 'vn-input-file[ng-model="$ctrl.dms.files"]',
+        confirm: 'button[response="accept"]',
         save: 'vn-invoice-in-basic-data button[type=submit]'
     },
     invoiceInTax: {

e2e/paths/02-client/23_send_compensation.spec.js

@@ -0,0 +1,27 @@
+import selectors from '../../helpers/selectors';
+import getBrowser from '../../helpers/puppeteer';
+
+describe('Client Send balance compensation', () => {
+    let browser;
+    let page;
+    beforeAll(async() => {
+        browser = await getBrowser();
+        page = browser.page;
+        await page.loginAndModule('employee', 'client');
+        await page.accessToSearchResult('Clark Kent');
+        await page.accessToSection('client.card.balance.index');
+    });
+
+    afterAll(async() => {
+        await browser.close();
+    });
+
+    it(`should click on send compensation button`, async() => {
+        await page.autocompleteSearch(selectors.clientBalance.company, 'VNL');
+        await page.waitToClick(selectors.clientBalance.compensationButton);
+        await page.waitToClick(selectors.clientBalance.saveButton);
+        const message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('Notification sent!');
+    });
+});

e2e/paths/09-invoice-in/03_basic_data.spec.js

@@ -4,6 +4,7 @@ import getBrowser from '../../helpers/puppeteer';
 describe('InvoiceIn basic data path', () => {
     let browser;
     let page;
+    let newDms;
 
     beforeAll(async() => {
         browser = await getBrowser();
@@ -24,6 +25,8 @@ describe('InvoiceIn basic data path', () => {
         await page.autocompleteSearch(selectors.invoiceInBasicData.supplier, 'Verdnatura');
         await page.clearInput(selectors.invoiceInBasicData.supplierRef);
         await page.write(selectors.invoiceInBasicData.supplierRef, '9999');
+        await page.clearInput(selectors.invoiceInBasicData.dms);
+        await page.write(selectors.invoiceInBasicData.dms, '2');
         await page.pickDate(selectors.invoiceInBasicData.bookEntried, now);
         await page.pickDate(selectors.invoiceInBasicData.booked, now);
         await page.autocompleteSearch(selectors.invoiceInBasicData.currency, 'USD');
@@ -61,4 +64,141 @@ describe('InvoiceIn basic data path', () => {
 
         expect(result).toEqual('ORN');
     });
+
+    it(`should confirm the invoiceIn dms was edited`, async() => {
+        const result = await page
+            .waitToGetProperty(selectors.invoiceInBasicData.dms, 'value');
+
+        expect(result).toEqual('2');
+    });
+
+    it(`should create a new invoiceIn dms and save the changes`, async() => {
+        await page.clearInput(selectors.invoiceInBasicData.dms);
+        await page.waitToClick(selectors.invoiceInBasicData.create);
+
+        await page.clearInput(selectors.invoiceInBasicData.reference);
+        await page.write(selectors.invoiceInBasicData.reference, 'New Dms');
+
+        await page.waitToClick(selectors.invoiceInBasicData.confirm);
+        let message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('The company can\'t be empty');
+
+        await page.clearInput(selectors.invoiceInBasicData.companyId);
+        await page.autocompleteSearch(selectors.invoiceInBasicData.companyId, 'VNL');
+
+        await page.waitToClick(selectors.invoiceInBasicData.confirm);
+        message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('The warehouse can\'t be empty');
+
+        await page.clearInput(selectors.invoiceInBasicData.warehouseId);
+        await page.autocompleteSearch(selectors.invoiceInBasicData.warehouseId, 'Warehouse One');
+
+        await page.waitToClick(selectors.invoiceInBasicData.confirm);
+        message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('The DMS Type can\'t be empty');
+
+        await page.clearInput(selectors.invoiceInBasicData.dmsTypeId);
+        await page.autocompleteSearch(selectors.invoiceInBasicData.dmsTypeId, 'Ticket');
+
+        await page.waitToClick(selectors.invoiceInBasicData.confirm);
+        message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('The description can\'t be empty');
+
+        await page.waitToClick(selectors.invoiceInBasicData.description);
+        await page.write(selectors.invoiceInBasicData.description, 'Dms without edition.');
+
+        await page.waitToClick(selectors.invoiceInBasicData.confirm);
+        message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('The files can\'t be empty');
+
+        let currentDir = process.cwd();
+        let filePath = `${currentDir}/e2e/assets/thermograph.jpeg`;
+
+        const [fileChooser] = await Promise.all([
+            page.waitForFileChooser(),
+            page.waitToClick(selectors.invoiceInBasicData.inputFile)
+        ]);
+        await fileChooser.accept([filePath]);
+
+        await page.waitToClick(selectors.invoiceInBasicData.confirm);
+        message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('Data saved!');
+
+        newDms = await page
+            .waitToGetProperty(selectors.invoiceInBasicData.dms, 'value');
+    });
+
+    it(`should confirm the invoiceIn was edited with the new dms`, async() => {
+        await page.reloadSection('invoiceIn.card.basicData');
+        const result = await page
+            .waitToGetProperty(selectors.invoiceInBasicData.dms, 'value');
+
+        expect(result).toEqual(newDms);
+    });
+
+    it(`should edit the invoiceIn`, async() => {
+        await page.waitToClick(selectors.invoiceInBasicData.edit);
+
+        await page.clearInput(selectors.invoiceInBasicData.reference);
+        await page.write(selectors.invoiceInBasicData.reference, 'Dms Edited');
+        await page.clearInput(selectors.invoiceInBasicData.companyId);
+        await page.autocompleteSearch(selectors.invoiceInBasicData.companyId, 'CCs');
+        await page.clearInput(selectors.invoiceInBasicData.warehouseId);
+        await page.autocompleteSearch(selectors.invoiceInBasicData.warehouseId, 'Algemesi');
+        await page.clearInput(selectors.invoiceInBasicData.dmsTypeId);
+        await page.autocompleteSearch(selectors.invoiceInBasicData.dmsTypeId, 'Basura');
+        await page.waitToClick(selectors.invoiceInBasicData.description);
+        await page.write(selectors.invoiceInBasicData.description, ' Nevermind, now is edited.');
+
+        await page.waitToClick(selectors.invoiceInBasicData.confirm);
+        let message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('Data saved!');
+    });
+
+    it(`should confirm the new dms has been edited`, async() => {
+        await page.reloadSection('invoiceIn.card.basicData');
+        await page.waitToClick(selectors.invoiceInBasicData.edit);
+
+        const reference = await page
+            .waitToGetProperty(selectors.invoiceInBasicData.reference, 'value');
+        const companyId = await page
+            .waitToGetProperty(selectors.invoiceInBasicData.companyId, 'value');
+        const warehouseId = await page
+            .waitToGetProperty(selectors.invoiceInBasicData.warehouseId, 'value');
+        const dmsTypeId = await page
+            .waitToGetProperty(selectors.invoiceInBasicData.dmsTypeId, 'value');
+        const description = await page
+            .waitToGetProperty(selectors.invoiceInBasicData.description, 'value');
+
+        expect(reference).toEqual('Dms Edited');
+        expect(companyId).toEqual('CCs');
+        expect(warehouseId).toEqual('Algemesi');
+        expect(dmsTypeId).toEqual('Basura');
+        expect(description).toEqual('Dms without edition. Nevermind, now is edited.');
+
+        await page.waitToClick(selectors.invoiceInBasicData.confirm);
+    });
+
+    it(`should disable edit and download if dms doesn't exists, and set back the original dms`, async() => {
+        await page.clearInput(selectors.invoiceInBasicData.dms);
+        await page.write(selectors.invoiceInBasicData.dms, '9999');
+
+        await page.waitForSelector(`${selectors.invoiceInBasicData.download}.disabled`);
+        await page.waitForSelector(`${selectors.invoiceInBasicData.edit}.disabled`);
+
+        await page.clearInput(selectors.invoiceInBasicData.dms);
+        await page.write(selectors.invoiceInBasicData.dms, '1');
+
+        await page.waitToClick(selectors.invoiceInBasicData.save);
+        const message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('Data saved!');
+    });
 });

loopback/locale/en.json

@@ -138,5 +138,8 @@
 	"You don't have grant privilege": "You don't have grant privilege",
 	"You don't own the role and you can't assign it to another user": "You don't own the role and you can't assign it to another user",
 	"Ticket merged": "Ticket [{{id}}]({{{fullPath}}}) ({{{originDated}}}) merged with [{{tfId}}]({{{fullPathFuture}}}) ({{{futureDated}}})",
-    "Sale(s) blocked, please contact production": "Sale(s) blocked, please contact production"
+    "Sale(s) blocked, please contact production": "Sale(s) blocked, please contact production",
+    "Receipt's bank was not found": "Receipt's bank was not found",
+    "This receipt was not compensated": "This receipt was not compensated",
+    "Client's email was not found": "Client's email was not found"
 }

loopback/locale/es.json

@@ -244,5 +244,8 @@
 	"Ticket merged": "Ticket [{{id}}]({{{fullPath}}}) ({{{originDated}}}) fusionado con [{{tfId}}]({{{fullPathFuture}}}) ({{{futureDated}}})",
 	"Already has this status": "Ya tiene este estado",
 	"There aren't records for this week": "No existen registros para esta semana",
-	"Empty data source": "Origen de datos vacio"
+	"Empty data source": "Origen de datos vacio",
+    "Receipt's bank was not found": "No se encontró el banco del recibo",
+    "This receipt was not compensated": "Este recibo no ha sido compensado",
+    "Client's email was not found": "No se encontró el email del cliente"
 }

modules/client/back/methods/receipt/balanceCompensationEmail.js

@@ -1,4 +1,5 @@
 const {Email} = require('vn-print');
+const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
     Self.remoteMethodCtx('balanceCompensationEmail', {
@@ -10,7 +11,7 @@ module.exports = Self => {
                 type: 'Number',
                 required: true,
                 description: 'The receipt id',
-                http: { source: 'path' }
+                http: {source: 'path'}
             }
         ],
         returns: {
@@ -23,18 +24,29 @@ module.exports = Self => {
         }
     });
 
-    Self.balanceCompensationEmail = async (ctx, id) => {
-
+    Self.balanceCompensationEmail = async(ctx, id) => {
         const models = Self.app.models;
-        const receipt = await models.Receipt.findById(id, {fields: ['clientFk']});
-        const client = await models.Client.findById(receipt.clientFk, {fields:['email']});
+        const receipt = await models.Receipt.findById(id, {fields: ['clientFk', 'bankFk']});
 
-        const email = new Email('balance-compensation', {
-            lang: ctx.req.getLocale(),
-            recipient: client.email+',administracion@verdnatura.es',
-            id
-        });
+        const bank = await models.Bank.findById(receipt.bankFk);
+        if (!bank)
+            throw new UserError(`Receipt's bank was not found`);
 
-        return email.send();
+        const accountingType = await models.AccountingType.findById(bank.accountingTypeFk);
+        if (!(accountingType && accountingType.code == 'compensation'))
+            throw new UserError(`This receipt was not compensated`);
+
+        const client = await models.Client.findById(receipt.clientFk, {fields: ['email']});
+
+        if (!client.email)
+            throw new UserError(`Client's email was not found`);
+        else {
+            const email = new Email('balance-compensation', {
+                lang: ctx.req.getLocale(),
+                recipient: client.email + ',administracion@verdnatura.es',
+                id
+            });
+            return email.send();
+        }
     };
 };

modules/client/back/methods/receipt/filter.js

@@ -42,7 +42,7 @@ module.exports = Self => {
 
         const stmt = new ParameterizedSQL(
             `SELECT * FROM (
-                SELECT 
+                SELECT
                     r.id,
                     r.isConciliate,
                     r.payed,
@@ -56,13 +56,16 @@ module.exports = Self => {
                     u.name userName,
                     r.clientFk,
                     FALSE hasPdf,
-                    FALSE isInvoice
+                    FALSE isInvoice,
+                    CASE WHEN at2.code LIKE 'compensation' THEN True ELSE False END as isCompensation
                 FROM vn.receipt r
                     LEFT JOIN vn.worker w ON w.id = r.workerFk
                     LEFT JOIN account.user u ON u.id = w.userFk
                     JOIN vn.company c ON c.id = r.companyFk
+                    JOIN vn.accounting a ON a.id = r.bankFk
+					JOIN vn.accountingType at2 ON at2.id = a.accountingTypeFk
                 WHERE r.clientFk = ? AND r.companyFk = ?
-                UNION ALL 
+                UNION ALL
                 SELECT
                     i.id,
                     TRUE,
@@ -77,9 +80,12 @@ module.exports = Self => {
                     NULL,
                     i.clientFk,
                     i.hasPdf,
-                    TRUE isInvoice
+                    TRUE isInvoice,
+                    CASE WHEN at2.code LIKE 'compensation' THEN True ELSE False END as isCompensation
                 FROM vn.invoiceOut i
                     JOIN vn.company c ON c.id = i.companyFk
+                    JOIN vn.accounting a ON a.id = i.bankFk
+					JOIN vn.accountingType at2 ON at2.id = a.accountingTypeFk
                 WHERE i.clientFk = ? AND i.companyFk = ?
                 ORDER BY payed DESC, created DESC
             ) t ORDER BY payed DESC, created DESC`,

modules/client/front/balance/index/index.html

@@ -121,7 +121,7 @@
                             </vn-icon-button>
                         </a>
                     </vn-td>
-                        <vn-td center shrink ng-if="!balance.isInvoice">
+                        <vn-td center shrink ng-if="balance.isCompensation">
                             <vn-icon-button
                                 vn-dialog="send_compensation"
                                 icon="outgoing_mail"
@@ -144,7 +144,7 @@
     vn-acl="salesAssistant"
     vn-acl-action="remove"
     icon="add"
-    vn-tooltip="New payment" 
+    vn-tooltip="New payment"
     vn-bind="+"
     fixed-bottom-right
     ng-click="balanceCreate.show()">
@@ -155,9 +155,9 @@
     company-fk="$ctrl.companyId"
     client-fk="$ctrl.$params.id">
 </vn-client-balance-create>
-<vn-worker-descriptor-popover 
+<vn-worker-descriptor-popover
     vn-id="workerDescriptor">
 </vn-worker-descriptor-popover>
-<vn-invoice-out-descriptor-popover 
+<vn-invoice-out-descriptor-popover
     vn-id="invoiceOutDescriptor">
-</vn-invoice-out-descriptor-popover>
+</vn-invoice-out-descriptor-popover>

modules/client/front/balance/index/index.js

@@ -55,41 +55,41 @@ class Controller extends Section {
             }
         })).then(() => this.getBalances());
     }
-    
+
     getCurrentBalance() {
         const clientRisks = this.$.riskModel.data;
         const selectedCompany = this.companyId;
         const currentBalance = clientRisks.find(balance => {
             return balance.companyFk === selectedCompany;
         });
-        
+
         return currentBalance && currentBalance.amount;
     }
-    
+
     getBalances() {
         const balances = this.$.model.data;
         balances.forEach((balance, index) => {
             if (index === 0)
-            balance.balance = this.getCurrentBalance();
+                balance.balance = this.getCurrentBalance();
             if (index > 0) {
                 let previousBalance = balances[index - 1];
                 balance.balance = previousBalance.balance - (previousBalance.debit - previousBalance.credit);
             }
         });
     }
-    
+
     showInvoiceOutDescriptor(event, balance) {
         if (!balance.isInvoice) return;
         if (event.defaultPrevented) return;
-        
+
         this.$.invoiceOutDescriptor.show(event.target, balance.id);
     }
-    
+
     changeDescription(balance) {
         const params = {description: balance.description};
         const endpoint = `Receipts/${balance.id}`;
         this.$http.patch(endpoint, params)
-        .then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
+            .then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
     }
 
     sendEmail(balance) {

modules/client/front/balance/index/index.spec.js

@@ -151,5 +151,19 @@ describe('Client', () => {
                 $httpBackend.flush();
             });
         });
+
+        describe('sendEmail()', () => {
+            it('should send an email', () => {
+                jest.spyOn(controller.vnEmail, 'send');
+
+                const $data = {id: 1103};
+
+                controller.sendEmail($data);
+
+                const expectedPath = `Receipts/${$data.id}/balance-compensation-email`;
+
+                expect(controller.vnEmail.send).toHaveBeenCalledWith(expectedPath);
+            });
+        });
     });
 });

modules/client/front/balance/index/locale/en.yml

@@ -1 +1,3 @@
-BILL: N/INV {{ref}}
+BILL: N/INV {{ref}}
+Notify compensation: Do you want to report compensation to the client by mail?
+Send compensation: Send compensation

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

@@ -5,6 +5,24 @@
     form="form"
     save="patch">
 </vn-watcher>
+<vn-crud-model
+    auto-load="true"
+    url="Companies"
+    data="companies"
+    order="code">
+</vn-crud-model>
+<vn-crud-model
+    auto-load="true"
+    url="Warehouses"
+    data="warehouses"
+    order="name">
+</vn-crud-model>
+<vn-crud-model
+    auto-load="true"
+    url="DmsTypes"
+    data="dmsTypes"
+    order="name">
+</vn-crud-model>
 <form name="form" ng-submit="watcher.submit()" class="vn-w-md">
     <vn-card class="vn-pa-lg">
         <vn-horizontal>
@@ -31,14 +49,14 @@
         </vn-horizontal>
         <vn-horizontal>
             <vn-date-picker
-                vn-one 
-                label="Expedition date" 
+                vn-one
+                label="Expedition date"
                 ng-model="$ctrl.invoiceIn.issued"
                 vn-focus
                 rule>
             </vn-date-picker>
             <vn-date-picker
-                vn-one 
+                vn-one
                 label="Operation date"
                 ng-model="$ctrl.invoiceIn.operated"
                 rule>
@@ -57,17 +75,47 @@
                     {{id}} - {{name}}
                 </tpl-item>
             </vn-datalist>
+            <vn-textfield
+                label="Document"
+                ng-model="$ctrl.invoiceIn.dmsFk"
+                ng-change="$ctrl.checkFileExists($ctrl.invoiceIn.dmsFk)"
+                rule>
+                <prepend>
+                    <vn-icon-button
+                        disabled="$ctrl.editDownloadDisabled"
+                        ng-if="$ctrl.invoiceIn.dmsFk"
+                        title="{{'Download file' | translate}}"
+                        icon="cloud_download"
+                        ng-click="$ctrl.downloadFile($ctrl.invoiceIn.dmsFk)">
+                    </vn-icon-button>
+                </prepend>
+                <append>
+                <vn-icon-button
+                    disabled="$ctrl.editDownloadDisabled"
+                    ng-if="$ctrl.invoiceIn.dmsFk"
+                    ng-click="$ctrl.openEditDialog($ctrl.invoiceIn.dmsFk)"
+                    icon="edit"
+                    title="{{'Edit document' | translate}}">
+                </vn-icon-button>
+                <vn-icon-button
+                    ng-if="!$ctrl.invoiceIn.dmsFk"
+                    ng-click="$ctrl.openCreateDialog()"
+                    icon="add_circle"
+                    title="{{'Create document' | translate}}">
+                </vn-icon-button>
+                </append>
+            </vn-textfield>
         </vn-horizontal>
         <vn-horizontal>
             <vn-date-picker
-                vn-one 
-                label="Entry date" 
+                vn-one
+                label="Entry date"
                 ng-model="$ctrl.invoiceIn.bookEntried"
                 rule>
             </vn-date-picker>
             <vn-date-picker
-                vn-one 
-                label="Accounted date" 
+                vn-one
+                label="Accounted date"
                 ng-model="$ctrl.invoiceIn.booked"
                 rule>
             </vn-date-picker>
@@ -104,4 +152,164 @@
             ng-click="watcher.loadOriginalData()">
         </vn-button>
     </vn-button-bar>
-</form>
+</form>
+<!-- Create edit dms dialog -->
+<vn-dialog
+    vn-id="dmsEditDialog"
+    message="Edit document"
+    on-accept="$ctrl.onEdit()">
+    <tpl-body>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                vn-focus
+                label="Reference"
+                ng-model="$ctrl.dms.reference"
+                rule>
+            </vn-textfield>
+            <vn-autocomplete vn-one required="true"
+                label="Company"
+                ng-model="$ctrl.dms.companyId"
+                url="Companies"
+                show-field="code"
+                value-field="id">
+            </vn-autocomplete>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-autocomplete vn-one required="true"
+                label="Warehouse"
+                ng-model="$ctrl.dms.warehouseId"
+                url="Warehouses"
+                show-field="name"
+                value-field="id">
+            </vn-autocomplete>
+            <vn-autocomplete vn-one required="true"
+                label="Type"
+                ng-model="$ctrl.dms.dmsTypeId"
+                url="DmsTypes"
+                show-field="name"
+                value-field="id">
+            </vn-autocomplete>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-textarea
+                vn-one
+                required="true"
+                label="Description"
+                ng-model="$ctrl.dms.description"
+                rule>
+            </vn-textarea>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-input-file
+                vn-one
+                label="File"
+                ng-model="$ctrl.dms.files"
+                on-change="$ctrl.onFileChange($files)"
+                accept="{{$ctrl.allowedContentTypes}}"
+                required="false"
+                multiple="true">
+                <append>
+                    <vn-icon vn-none
+                        color-marginal
+                        title="{{$ctrl.contentTypesInfo}}"
+                        icon="info">
+                    </vn-icon>
+                </append>
+            </vn-input-file>
+        </vn-horizontal>
+        <vn-vertical>
+            <vn-check disabled="true"
+                label="Generate identifier for original file"
+                ng-model="$ctrl.dms.hasFile">
+            </vn-check>
+        </vn-vertical>
+    </tpl-body>
+    <tpl-buttons>
+        <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
+        <button response="accept" translate>Save</button>
+    </tpl-buttons>
+</vn-dialog>
+<!-- Create new dms dialog -->
+<vn-dialog
+    vn-id="dmsCreateDialog"
+    message="Create document"
+    on-accept="$ctrl.onCreate()">
+        <tpl-body>
+            <vn-horizontal>
+                <vn-textfield
+                    vn-one
+                    vn-focus
+                    label="Reference"
+                    ng-model="$ctrl.dms.reference"
+                    rule>
+                </vn-textfield>
+                <vn-autocomplete
+                    vn-one
+                    label="Company"
+                    ng-model="$ctrl.dms.companyId"
+                    data="companies"
+                    show-field="code"
+                    value-field="id"
+                    required="true">
+                </vn-autocomplete>
+            </vn-horizontal>
+            <vn-horizontal>
+                <vn-autocomplete
+                    vn-one
+                    label="Warehouse"
+                    ng-model="$ctrl.dms.warehouseId"
+                    data="warehouses"
+                    show-field="name"
+                    value-field="id"
+                    required="true">
+                </vn-autocomplete>
+                <vn-autocomplete
+                    vn-one
+                    label="Type"
+                    ng-model="$ctrl.dms.dmsTypeId"
+                    data="dmsTypes"
+                    show-field="name"
+                    value-field="id"
+                    required="true">
+                </vn-autocomplete>
+            </vn-horizontal>
+            <vn-horizontal>
+                <vn-textarea
+                    vn-one
+                    label="Description"
+                    ng-model="$ctrl.dms.description"
+                    required="true"
+                    rule>
+                </vn-textarea>
+            </vn-horizontal>
+            <vn-horizontal>
+                <vn-input-file
+                    vn-one
+                    label="File"
+                    ng-model="$ctrl.dms.files"
+                    on-change="$ctrl.onFileChange($files)"
+                    accept="{{$ctrl.allowedContentTypes}}"
+                    required="true"
+                    multiple="true">
+                    <append>
+                        <vn-icon vn-none
+                            color-marginal
+                            title="{{$ctrl.contentTypesInfo}}"
+                            icon="info">
+                        </vn-icon>
+                    </append>
+                </vn-input-file>
+            </vn-horizontal>
+            <vn-vertical>
+                <vn-check
+                    label="Generate identifier for original file"
+                    ng-model="$ctrl.dms.hasFile">
+                </vn-check>
+            </vn-vertical>
+        </tpl-body>
+        <tpl-buttons>
+            <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
+            <button response="accept" translate>Create</button>
+        </tpl-buttons>
+</vn-dialog>

modules/invoiceIn/front/basic-data/index.js

@@ -1,9 +1,181 @@
 import ngModule from '../module';
 import Section from 'salix/components/section';
+import UserError from 'core/lib/user-error';
+
+class Controller extends Section {
+    constructor($element, $, vnFile) {
+        super($element, $, vnFile);
+        this.dms = {
+            files: [],
+            hasFile: false,
+            hasFileAttached: false
+        };
+        this.vnFile = vnFile;
+        this.getAllowedContentTypes();
+        this._editDownloadDisabled = false;
+    }
+
+    get contentTypesInfo() {
+        return this.$t('ContentTypesInfo', {
+            allowedContentTypes: this.allowedContentTypes
+        });
+    }
+
+    get editDownloadDisabled() {
+        return this._editDownloadDisabled;
+    }
+
+    async checkFileExists(dmsId) {
+        if (!dmsId) return;
+        let filter = {
+            fields: ['id']
+        };
+        await this.$http.get(`Dms/${dmsId}`, {filter})
+            .then(() => this._editDownloadDisabled = false)
+            .catch(() => this._editDownloadDisabled = true);
+    }
+
+    async getFile(dmsId) {
+        const path = `Dms/${dmsId}`;
+        await this.$http.get(path).then(res => {
+            const dms = res.data && res.data;
+            this.dms = {
+                dmsId: dms.id,
+                reference: dms.reference,
+                warehouseId: dms.warehouseFk,
+                companyId: dms.companyFk,
+                dmsTypeId: dms.dmsTypeFk,
+                description: dms.description,
+                hasFile: dms.hasFile,
+                hasFileAttached: false,
+                files: []
+            };
+        });
+    }
+
+    getAllowedContentTypes() {
+        this.$http.get('DmsContainers/allowedContentTypes').then(res => {
+            if (res.data.length > 0) {
+                const contentTypes = res.data.join(', ');
+                this.allowedContentTypes = contentTypes;
+            }
+        });
+    }
+
+    openEditDialog(dmsId) {
+        this.getFile(dmsId).then(() => this.$.dmsEditDialog.show());
+    }
+
+    openCreateDialog() {
+        this.dms = {
+            reference: null,
+            warehouseId: null,
+            companyId: null,
+            dmsTypeId: null,
+            description: null,
+            hasFile: true,
+            hasFileAttached: true,
+            files: null
+        };
+        this.$.dmsCreateDialog.show();
+    }
+
+    downloadFile(dmsId) {
+        this.vnFile.download(`api/dms/${dmsId}/downloadFile`);
+    }
+
+    onFileChange(files) {
+        let hasFileAttached = false;
+        if (files.length > 0)
+            hasFileAttached = true;
+
+        this.$.$applyAsync(() => {
+            this.dms.hasFileAttached = hasFileAttached;
+        });
+    }
+
+    onEdit() {
+        if (!this.dms.companyId)
+            throw new UserError(`The company can't be empty`);
+        if (!this.dms.warehouseId)
+            throw new UserError(`The warehouse can't be empty`);
+        if (!this.dms.dmsTypeId)
+            throw new UserError(`The DMS Type can't be empty`);
+        if (!this.dms.description)
+            throw new UserError(`The description can't be empty`);
+
+        const query = `dms/${this.dms.dmsId}/updateFile`;
+        const options = {
+            method: 'POST',
+            url: query,
+            params: this.dms,
+            headers: {
+                'Content-Type': undefined
+            },
+            transformRequest: files => {
+                const formData = new FormData();
+
+                for (let i = 0; i < files.length; i++)
+                    formData.append(files[i].name, files[i]);
+
+                return formData;
+            },
+            data: this.dms.files
+        };
+
+        this.$http(options).then(res => {
+            if (res) {
+                this.vnApp.showSuccess(this.$t('Data saved!'));
+                if (res.data.length > 0) this.invoiceIn.dmsFk = res.data[0].id;
+            }
+        });
+    }
+
+    onCreate() {
+        if (!this.dms.companyId)
+            throw new UserError(`The company can't be empty`);
+        if (!this.dms.warehouseId)
+            throw new UserError(`The warehouse can't be empty`);
+        if (!this.dms.dmsTypeId)
+            throw new UserError(`The DMS Type can't be empty`);
+        if (!this.dms.description)
+            throw new UserError(`The description can't be empty`);
+        if (!this.dms.files)
+            throw new UserError(`The files can't be empty`);
+
+        const query = `Dms/uploadFile`;
+        const options = {
+            method: 'POST',
+            url: query,
+            params: this.dms,
+            headers: {
+                'Content-Type': undefined
+            },
+            transformRequest: files => {
+                const formData = new FormData();
+
+                for (let i = 0; i < files.length; i++)
+                    formData.append(files[i].name, files[i]);
+
+                return formData;
+            },
+            data: this.dms.files
+        };
+
+        this.$http(options).then(res => {
+            if (res) {
+                this.vnApp.showSuccess(this.$t('Data saved!'));
+                if (res.data.length > 0) this.invoiceIn.dmsFk = res.data[0].id;
+            }
+        });
+    }
+}
+
+Controller.$inject = ['$element', '$scope', 'vnFile'];
 
 ngModule.vnComponent('vnInvoiceInBasicData', {
     template: require('./index.html'),
-    controller: Section,
+    controller: Controller,
     bindings: {
         invoiceIn: '<'
     }

modules/invoiceIn/front/basic-data/index.spec.js

@@ -0,0 +1,102 @@
+import './index.js';
+import watcher from 'core/mocks/watcher';
+
+describe('InvoiceIn', () => {
+    describe('Component vnInvoiceInBasicData', () => {
+        let controller;
+        let $scope;
+        let $httpBackend;
+        let $httpParamSerializer;
+
+        beforeEach(ngModule('invoiceIn'));
+
+        beforeEach(inject(($componentController, $rootScope, _$httpBackend_, _$httpParamSerializer_) => {
+            $scope = $rootScope.$new();
+            $httpBackend = _$httpBackend_;
+            $httpParamSerializer = _$httpParamSerializer_;
+            const $element = angular.element('<vn-invoice-in-basic-data></vn-invoice-in-basic-data>');
+            controller = $componentController('vnInvoiceInBasicData', {$element, $scope});
+            controller.$.watcher = watcher;
+            $httpBackend.expect('GET', `DmsContainers/allowedContentTypes`).respond({});
+        }));
+
+        describe('onFileChange()', () => {
+            it('should set dms hasFileAttached property to true if has any files', () => {
+                const files = [{id: 1, name: 'MyFile'}];
+                controller.onFileChange(files);
+
+                $scope.$apply();
+
+                expect(controller.dms.hasFileAttached).toBeTruthy();
+            });
+        });
+
+        describe('checkFileExists()', () => {
+            it(`should return false if a file exists`, () => {
+                const fileIdExists = 1;
+                controller.checkFileExists(fileIdExists);
+
+                expect(controller.editDownloadDisabled).toBe(false);
+            });
+        });
+
+        describe('onEdit()', () => {
+            it(`should perform a POST query to edit the dms properties`, () => {
+                jest.spyOn(controller.vnApp, 'showSuccess');
+
+                const dms = {
+                    dmsId: 1,
+                    reference: 'Ref1',
+                    warehouseId: 1,
+                    companyId: 442,
+                    dmsTypeId: 20,
+                    description: 'This is a description',
+                    files: []
+                };
+
+                controller.dms = dms;
+                const serializedParams = $httpParamSerializer(controller.dms);
+                const query = `dms/${controller.dms.dmsId}/updateFile?${serializedParams}`;
+
+                $httpBackend.expectPOST(query).respond({});
+                controller.onEdit();
+                $httpBackend.flush();
+
+                expect(controller.vnApp.showSuccess).toHaveBeenCalled();
+            });
+        });
+
+        describe('onCreate()', () => {
+            it(`should perform a POST query to create a new dms`, () => {
+                jest.spyOn(controller.vnApp, 'showSuccess');
+
+                const dms = {
+                    reference: 'Ref1',
+                    warehouseId: 1,
+                    companyId: 442,
+                    dmsTypeId: 20,
+                    description: 'This is a description',
+                    files: [{
+                        lastModified: 1668673957761,
+                        lastModifiedDate: new Date(),
+                        name: 'file-example.png',
+                        size: 19653,
+                        type: 'image/png',
+                        webkitRelativePath: ''
+                    }]
+                };
+
+                controller.dms = dms;
+                const serializedParams = $httpParamSerializer(controller.dms);
+                const query = `Dms/uploadFile?${serializedParams}`;
+
+                $httpBackend.expectPOST(query).respond({});
+                controller.onCreate();
+                $httpBackend.flush();
+
+                expect(controller.vnApp.showSuccess).toHaveBeenCalled();
+            });
+        });
+    });
+});
+

modules/invoiceIn/front/basic-data/locale/en.yml

@@ -0,0 +1 @@
+ContentTypesInfo: Allowed file types {{allowedContentTypes}}

modules/invoiceIn/front/basic-data/locale/es.yml

@@ -0,0 +1,15 @@
+Upload file: Subir fichero
+Edit file: Editar fichero
+Upload: Subir
+Document: Documento
+ContentTypesInfo: "Tipos de archivo permitidos: {{allowedContentTypes}}"
+Generate identifier for original file: Generar identificador para archivo original
+File management: Gestión documental
+Hard copy: Copia
+This file will be deleted: Este fichero va a ser borrado
+Are you sure?: Estas seguro?
+File deleted: Fichero eliminado
+Remove file: Eliminar fichero
+Download file: Descargar fichero
+Edit document: Editar documento
+Create document: Crear documento

modules/ticket/back/methods/expedition/filter.js

@@ -37,7 +37,6 @@ module.exports = Self => {
                 i1.name packageItemName,
                 e.counter,
                 i2.name freightItemName,
-                e.itemFk,
                 u.name userName,
                 e.created,
                 e.externalId,
@@ -50,10 +49,10 @@ module.exports = Self => {
                 est.description state
             FROM vn.expedition e
                 LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk 
-                LEFT JOIN vn.item i2 ON i2.id = e.itemFk
                 INNER JOIN vn.item i1 ON i1.id = e.freightItemFk
                 LEFT JOIN vn.packaging p ON p.id = e.packagingFk
                 LEFT JOIN vn.item i3 ON i3.id = p.itemFk
+                LEFT JOIN vn.item i2 ON i2.id = p.itemFk
                 LEFT JOIN account.user u ON u.id = e.workerFk
                 LEFT JOIN vn.expeditionScan es ON es.expeditionFk = e.id
                 LEFT JOIN account.user su ON su.id = es.workerFk

modules/ticket/back/models/expedition.json

@@ -37,11 +37,6 @@
         "model": "agency-mode",
         "foreignKey": "agencyModeFk"
       },
-      "packageItem": {
-        "type": "belongsTo",
-        "model": "Item",
-        "foreignKey": "itemFk"
-      },
       "worker": {
         "type": "belongsTo",
         "model": "Worker",