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

7199-devToTest_2316 #2287

Merged
alexm merged 169 commits from 7199-devToTest_2316 into test 2024-04-11 06:25:23 +00:00
Conversation 0 Commits 169 Files Changed 105 +14 -14
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eedf30a2dd - Show all commits

2
db/routines/vn2008/views/Proveedores.sql
View File

@ -23,7 +23,7 @@ AS SELECT `s`.`id` AS `Id_Proveedor`,
`s`.`isOfficial` AS `oficial`, `s`.`isOfficial` AS `oficial`,
`s`.`workerFk` AS `workerFk`, `s`.`workerFk` AS `workerFk`,
`s`.`payDay` AS `pay_day`, `s`.`payDay` AS `pay_day`,
`s`.`isReal` AS `real`, `s`.`isSerious` AS `serious`,
`s`.`note` AS `notas`, `s`.`note` AS `notas`,
`s`.`taxTypeSageFk` AS `taxTypeSageFk`, `s`.`taxTypeSageFk` AS `taxTypeSageFk`,
`s`.`withholdingSageFk` AS `withholdingSageFk`, `s`.`withholdingSageFk` AS `withholdingSageFk`,

2
e2e/helpers/selectors.js
View File

@ -1258,7 +1258,7 @@ export default {
}, },
supplierBasicData: { supplierBasicData: {
alias: 'vn-supplier-basic-data vn-textfield[ng-model="$ctrl.supplier.nickname"]', alias: 'vn-supplier-basic-data vn-textfield[ng-model="$ctrl.supplier.nickname"]',
isSerious: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isSerious"]', isReal: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isReal"]',
isActive: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isActive"]', isActive: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isActive"]',
isPayMethodChecked: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isPayMethodChecked"]', isPayMethodChecked: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isPayMethodChecked"]',
notes: 'vn-supplier-basic-data vn-textarea[ng-model="$ctrl.supplier.note"]', notes: 'vn-supplier-basic-data vn-textarea[ng-model="$ctrl.supplier.note"]',

6
e2e/paths/13-supplier/02_basic_data.spec.js
View File

@ -20,7 +20,7 @@ describe('Supplier basic data path', () => {
it('should edit the basic data', async() => { it('should edit the basic data', async() => {
await page.clearInput(selectors.supplierBasicData.alias); await page.clearInput(selectors.supplierBasicData.alias);
await page.write(selectors.supplierBasicData.alias, 'Plants Nick SL'); await page.write(selectors.supplierBasicData.alias, 'Plants Nick SL');
await page.waitToClick(selectors.supplierBasicData.isSerious); await page.waitToClick(selectors.supplierBasicData.isReal);
await page.waitToClick(selectors.supplierBasicData.isActive); await page.waitToClick(selectors.supplierBasicData.isActive);
await page.waitToClick(selectors.supplierBasicData.isPayMethodChecked); await page.waitToClick(selectors.supplierBasicData.isPayMethodChecked);
await page.write(selectors.supplierBasicData.notes, 'Some notes'); await page.write(selectors.supplierBasicData.notes, 'Some notes');
@ -41,8 +41,8 @@ describe('Supplier basic data path', () => {
expect(result).toEqual('Plants Nick SL'); expect(result).toEqual('Plants Nick SL');
}); });
it('should check the isSerious checkbox is now checked', async() => { it('should check the isReal checkbox is now checked', async() => {
const result = await page.checkboxState(selectors.supplierBasicData.isSerious); const result = await page.checkboxState(selectors.supplierBasicData.isReal);
expect(result).toBe('checked'); expect(result).toBe('checked');
}); });

2
modules/supplier/back/locale/supplier/en.yml
View File

@ -11,7 +11,7 @@ columns:
postcodeFk: postcode postcodeFk: postcode
isActive: active isActive: active
isOfficial: official isOfficial: official
isSerious: serious isReal: real
isTrucker: trucker isTrucker: trucker
note: note note: note
street: street street: street

2
modules/supplier/back/locale/supplier/es.yml
View File

@ -11,7 +11,7 @@ columns:
postcodeFk: código postal postcodeFk: código postal
isActive: activo isActive: activo
isOfficial: oficial isOfficial: oficial
isSerious: serio isReal: real
isTrucker: camionero isTrucker: camionero
note: nota note: nota
street: calle street: calle

2
modules/supplier/front/basic-data/index.html
View File

@ -26,7 +26,7 @@
<vn-horizontal> <vn-horizontal>
<vn-check <vn-check
label="Verified" label="Verified"
ng-model="$ctrl.supplier.isSerious"> ng-model="$ctrl.supplier.isReal">
</vn-check> </vn-check>
<vn-check <vn-check
label="Active" label="Active"

2
modules/supplier/front/descriptor/index.html
View File

@ -32,7 +32,7 @@
<vn-icon <vn-icon
vn-tooltip="Unverified supplier" vn-tooltip="Unverified supplier"
icon="icon-supplierfalse" icon="icon-supplierfalse"
ng-if="$ctrl.supplier.isSerious == false"> ng-if="$ctrl.supplier.isReal == false">
</vn-icon> </vn-icon>
</div> </div>
<div class="quicklinks"> <div class="quicklinks">

2
modules/supplier/front/descriptor/index.js
View File

@ -40,7 +40,7 @@ class Controller extends Descriptor {
'payDemFk', 'payDemFk',
'payDay', 'payDay',
'isActive', 'isActive',
'isSerious', 'isReal',
'isTrucker', 'isTrucker',
'account' 'account'
], ],

2
modules/supplier/front/descriptor/index.spec.js
View File

@ -26,7 +26,7 @@ describe('Supplier Component vnSupplierDescriptor', () => {
'payDemFk', 'payDemFk',
'payDay', 'payDay',
'isActive', 'isActive',
'isSerious', 'isReal',
'isTrucker', 'isTrucker',
'account' 'account'
], ],

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

@ -44,12 +44,12 @@
</vn-label-value> </vn-label-value>
<vn-check <vn-check
label="Verified" label="Verified"
ng-model="$ctrl.summary.isSerious" ng-model="$ctrl.summary.isReal"
disabled="true"> disabled="true">
</vn-check> </vn-check>
<vn-check <vn-check
label="Is active" label="Is active"
ng-model="$ctrl.summary.isActive" ng-model="$ctrl.summary.isActive"
disabled="true"> disabled="true">
</vn-check> </vn-check>
</vn-vertical> </vn-vertical>
@ -141,7 +141,7 @@
value="{{::$ctrl.summary.name}}"> value="{{::$ctrl.summary.name}}">
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Tax number" label="Tax number"
value="{{::$ctrl.summary.nif}}"> value="{{::$ctrl.summary.nif}}">
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value