Skip to content

Commit

Permalink
Merge pull request #6715 from ehuelsmann/features/reversed-transactions
Browse files Browse the repository at this point in the history 
Transaction reversal tracking
  • Loading branch information
@ehuelsmann
ehuelsmann committed Apr 29, 2023
2 parents c6e367b + 1bd698b commit cdd1334
Show file tree
Hide file tree
Showing 26 changed files with 644 additions and 197 deletions.
93 changes: 57 additions & 36 deletions UI/Reports/filters/gl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,47 @@
} %]</td>
</tr>
<tr>
<th align="right">[% text('Include in Report') %]</th>
<th align="right" valign="top">[% text('Transaction status') %]</th>

<td colspan="5">
<table class='criteria'>
<tr>
<td>
[% PROCESS input element_data = {
name = 'is_approved'
type = 'radio'
value = 'All'
checked = 'CHECKED'
}; %]&nbsp;[% text('All'); %]</td>
<td>[% PROCESS input element_data = {
name = 'is_approved'
type = 'radio'
value = 'Y'
}; %]&nbsp;[% text('Approved'); %]</td><td>
[% PROCESS input element_data = {
name = 'is_approved'
type = 'radio'
value = 'N'
}; %]&nbsp;[% text('Unapproved'); %]</td>
</tr>
<tr>
<td>[% PROCESS input element_data = {
name = 'is_voided'
type = 'radio'
value = 'All'
checked = 'CHECKED'
}; %]&nbsp;[% text('All'); %]</td>
<td>[% PROCESS input element_data = {
name = 'is_voided'
type = 'radio'
value = 'Y'
}; %]&nbsp;[% text('Reversed'); %]</td><td>
[% PROCESS input element_data = {
name = 'is_voided'
type = 'radio'
value = 'N'
}; %]&nbsp;[% text('Non-reversed'); %]</td>
</tr>
<tr>
<td>
[% PROCESS input element_data = {
Expand All @@ -125,69 +162,56 @@
value="X"
checked = "checked"
} %]&nbsp;[% text('All') %]</td>
<td align="left">
<td align="left">
[% PROCESS input element_data = {
name="category"
id="category-asset"
class="radio"
type="radio"
value="A"
} %]&nbsp;[% text('Asset') %]</td>
<td align="left">
<td align="left">
[% PROCESS input element_data = {
name="category"
id="category-liability"
class="radio"
type="radio"
value="L"
} %]&nbsp;[% text('Liability') %]</td>
<td align="left">
<td align="left">
[% PROCESS input element_data = {
name="category"
id="category-equity"
class="radio"
type="radio"
value="Q"
} %]&nbsp;[% text('Equity') %]</td>
<td align="left">
<td align="left">
[% PROCESS input element_data = {
name="category"
id="category-income"
class="radio"
type="radio"
value="I"
} %]&nbsp;[% text('Income') %]</td>
<td align="left">
<td align="left">
[% PROCESS input element_data = {
name="category"
id="category-expense"
class="radio"
type="radio"
value="E"
} %]&nbsp;[% text('Expense') %]
</td>
</tr>
<tr>
<td>[% PROCESS input element_data = {
name = 'is_approved'
type = 'radio'
value = 'Y'
checked = 'CHECKED'
}; %]&nbsp;[% text('Approved'); %]</td><td>
[% PROCESS input element_data = {
name = 'is_approved'
type = 'radio'
value = 'N'
}; %]&nbsp;[% text('Unapproved'); %]</td><td>
[% PROCESS input element_data = {
name = 'is_approved'
type = 'radio'
value = 'All'
}; %]&nbsp;[% text('All'); %]</td>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<th align="right" valign="top">[% text('Include in Report') %]</th>
<td colspan="5">
<table>
<tr>
<table>
<tr>
<td nowrap>[% PROCESS input element_data = {
name="col_id"
class="checkbox"
Expand Down Expand Up @@ -222,8 +246,8 @@
value="1"
checked="checked"
} %] [% text('Description') %]</td>
</tr>
<tr>
</tr>
<tr>
<td nowrap>[% PROCESS input element_data = {
name="col_debits"
class="checkbox"
Expand Down Expand Up @@ -256,8 +280,8 @@
type="checkbox"
value="1"
} %] [% text('FX Credit') %]</td>
</tr>
<tr>
</tr>
<tr>
<td nowrap>[% PROCESS input element_data = {
name="col_source"
class="checkbox"
Expand All @@ -283,8 +307,8 @@
type="checkbox"
value="1"
} %] [% text('Till') %]</td>
</tr>
<tr>
</tr>
<tr>
<td nowrap>[% PROCESS input element_data = {
name="col_accno"
class="checkbox"
Expand Down Expand Up @@ -316,13 +340,10 @@
type="checkbox"
value="1"
} %] [% text('Subtotal') %]</td>
</tr>
</table>
</tr>
</table>
</td>
</tr>

</table>
</td>
</tr>
Expand Down
108 changes: 66 additions & 42 deletions UI/Reports/filters/invoice_search.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,44 +167,39 @@
} %]</td>
</tr>
[% PROCESS date_row %]
<tr id="onhold-row">
<th>[% text('Invoice Status') %]</th>
<td>[% label_pos = 1; PROCESS input element_data = {
label = text('All')
type = 'radio'
name = 'on_hold'
id = 'on_hold-all'
value = ''
checked = 'CHECKED'
};
PROCESS input element_data = {
label = text('Active')
type = 'radio'
name = 'on_hold'
id = 'on_hold-active'
value = '0'
};
PROCESS input element_data = {
label = text('On Hold') #'
type = 'radio'
name = 'on_hold'
id = 'on_hold-hold'
value = '1'
}; %]</td>
</tr>
<tr>
<th colspan="4" class="centered">[% text('Include in Report') %]</th>
</tr>
<tr>
<th>&nbsp;</th>
<td colspan="3">
<th valign="top">[% text('Invoice Status') %]</th>
<td colspan="4">
<table>
<tr id="onhold-row">
<td>[% label_pos = 1; PROCESS input element_data = {
label = text('Active')
type = 'radio'
name = 'on_hold'
id = 'on_hold-active'
value = '0'
}; %]</td>
<td>[% PROCESS input element_data = {
label = text('On Hold')
type = 'radio'
name = 'on_hold'
id = 'on_hold-hold'
value = '1'
}; %]</td>
<td>[% PROCESS input element_data = {
label = text('All')
type = 'radio'
name = 'on_hold'
id = 'on_hold-all'
value = ''
checked = 'CHECKED'
}; %]</td>
</tr>
<tr>
<td>[% PROCESS input element_data = {
name = 'oc_state'
type = 'radio'
value = 'open'
checked = 'CHECKED'
label = text('Open')
} %]</td>
<td>[% PROCESS input element_data = {
Expand All @@ -218,6 +213,7 @@
type = 'radio'
value = 'all'
label = text('All')
checked = 'CHECKED'
} %]</td>
</tr>
<tr>
Expand All @@ -226,7 +222,6 @@
type = 'radio'
value = 'Y'
label = text('Approved')
checked = 'CHECKED'
}; %]</td>
<td>[% PROCESS input element_data = {
name = 'is_approved'
Expand All @@ -239,8 +234,37 @@
type = 'radio'
value = 'All'
label = text('All')
checked = 'CHECKED'
}; %]</td>
</tr>
<tr>
<td>[% PROCESS input element_data = {
name = 'is_voided'
type = 'radio'
value = 'Y'
label = text('Voided')
}; %]</td>
<td>[% PROCESS input element_data = {
name = 'is_voided'
type = 'radio'
value = 'N'
label = text('Unvoided')
}; %]</td>
<td>[% PROCESS input element_data = {
name = 'is_voided'
type = 'radio'
value = 'All'
label = text('All')
checked = 'CHECKED'
}; %]</td>
</tr>
</table>
</td>
</tr>
<tr>
<th valign="top">[% text('Include in Report') %]</th>
<td colspan="4">
<table>
<tr>
<td>[% PROCESS input element_data = {
name = 'col_running_number'
Expand All @@ -259,35 +283,35 @@
name = 'col_invnumber'
type = 'checkbox'
value = '1'
label = text('Invoice Number') #'
label = text('Invoice Number')
checked = 'CHECKED'
} %]</td>
<td>[% PROCESS input element_data = {
name = 'col_ordnumber'
type = 'checkbox'
value = '1'
label = text('Order Number') #'
label = text('Order Number')
} %]</td>
<td>[% PROCESS input element_data = {
name = 'col_ponumber'
type = 'checkbox'
value = '1'
label = text('PO Number') #'
label = text('PO Number')
} %]</td>
</tr>
<tr>
<td>[% PROCESS input element_data = {
name = 'col_transdate'
type = 'checkbox'
value = '1'
label = text('Invoice Date') #'
label = text('Invoice Date')
checked = 'CHECKED'
} %]</td>
<td>[% PROCESS input element_data = {
name = 'col_business_units'
type = 'checkbox'
value = '1'
label = text('Business Units') #'
label = text('Business Units')
} %]</td>
<td>[% PROCESS input element_data = {
name = 'col_entity_name'
Expand Down Expand Up @@ -339,7 +363,7 @@
name = 'col_last_payment'
type = 'checkbox'
value = '1'
label = text('Date Paid') #'
label = text('Date Paid')
} %]</td>
</tr>
<tr>
Expand All @@ -354,13 +378,13 @@
name = 'col_due_date'
type = 'checkbox'
value = '1'
label = text('Due Date') #'
label = text('Due Date')
} %]</td>
<td>[% PROCESS input element_data = {
name = 'col_due'
type = 'checkbox'
value = '1'
label = text('Amount Due') #'
label = text('Amount Due')
checked = 'CHECKED'
} %]</td>
<td>[% PROCESS input element_data = {
Expand All @@ -381,13 +405,13 @@
name = 'col_shipping_point'
type = 'checkbox'
value = '1'
label = text('Shipping Point') #'
label = text('Shipping Point')
} %]</td>
<td>[% PROCESS input element_data = {
name = 'col_ship_via'
type = 'checkbox'
value = '1'
label = text('Ship Via') #'
label = text('Ship Via')
} %]</td>
</tr>
<tr>
Expand Down
Loading

0 comments on commit cdd1334

Please sign in to comment.