X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=ca85d26e74d9ae77e38d2a208b3b19433d9f5cc6;hb=f5a86be183c6023b189199c69ac409df1b7116df;hp=e8121c35977f762d9fd4503cd544cd1238f691a7;hpb=4caf520181fb8539cb52079552b650aef81cb1cb;p=fa-stable.git
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index e8121c35..ca85d26e 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -1232,25 +1232,28 @@ function tax_groups_list_row($label, $name, $selected_id=null, $none_option=fals
//------------------------------------------------------------------------------------
-function item_tax_types_list($name, $selected_id=null)
+function item_tax_types_list($name, $selected_id=null, $show_inactive = false)
{
$sql ="SELECT id, name FROM ".TB_PREF."item_tax_types";
+ if (!$show_inactive)
+ $sql .= " WHERE !inactive";
+
return combo_input($name, $selected_id, $sql, 'id', 'name', array('order' => 'id') );
}
-function item_tax_types_list_cells($label, $name, $selected_id=null)
+function item_tax_types_list_cells($label, $name, $selected_id=null, $show_inactive = false)
{
if ($label != null)
echo "
$label | \n";
echo "";
- echo item_tax_types_list($name, $selected_id);
+ echo item_tax_types_list($name, $selected_id, $show_inactive);
echo " | \n";
}
-function item_tax_types_list_row($label, $name, $selected_id=null)
+function item_tax_types_list_row($label, $name, $selected_id=null, $show_inactive = false)
{
echo "$label | ";
- item_tax_types_list_cells(null, $name, $selected_id);
+ item_tax_types_list_cells(null, $name, $selected_id, $show_inactive);
echo "
\n";
}
@@ -1308,25 +1311,27 @@ function sales_persons_list_row($label, $name, $selected_id=null, $spec_opt=fals
//------------------------------------------------------------------------------------
-function sales_areas_list($name, $selected_id=null)
+function sales_areas_list($name, $selected_id=null, $special_option=false)
{
$sql = "SELECT area_code, description, inactive FROM ".TB_PREF."areas";
- return combo_input($name, $selected_id, $sql, 'area_code', 'description', array());
+ return combo_input($name, $selected_id, $sql, 'area_code', 'description',
+ array('spec_option' => $special_option===true ? ' ' : $special_option,
+ 'order' => 'description', 'spec_id' => 0));
}
-function sales_areas_list_cells($label, $name, $selected_id=null)
+function sales_areas_list_cells($label, $name, $selected_id=null, $special_option=false)
{
if ($label != null)
echo "$label | \n";
echo "";
- echo sales_areas_list($name, $selected_id);
+ echo sales_areas_list($name, $selected_id, $special_option);
echo " | \n";
}
-function sales_areas_list_row($label, $name, $selected_id=null)
+function sales_areas_list_row($label, $name, $selected_id=null, $special_option=false)
{
echo "$label | ";
- sales_areas_list_cells(null, $name, $selected_id);
+ sales_areas_list_cells(null, $name, $selected_id, $special_option);
echo "
\n";
}
@@ -1802,7 +1807,7 @@ function gl_account_types_list_row($label, $name, $selected_id=null, $all_option
//-----------------------------------------------------------------------------------------------
function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=false,
- $cells=false, $all_option=false, $submit_on_change=false, $all=false)
+ $cells=false, $all_option=false, $submit_on_change=false, $all=false, $type_id=false)
{
if ($skip_bank_accounts)
$sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id
@@ -1815,6 +1820,7 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
$sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id
FROM ".TB_PREF."chart_master chart,".TB_PREF."chart_types type
WHERE chart.account_type=type.id";
+ if ($type_id ) $sql .= " AND chart.account_type=".db_escape($type_id);
return combo_input($name, $selected_id, $sql, 'chart.account_code', 'chart.account_name',
array(
@@ -1842,22 +1848,22 @@ function _format_account($row)
function gl_all_accounts_list_cells($label, $name, $selected_id=null,
$skip_bank_accounts=false, $cells=false, $all_option=false,
- $submit_on_change=false, $all=false)
+ $submit_on_change=false, $all=false, $type_id=false)
{
if ($label != null)
echo "$label | \n";
echo "";
echo gl_all_accounts_list($name, $selected_id,
- $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all);
+ $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all, $type_id);
echo " | \n";
}
function gl_all_accounts_list_row($label, $name, $selected_id=null,
- $skip_bank_accounts=false, $cells=false, $all_option=false)
+ $skip_bank_accounts=false, $cells=false, $all_option=false, $type_id=false)
{
echo "$label | ";
gl_all_accounts_list_cells(null, $name, $selected_id,
- $skip_bank_accounts, $cells, $all_option);
+ $skip_bank_accounts, $cells, $all_option, $type_id);
echo "
\n";
}
@@ -2121,7 +2127,7 @@ function journal_types_list_cells($label, $name, $value=null, $submit_on_change=
echo "\n";
}
-function cust_allocations_list_cells($label, $name, $selected=null)
+function cust_allocations_list_cells($label, $name, $selected=null, $submit_on_change=false)
{
if ($label != null)
@@ -2130,12 +2136,12 @@ function cust_allocations_list_cells($label, $name, $selected=null)
$allocs = array(
ALL_TEXT=>_("All Types"),
'1'=> _("Sales Invoices"),
- '2'=> _("Overdue Invoices"),
+ '2'=> _("Unsettled transactions"),
'3' => _("Payments"),
'4' => _("Credit Notes"),
'5' => _("Delivery Notes")
);
- echo array_selector($name, $selected, $allocs);
+ echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change));
echo "\n";
}
@@ -2155,7 +2161,7 @@ function supp_allocations_list_cell($name, $selected=null)
echo "\n";
}
-function supp_transactions_list_cell($name, $selected=null)
+function supp_transactions_list_cell($name, $selected=null, $submit_on_change=false)
{
echo "\n";
@@ -2163,13 +2169,13 @@ function supp_transactions_list_cell($name, $selected=null)
ALL_TEXT=>_("All Types"),
'6'=>_("GRNs"),
'1'=> _("Invoices"),
- '2'=> _("Overdue Invoices"),
+ '2'=> _("Unsettled transactions"),
'3' => _("Payments"),
'4' => _("Credit Notes"),
'5' => _("Overdue Credit Notes")
);
- echo array_selector($name, $selected, $allocs);
+ echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change));
echo " | \n";
}
@@ -2633,12 +2639,12 @@ function subledger_list($name, $account, $selected_id=null)
FROM "
.TB_PREF."debtors_master d,"
.TB_PREF."cust_branch c
- WHERE d.debtor_no=c.debtor_no AND c.receivables_account=".db_escape($account);
+ WHERE d.debtor_no=c.debtor_no AND NOT d.inactive AND c.receivables_account=".db_escape($account);
else
$sql = "SELECT supplier_id as id, supp_ref as name
FROM "
.TB_PREF."suppliers s
- WHERE s.payable_account=".db_escape($account);
+ WHERE NOT s.inactive AND s.payable_account=".db_escape($account);
$mode = get_company_pref('no_customer_list');