Skip to content
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.

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

CIVIPLMMSR-302: Merge RC branch to master #19

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</compatibility>
<comments>This extension allows a backend user to add, edit and cancel line item(s) associated with a Contribution.
</comments>
<comments>PATCH 7</comments>
<comments>PATCH 8</comments>
<civix>
<namespace>CRM/Lineitemedit</namespace>
<format>23.02.1</format>
Expand Down
14 changes: 7 additions & 7 deletions lineitemedit.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,13 @@ function lineitemedit_civicrm_pre($op, $entity, $entityID, &$params) {
$taxEnabled = (bool) Civi::settings()->get('invoicing');

if (!isset($params['item_label'])) {
$params['item_label'] = CRM_Utils_Request::retrieve('item_label', 'String', NULL, FALSE, NULL, 'POST');
$params['item_financial_type_id'] = CRM_Utils_Request::retrieve('item_financial_type_id', 'String', NULL, FALSE, NULL, 'POST');
$params['item_qty'] = CRM_Utils_Request::retrieve('item_qty', 'String', NULL, FALSE, NULL, 'POST');
$params['item_unit_price'] = CRM_Utils_Request::retrieve('item_unit_price', 'String', NULL, FALSE, NULL, 'POST');
$params['item_line_total'] = CRM_Utils_Request::retrieve('item_line_total', 'String', NULL, FALSE, NULL, 'POST');
$params['item_price_field_value_id'] = CRM_Utils_Request::retrieve('item_price_field_value_id', 'String', NULL, FALSE, NULL, 'POST');
$params['item_tax_amount'] = CRM_Utils_Request::retrieve('item_tax_amount', 'String', NULL, FALSE, NULL, 'POST');
$params['item_label'] = CRM_Utils_Request::retrieve('item_label', 'String');
$params['item_financial_type_id'] = CRM_Utils_Request::retrieve('item_financial_type_id', 'String');
$params['item_qty'] = CRM_Utils_Request::retrieve('item_qty', 'String');
$params['item_unit_price'] = CRM_Utils_Request::retrieve('item_unit_price', 'String');
$params['item_line_total'] = CRM_Utils_Request::retrieve('item_line_total', 'String');
$params['item_price_field_value_id'] = CRM_Utils_Request::retrieve('item_price_field_value_id', 'String');
$params['item_tax_amount'] = CRM_Utils_Request::retrieve('item_tax_amount', 'String');
$params['tax_amount'] = 0; // previous tax can be removed since it will be recalculated below
}

Expand Down