Skip to content

Fix overpayments 1.12 #8901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
einhverfr wants to merge 14 commits into
base: 1.12
Choose a base branch
from
Draft

Fix overpayments 1.12 #8901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
240693b
Fixing payment search
einhverfr Jun 8, 2025
157a8b3
Readability fixes
einhverfr Jun 8, 2025
16e266b
Simplifying Use Overpayment Code
einhverfr Jun 10, 2025
1827d49
Use Overpayment/Update Fix Mangled fields
einhverfr Jun 10, 2025
85d1a1f
Infrastructure to fix ar vs is links
einhverfr Jun 10, 2025
d393a5e
Fixing Name Display for Use Overpayment
einhverfr Jun 11, 2025
5c86c1b
Skip invoices with no amount set
einhverfr Jun 12, 2025
0dfe0fa
Fix amounts etc not being passed to payment_post function
einhverfr Jun 12, 2025
b4b4804
Fixing exchangerate passthrough
einhverfr Jun 12, 2025
3ea499f
Fixing #8858
einhverfr Jun 12, 2025
15639d3
Fixing obvious errors found by use strict.
einhverfr Jun 12, 2025
4d828f8
Overpayments minor UI fixes
einhverfr Jun 14, 2025
845d171
Manual testing of overpayment usage now passes.
einhverfr Jun 14, 2025
fab47d9
Fixing PerlCritic warnings
einhverfr Jun 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 12 additions & 64 deletions UI/payments/use_overpayment2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,11 @@
id="entity_id_$i"
name="entity_id_$i"
value=data.entity_id } %]
[% PROCESS input element_data = {
type="hidden"
id="entity_name_$i"
name="entity_name_$i"
value=data.entity_name } %]
</td>
<td align="center"> [% data.invoice_date %]
[% PROCESS input element_data = {
Expand All @@ -186,7 +191,7 @@
value=data.invoice_date } %]
</td>
<td align="right"> [% data.applied_due -%]
[% PROCESS input element_data {
[% PROCESS input element_data = {
type="hidden"
id="due_$i"
name="due_$i"
Expand Down Expand Up @@ -216,67 +221,6 @@
name="checkbox_$i" } %]</td>
</tr>
[% END -%]
[% FOREACH data IN avble_invoices; # Loop through selected entity invoices
IF not data.amount; data.amount = 0; END; -%]
[% i = i + 1; j = i % 2; alterning_style = "listrow$j" -%]
<tr class="[% alterning_style %]">
<td align="center"> <a href="[% data.invoice.href %]">[% data.invoice.number %]</a>
[% PROCESS input element_data = {
type="hidden"
id="invnumber_$i"
name="invnumber_$i"
value=data.invoice.number } %]
[% PROCESS input element_data = {
type="hidden"
id="invoice_id_$i"
name="invoice_id_$i"
value=data.invoice.id } %]
</td>
<td align="center"> [% data.entity_name %]
[% PROCESS input element_data = {
type="hidden"
id="entity_id_$i"
name="entity_id_$i"
value=data.entity_id } %]
</td>
<td align="center"> [% data.invoice_date %]
[% PROCESS input element_data = {
type="hidden"
id="invoice_date_$i"
name="invoice_date_$i"
value=data.invoice_date } %]
</td >
<td align="right"> [% data.due %]
[% PROCESS input element_data = {
type="hidden"
id="due_$i"
name="due_$i"
value=data.due } %]
</td>
[% IF data.repeated_invoice == 'true' -%]
<td align="center"> &nbsp; </td>
[% END -%]
<td align="center"> [% data.selected_accno.ovp_accno %]
[% PROCESS input element_data = {
type="hidden"
id="selected_accno_$i"
name="selected_accno_$i"
value=data.selected_accno.id _ '--' _ data.selected_accno.ovp_accno
} %]
</td>
<td align="center">
[% PROCESS input element_data = {
name="amount_$i"
id="amount_$i"
value=data.amount } %]
[% subtotal_inv = subtotal_inv + data.amount -%]
</td>
<td align="center">
[% PROCESS input element_data = {
type="checkbox"
name="checkbox_$i" } %]</td>
</tr>
[% END -%]
[% i = i + 1; j = i % 2; alterning_style = "listrow$j" -%]
<tr class="[% alterning_style %]">
<td align="center">[% PROCESS input element_data = {
Expand All @@ -296,8 +240,7 @@
value_attr = 'value'
text_attr = 'name'
options = vc_list
default_values = [ request.new_entity_id ]
default_blank = 1
default_values = []
} %]
</td>
<td align="center">N/A</td>
Expand Down Expand Up @@ -380,6 +323,11 @@
</td>
</tr>
</table>
[% PROCESS input element_data = {
type="hidden"
id="count"
name="count"
value=i } %]
[% FOREACH item IN hiddens -%]
[% INCLUDE input element_data=item %]
[% END -%]
Expand Down
Loading
Loading