|
Lines 69-75
Link Here
|
| 69 |
[% IF credit.debit %] |
69 |
[% IF credit.debit %] |
| 70 |
<tr> |
70 |
<tr> |
| 71 |
<td>[% accountline.accountlines_id | html %]</td> |
71 |
<td>[% accountline.accountlines_id | html %]</td> |
| 72 |
<td>{ "type": "credit", "description": "[%- PROCESS account_type_description account=accountline -%] ([% accountline.payment_type | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }</td> |
72 |
<td>{ "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% accountline.payment_type | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }</td> |
| 73 |
<td></td> |
73 |
<td></td> |
| 74 |
<td> |
74 |
<td> |
| 75 |
[%- PROCESS account_type_description account=credit.debit -%] |
75 |
[%- PROCESS account_type_description account=credit.debit -%] |
|
Lines 93-99
Link Here
|
| 93 |
[% IF debit.credit %] |
93 |
[% IF debit.credit %] |
| 94 |
<tr> |
94 |
<tr> |
| 95 |
<td>[% accountline.accountlines_id | html %]</td> |
95 |
<td>[% accountline.accountlines_id | html %]</td> |
| 96 |
<td>{ "type": "debit", "description": "[%- PROCESS account_type_description account=accountline -%] ([% accountline.payment_type | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }</td> |
96 |
<td>{ "type": "debit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% accountline.payment_type | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }</td> |
| 97 |
<td></td> |
97 |
<td></td> |
| 98 |
<td>[%- PROCESS account_type_description account=debit.credit -%]</td> |
98 |
<td>[%- PROCESS account_type_description account=debit.credit -%]</td> |
| 99 |
<td> |
99 |
<td> |
|
Lines 158-164
Link Here
|
| 158 |
[% IF credit.debit %] |
158 |
[% IF credit.debit %] |
| 159 |
<tr> |
159 |
<tr> |
| 160 |
<td>[% accountline.accountlines_id | html %]</td> |
160 |
<td>[% accountline.accountlines_id | html %]</td> |
| 161 |
<td>{ "type": "credit", "description": "[%- PROCESS account_type_description account=accountline -%] ([% accountline.payment_type | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }</td> |
161 |
<td>{ "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% accountline.payment_type | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }</td> |
| 162 |
<td></td> |
162 |
<td></td> |
| 163 |
<td> |
163 |
<td> |
| 164 |
[%- PROCESS account_type_description account=credit.debit -%] |
164 |
[%- PROCESS account_type_description account=credit.debit -%] |
|
Lines 180-186
Link Here
|
| 180 |
[% IF debit.credit %] |
180 |
[% IF debit.credit %] |
| 181 |
<tr> |
181 |
<tr> |
| 182 |
<td>[% accountline.accountlines_id | html %]</td> |
182 |
<td>[% accountline.accountlines_id | html %]</td> |
| 183 |
<td>{ "type": "debit", "description": "[%- PROCESS account_type_description account=accountline -%] ([% accountline.payment_type | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }</td> |
183 |
<td>{ "type": "debit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% accountline.payment_type | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }</td> |
| 184 |
<td></td> |
184 |
<td></td> |
| 185 |
<td>[%- PROCESS account_type_description account=debit.credit -%]</td> |
185 |
<td>[%- PROCESS account_type_description account=debit.credit -%]</td> |
| 186 |
<td>[%- IF debit.credit.description %][% debit.credit.description | html %][% END %] |
186 |
<td>[%- IF debit.credit.description %][% debit.credit.description | html %][% END %] |
|
Lines 298-305
Link Here
|
| 298 |
dataSrc: 0, |
298 |
dataSrc: 0, |
| 299 |
startRender: function ( rows, group ) { |
299 |
startRender: function ( rows, group ) { |
| 300 |
var details = JSON.parse(rows.data().pluck(1).pop()); |
300 |
var details = JSON.parse(rows.data().pluck(1).pop()); |
|
|
301 |
var identifier = details.identifier || group; |
| 301 |
return $('<tr class="'+details.type+'"/>') |
302 |
return $('<tr class="'+details.type+'"/>') |
| 302 |
.append( '<td>'+group+'</td>' ) |
303 |
.append( '<td>'+identifier+'</td>' ) |
| 303 |
.append( '<td colspan="2">'+details.description+'</td>' ) |
304 |
.append( '<td colspan="2">'+details.description+'</td>' ) |
| 304 |
.append( '<td>'+details.amount+'</td>' ) |
305 |
.append( '<td>'+details.amount+'</td>' ) |
| 305 |
.append( '<td><button class="printReceipt btn btn-default btn-xs" data-accountline="'+group+'"><i class="fa fa-print"></i> ' + _("Print receipt") + '</button></td>'); |
306 |
.append( '<td><button class="printReceipt btn btn-default btn-xs" data-accountline="'+group+'"><i class="fa fa-print"></i> ' + _("Print receipt") + '</button></td>'); |
|
Lines 318-325
Link Here
|
| 318 |
dataSrc: 0, |
319 |
dataSrc: 0, |
| 319 |
startRender: function ( rows, group ) { |
320 |
startRender: function ( rows, group ) { |
| 320 |
var details = JSON.parse(rows.data().pluck(1).pop()); |
321 |
var details = JSON.parse(rows.data().pluck(1).pop()); |
|
|
322 |
var identifier = details.identifier || group; |
| 321 |
return $('<tr class="'+details.type+'"/>') |
323 |
return $('<tr class="'+details.type+'"/>') |
| 322 |
.append( '<td>'+group+'</td>' ) |
324 |
.append( '<td>'+identifier+'</td>' ) |
| 323 |
.append( '<td colspan="2">'+details.description+'</td>' ) |
325 |
.append( '<td colspan="2">'+details.description+'</td>' ) |
| 324 |
.append( '<td>'+details.amount+'</td>' ) |
326 |
.append( '<td>'+details.amount+'</td>' ) |
| 325 |
.append( '<td><button class="printReceipt btn btn-default btn-xs" data-accountline="'+group+'"><i class="fa fa-print"></i> Print receipt</button></td>'); |
327 |
.append( '<td><button class="printReceipt btn btn-default btn-xs" data-accountline="'+group+'"><i class="fa fa-print"></i> Print receipt</button></td>'); |
| 326 |
- |
|
|