1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00

Merge pull request #3448 from maikelreyes/master

Fix aging fields for statements
This commit is contained in:
Hillel Coren 2020-03-07 22:09:41 +02:00 committed by GitHub
commit be96bef3f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -151,7 +151,7 @@ class GenerateStatementData
$item->product_key = $ageGroups['age_group_0'];
$item->notes = $ageGroups['age_group_30'];
$item->custom_value1 = $ageGroups['age_group_60'];
$item->custom_value1 = $ageGroups['age_group_90'];
$item->custom_value2 = $ageGroups['age_group_90'];
$item->cost = $ageGroups['age_group_120'];
$item->invoice_item_type_id = 4;
$data->push($item);

View File

@ -596,7 +596,7 @@ NINJA.statementAging = function(invoice) {
{text: formatMoneyInvoice(item.product_key, invoice), style:['subtotals', 'odd', 'firstColumn']},
{text: formatMoneyInvoice(item.notes, invoice), style:['subtotals', 'odd']},
{text: formatMoneyInvoice(item.custom_value1, invoice), style:['subtotals', 'odd']},
{text: formatMoneyInvoice(item.custom_value1, invoice), style:['subtotals', 'odd']},
{text: formatMoneyInvoice(item.custom_value2, invoice), style:['subtotals', 'odd']},
{text: formatMoneyInvoice(item.cost, invoice), style:['subtotals', 'odd', 'lastColumn']},
]);
}