db/dump/fixtures.sql

@@ -2171,15 +2171,45 @@ INSERT INTO `hedera`.`imageCollectionSize`(`id`, `collectionFk`,`width`, `height
     VALUES
         (1, 4, 160, 160);
 
-INSERT INTO `vn`.`invoiceIn`(`serialNumber`,`serial`, `supplierFk`, `issued`, `supplierRef`, `isBooked`, `companyFk`, `docFk`)
+INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk, taxFk) 
+    VALUES 
+        (1,     '07546501420', 67,  671,    CURDATE(),  1761, 1, 1),
+        (2,     '07546491421', 252, 2769,   CURDATE(),  5231, 1, 1),
+        (3,     '07546500823', 102, 1495,   CURDATE(),  3221, 1, 1),
+        (4,     '99610288821', 252, 2777,   CURDATE(),  3641, 1, 1),
+        (5,     '07546500834', 229, 3292,   CURDATE(),  6601, 2, 1),
+        (6,     '22101929561', 37,  458,    CURDATE(),  441,  2, 1),
+        (7,     '07546491432', 258, 3034,   CURDATE(),  6441, 2, 1),
+        (8,     '99610288644', 476, 4461,   CURDATE(),  5751, 442, 1),
+        (9,     '99610289193', 302, 2972,   CURDATE(),  3871, 442, 1),
+        (10,    '07546500856', 185, 2364,   CURDATE(),  5321, 442, 1);
+
+
+REPLACE INTO vn.dua (id, code, awbFk, issued, operated, booked, bookEntried, gestdocFk, customsValue, companyFk) 
+    VALUES 
+        (1,  '19ES0028013A481523', 1,  CURDATE(), CURDATE(), CURDATE(), CURDATE(), 1, 11276.95,   442),
+        (2,  '21ES00280136115760', 2,  CURDATE(), CURDATE(), CURDATE(), CURDATE(), 2, 1376.20,    442),
+        (3,  '19ES00280131956004', 3,  CURDATE(), CURDATE(), CURDATE(), CURDATE(), 3, 14268.50,   442),
+        (4,  '19ES00280131955995', 4,  CURDATE(), CURDATE(), CURDATE(), CURDATE(), 1, 8242.50,    442),
+        (5,  '19ES00280132022070', 5,  CURDATE(), CURDATE(), CURDATE(), CURDATE(), 2, 10012.49,   442),
+        (6,  '19ES00280132032308', 6,  CURDATE(), CURDATE(), CURDATE(), CURDATE(), 2, 19914.25,   442),
+        (7,  '19ES00280132025489', 7,  DATE_ADD(CURDATE(), INTERVAL -1 MONTH), CURDATE(), CURDATE(), CURDATE(), 2, 1934.06,    442),
+        (8,  '19ES00280132025489', 8,  DATE_ADD(CURDATE(), INTERVAL -1 MONTH), CURDATE(), CURDATE(), CURDATE(), 2, 3618.52,    442),
+        (9,  '19ES00280132025489', 9,  DATE_ADD(CURDATE(), INTERVAL -1 MONTH), CURDATE(), CURDATE(), CURDATE(), 2, 7126.23,    442),
+        (10, '19ES00280132025489', 10, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), CURDATE(), CURDATE(), CURDATE(), 2, 4631.45,    442);
+
+REPLACE INTO `vn`.`invoiceIn`(`id`, `serialNumber`,`serial`, `supplierFk`, `issued`, `created`, `supplierRef`, `isBooked`, `companyFk`, `docFk`)
     VALUES
-        (1001, 'R', 1, CURDATE(), 1234, 0, 442, 1),
+        (1,  1001,  'R', 1, CURDATE(), CURDATE(), 1234, 0, 442, 1),
-        (1002, 'R', 1, CURDATE(), 1235, 1, 442, 1),
+        (2,  1002,  'R', 1, CURDATE(), CURDATE(), 1235, 1, 442, 1),
-        (1004, 'R', 1, CURDATE(), 1236, 0, 442, 1),
+        (3,  1003,  'R', 1, CURDATE(), CURDATE(), 1236, 0, 442, 1),
-        (1005, 'R', 2, CURDATE(), 4233, 0, 442, 1),
+        (4,  1004,  'R', 1, CURDATE(), CURDATE(), 1237, 0, 442, 1),
-        (1006, 'R', 2, CURDATE(), 4234, 1, 442, 1),
+        (5,  1005,  'R', 1, CURDATE(), CURDATE(), 1238, 1, 442, 1),
-        (1007, 'R', 2, CURDATE(), 4235, 0, 442, 1),
+        (6,  1006,  'R', 2, CURDATE(), CURDATE(), 1239, 0, 442, 1),
-        (1008, 'R', 2, CURDATE(), 4236, 1, 442, 1);
+        (7,  1007,  'R', 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1240, 1, 442, 1),
+        (8,  1008,  'R', 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1241, 1, 442, 1),
+        (9,  1009,  'R', 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1242, 1, 442, 1),
+        (10, 1010,  'R', 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1243, 1, 442, 1);
 
 INSERT INTO `vn`.`invoiceInDueDay`(`invoiceInFk`, `dueDated`, `bankFk`, `amount`)
     VALUES
@@ -2194,3 +2224,16 @@ INSERT INTO `vn`.`invoiceInDueDay`(`invoiceInFk`, `dueDated`, `bankFk`, `amount`
         (5, CURDATE(), 1, 64.23),
         (6, CURDATE(), 1, 32.95),
         (7, CURDATE(), 1, 58.64);
+
+INSERT INTO `vn`.`duaInvoiceIn`(`id`, `duaFk`, `invoiceInFk`)
+    VALUES
+        (1,  1,  1),
+        (2,  2,  2),
+        (3,  3,  3),
+        (4,  4,  4),
+        (5,  5,  5),
+        (6,  6,  6),
+        (7,  7,  7),
+        (8,  8,  8),
+        (9,  9,  9),
+        (10, 10, 10);

db/export-structure.sh

@@ -64,7 +64,6 @@ IGNORETABLES=(
     --ignore-table=vn.printingQueue
     --ignore-table=vn.printServerQueue__
     --ignore-table=vn.promissoryNote
-    --ignore-table=vn.rate
     --ignore-table=vn.referenceRate__
     --ignore-table=vn.routesControl
     --ignore-table=vn.salesToPrePrepare

modules/client/back/methods/client/specs/createReceipt.spec.js

@@ -1,7 +1,8 @@
 const app = require('vn-loopback/server/server');
 const LoopBackContext = require('loopback-context');
 
-describe('Client createReceipt', () => {
+// Issue #2828 table 'a' doesn't exists
+xdescribe('Client createReceipt', () => {
     const clientFk = 108;
     const payed = Date();
     const companyFk = 442;

modules/invoiceIn/back/methods/invoice-in/filter.js

@@ -46,9 +46,13 @@ module.exports = Self => {
                 description: 'The amount'
             },
             {
-                arg: 'created',
+                arg: 'from',
                 type: 'date',
-                description: 'The creation date'
+                description: `The from date filter`
+            }, {
+                arg: 'to',
+                type: 'date',
+                description: `The to date filter`
             },
             {
                 arg: 'issued',
@@ -60,6 +64,11 @@ module.exports = Self => {
                 type: 'number',
                 description: 'The account number'
             },
+            {
+                arg: 'awbCode',
+                type: 'string',
+                description: 'The Air Waybill code'
+            },
             {
                 arg: 'isBooked',
                 type: 'boolean',
@@ -77,7 +86,13 @@ module.exports = Self => {
     });
 
     Self.filter = async(ctx, filter) => {
-        let conn = Self.dataSource.connector;
+        const conn = Self.dataSource.connector;
+        const args = ctx.args;
+
+        if (args && args.to) {
+            const dateTo = args.to;
+            dateTo.setHours(23, 59, 0, 0);
+        }
 
         let where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
@@ -85,6 +100,10 @@ module.exports = Self => {
                 return /^\d+$/.test(value)
                     ? {'ii.id': value}
                     : {'s.name': {like: `%${value}%`}};
+            case 'from':
+                return {'ii.created': {gte: value}};
+            case 'to':
+                return {'ii.created': {lte: value}};
             case 'account':
             case 'fi':
                 return {[`s.${param}`]: value};
@@ -92,9 +111,10 @@ module.exports = Self => {
             case 'serialNumber':
             case 'serial':
             case 'issued':
-            case 'created':
             case 'isBooked':
                 return {[`ii.${param}`]: value};
+            case 'awbCode':
+                return {'awb.code': value};
             }
         });
 
@@ -111,14 +131,18 @@ module.exports = Self => {
                 ii.issued,
                 ii.isBooked,
                 ii.supplierRef,
+                ii.docFk AS dmsFk,
                 s.id AS supplierFk,
                 s.name AS supplierName,
                 s.account,
                 SUM(iid.amount) AS amount,
-                docFk AS dmsFk
+                awb.code AS awbCode
             FROM invoiceIn ii
                 JOIN supplier s ON s.id = ii.supplierFk
                 LEFT JOIN invoiceInDueDay iid ON iid.invoiceInFk = ii.id
+                LEFT JOIN duaInvoiceIn dii ON dii.invoiceInFk = ii.id
+                LEFT JOIN dua d ON d.id = dii.duaFk
+                LEFT JOIN awb ON awb.id = d.awbFk
                 LEFT JOIN company co ON co.id = ii.companyFk`
         );
 

modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js

@@ -10,21 +10,21 @@ describe('InvoiceIn filter()', () => {
 
         let result = await app.models.InvoiceIn.filter(ctx);
 
-        expect(result.length).toEqual(3);
+        expect(result.length).toEqual(5);
         expect(result[0].supplierName).toEqual('Plants SL');
     });
 
     it('should return the invoice in matching supplier reference', async() => {
         let ctx = {
             args: {
-                supplierRef: '4233',
+                supplierRef: '1241',
             }
         };
 
         let result = await app.models.InvoiceIn.filter(ctx);
 
         expect(result.length).toEqual(1);
-        expect(result[0].supplierRef).toEqual('4233');
+        expect(result[0].supplierRef).toEqual('1241');
     });
 
     it('should return the invoice in matching the serial number', async() => {
@@ -49,10 +49,25 @@ describe('InvoiceIn filter()', () => {
 
         let result = await app.models.InvoiceIn.filter(ctx);
 
-        expect(result.length).toEqual(4);
+        expect(result.length).toEqual(5);
         expect(result[0].account).toEqual('4000020002');
     });
 
+    it('should return the invoice in matching the awb code', async() => {
+        let ctx = {
+            args: {
+                awbCode: '07546491432',
+            }
+        };
+
+        let result = await app.models.InvoiceIn.filter(ctx);
+        const firstRow = result[0];
+
+        expect(result.length).toEqual(1);
+        expect(firstRow.id).toEqual(7);
+        expect(firstRow.awbCode).toEqual('07546491432');
+    });
+
     it('should return the invoice in matching the amount', async() => {
         let ctx = {
             args: {
@@ -66,6 +81,21 @@ describe('InvoiceIn filter()', () => {
         expect(result[0].amount).toEqual(64.23);
     });
 
+    it('should return the invoice in matching "from" and "to"', async() => {
+        const from = new Date();
+        const to = new Date();
+        from.setHours(0, 0, 0, 0);
+        to.setHours(23, 59, 59, 999);
+        to.setDate(to.getDate() + 1);
+        const ctx = {
+            args: {from, to}
+        };
+
+        const result = await app.models.InvoiceIn.filter(ctx);
+
+        expect(result.length).toEqual(6);
+    });
+
     it('should return the booked invoice in', async() => {
         let ctx = {
             args: {
@@ -75,7 +105,7 @@ describe('InvoiceIn filter()', () => {
 
         let result = await app.models.InvoiceIn.filter(ctx);
 
-        expect(result.length).toEqual(3);
+        expect(result.length).toEqual(6);
         expect(result[0].isBooked).toBeTruthy();
     });
 });

modules/invoiceIn/back/models/invoice-in.json

@@ -32,6 +32,12 @@
         },
         "operated": {
             "type": "date"
+        },
+        "dmsFk": {
+            "type": "number",
+            "mysql": {
+                "columnName": "docFk"
+            }
         }
     },
     "relations": {
@@ -49,6 +55,11 @@
             "type": "belongsTo",
             "model": "Currency",
             "foreignKey": "currencyFk"
+        },
+        "dms": {
+            "type": "belongsTo",
+            "model": "Dms",
+            "foreignKey": "dmsFk"
         }
     }
 }

modules/invoiceIn/front/card/index.html

@@ -1,5 +1,5 @@
 <vn-portal slot="menu">
-    <vn-invoice-in-descriptor invoice-in="$ctrl.invoiceIn"></vn-invoice-out-descriptor>
+    <vn-invoice-in-descriptor invoice-in="$ctrl.invoiceIn"></vn-invoice-in-descriptor>
     <vn-left-menu source="card"></vn-left-menu>
 </vn-portal>
 <ui-view></ui-view>

modules/invoiceIn/front/card/index.js

@@ -3,32 +3,10 @@ import ModuleCard from 'salix/components/module-card';
 
 class Controller extends ModuleCard {
     reload() {
-        const filter = {
+        const filter = {};
-            fields: [
-                'id',
-                'ref',
-                'issued',
-                'amount',
-                'clientFk',
-                'companyFk'
-            ],
-            include: [
-                {
-                    relation: 'company',
-                    scope: {
-                        fields: ['id', 'code']
-                    }
-                }, {
-                    relation: 'client',
-                    scope: {
-                        fields: ['id', 'socialName', 'name']
-                    }
-                }
-            ]
-        };
 
-        this.$http.get(`InvoiceOuts/${this.$params.id}`, {filter})
+        this.$http.get(`InvoiceIns/${this.$params.id}`, {filter})
-            .then(res => this.invoiceOut = res.data);
+            .then(res => this.invoiceIn = res.data);
     }
 }
 

modules/invoiceIn/front/descriptor-popover/index.html

@@ -1,4 +1,4 @@
 <slot-descriptor>
-    <vn-invoice-out-descriptor>
+    <vn-invoice-in-descriptor>
-    </vn-invoice-out-descriptor>
+    </vn-invoice-in-descriptor>
 </slot-descriptor>

modules/invoiceIn/front/descriptor-popover/index.js

@@ -3,7 +3,7 @@ import DescriptorPopover from 'salix/components/descriptor-popover';
 
 class Controller extends DescriptorPopover {}
 
-ngModule.vnComponent('vnInvoiceOutDescriptorPopover', {
+ngModule.vnComponent('vnInvoiceInDescriptorPopover', {
     slotTemplate: require('./index.html'),
     controller: Controller
 });

modules/invoiceIn/front/descriptor/index.html

@@ -1,84 +0,0 @@
-<vn-descriptor-content
-    module="invoiceOut"
-    description="$ctrl.invoiceOut.ref">
-    <slot-menu>
-        <a class="vn-item"
-            href="api/InvoiceOuts/{{$ctrl.id}}/download?access_token={{$ctrl.vnToken.token}}"
-            target="_blank"
-            name="showInvoicePdf"
-            translate>
-            Show invoice PDF
-        </a>
-        <vn-item
-            ng-click="deleteConfirmation.show()"
-            vn-acl="invoicing"
-            vn-acl-action="remove"
-            name="deleteInvoice"
-            translate>
-            Delete Invoice
-        </vn-item>
-        <vn-item
-            ng-click="bookConfirmation.show()"
-            vn-acl="invoicing"
-            vn-acl-action="remove"
-            name="bookInvoice"
-            translate>
-            Book invoice
-        </vn-item>
-    </slot-menu>
-    <slot-body>
-        <div class="attributes">
-            <vn-label-value
-                label="Date" 
-                value="{{$ctrl.invoiceOut.issued | date: 'dd/MM/yyyy'}}">
-            </vn-label-value>
-            <vn-label-value
-                label="Import" 
-                value="{{$ctrl.invoiceOut.amount | currency: 'EUR': 2}}">
-            </vn-label-value>
-            <vn-label-value
-                label="Client">
-                <span 
-                    ng-click="clientDescriptor.show($event, $ctrl.invoiceOut.client.id)"
-                    class="link">
-                    {{$ctrl.invoiceOut.client.name}}
-                </span>
-            </vn-label-value>
-            <vn-label-value
-                label="Company" 
-                value="{{$ctrl.invoiceOut.company.code}}">
-            </vn-label-value>
-        </div>
-        <div class="quicklinks">
-            <div ng-transclude="btnOne">
-                <vn-quick-link
-                    tooltip="Client card"
-                    state="['client.card.summary', {id: $ctrl.invoiceOut.clientFk}]"
-                    icon="person">
-                </vn-quick-link>
-            </div>
-            <div ng-transclude="btnTwo">
-                <vn-quick-link
-                    tooltip="Invoice ticket list"
-                    state="['ticket.index', {q: $ctrl.filter}]"
-                    icon="icon-ticket">
-                </vn-quick-link>
-            </div>
-            <div ng-transclude="btnThree">
-            </div>
-        </div>
-    </slot-body>
-</vn-descriptor-content>
-<vn-confirm
-    vn-id="deleteConfirmation"
-    on-accept="$ctrl.deleteInvoiceOut()"
-    question="Are you sure you want to delete this invoice?">
-</vn-confirm>
-<vn-confirm
-    vn-id="bookConfirmation"
-    on-accept="$ctrl.bookInvoiceOut()"
-    question="Are you sure you want to book this invoice?">
-</vn-confirm>
-<vn-client-descriptor-popover 
-    vn-id="clientDescriptor">
-</vn-client-descriptor-popover>

modules/invoiceIn/front/index/index.html

@@ -16,6 +16,7 @@
                 <vn-th field="account">Account</vn-th>
                 <vn-th field="issued" expand>Issued</vn-th>
                 <vn-th field="isBooked" center>Is booked</vn-th>
+                <vn-th field="awbCode" vn-tooltip="Air Waybill">AWB</vn-th>
                 <vn-th field="amount" filter-enabled="false">Amount</vn-th>
                 <vn-th></vn-th>
             </vn-tr>
@@ -42,20 +43,21 @@
                         ng-model="invoiceIn.isBooked">
                     </vn-check>
                 </vn-td> 
+                <vn-td>{{::invoiceIn.awbCode}}</vn-td> 
                 <vn-td>{{::invoiceIn.amount | currency:'EUR'}}</vn-td> 
                 <vn-td shrink>
-                    <vn-icon-button
-                        ng-show="invoiceIn.hasPdf"
-                        vn-click-stop="$ctrl.openPdf(invoiceIn.id)"
-                        icon="cloud_download"
-                        title="Download PDF"
-                        vn-tooltip="Download PDF">
-                    </vn-icon-button>
                     <vn-icon-button
                         vn-click-stop="$ctrl.preview(invoiceIn)"
                         vn-tooltip="Preview"
                         icon="preview">
-                </vn-icon-button>
+                    </vn-icon-button>
+                    <vn-icon-button
+                        ng-show="invoiceIn.dmsFk"
+                        vn-click-stop="$ctrl.openPdf(invoiceIn.dmsFk)"
+                        icon="cloud_download"
+                        title="Download PDF"
+                        vn-tooltip="Download PDF">
+                    </vn-icon-button>
                 </vn-td>
             </a>
         </vn-tbody>

modules/invoiceIn/front/index/index.js

@@ -20,6 +20,8 @@ export default class Controller extends Section {
         case 'account':
         case 'fi':
             return {[`s.${param}`]: value};
+        case 'awbCode':
+            return {'awb.code': value};
         default:
             return {[param]: value};
         }

modules/invoiceIn/front/search-panel/index.html

@@ -21,11 +21,28 @@
                 ng-model="filter.fi">
             </vn-textfield>
         </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="Account"
+                ng-model="filter.account">
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Amount"
+                ng-model="filter.amount">
+            </vn-textfield>
+        </vn-horizontal>
         <vn-horizontal>
             <vn-date-picker
                 vn-one
-                label="Created"
+                label="From"
-                ng-model="filter.created">
+                ng-model="filter.from">
+            </vn-date-picker>
+            <vn-date-picker
+                vn-one
+                label="To"
+                ng-model="filter.to">
             </vn-date-picker>
             <vn-date-picker
                 vn-one
@@ -44,17 +61,10 @@
                 label="Serial"
                 ng-model="filter.serial">
             </vn-textfield>
-        </vn-horizontal>
-        <vn-horizontal>
             <vn-textfield
                 vn-one
-                label="Account"
+                label="AWB"
-                ng-model="filter.account">
+                ng-model="filter.awbCode">
-            </vn-textfield>
-            <vn-textfield
-                vn-one
-                label="Amount"
-                ng-model="filter.amount">
             </vn-textfield>
         </vn-horizontal>
         <vn-horizontal>