231801_test_to_master #1519
|
@ -1247,7 +1247,6 @@ export default {
|
||||||
entryBasicData: {
|
entryBasicData: {
|
||||||
reference: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.reference"]',
|
reference: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.reference"]',
|
||||||
invoiceNumber: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.invoiceNumber"]',
|
invoiceNumber: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.invoiceNumber"]',
|
||||||
// notes: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.notes"]',
|
|
||||||
observations: 'vn-entry-basic-data vn-textarea[ng-model="$ctrl.entry.observation"]',
|
observations: 'vn-entry-basic-data vn-textarea[ng-model="$ctrl.entry.observation"]',
|
||||||
supplier: 'vn-entry-basic-data vn-autocomplete[ng-model="$ctrl.entry.supplierFk"]',
|
supplier: 'vn-entry-basic-data vn-autocomplete[ng-model="$ctrl.entry.supplierFk"]',
|
||||||
currency: 'vn-entry-basic-data vn-autocomplete[ng-model="$ctrl.entry.currencyFk"]',
|
currency: 'vn-entry-basic-data vn-autocomplete[ng-model="$ctrl.entry.currencyFk"]',
|
||||||
|
|
|
@ -20,7 +20,6 @@ describe('Entry basic data path', () => {
|
||||||
it('should edit the basic data', async() => {
|
it('should edit the basic data', async() => {
|
||||||
await page.write(selectors.entryBasicData.reference, 'new movement 8');
|
await page.write(selectors.entryBasicData.reference, 'new movement 8');
|
||||||
await page.write(selectors.entryBasicData.invoiceNumber, 'new movement 8');
|
await page.write(selectors.entryBasicData.invoiceNumber, 'new movement 8');
|
||||||
// await page.write(selectors.entryBasicData.notes, 'new notes');
|
|
||||||
await page.write(selectors.entryBasicData.observations, ' edited');
|
await page.write(selectors.entryBasicData.observations, ' edited');
|
||||||
await page.autocompleteSearch(selectors.entryBasicData.supplier, 'Plants nick');
|
await page.autocompleteSearch(selectors.entryBasicData.supplier, 'Plants nick');
|
||||||
await page.autocompleteSearch(selectors.entryBasicData.currency, 'eur');
|
await page.autocompleteSearch(selectors.entryBasicData.currency, 'eur');
|
||||||
|
@ -53,12 +52,6 @@ describe('Entry basic data path', () => {
|
||||||
expect(result).toEqual('new movement 8');
|
expect(result).toEqual('new movement 8');
|
||||||
});
|
});
|
||||||
|
|
||||||
// it('should confirm the note was edited', async() => {
|
|
||||||
// const result = await page.waitToGetProperty(selectors.entryBasicData.notes, 'value');
|
|
||||||
|
|
||||||
// expect(result).toEqual('new notes');
|
|
||||||
// });
|
|
||||||
|
|
||||||
it('should confirm the observation was edited', async() => {
|
it('should confirm the observation was edited', async() => {
|
||||||
const result = await page.waitToGetProperty(selectors.entryBasicData.observations, 'value');
|
const result = await page.waitToGetProperty(selectors.entryBasicData.observations, 'value');
|
||||||
|
|
||||||
|
|
|
@ -154,5 +154,6 @@
|
||||||
"Valid priorities: 1,2,3": "Valid priorities: 1,2,3",
|
"Valid priorities: 1,2,3": "Valid priorities: 1,2,3",
|
||||||
"Warehouse inventory not set": "Almacén inventario no está establecido",
|
"Warehouse inventory not set": "Almacén inventario no está establecido",
|
||||||
"Component cost not set": "Componente coste no está estabecido",
|
"Component cost not set": "Componente coste no está estabecido",
|
||||||
"Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2"
|
"Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2",
|
||||||
|
"Description cannot be blank": "Description cannot be blank"
|
||||||
}
|
}
|
|
@ -52,13 +52,6 @@
|
||||||
rule
|
rule
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-textfield>
|
</vn-textfield>
|
||||||
<!-- <vn-textfield
|
|
||||||
vn-one
|
|
||||||
label="Notes"
|
|
||||||
ng-model="$ctrl.entry.notes"
|
|
||||||
rule
|
|
||||||
vn-focus>
|
|
||||||
</vn-textfield> -->
|
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
<vn-horizontal>
|
<vn-horizontal>
|
||||||
<vn-textfield
|
<vn-textfield
|
||||||
|
|
|
@ -12,7 +12,6 @@ Reference: Referencia
|
||||||
Created: Creado
|
Created: Creado
|
||||||
Booked: Contabilizada
|
Booked: Contabilizada
|
||||||
Is inventory: Inventario
|
Is inventory: Inventario
|
||||||
# Notes: Notas
|
|
||||||
Status: Estado
|
Status: Estado
|
||||||
Selection: Selección
|
Selection: Selección
|
||||||
Invoice number: Núm. factura
|
Invoice number: Núm. factura
|
|
@ -32,9 +32,6 @@
|
||||||
<vn-label-value label="Invoice number"
|
<vn-label-value label="Invoice number"
|
||||||
value="{{$ctrl.entryData.invoiceNumber}}">
|
value="{{$ctrl.entryData.invoiceNumber}}">
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<!-- <vn-label-value label="Notes"
|
|
||||||
value="{{$ctrl.entryData.notes}}">
|
|
||||||
</vn-label-value> -->
|
|
||||||
</vn-one>
|
</vn-one>
|
||||||
<vn-one>
|
<vn-one>
|
||||||
<vn-label-value label="Reference">
|
<vn-label-value label="Reference">
|
||||||
|
|
|
@ -100,12 +100,6 @@
|
||||||
<vn-td shrink>{{entry.pallet}}</vn-td>
|
<vn-td shrink>{{entry.pallet}}</vn-td>
|
||||||
<vn-td shrink>{{entry.m3}}</vn-td>
|
<vn-td shrink>{{entry.m3}}</vn-td>
|
||||||
<vn-td shrink>
|
<vn-td shrink>
|
||||||
<!-- <vn-icon
|
|
||||||
ng-if="entry.notes.length"
|
|
||||||
vn-tooltip="{{entry.notes}}"
|
|
||||||
icon="insert_drive_file"
|
|
||||||
class="bright">
|
|
||||||
</vn-icon> -->
|
|
||||||
<vn-icon
|
<vn-icon
|
||||||
ng-if="entry.observation.length"
|
ng-if="entry.observation.length"
|
||||||
vn-tooltip="{{entry.observation}}"
|
vn-tooltip="{{entry.observation}}"
|
||||||
|
|
|
@ -77,16 +77,6 @@
|
||||||
</tr>
|
</tr>
|
||||||
</tfoot>
|
</tfoot>
|
||||||
</table>
|
</table>
|
||||||
<!-- <div class="columns">
|
|
||||||
<div class="size50">
|
|
||||||
<div id="notes" class="panel no-page-break" v-if="entry.notes">
|
|
||||||
<div class="body">
|
|
||||||
<h3>{{$t('notes')}}</h3>
|
|
||||||
<div>{{entry.notes}}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div> -->
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<template v-slot:footer>
|
<template v-slot:footer>
|
||||||
|
|
Loading…
Reference in New Issue