projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Print full Location name on reports
[fa-stable.git]
/
taxes
/
tax_types.php
diff --git
a/taxes/tax_types.php
b/taxes/tax_types.php
index 20369be770dfdd5bc06a8bae6d672822393a5c98..4dfebf7fbfe7d9e4afe9d70f00c6b41ce40ff9bf 100644
(file)
--- a/
taxes/tax_types.php
+++ b/
taxes/tax_types.php
@@
-9,11
+9,11
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
-$page_security =
3
;
-$path_to_root
=
"..";
+$page_security =
'SA_TAXRATES'
;
+$path_to_root
=
"..";
include($path_to_root . "/includes/session.inc");
include($path_to_root . "/includes/session.inc");
-page(_("Tax Types"));
+page(_(
$help_context =
"Tax Types"));
include_once($path_to_root . "/includes/ui.inc");
include_once($path_to_root . "/taxes/db/tax_types_db.inc");
include_once($path_to_root . "/includes/ui.inc");
include_once($path_to_root . "/taxes/db/tax_types_db.inc");
@@
-38,7
+38,7
@@
function can_process()
return false;
}
return false;
}
- if (!is_tax_gl_unique(get_post('sales_gl_code'
, 'purchasing_gl_code', $selected_id)
)) {
+ if (!is_tax_gl_unique(get_post('sales_gl_code'
), get_post('purchasing_gl_code'), $selected_id
)) {
display_error( _("Selected GL Accounts cannot be used by another tax type."));
set_focus('sales_gl_code');
return false;
display_error( _("Selected GL Accounts cannot be used by another tax type."));
set_focus('sales_gl_code');
return false;
@@
-72,7
+72,7
@@
if ($Mode=='UPDATE_ITEM' && can_process())
function can_delete($selected_id)
{
function can_delete($selected_id)
{
- $sql= "SELECT COUNT(*) FROM ".TB_PREF."tax_group_items WHERE tax_type_id=
$selected_id"
;
+ $sql= "SELECT COUNT(*) FROM ".TB_PREF."tax_group_items WHERE tax_type_id=
".db_escape($selected_id)
;
$result = db_query($sql, "could not query tax groups");
$myrow = db_fetch_row($result);
if ($myrow[0] > 0)
$result = db_query($sql, "could not query tax groups");
$myrow = db_fetch_row($result);
if ($myrow[0] > 0)
@@
-102,11
+102,13
@@
if ($Mode == 'Delete')
if ($Mode == 'RESET')
{
$selected_id = -1;
if ($Mode == 'RESET')
{
$selected_id = -1;
+ $sav = get_post('show_inactive');
unset($_POST);
unset($_POST);
+ $_POST['show_inactive'] = $sav;
}
//-----------------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------------
-$result = get_all_tax_types();
+$result = get_all_tax_types(
check_value('show_inactive')
);
start_form();
start_form();
@@
-115,6
+117,7
@@
start_table($table_style);
$th = array(_("Description"), _("Default Rate (%)"),
_("Sales GL Account"), _("Purchasing GL Account"), "", "");
$th = array(_("Description"), _("Default Rate (%)"),
_("Sales GL Account"), _("Purchasing GL Account"), "", "");
+inactive_control_column($th);
table_header($th);
$k = 0;
table_header($th);
$k = 0;
@@
-128,21
+131,17
@@
while ($myrow = db_fetch($result))
label_cell($myrow["sales_gl_code"] . " " . $myrow["SalesAccountName"]);
label_cell($myrow["purchasing_gl_code"] . " " . $myrow["PurchasingAccountName"]);
label_cell($myrow["sales_gl_code"] . " " . $myrow["SalesAccountName"]);
label_cell($myrow["purchasing_gl_code"] . " " . $myrow["PurchasingAccountName"]);
+ inactive_control_cell($myrow["id"], $myrow["inactive"], 'tax_types', 'id');
edit_button_cell("Edit".$myrow["id"], _("Edit"));
delete_button_cell("Delete".$myrow["id"], _("Delete"));
end_row();
}
edit_button_cell("Edit".$myrow["id"], _("Edit"));
delete_button_cell("Delete".$myrow["id"], _("Delete"));
end_row();
}
-end_table();
-
-end_form();
-echo '<br>';
-
+inactive_control_row($th);
+end_table(1);
//-----------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------
-start_form();
-
start_table($table_style2);
if ($selected_id != -1)
start_table($table_style2);
if ($selected_id != -1)
@@
-167,7
+166,7
@@
gl_all_accounts_list_row(_("Purchasing GL Account:"), 'purchasing_gl_code', null
end_table(1);
end_table(1);
-submit_add_or_update_center($selected_id == -1, '',
true
);
+submit_add_or_update_center($selected_id == -1, '',
'both'
);
end_form();
end_form();