projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Two small cleanups.
[fa-stable.git]
/
inventory
/
manage
/
movement_types.php
diff --git
a/inventory/manage/movement_types.php
b/inventory/manage/movement_types.php
index 69e8fe16bba92f9155871270c1a9fb4c812a9d7a..e7086f947432915989c1a32f1f68631f13750c3a 100644
(file)
--- a/
inventory/manage/movement_types.php
+++ b/
inventory/manage/movement_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_INVENTORYMOVETYPE'
;
+$path_to_root
=
"../..";
include($path_to_root . "/includes/session.inc");
include($path_to_root . "/includes/session.inc");
-page(_("Inventory Movement Types"));
+page(_(
$help_context =
"Inventory Movement Types"));
include_once($path_to_root . "/inventory/includes/inventory_db.inc");
include_once($path_to_root . "/inventory/includes/inventory_db.inc");
@@
-56,11
+56,7
@@
if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
function can_delete($selected_id)
{
function can_delete($selected_id)
{
- $sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_moves
- WHERE type=" . systypes::inventory_adjustment(). " AND person_id=$selected_id";
- $result = db_query($sql, "could not query stock moves");
- $myrow = db_fetch_row($result);
- if ($myrow[0] > 0)
+ if (movement_types_in_stock_moves($selected_id))
{
display_error(_("Cannot delete this inventory movement type because item transactions have been created referring to it."));
return false;
{
display_error(_("Cannot delete this inventory movement type because item transactions have been created referring to it."));
return false;
@@
-85,16
+81,19
@@
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_movement_type();
+$result = get_all_movement_type(
check_value('show_inactive')
);
start_form();
start_form();
-start_table(
"$table_style
width=30%");
+start_table(
TABLESTYLE, "
width=30%");
$th = array(_("Description"), "", "");
$th = array(_("Description"), "", "");
+inactive_control_column($th);
table_header($th);
$k = 0;
while ($myrow = db_fetch($result))
table_header($th);
$k = 0;
while ($myrow = db_fetch($result))
@@
-103,20
+102,17
@@
while ($myrow = db_fetch($result))
alt_table_row_color($k);
label_cell($myrow["name"]);
alt_table_row_color($k);
label_cell($myrow["name"]);
+ inactive_control_cell($myrow["id"], $myrow["inactive"], 'movement_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);
+start_table(TABLESTYLE2);
if ($selected_id != -1)
{
if ($selected_id != -1)
{
@@
-134,7
+130,7
@@
text_row(_("Description:"), 'name', null, 50, 50);
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();