projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Backup and Restore: system settings has not been refreshed after restore (typo).
[fa-stable.git]
/
sales
/
manage
/
sales_areas.php
diff --git
a/sales/manage/sales_areas.php
b/sales/manage/sales_areas.php
index e5b06a1448a1f255078ef9f382fe3328bff182fb..7e513861211d27c5b4d6a75eff4c17c5add09354 100644
(file)
--- a/
sales/manage/sales_areas.php
+++ b/
sales/manage/sales_areas.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_SALESAREA'
;
+$path_to_root
=
"../..";
include($path_to_root . "/includes/session.inc");
include($path_to_root . "/includes/session.inc");
-page(_("Sales Areas"));
+page(_(
$help_context =
"Sales Areas"));
include($path_to_root . "/includes/ui.inc");
include($path_to_root . "/includes/ui.inc");
@@
-35,16
+35,15
@@
if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
{
if ($selected_id != -1)
{
{
if ($selected_id != -1)
{
-
$sql = "UPDATE ".TB_PREF."areas SET description=".db_escape($_POST['description'])." WHERE area_code = ".db_escape($selected_id
);
+
update_sales_area($selected_id, $_POST['description']
);
$note = _('Selected sales area has been updated');
}
else
{
$note = _('Selected sales area has been updated');
}
else
{
-
$sql = "INSERT INTO ".TB_PREF."areas (description) VALUES (".db_escape($_POST['description']) . ")"
;
+
add_sales_area($_POST['description'])
;
$note = _('New sales area has been added');
}
$note = _('New sales area has been added');
}
- db_query($sql,"The sales area could not be updated or added");
display_notification($note);
$Mode = 'RESET';
}
display_notification($note);
$Mode = 'RESET';
}
@@
-57,18
+56,14
@@
if ($Mode == 'Delete')
// PREVENT DELETES IF DEPENDENT RECORDS IN 'debtors_master'
// PREVENT DELETES IF DEPENDENT RECORDS IN 'debtors_master'
- $sql= "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE area=".db_escape($selected_id);
- $result = db_query($sql,"check failed");
- $myrow = db_fetch_row($result);
- if ($myrow[0] > 0)
+ if (key_in_foreign_table($selected_id, 'cust_branch', 'area'))
{
$cancel_delete = 1;
display_error(_("Cannot delete this area because customer branches have been created using this area."));
}
if ($cancel_delete == 0)
{
{
$cancel_delete = 1;
display_error(_("Cannot delete this area because customer branches have been created using this area."));
}
if ($cancel_delete == 0)
{
- $sql="DELETE FROM ".TB_PREF."areas WHERE area_code=".db_escape($selected_id);
- db_query($sql,"could not delete sales area");
+ delete_sales_area($selected_id);
display_notification(_('Selected sales area has been deleted'));
} //end if Delete area
display_notification(_('Selected sales area has been deleted'));
} //end if Delete area
@@
-78,16
+73,21
@@
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;
}
}
+
//-------------------------------------------------------------------------------------------------
//-------------------------------------------------------------------------------------------------
-$sql = "SELECT * FROM ".TB_PREF."areas";
-$result = db_query($sql,"could not get areas");
+$result = get_sales_areas(check_value('show_inactive'));
start_form();
start_form();
-start_table("$table_style width=30%");
+start_table(TABLESTYLE, "width='30%'");
+
$th = array(_("Area Name"), "", "");
$th = array(_("Area Name"), "", "");
+inactive_control_column($th);
+
table_header($th);
$k = 0;
table_header($th);
$k = 0;
@@
-97,30
+97,27
@@
while ($myrow = db_fetch($result))
alt_table_row_color($k);
label_cell($myrow["description"]);
alt_table_row_color($k);
label_cell($myrow["description"]);
+
+ inactive_control_cell($myrow["area_code"], $myrow["inactive"], 'areas', 'area_code');
+
edit_button_cell("Edit".$myrow["area_code"], _("Edit"));
delete_button_cell("Delete".$myrow["area_code"], _("Delete"));
end_row();
}
edit_button_cell("Edit".$myrow["area_code"], _("Edit"));
delete_button_cell("Delete".$myrow["area_code"], _("Delete"));
end_row();
}
-
-
+
+inactive_control_row($th);
end_table();
end_table();
-end_form();
echo '<br>';
//-------------------------------------------------------------------------------------------------
echo '<br>';
//-------------------------------------------------------------------------------------------------
-start_form();
-
-start_table($table_style2);
+start_table(TABLESTYLE2);
if ($selected_id != -1)
{
if ($Mode == 'Edit') {
//editing an existing area
if ($selected_id != -1)
{
if ($Mode == 'Edit') {
//editing an existing area
- $sql = "SELECT * FROM ".TB_PREF."areas WHERE area_code=".db_escape($selected_id);
-
- $result = db_query($sql,"could not get area");
- $myrow = db_fetch($result);
+ $myrow = get_sales_area($selected_id);
$_POST['description'] = $myrow["description"];
}
$_POST['description'] = $myrow["description"];
}
@@
-131,9
+128,8
@@
text_row_ex(_("Area Name:"), 'description', 30);
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_page();
end_form();
end_page();
-?>