verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

Merge pull request '2737-supplier_basic_data_worker' (#539) from 2737-supplier_basic_data_worker into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #539
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2021-02-08 09:32:52 +00:00
parent 4782d216b2 a62bebd51e
commit 8db5735e8a
9 changed files with 73 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/changes/10281-valentineDay/00-supplier.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE `vn`.`supplier` ADD COLUMN `workerFk` INT(11) NULL DEFAULT NULL COMMENT 'Responsible for approving invoices' AFTER `isTrucker`;
ALTER TABLE `vn`.`supplier` ADD CONSTRAINT `supplier_workerFk` FOREIGN KEY (`workerFk`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE;

0
db/changes/10281-valentineDay/delete.keep
View File

8
db/dump/fixtures.sql
View File

@ -1233,11 +1233,11 @@ INSERT INTO `vn`.`annualAverageInvoiced`(`clientFk`, `invoiced`)
(104, 500),
(105, 5000);
INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`,`isFarmer`,`commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`)
INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`,`isFarmer`,`commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`)
VALUES
(1, 'Plants SL', 'Plants nick', 4100000001, 1, '06089160W', 0, 0, CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15, 4, 1, 1),
(2, 'Farmer King', 'The farmer', 4000020002, 1, '87945234L', 1, 0, CURDATE(), 1, 'supplier address 2', 'SILLA', 2, 43022, 1, 2, 10, 93, 2, 8),
(442, 'Verdnatura Levante SL', 'Verdnatura', 5115000442, 1, '06815934E', 0, 0, CURDATE(), 1, 'supplier address 3', 'SILLA', 1, 43022, 1, 2, 15, 6, 9, 3);
(1, 'Plants SL', 'Plants nick', 4100000001, 1, '06089160W', 0, 0, CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15, 4, 1, 1, 18),
(2, 'Farmer King', 'The farmer', 4000020002, 1, '87945234L', 1, 0, CURDATE(), 1, 'supplier address 2', 'SILLA', 2, 43022, 1, 2, 10, 93, 2, 8, 18),
(442, 'Verdnatura Levante SL', 'Verdnatura', 5115000442, 1, '06815934E', 0, 0, CURDATE(), 1, 'supplier address 3', 'SILLA', 1, 43022, 1, 2, 15, 6, 9, 3, 18);
INSERT INTO `vn`.`supplierContact`(`id`, `supplierFk`, `phone`, `mobile`, `email`, `observation`, `name`)
VALUES

15
modules/supplier/back/methods/supplier/getSummary.js
View File

@ -42,6 +42,7 @@ module.exports = Self => {
'sageTaxTypeFk',
'sageTransactionTypeFk',
'sageWithholdingFk',
'workerFk'
],
include: [
{
@ -85,7 +86,19 @@ module.exports = Self => {
scope: {
fields: ['id', 'withholding']
}
}
},
{
relation: 'worker',
scope: {
fields: ['userFk'],
include: {
relation: 'user',
scope: {
fields: ['nickname']
}
}
}
},
]
};
let supplier = await Self.app.models.Supplier.findOne(filter);

54
modules/supplier/back/models/supplier.json
View File

@ -11,75 +11,78 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"name": {
"type": "String"
"type": "string"
},
"account": {
"type": "String"
"type": "string"
},
"countryFk": {
"type": "Number"
"type": "number"
},
"nif": {
"type": "String"
"type": "string"
},
"isFarmer": {
"type": "Boolean"
"type": "boolean"
},
"phone": {
"type": "Number"
"type": "number"
},
"retAccount": {
"type": "Number"
"type": "number"
},
"commission": {
"type": "Boolean"
"type": "boolean"
},
"created": {
"type": "Date"
"type": "date"
},
"postcodeFk": {
"type": "Number"
"type": "number"
},
"isActive": {
"type": "Boolean"
"type": "boolean"
},
"isOfficial": {
"type": "Boolean"
"type": "boolean"
},
"isSerious": {
"type": "Boolean"
"type": "boolean"
},
"note": {
"type": "String"
"type": "string"
},
"street": {
"type": "String"
"type": "string"
},
"city": {
"type": "String"
"type": "string"
},
"provinceFk": {
"type": "Number"
"type": "number"
},
"postCode": {
"type": "String"
"type": "string"
},
"payMethodFk": {
"type": "Number"
"type": "number"
},
"payDemFk": {
"type": "Number"
"type": "number"
},
"payDay": {
"type": "Number"
"type": "number"
},
"nickname": {
"type": "String"
"type": "string"
},
"workerFk": {
"type": "number"
},
"sageTaxTypeFk": {
"type": "number",
@ -126,6 +129,11 @@
"model": "Client",
"foreignKey": "nif",
"primaryKey": "fi"
},
"worker": {
"type": "belongsTo",
"model": "Worker",
"foreignKey": "workerFk"
},
"sageTaxType": {
"type": "belongsTo",

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

@ -15,6 +15,17 @@
rule
vn-focus>
</vn-textfield>
<vn-autocomplete
vn-one
ng-model="$ctrl.supplier.workerFk"
url="Clients/activeWorkersWithRole"
search-function="{firstName: $search}"
show-field="nickname"
value-field="id"
where="{role: 'employee'}"
label="Responsible"
info="Responsible for approving invoices">
</vn-autocomplete>
</vn-horizontal>
<vn-horizontal>
<vn-check

3
modules/supplier/front/basic-data/locale/es.yml
View File

@ -1,3 +1,4 @@
Notes: Notas
Active: Activo
Verified: Verificado
Verified: Verificado
Responsible for approving invoices: Responsable de aprobar las facturas

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

@ -31,6 +31,13 @@
label="Alias"
value="{{::$ctrl.summary.nickname}}">
</vn-label-value>
<vn-label-value label="Responsible">
<span
ng-click="workerDescriptor.show($event, $ctrl.summary.workerFk)"
class="link">
{{$ctrl.summary.worker.user.nickname}}
</span>
</vn-label-value>
<vn-label-value no-ellipsize
label="Notes"
value="{{::$ctrl.summary.note}}">

3
modules/supplier/front/summary/locale/es.yml
View File

@ -6,4 +6,5 @@ Is Farmer: Es agrícola
Sage tax type: Tipo de impuesto Sage
Sage transaction type: Tipo de transacción Sage
Sage withholding: Retencion Sage
Go to the supplier: Ir al proveedor
Go to the supplier: Ir al proveedor
Responsible: Responsable