From 575fa4304beb3cd570a0352d52ee6c6aeb3864f7 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Tue, 1 Nov 2011 01:39:18 +0100 Subject: [PATCH] Changed popup to tabs in customers, suppliers, items for transactions. --- inventory/inquiry/stock_movements.php | 28 +- inventory/inquiry/stock_status.php | 28 +- inventory/manage/items.php | 370 +++++++++++++----------- purchasing/inquiry/supplier_inquiry.php | 42 +-- purchasing/manage/suppliers.php | 17 +- sales/inquiry/customer_inquiry.php | 36 ++- sales/manage/customers.php | 17 +- 7 files changed, 288 insertions(+), 250 deletions(-) diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php index aaee30cd..2c5aa0e0 100644 --- a/inventory/inquiry/stock_movements.php +++ b/inventory/inquiry/stock_movements.php @@ -18,13 +18,15 @@ include_once($path_to_root . "/includes/banking.inc"); include_once($path_to_root . "/sales/includes/sales_db.inc"); include_once($path_to_root . "/includes/ui.inc"); -$js = ""; -if ($use_popup_windows) - $js .= get_js_open_window(800, 500); -if ($use_date_picker) - $js .= get_js_date_picker(); - -page(_($help_context = "Inventory Item Movement"), @$_REQUEST['popup'], false, "", $js); +if (!@$_GET['popup']) +{ + $js = ""; + if ($use_popup_windows) + $js .= get_js_open_window(800, 500); + if ($use_date_picker) + $js .= get_js_date_picker(); + page(_($help_context = "Inventory Item Movement"), @$_GET['popup'], false, "", $js); +} //------------------------------------------------------------------------------------------------ check_db_has_stock_items(_("There are no items defined in the system.")); @@ -39,14 +41,16 @@ if (isset($_GET['stock_id'])) $_POST['stock_id'] = $_GET['stock_id']; } -start_form(); +if (!@$_GET['popup']) + start_form(); if (!isset($_POST['stock_id'])) $_POST['stock_id'] = get_global_stock_item(); start_table(TABLESTYLE_NOBORDER); start_row(); -stock_costable_items_list_cells(_("Item:"), 'stock_id', $_POST['stock_id']); +if (!@$_GET['popup']) + stock_costable_items_list_cells(_("Item:"), 'stock_id', $_POST['stock_id']); end_row(); end_table(); @@ -61,7 +65,8 @@ date_cells(_("To:"), 'BeforeDate'); submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), 'default'); end_row(); end_table(); -end_form(); +if (!@$_GET['popup']) + end_form(); set_global_stock_item($_POST['stock_id']); @@ -185,6 +190,7 @@ end_row(); end_table(1); div_end(); -end_page(@$_REQUEST['popup'], false, false); +if (!@$_GET['popup']) + end_page(@$_GET['popup'], false, false); ?> diff --git a/inventory/inquiry/stock_status.php b/inventory/inquiry/stock_status.php index 0e5f82a7..9d4c4b99 100644 --- a/inventory/inquiry/stock_status.php +++ b/inventory/inquiry/stock_status.php @@ -13,13 +13,16 @@ $page_security = 'SA_ITEMSSTATVIEW'; $path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -if (isset($_GET['stock_id'])){ - $_POST['stock_id'] = $_GET['stock_id']; - page(_($help_context = "Inventory Item Status"), true); -} else { - page(_($help_context = "Inventory Item Status")); +if (!@$_GET['popup']) +{ + if (isset($_GET['stock_id'])){ + page(_($help_context = "Inventory Item Status"), true); + } else { + page(_($help_context = "Inventory Item Status")); + } } - +if (isset($_GET['stock_id'])) + $_POST['stock_id'] = $_GET['stock_id']; include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/manufacturing.inc"); @@ -33,13 +36,15 @@ if (list_updated('stock_id')) check_db_has_stock_items(_("There are no items defined in the system.")); -start_form(); +if (!@$_GET['popup']) + start_form(); if (!isset($_POST['stock_id'])) $_POST['stock_id'] = get_global_stock_item(); echo "
" . _("Item:"). " "; -echo stock_costable_items_list('stock_id', $_POST['stock_id'], false, true); +if (!@$_GET['popup']) + echo stock_costable_items_list('stock_id', $_POST['stock_id'], false, true); echo "
"; echo "
"; @@ -115,7 +120,10 @@ while ($myrow = db_fetch($loc_details)) end_table(); div_end(); -end_form(); -end_page(@$_REQUEST['popup'], false, false); +if (!@$_GET['popup']) +{ + end_form(); + end_page(@$_GET['popup'], false, false); +} ?> diff --git a/inventory/manage/items.php b/inventory/manage/items.php index c07c198b..4599dfdf 100644 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@ -16,7 +16,7 @@ $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_($help_context = "Items"), @$_REQUEST['popup'], false, "", $js); +page(_($help_context = "Items"), false, false, "", $js); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -30,11 +30,7 @@ $new_item = get_post('stock_id')=='' || get_post('cancel') || get_post('clone'); if (isset($_GET['stock_id'])) { - $_POST['stock_id'] = $stock_id = $_GET['stock_id']; -} -elseif (isset($_POST['stock_id'])) -{ - $stock_id = $_POST['stock_id']; + $_POST['stock_id'] = $_GET['stock_id']; } if (list_updated('stock_id')) { $_POST['NewStockID'] = get_post('stock_id'); @@ -49,7 +45,7 @@ if (get_post('cancel')) { set_focus('stock_id'); $Ajax->activate('_page_body'); } - +$stock_id = get_post('stock_id'); if (list_updated('category_id') || list_updated('mb_flag')) { $Ajax->activate('details'); } @@ -247,211 +243,237 @@ if (isset($_POST['delete']) && strlen($_POST['delete']) > 1) $Ajax->activate('_page_body'); } } -//-------------------------------------------------------------------------------------------- - -start_form(true); -if (db_has_stock_items()) +function item_settings($stock_id) { - start_table(TABLESTYLE_NOBORDER); - start_row(); - stock_items_list_cells(_("Select an item:"), 'stock_id', null, - _('New item'), true, check_value('show_inactive')); - $new_item = get_post('stock_id')==''; - check_cells(_("Show inactive:"), 'show_inactive', null, true); - end_row(); - end_table(); + global $SysPrefs, $path_to_root, $new_item, $pic_height; - if (get_post('_show_inactive_update')) { - $Ajax->activate('stock_id'); - set_focus('stock_id'); - } -} + div_start('details'); -div_start('details'); -start_outer_table(TABLESTYLE2); + start_outer_table(TABLESTYLE2); -table_section(1); + table_section(1); -table_section_title(_("Item")); + table_section_title(_("Item")); -//------------------------------------------------------------------------------------ -if ($new_item) -{ - text_row(_("Item Code:"), 'NewStockID', null, 21, 20); - - $_POST['inactive'] = 0; -} -else -{ // Must be modifying an existing item - if (get_post('NewStockID') != get_post('stock_id') || get_post('addupdate')) { // first item display - - $_POST['NewStockID'] = $_POST['stock_id']; - - $myrow = get_item($_POST['NewStockID']); - - $_POST['long_description'] = $myrow["long_description"]; - $_POST['description'] = $myrow["description"]; - $_POST['category_id'] = $myrow["category_id"]; - $_POST['tax_type_id'] = $myrow["tax_type_id"]; - $_POST['units'] = $myrow["units"]; - $_POST['mb_flag'] = $myrow["mb_flag"]; - - $_POST['sales_account'] = $myrow['sales_account']; - $_POST['inventory_account'] = $myrow['inventory_account']; - $_POST['cogs_account'] = $myrow['cogs_account']; - $_POST['adjustment_account'] = $myrow['adjustment_account']; - $_POST['assembly_account'] = $myrow['assembly_account']; - $_POST['dimension_id'] = $myrow['dimension_id']; - $_POST['dimension2_id'] = $myrow['dimension2_id']; - $_POST['no_sale'] = $myrow['no_sale']; - $_POST['del_image'] = 0; - $_POST['inactive'] = $myrow["inactive"]; - $_POST['editable'] = $myrow["editable"]; + //------------------------------------------------------------------------------------ + if ($new_item) + { + text_row(_("Item Code:"), 'NewStockID', null, 21, 20); + + $_POST['inactive'] = 0; + } + else + { // Must be modifying an existing item + if (get_post('NewStockID') != get_post('stock_id') || get_post('addupdate')) { // first item display + + $_POST['NewStockID'] = $_POST['stock_id']; + + $myrow = get_item($_POST['NewStockID']); + + $_POST['long_description'] = $myrow["long_description"]; + $_POST['description'] = $myrow["description"]; + $_POST['category_id'] = $myrow["category_id"]; + $_POST['tax_type_id'] = $myrow["tax_type_id"]; + $_POST['units'] = $myrow["units"]; + $_POST['mb_flag'] = $myrow["mb_flag"]; + + $_POST['sales_account'] = $myrow['sales_account']; + $_POST['inventory_account'] = $myrow['inventory_account']; + $_POST['cogs_account'] = $myrow['cogs_account']; + $_POST['adjustment_account'] = $myrow['adjustment_account']; + $_POST['assembly_account'] = $myrow['assembly_account']; + $_POST['dimension_id'] = $myrow['dimension_id']; + $_POST['dimension2_id'] = $myrow['dimension2_id']; + $_POST['no_sale'] = $myrow['no_sale']; + $_POST['del_image'] = 0; + $_POST['inactive'] = $myrow["inactive"]; + $_POST['editable'] = $myrow["editable"]; + } + label_row(_("Item Code:"),$_POST['NewStockID']); + hidden('NewStockID', $_POST['NewStockID']); + set_focus('description'); } - label_row(_("Item Code:"),$_POST['NewStockID']); - hidden('NewStockID', $_POST['NewStockID']); - set_focus('description'); -} -text_row(_("Name:"), 'description', null, 52, 200); + text_row(_("Name:"), 'description', null, 52, 200); -textarea_row(_('Description:'), 'long_description', null, 42, 3); + textarea_row(_('Description:'), 'long_description', null, 42, 3); -stock_categories_list_row(_("Category:"), 'category_id', null, false, $new_item); + stock_categories_list_row(_("Category:"), 'category_id', null, false, $new_item); -if ($new_item && (list_updated('category_id') || !isset($_POST['units']))) { + if ($new_item && (list_updated('category_id') || !isset($_POST['units']))) { - $category_record = get_item_category($_POST['category_id']); + $category_record = get_item_category($_POST['category_id']); - $_POST['tax_type_id'] = $category_record["dflt_tax_type"]; - $_POST['units'] = $category_record["dflt_units"]; - $_POST['mb_flag'] = $category_record["dflt_mb_flag"]; - $_POST['inventory_account'] = $category_record["dflt_inventory_act"]; - $_POST['cogs_account'] = $category_record["dflt_cogs_act"]; - $_POST['sales_account'] = $category_record["dflt_sales_act"]; - $_POST['adjustment_account'] = $category_record["dflt_adjustment_act"]; - $_POST['assembly_account'] = $category_record["dflt_assembly_act"]; - $_POST['dimension_id'] = $category_record["dflt_dim1"]; - $_POST['dimension2_id'] = $category_record["dflt_dim2"]; - $_POST['no_sale'] = $category_record["dflt_no_sale"]; - $_POST['editable'] = 0; + $_POST['tax_type_id'] = $category_record["dflt_tax_type"]; + $_POST['units'] = $category_record["dflt_units"]; + $_POST['mb_flag'] = $category_record["dflt_mb_flag"]; + $_POST['inventory_account'] = $category_record["dflt_inventory_act"]; + $_POST['cogs_account'] = $category_record["dflt_cogs_act"]; + $_POST['sales_account'] = $category_record["dflt_sales_act"]; + $_POST['adjustment_account'] = $category_record["dflt_adjustment_act"]; + $_POST['assembly_account'] = $category_record["dflt_assembly_act"]; + $_POST['dimension_id'] = $category_record["dflt_dim1"]; + $_POST['dimension2_id'] = $category_record["dflt_dim2"]; + $_POST['no_sale'] = $category_record["dflt_no_sale"]; + $_POST['editable'] = 0; -} -$fresh_item = !isset($_POST['NewStockID']) || $new_item - || check_usage($_POST['stock_id'],false); + } + $fresh_item = !isset($_POST['NewStockID']) || $new_item + || check_usage($_POST['stock_id'],false); -item_tax_types_list_row(_("Item Tax Type:"), 'tax_type_id', null); + item_tax_types_list_row(_("Item Tax Type:"), 'tax_type_id', null); -stock_item_types_list_row(_("Item Type:"), 'mb_flag', null, $fresh_item); + stock_item_types_list_row(_("Item Type:"), 'mb_flag', null, $fresh_item); -stock_units_list_row(_('Units of Measure:'), 'units', null, $fresh_item); + stock_units_list_row(_('Units of Measure:'), 'units', null, $fresh_item); -check_row(_("Editable description:"), 'editable'); + check_row(_("Editable description:"), 'editable'); -check_row(_("Exclude from sales:"), 'no_sale'); + check_row(_("Exclude from sales:"), 'no_sale'); -if (!$new_item) -{ - if (!@$_REQUEST['popup']) + table_section(2); + + $dim = get_company_pref('use_dimension'); + if ($dim >= 1) { - start_row(); - echo ' '; - echo viewer_link(''. _('Inventory Item Movement').'', "inventory/inquiry/stock_movements.php?stock_id=$stock_id&popup=1"); - echo "\n"; - end_row(); - start_row(); - echo ' '; - echo viewer_link(''. _('Inventory Item Status').'', "inventory/inquiry/stock_status.php?stock_id=$stock_id&popup=1"); - echo "\n"; - end_row(); - } -} + table_section_title(_("Dimensions")); -table_section(2); + dimensions_list_row(_("Dimension")." 1", 'dimension_id', null, true, " ", false, 1); + if ($dim > 1) + dimensions_list_row(_("Dimension")." 2", 'dimension2_id', null, true, " ", false, 2); + } + if ($dim < 1) + hidden('dimension_id', 0); + if ($dim < 2) + hidden('dimension2_id', 0); -$dim = get_company_pref('use_dimension'); -if ($dim >= 1) -{ - table_section_title(_("Dimensions")); + table_section_title(_("GL Accounts")); - dimensions_list_row(_("Dimension")." 1", 'dimension_id', null, true, " ", false, 1); - if ($dim > 1) - dimensions_list_row(_("Dimension")." 2", 'dimension2_id', null, true, " ", false, 2); -} -if ($dim < 1) - hidden('dimension_id', 0); -if ($dim < 2) - hidden('dimension2_id', 0); + gl_all_accounts_list_row(_("Sales Account:"), 'sales_account', $_POST['sales_account']); -table_section_title(_("GL Accounts")); + if (!is_service($_POST['mb_flag'])) + { + gl_all_accounts_list_row(_("Inventory Account:"), 'inventory_account', $_POST['inventory_account']); + gl_all_accounts_list_row(_("C.O.G.S. Account:"), 'cogs_account', $_POST['cogs_account']); + gl_all_accounts_list_row(_("Inventory Adjustments Account:"), 'adjustment_account', $_POST['adjustment_account']); + } + else + { + gl_all_accounts_list_row(_("C.O.G.S. Account:"), 'cogs_account', $_POST['cogs_account']); + hidden('inventory_account', $_POST['inventory_account']); + hidden('adjustment_account', $_POST['adjustment_account']); + } -gl_all_accounts_list_row(_("Sales Account:"), 'sales_account', $_POST['sales_account']); -if (!is_service($_POST['mb_flag'])) -{ - gl_all_accounts_list_row(_("Inventory Account:"), 'inventory_account', $_POST['inventory_account']); - gl_all_accounts_list_row(_("C.O.G.S. Account:"), 'cogs_account', $_POST['cogs_account']); - gl_all_accounts_list_row(_("Inventory Adjustments Account:"), 'adjustment_account', $_POST['adjustment_account']); -} -else -{ - gl_all_accounts_list_row(_("C.O.G.S. Account:"), 'cogs_account', $_POST['cogs_account']); - hidden('inventory_account', $_POST['inventory_account']); - hidden('adjustment_account', $_POST['adjustment_account']); -} + if (is_manufactured($_POST['mb_flag'])) + gl_all_accounts_list_row(_("Item Assembly Costs Account:"), 'assembly_account', $_POST['assembly_account']); + else + hidden('assembly_account', $_POST['assembly_account']); + table_section_title(_("Other")); -if (is_manufactured($_POST['mb_flag'])) - gl_all_accounts_list_row(_("Item Assembly Costs Account:"), 'assembly_account', $_POST['assembly_account']); -else - hidden('assembly_account', $_POST['assembly_account']); + // Add image upload for New Item - by Joe + file_row(_("Image File (.jpg)") . ":", 'pic', 'pic'); + // Add Image upload for New Item - by Joe + $stock_img_link = ""; + $check_remove_image = false; + if (isset($_POST['NewStockID']) && file_exists(company_path().'/images/' + .item_img_name($_POST['NewStockID']).".jpg")) + { + // 31/08/08 - rand() call is necessary here to avoid caching problems. Thanks to Peter D. + $stock_img_link .= "[".$_POST["; + $check_remove_image = true; + } + else + { + $stock_img_link .= _("No image"); + } -table_section_title(_("Other")); + label_row(" ", $stock_img_link); + if ($check_remove_image) + check_row(_("Delete Image:"), 'del_image'); -// Add image upload for New Item - by Joe -file_row(_("Image File (.jpg)") . ":", 'pic', 'pic'); -// Add Image upload for New Item - by Joe -$stock_img_link = ""; -$check_remove_image = false; -if (isset($_POST['NewStockID']) && file_exists(company_path().'/images/' - .item_img_name($_POST['NewStockID']).".jpg")) -{ - // 31/08/08 - rand() call is necessary here to avoid caching problems. Thanks to Peter D. - $stock_img_link .= "[".$_POST["; - $check_remove_image = true; -} -else -{ - $stock_img_link .= _("No image"); + record_status_list_row(_("Item status:"), 'inactive'); + end_outer_table(1); + div_end(); + div_start('controls'); + if (!isset($_POST['NewStockID']) || $new_item) + { + submit_center('addupdate', _("Insert New Item"), true, '', 'default'); + } + else + { + submit_center_first('addupdate', _("Update Item"), '', + @$_REQUEST['popup'] ? true : 'default'); + submit_return('select', get_post('stock_id'), + _("Select this items and return to document entry."), 'default'); + submit('clone', _("Clone This Item"), true, '', true); + submit('delete', _("Delete This Item"), true, '', true); + submit_center_last('cancel', _("Cancel"), _("Cancel Edition"), 'cancel'); + } + + div_end(); } -label_row(" ", $stock_img_link); -if ($check_remove_image) - check_row(_("Delete Image:"), 'del_image'); - -record_status_list_row(_("Item status:"), 'inactive'); -end_outer_table(1); -div_end(); -div_start('controls'); -if (!isset($_POST['NewStockID']) || $new_item) +//-------------------------------------------------------------------------------------------- + +start_form(true); + +if (db_has_stock_items()) { - submit_center('addupdate', _("Insert New Item"), true, '', 'default'); -} -else + start_table(TABLESTYLE_NOBORDER); + start_row(); + stock_items_list_cells(_("Select an item:"), 'stock_id', null, + _('New item'), true, check_value('show_inactive')); + $new_item = get_post('stock_id')==''; + check_cells(_("Show inactive:"), 'show_inactive', null, true); + end_row(); + end_table(); + + if (get_post('_show_inactive_update')) { + $Ajax->activate('stock_id'); + set_focus('stock_id'); + } +} +else { - submit_center_first('addupdate', _("Update Item"), '', - @$_REQUEST['popup'] ? true : 'default'); - submit_return('select', get_post('stock_id'), - _("Select this items and return to document entry."), 'default'); - submit('clone', _("Clone This Item"), true, '', true); - submit('delete', _("Delete This Item"), true, '', true); - submit_center_last('cancel', _("Cancel"), _("Cancel Edition"), 'cancel'); + hidden('stock_id', get_post('stock_id')); } -div_end(); +if ($stock_id != "") + unset($_POST['_tabs_sel']); // force settings tab for new customer + +tabbed_content_start('tabs', array( + 'settings' => array(_('&General settings'), $stock_id), + 'movement' => array(_('&Movement'), $stock_id), + 'status' => array(_('&Status'), $stock_id), + )); + + switch (get_post('_tabs_sel')) { + default: + case 'settings': + item_settings($stock_id); + break; + case 'movement': + $_GET['stock_id'] = $stock_id; + $_GET['popup'] = 1; + $_SERVER['REQUEST_METHOD'] = 'GET'; + include_once($path_to_root."/inventory/inquiry/stock_movements.php"); + break; + case 'status': + $_GET['stock_id'] = $stock_id; + $_GET['popup'] = 1; + $_SERVER['REQUEST_METHOD'] = 'GET'; + include_once($path_to_root."/inventory/inquiry/stock_status.php"); + break; + }; +br(); +tabbed_content_end(); + + hidden('popup', @$_REQUEST['popup']); end_form(); diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php index 5eff15da..ffb264b5 100644 --- a/purchasing/inquiry/supplier_inquiry.php +++ b/purchasing/inquiry/supplier_inquiry.php @@ -11,19 +11,21 @@ ***********************************************************************/ $page_security = 'SA_SUPPTRANSVIEW'; $path_to_root = "../.."; -include($path_to_root . "/includes/db_pager.inc"); -include($path_to_root . "/includes/session.inc"); +include_once($path_to_root . "/includes/db_pager.inc"); +include_once($path_to_root . "/includes/session.inc"); -include($path_to_root . "/purchasing/includes/purchasing_ui.inc"); -include($path_to_root . "/reporting/includes/reporting.inc"); - -$js = ""; -if ($use_popup_windows) - $js .= get_js_open_window(900, 500); -if ($use_date_picker) - $js .= get_js_date_picker(); -page(_($help_context = "Supplier Inquiry"), isset($_GET['supplier_id']), false, "", $js); +include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc"); +include_once($path_to_root . "/reporting/includes/reporting.inc"); +if (!@$_GET['popup']) +{ + $js = ""; + if ($use_popup_windows) + $js .= get_js_open_window(900, 500); + if ($use_date_picker) + $js .= get_js_date_picker(); + page(_($help_context = "Supplier Inquiry"), isset($_GET['supplier_id']), false, "", $js); +} if (isset($_GET['supplier_id'])){ $_POST['supplier_id'] = $_GET['supplier_id']; } @@ -36,7 +38,8 @@ if (isset($_GET['ToDate'])){ //------------------------------------------------------------------------------------------------ -start_form(); +if (!@$_GET['popup']) + start_form(); if (!isset($_POST['supplier_id'])) $_POST['supplier_id'] = get_global_supplier(); @@ -44,7 +47,8 @@ if (!isset($_POST['supplier_id'])) start_table(TABLESTYLE_NOBORDER); start_row(); -supplier_list_cells(_("Select a supplier:"), 'supplier_id', null, true, false, false, !@$_REQUEST['popup']); +if (!@$_GET['popup']) + supplier_list_cells(_("Select a supplier:"), 'supplier_id', null, true, false, false, !@$_GET['popup']); date_cells(_("From:"), 'TransAfterDate', '', null, -30); date_cells(_("To:"), 'TransToDate'); @@ -123,7 +127,7 @@ function gl_view($row) function credit_link($row) { - if (@$_REQUEST['popup']) + if (@$_GET['popup']) return ''; return $row['type'] == ST_SUPPINVOICE && $row["TotalAmount"] - $row["Allocated"] > 0 ? pager_link(_("Credit This"), @@ -192,9 +196,9 @@ $table->width = "85%"; display_db_pager($table); -hidden('popup', @$_REQUEST['popup']); -end_form(); - -end_page(@$_REQUEST['popup'], false, false); - +if (!@$_GET['popup']) +{ + end_form(); + end_page(@$_GET['popup'], false, false); +} ?> diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php index 64b2cb5c..34ab0bae 100644 --- a/purchasing/manage/suppliers.php +++ b/purchasing/manage/suppliers.php @@ -149,17 +149,7 @@ function supplier_settings(&$supplier_id) table_section_title(_("General")); textarea_row(_("General Notes:"), 'notes', null, 35, 5); if ($supplier_id) - { record_status_list_row(_("Supplier status:"), 'inactive'); - if (!@$_REQUEST['popup']) - { - start_row(); - echo ' '; - echo viewer_link(''. _('Supplier Inquiry').'', "purchasing/inquiry/supplier_inquiry.php?supplier_id=$supplier_id&popup=1"); - echo "\n"; - end_row(); - } - } else { table_section_title(_("Contact Data")); text_row(_("Contact Person:"), 'contact', null, 42, 40); @@ -312,6 +302,7 @@ if (!$supplier_id) tabbed_content_start('tabs', array( 'settings' => array(_('&General settings'), $supplier_id), 'contacts' => array(_('&Contacts'), $supplier_id), + 'transactions' => array(_('&Supplier Inquiry'), $supplier_id), )); switch (get_post('_tabs_sel')) { @@ -323,6 +314,12 @@ tabbed_content_start('tabs', array( $contacts = new contacts('contacts', $supplier_id, 'supplier'); $contacts->show(); break; + case 'transactions': + $_GET['supplier_id'] = $supplier_id; + $_GET['popup'] = 1; + $_SERVER['REQUEST_METHOD'] = 'GET'; + include_once($path_to_root."/purchasing/inquiry/supplier_inquiry.php"); + break; case 'orders': }; br(); diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php index 0b3d2bfd..877b33e0 100644 --- a/sales/inquiry/customer_inquiry.php +++ b/sales/inquiry/customer_inquiry.php @@ -18,13 +18,15 @@ include_once($path_to_root . "/sales/includes/sales_ui.inc"); include_once($path_to_root . "/sales/includes/sales_db.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); -$js = ""; -if ($use_popup_windows) - $js .= get_js_open_window(900, 500); -if ($use_date_picker) - $js .= get_js_date_picker(); -page(_($help_context = "Customer Transactions"), isset($_GET['customer_id']), false, "", $js); - +if (!@$_GET['popup']) +{ + $js = ""; + if ($use_popup_windows) + $js .= get_js_open_window(900, 500); + if ($use_date_picker) + $js .= get_js_date_picker(); + page(_($help_context = "Customer Transactions"), isset($_GET['customer_id']), false, "", $js); +} if (isset($_GET['customer_id'])) { @@ -33,7 +35,8 @@ if (isset($_GET['customer_id'])) //------------------------------------------------------------------------------------------------ -start_form(); +if (!@$_GET['popup']) + start_form(); if (!isset($_POST['customer_id'])) $_POST['customer_id'] = get_global_customer(); @@ -41,7 +44,8 @@ if (!isset($_POST['customer_id'])) start_table(TABLESTYLE_NOBORDER); start_row(); -customer_list_cells(_("Select a customer: "), 'customer_id', null, true, false, false, !@$_REQUEST['popup']); +if (!@$_GET['popup']) + customer_list_cells(_("Select a customer: "), 'customer_id', null, true, false, false, !@$_GET['popup']); date_cells(_("From:"), 'TransAfterDate', '', null, -30); date_cells(_("To:"), 'TransToDate', '', null, 1); @@ -154,7 +158,7 @@ function fmt_credit($row) function credit_link($row) { - if (@$_REQUEST['popup']) + if (@$_GET['popup']) return ''; return $row['type'] == ST_SALESINVOICE && $row["Outstanding"] > 0 ? pager_link(_("Credit This") , @@ -165,7 +169,7 @@ function edit_link($row) { $str = ''; - if (@$_REQUEST['popup']) + if (@$_GET['popup']) return ''; switch($row['type']) { case ST_SALESINVOICE: @@ -250,9 +254,9 @@ $table->width = "85%"; display_db_pager($table); -hidden('popup', @$_REQUEST['popup']); -end_form(); - -end_page(@$_REQUEST['popup'], false, false); - +if (!@$_GET['popup']) +{ + end_form(); + end_page(@$_GET['popup'], false, false); +} ?> diff --git a/sales/manage/customers.php b/sales/manage/customers.php index 8a1066be..01b167d9 100644 --- a/sales/manage/customers.php +++ b/sales/manage/customers.php @@ -241,17 +241,7 @@ function customer_settings($selected_id) sales_types_list_row(_("Sales Type/Price List:"), 'sales_type', $_POST['sales_type']); if($selected_id) - { record_status_list_row(_("Customer status:"), 'inactive'); - if (!@$_REQUEST['popup']) - { - start_row(); - echo ' '; - echo viewer_link(''. _('Customer Transactions').'', "sales/inquiry/customer_inquiry.php?customer_id=$selected_id&popup=1"); - echo "\n"; - end_row(); - } - } elseif (isset($auto_create_branch) && $auto_create_branch == 1) { table_section_title(_("Branch")); @@ -347,6 +337,7 @@ if (!$selected_id) tabbed_content_start('tabs', array( 'settings' => array(_('&General settings'), $selected_id), 'contacts' => array(_('&Contacts'), $selected_id), + 'transactions' => array(_('Customer &Transactions'), $selected_id), )); switch (get_post('_tabs_sel')) { @@ -358,6 +349,12 @@ tabbed_content_start('tabs', array( $contacts = new contacts('contacts', $selected_id, 'customer'); $contacts->show(); break; + case 'transactions': + $_GET['customer_id'] = $selected_id; + $_GET['popup'] = 1; + $_SERVER['REQUEST_METHOD'] = 'GET'; + include_once($path_to_root."/sales/inquiry/customer_inquiry.php"); + break; case 'orders': }; br(); -- 2.30.2