Merge pull request 'HOTFIX: maxium calls exceed' (!1490) from hotfix_customerBalance_newPayment into master
Reviewed-on: #1490 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
This commit is contained in:
commit
c07fd2d2a5
|
@ -77,24 +77,23 @@ onBeforeMount(() => {
|
||||||
function setPaymentType(accounting) {
|
function setPaymentType(accounting) {
|
||||||
if (!accounting) return;
|
if (!accounting) return;
|
||||||
accountingType.value = accounting.accountingType;
|
accountingType.value = accounting.accountingType;
|
||||||
|
|
||||||
initialData.description = [];
|
initialData.description = [];
|
||||||
initialData.payed = Date.vnNew();
|
initialData.payed = Date.vnNew();
|
||||||
isCash.value = accountingType.value.code == 'cash';
|
isCash.value = accountingType.value.code == 'cash';
|
||||||
viewReceipt.value = isCash.value;
|
viewReceipt.value = isCash.value;
|
||||||
if (accountingType.value.daysInFuture)
|
if (accountingType.value.daysInFuture)
|
||||||
initialData.payed.setDate(
|
initialData.payed.setDate(
|
||||||
initialData.payed.getDate() + accountingType.value.daysInFuture
|
initialData.payed.getDate() + accountingType.value.daysInFuture,
|
||||||
);
|
);
|
||||||
maxAmount.value = accountingType.value && accountingType.value.maxAmount;
|
maxAmount.value = accountingType.value && accountingType.value.maxAmount;
|
||||||
|
|
||||||
if (accountingType.value.code == 'compensation')
|
if (accountingType.value.code == 'compensation')
|
||||||
return (initialData.description = '');
|
return (initialData.description = '');
|
||||||
if (accountingType.value.receiptDescription)
|
|
||||||
initialData.description.push(accountingType.value.receiptDescription);
|
|
||||||
if (initialData.description) initialData.description.push(initialData.description);
|
|
||||||
|
|
||||||
initialData.description = initialData.description.join(', ');
|
let descriptions = [];
|
||||||
|
if (accountingType.value.receiptDescription)
|
||||||
|
descriptions.push(accountingType.value.receiptDescription);
|
||||||
|
if (initialData.description) descriptions.push(initialData.description);
|
||||||
|
initialData.description = descriptions.join(', ');
|
||||||
}
|
}
|
||||||
|
|
||||||
const calculateFromAmount = (event) => {
|
const calculateFromAmount = (event) => {
|
||||||
|
|
Loading…
Reference in New Issue