[Frontaccounting-cvs_updates] /hgrepo/f/fr/frontaccounting/frontaccounting: Changed popup to t...
Brought to you by:
frontaccounting,
itronics
Menu
▾
▴
[Frontaccounting-cvs_updates] /hgrepo/f/fr/frontaccounting/frontaccounting: Changed popup to t...
|
From: FrontAccounting <fro...@us...> - 2011-11-01 00:39:56
|
details: http://frontaccounting.hg.sourceforge.net:8000/hgroot/frontaccounting/frontaccounting/hgrepo/f/fr/frontaccounting/frontaccounting/rev/24eefe857960 changeset: 2910:24eefe857960 user: Joe Hunt <joe...@gm...> date: Tue Nov 01 01:39:18 2011 +0100 description: Changed popup to tabs in customers, suppliers, items for transactions. diffstat: inventory/inquiry/stock_movements.php | 28 +- inventory/inquiry/stock_status.php | 28 +- inventory/manage/items.php | 394 ++++++++++++++++--------------- 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, 300 insertions(+), 262 deletions(-) diffs (truncated from 802 to 300 lines): diff -r c255f100f70d -r 24eefe857960 inventory/inquiry/stock_movements.php --- a/inventory/inquiry/stock_movements.php Sat Oct 29 22:37:09 2011 +0200 +++ b/inventory/inquiry/stock_movements.php Tue Nov 01 01:39:18 2011 +0100 @@ -18,13 +18,15 @@ 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 @@ $_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 @@ 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_table(1); div_end(); -end_page(@$_REQUEST['popup'], false, false); +if (!@$_GET['popup']) + end_page(@$_GET['popup'], false, false); ?> diff -r c255f100f70d -r 24eefe857960 inventory/inquiry/stock_status.php --- a/inventory/inquiry/stock_status.php Sat Oct 29 22:37:09 2011 +0200 +++ b/inventory/inquiry/stock_status.php Tue Nov 01 01:39:18 2011 +0100 @@ -13,13 +13,16 @@ $path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -if (isset($_GET['stock_id'])){ +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']; - page(_($help_context = "Inventory Item Status"), true); -} else { - page(_($help_context = "Inventory Item Status")); -} - 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 @@ 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 "<center> " . _("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 "<br>"; echo "<hr></center>"; @@ -115,7 +120,10 @@ end_table(); div_end(); -end_form(); -end_page(@$_REQUEST['popup'], false, false); +if (!@$_GET['popup']) +{ + end_form(); + end_page(@$_GET['popup'], false, false); +} ?> diff -r c255f100f70d -r 24eefe857960 inventory/manage/items.php --- a/inventory/manage/items.php Sat Oct 29 22:37:09 2011 +0200 +++ b/inventory/manage/items.php Tue Nov 01 01:39:18 2011 +0100 @@ -16,7 +16,7 @@ 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 @@ 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 @@ 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,6 +243,181 @@ $Ajax->activate('_page_body'); } } + +function item_settings($stock_id) +{ + global $SysPrefs, $path_to_root, $new_item, $pic_height; + + div_start('details'); + + start_outer_table(TABLESTYLE2); + + table_section(1); + + 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"]; + } + label_row(_("Item Code:"),$_POST['NewStockID']); + hidden('NewStockID', $_POST['NewStockID']); + set_focus('description'); + } + + text_row(_("Name:"), 'description', null, 52, 200); + + textarea_row(_('Description:'), 'long_description', null, 42, 3); + + stock_categories_list_row(_("Category:"), 'category_id', null, false, $new_item); + + if ($new_item && (list_updated('category_id') || !isset($_POST['units']))) { + + $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; + + } + $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); + + stock_item_types_list_row(_("Item Type:"), 'mb_flag', null, $fresh_item); + + stock_units_list_row(_('Units of Measure:'), 'units', null, $fresh_item); + + check_row(_("Editable description:"), 'editable'); + + check_row(_("Exclude from sales:"), 'no_sale'); + + table_section(2); + + $dim = get_company_pref('use_dimension'); + if ($dim >= 1) + { + table_section_title(_("Dimensions")); + + 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); + + table_section_title(_("GL Accounts")); + + 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")); + + // 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 .= "<img id='item_img' alt = '[".$_POST['NewStockID'].".jpg". + "]' src='".company_path().'/images/'.item_img_name($_POST['NewStockID']). |