Skip to content

adding shipper options for delivery reports #60

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

Open
trafficpest wants to merge 5 commits into
base: master
Choose a base branch
from
Open

adding shipper options for delivery reports #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ac8775
adding shipper options for delivery reports
trafficpest Feb 6, 2024
708c1f4
Revert "only changing function for new plugin support"
trafficpest Feb 16, 2024
573c35c
Left only the shipper filter to core
trafficpest Feb 20, 2024
0578a8f
updated gitignore for addtional fields files
trafficpest Feb 21, 2024
bac4633
updatw gitignore
trafficpest Apr 11, 2024
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@
/company/*/backup/*.sql
/company/*/backup/*.sql.gz
/company/*/pdf_files/*.pdf
/company/*/pdf_files/*.xls
/company/*/js_cache/*.js
/company/*/js_cache/*/*.js
/company/*/reporting
/company/*/images
/company/*
/tmp
/lang
/modules
Expand All @@ -19,3 +22,4 @@ installed_extensions.php
config.php
config_db.php
!index.php
tags
6 changes: 4 additions & 2 deletions includes/ui/ui_lists.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1265,11 +1265,13 @@ function item_tax_types_list_row($label, $name, $selected_id=null, $show_inactiv

//------------------------------------------------------------------------------------

function shippers_list($name, $selected_id=null)
function shippers_list($name, $selected_id=null, $spec_option=false)
{
$sql = "SELECT shipper_id, shipper_name, inactive FROM ".TB_PREF."shippers";
return combo_input($name, $selected_id, $sql, 'shipper_id', 'shipper_name',
array('order'=>array('shipper_name')));
array('order'=>array('shipper_name'),
'spec_option' => $spec_option === true ? _("All Shippers") : $spec_option,
));
}

function shippers_list_cells($label, $name, $selected_id=null)
Expand Down
7 changes: 7 additions & 0 deletions reporting/includes/reports_classes.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,13 @@ class BoxReports
else
return supplier_list($name);

case 'SHIPPERS_NO_FILTER':
case 'SHIPPERS':
if ($type == 'SHIPPERS_NO_FILTER')
return shippers_list($name, null, _("No Shipper Filter"));
else
return shippers_list($name);

case 'INVOICE':
$IV = $type_shortcuts[ST_SALESINVOICE];
$ref = ($SysPrefs->print_invoice_no() == 1 ? "trans_no" : "reference");
Expand Down