Merge pull request 'master to test' (!2928) from master into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2928 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
This commit is contained in:
commit
ca882dbac9
|
@ -3953,3 +3953,7 @@ VALUES
|
||||||
(4, 'Referencia Transferencias', 'trnRef'),
|
(4, 'Referencia Transferencias', 'trnRef'),
|
||||||
(5, 'Referencia Nominas', 'payRef'),
|
(5, 'Referencia Nominas', 'payRef'),
|
||||||
(6, 'ABA', 'aba');
|
(6, 'ABA', 'aba');
|
||||||
|
|
||||||
|
INSERT INTO vn.ormConfig SET
|
||||||
|
id = 1,
|
||||||
|
selectLimit = 1000;
|
|
@ -23,6 +23,7 @@ class Controller extends Dialog {
|
||||||
}
|
}
|
||||||
|
|
||||||
set clientFk(value) {
|
set clientFk(value) {
|
||||||
|
if (!value) return;
|
||||||
this.receipt.clientFk = value;
|
this.receipt.clientFk = value;
|
||||||
|
|
||||||
const filter = {
|
const filter = {
|
||||||
|
@ -32,6 +33,7 @@ class Controller extends Dialog {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.getAmountPaid();
|
||||||
this.$http.get(`Clients/findOne`, {filter})
|
this.$http.get(`Clients/findOne`, {filter})
|
||||||
.then(res => {
|
.then(res => {
|
||||||
this.receipt.email = res.data.email;
|
this.receipt.email = res.data.email;
|
||||||
|
@ -50,7 +52,6 @@ class Controller extends Dialog {
|
||||||
|
|
||||||
set companyFk(value) {
|
set companyFk(value) {
|
||||||
this.receipt.companyFk = value;
|
this.receipt.companyFk = value;
|
||||||
this.getAmountPaid();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
set description(value) {
|
set description(value) {
|
||||||
|
@ -152,7 +153,7 @@ class Controller extends Dialog {
|
||||||
getAmountPaid() {
|
getAmountPaid() {
|
||||||
const filter = {
|
const filter = {
|
||||||
where: {
|
where: {
|
||||||
clientFk: this.$params.id,
|
clientFk: this.$params.id ?? this.clientFk,
|
||||||
companyFk: this.receipt.companyFk
|
companyFk: this.receipt.companyFk
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -210,8 +211,8 @@ ngModule.vnComponent('vnClientBalanceCreate', {
|
||||||
payed: '<?',
|
payed: '<?',
|
||||||
bankFk: '<?',
|
bankFk: '<?',
|
||||||
amountPaid: '<?',
|
amountPaid: '<?',
|
||||||
|
clientFk: '<?',
|
||||||
companyFk: '<?',
|
companyFk: '<?',
|
||||||
description: '<?',
|
description: '<?',
|
||||||
clientFk: '<?'
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue