Merge branch 'dev' into 084200-footerAlbaranReport

e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js

@@ -79,27 +79,21 @@ describe('SmartTable SearchBar integration', () => {
         it('should order by first id', async() => {
             await page.loginAndModule('developer', 'item');
             await page.accessToSection('item.fixedPrice');
-            await page.doSearch();
+            await page.keyboard.press('Enter');
 
             const result = await page.waitToGetProperty(selectors.itemFixedPrice.firstItemID, 'value');
 
             expect(result).toEqual('1');
         });
 
-        it('should order by last id', async() => {
+        it('should order by last id, reload page and have same order', async() => {
             await page.waitToClick(selectors.itemFixedPrice.orderColumnId);
-            const result = await page.waitToGetProperty(selectors.itemFixedPrice.firstItemID, 'value');
-
-            expect(result).toEqual('3');
-        });
-
-        it('should reload page and have same order', async() => {
             await page.reload({
                 waitUntil: 'networkidle2'
             });
             const result = await page.waitToGetProperty(selectors.itemFixedPrice.firstItemID, 'value');
 
-            expect(result).toEqual('3');
+            expect(result).toEqual('13');
         });
     });
 });

print/templates/reports/invoice-incoterms/invoice-incoterms.js

@@ -11,7 +11,7 @@ module.exports = {
     },
     props: {
         reference: {
-            type: Number,
+            type: String,
             required: true,
             description: 'The invoice ref'
         }

print/templates/reports/invoice/invoice.html

@@ -1,6 +1,8 @@
 <report-body v-bind="$props">
-    <invoice-incoterms v-if="hasIncoterms" v-bind="$props"> </invoice-incoterms>
     <template v-slot:header>
+        <div v-if="hasIncoterms" class="page-break-after">
+            <invoice-incoterms v-bind="$props"> </invoice-incoterms>
+        </div>
         <report-header v-bind="$props" v-bind:company-code="invoice.companyCode"></report-header>
     </template>
    <div class="grid-row">