verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

231801_test_to_master #1519

Merged
alexm merged 490 commits from 231801_test_to_master into master 2023-05-12 06:29:59 +00:00
Conversation 0 Commits 490 Files Changed 557 +3 -37
8 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d399cda050 - Show all commits

1
e2e/helpers/selectors.js
View File

@ -1247,7 +1247,6 @@ export default {
entryBasicData: {
reference: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.reference"]',
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"]',
supplier: 'vn-entry-basic-data vn-autocomplete[ng-model="$ctrl.entry.supplierFk"]',
currency: 'vn-entry-basic-data vn-autocomplete[ng-model="$ctrl.entry.currencyFk"]',

7
e2e/paths/12-entry/05_basicData.spec.js
View File

@ -20,7 +20,6 @@ describe('Entry basic data path', () => {
it('should edit the basic data', async() => {
await page.write(selectors.entryBasicData.reference, '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.autocompleteSearch(selectors.entryBasicData.supplier, 'Plants nick');
await page.autocompleteSearch(selectors.entryBasicData.currency, 'eur');
@ -53,12 +52,6 @@ describe('Entry basic data path', () => {
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() => {
const result = await page.waitToGetProperty(selectors.entryBasicData.observations, 'value');

5
loopback/locale/en.json
View File

@ -154,5 +154,6 @@
"Valid priorities: 1,2,3": "Valid priorities: 1,2,3",
"Warehouse inventory not set": "Almacén inventario no está establecido",
"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"
}

7
modules/entry/front/basic-data/index.html
View File

@ -52,13 +52,6 @@
rule
vn-focus>
</vn-textfield>
<!-- <vn-textfield
vn-one
label="Notes"
ng-model="$ctrl.entry.notes"
rule
vn-focus>
</vn-textfield> -->
</vn-horizontal>
<vn-horizontal>
<vn-textfield

1
modules/entry/front/index/locale/es.yml
View File

@ -12,7 +12,6 @@ Reference: Referencia
Created: Creado
Booked: Contabilizada
Is inventory: Inventario
# Notes: Notas
Status: Estado
Selection: Selección
Invoice number: Núm. factura

3
modules/entry/front/summary/index.html
View File

@ -32,9 +32,6 @@
<vn-label-value label="Invoice number"
value="{{$ctrl.entryData.invoiceNumber}}">
</vn-label-value>
<!-- <vn-label-value label="Notes"
value="{{$ctrl.entryData.notes}}">
</vn-label-value> -->
</vn-one>
<vn-one>
<vn-label-value label="Reference">

6
modules/travel/front/summary/index.html
View File

@ -100,12 +100,6 @@
<vn-td shrink>{{entry.pallet}}</vn-td>
<vn-td shrink>{{entry.m3}}</vn-td>
<vn-td shrink>
<!-- <vn-icon
ng-if="entry.notes.length"
vn-tooltip="{{entry.notes}}"
icon="insert_drive_file"
class="bright">
</vn-icon> -->
<vn-icon
ng-if="entry.observation.length"
vn-tooltip="{{entry.observation}}"

10
print/templates/reports/entry-order/entry-order.html
View File

@ -77,16 +77,6 @@
</tr>
</tfoot>
</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>
<template v-slot:footer>