Thread: [Frontaccounting-cvs_updates] /hgroot/frontaccounting/frontaccounting: Changed hardcoded trans...
Brought to you by:
frontaccounting,
itronics
From: FrontAccounting <fro...@us...> - 2012-04-09 09:33:17
|
details: http://frontaccounting.hg.sourceforge.net:8000/hgroot/frontaccounting/frontaccounting/hgroot/frontaccounting/frontaccounting/rev/5974923eeedf changeset: 3004:5974923eeedf user: Joe Hunt <joe...@gm...> date: Mon Apr 09 11:32:29 2012 +0200 description: Changed hardcoded trans days in inquiries (30) to be a user preference. diffstat: admin/display_prefs.php | 4 +++- gl/inquiry/bank_inquiry.php | 2 +- gl/inquiry/gl_account_inquiry.php | 2 +- gl/inquiry/gl_trial_balance.php | 2 +- gl/inquiry/profit_loss.php | 2 +- gl/inquiry/tax_inquiry.php | 2 +- gl/view/accrual_trans.php | 2 +- includes/current_user.inc | 6 ++++++ includes/prefs/userprefs.inc | 12 ++++++++++-- inventory/inquiry/stock_movements.php | 2 +- purchasing/includes/ui/invoice_ui.inc | 3 ++- purchasing/inquiry/po_search.php | 2 +- purchasing/inquiry/po_search_completed.php | 2 +- purchasing/inquiry/supplier_allocation_inquiry.php | 2 +- purchasing/inquiry/supplier_inquiry.php | 2 +- sales/inquiry/customer_allocation_inquiry.php | 2 +- sales/inquiry/customer_inquiry.php | 2 +- sales/inquiry/sales_deliveries_view.php | 2 +- sales/inquiry/sales_orders_view.php | 2 +- sql/alter2.4.sql | 3 ++- sql/en_US-demo.sql | 5 +++-- sql/en_US-new.sql | 1 + 22 files changed, 42 insertions(+), 22 deletions(-) diffs (truncated from 317 to 300 lines): diff -r 9f6f9ac5ce67 -r 5974923eeedf admin/display_prefs.php --- a/admin/display_prefs.php Mon Apr 09 10:13:30 2012 +0200 +++ b/admin/display_prefs.php Mon Apr 09 11:32:29 2012 +0200 @@ -40,7 +40,7 @@ 'theme', 'page_size', 'language', 'startup_tab', 'show_gl' => 0, 'show_codes'=> 0, 'show_hints' => 0, 'rep_popup' => 0, 'graphic_links' => 0, 'sticky_doc_date' => 0, - 'query_size' => 10.0))); + 'query_size' => 10.0, 'transaction_days' => 30))); if ($chg_lang) $_SESSION['language']->set_language($_POST['language']); @@ -137,6 +137,8 @@ check_row(_("Remember last document date:"), 'sticky_doc_date', sticky_doc_date(), false, _('If set document date is remembered on subsequent documents, otherwise default is current date')); +text_row_ex(_("Transaction days:"), 'transaction_days', 5, 5, '', user_transaction_days()); + end_outer_table(1); submit_center('setprefs', _("Update"), true, '', 'default'); diff -r 9f6f9ac5ce67 -r 5974923eeedf gl/inquiry/bank_inquiry.php --- a/gl/inquiry/bank_inquiry.php Mon Apr 09 10:13:30 2012 +0200 +++ b/gl/inquiry/bank_inquiry.php Mon Apr 09 11:32:29 2012 +0200 @@ -46,7 +46,7 @@ start_row(); bank_accounts_list_cells(_("Account:"), 'bank_account', null); -date_cells(_("From:"), 'TransAfterDate', '', null, -30); +date_cells(_("From:"), 'TransAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("To:"), 'TransToDate'); submit_cells('Show',_("Show"),'','', 'default'); diff -r 9f6f9ac5ce67 -r 5974923eeedf gl/inquiry/gl_account_inquiry.php --- a/gl/inquiry/gl_account_inquiry.php Mon Apr 09 10:13:30 2012 +0200 +++ b/gl/inquiry/gl_account_inquiry.php Mon Apr 09 11:32:29 2012 +0200 @@ -68,7 +68,7 @@ start_table(TABLESTYLE_NOBORDER); start_row(); gl_all_accounts_list_cells(_("Account:"), 'account', null, false, false, _("All Accounts")); - date_cells(_("from:"), 'TransFromDate', '', null, -30); + date_cells(_("from:"), 'TransFromDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("to:"), 'TransToDate'); end_row(); end_table(); diff -r 9f6f9ac5ce67 -r 5974923eeedf gl/inquiry/gl_trial_balance.php --- a/gl/inquiry/gl_trial_balance.php Mon Apr 09 10:13:30 2012 +0200 +++ b/gl/inquiry/gl_trial_balance.php Mon Apr 09 11:32:29 2012 +0200 @@ -46,7 +46,7 @@ start_table(TABLESTYLE_NOBORDER); - date_cells(_("From:"), 'TransFromDate', '', null, -30); + date_cells(_("From:"), 'TransFromDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("To:"), 'TransToDate'); if ($dim >= 1) dimensions_list_cells(_("Dimension")." 1:", 'Dimension', null, true, " ", false, 1); diff -r 9f6f9ac5ce67 -r 5974923eeedf gl/inquiry/profit_loss.php --- a/gl/inquiry/profit_loss.php Mon Apr 09 10:13:30 2012 +0200 +++ b/gl/inquiry/profit_loss.php Mon Apr 09 11:32:29 2012 +0200 @@ -160,7 +160,7 @@ $dim = get_company_pref('use_dimension'); start_table(TABLESTYLE_NOBORDER); - date_cells(_("From:"), 'TransFromDate', '', null, -30); + date_cells(_("From:"), 'TransFromDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("To:"), 'TransToDate'); //Compare Combo diff -r 9f6f9ac5ce67 -r 5974923eeedf gl/inquiry/tax_inquiry.php --- a/gl/inquiry/tax_inquiry.php Mon Apr 09 10:13:30 2012 +0200 +++ b/gl/inquiry/tax_inquiry.php Mon Apr 09 11:32:29 2012 +0200 @@ -58,7 +58,7 @@ start_table(TABLESTYLE_NOBORDER); start_row(); - date_cells(_("from:"), 'TransFromDate', '', null, -30); + date_cells(_("from:"), 'TransFromDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("to:"), 'TransToDate'); submit_cells('Show',_("Show"),'','', 'default'); diff -r 9f6f9ac5ce67 -r 5974923eeedf gl/view/accrual_trans.php --- a/gl/view/accrual_trans.php Mon Apr 09 10:13:30 2012 +0200 +++ b/gl/view/accrual_trans.php Mon Apr 09 11:32:29 2012 +0200 @@ -64,7 +64,7 @@ table_header($th); $end = $_GET['date']; $account = $_GET['act']; -$begin = add_days($end, -30); +$begin = add_days($end, -$_SESSION["wa_current_user"]->prefs->transaction_days()); $result = get_gl_transactions($begin, $end, -1, $account, 0, 0, null); $j = 0; diff -r 9f6f9ac5ce67 -r 5974923eeedf includes/current_user.inc --- a/includes/current_user.inc Mon Apr 09 10:13:30 2012 +0200 +++ b/includes/current_user.inc Mon Apr 09 11:32:29 2012 +0200 @@ -434,6 +434,12 @@ return $_SESSION["wa_current_user"]->prefs->start_up_tab(); } +function user_transaction_days() +{ + return $_SESSION["wa_current_user"]->prefs->transaction_days(); +} + + function user_check_access($sec_area) { return $_SESSION["wa_current_user"]->can_access($sec_area); diff -r 9f6f9ac5ce67 -r 5974923eeedf includes/prefs/userprefs.inc --- a/includes/prefs/userprefs.inc Mon Apr 09 10:13:30 2012 +0200 +++ b/includes/prefs/userprefs.inc Mon Apr 09 11:32:29 2012 +0200 @@ -35,7 +35,8 @@ var $graphic_links; // use graphic links var $sticky_date; // save date on subsequent document entry var $startup_tab; // default start-up menu tab - + var $transaction_days; // transaction days in inquiries. + function user_prefs($user=null) { if ($user == null) { @@ -49,7 +50,8 @@ $this->price_dec = 2; $this->language = $dflt_lang; $this->theme = 'default'; - + $this->transaction_days = -30; + } else { $this->language = $user["language"]; $_SESSION['language']->set_language($this->language); @@ -82,6 +84,7 @@ $this->sticky_date = 0; $this->startup_tab = "orders"; } + $this->transaction_days = $user['transaction_days']; } } @@ -222,6 +225,11 @@ return $this->startup_tab; } + function transaction_days() + { + return $this->transaction_days; + } + function set_dec($price_dec, $qty_dec, $exrate_dec, $percent_dec, $showgl, $showcodes) { $this->price_dec = $price_dec; diff -r 9f6f9ac5ce67 -r 5974923eeedf inventory/inquiry/stock_movements.php --- a/inventory/inquiry/stock_movements.php Mon Apr 09 10:13:30 2012 +0200 +++ b/inventory/inquiry/stock_movements.php Mon Apr 09 11:32:29 2012 +0200 @@ -55,7 +55,7 @@ locations_list_cells(_("From Location:"), 'StockLocation', null); -date_cells(_("From:"), 'AfterDate', '', null, -30); +date_cells(_("From:"), 'AfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("To:"), 'BeforeDate'); submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), 'default'); diff -r 9f6f9ac5ce67 -r 5974923eeedf purchasing/includes/ui/invoice_ui.inc --- a/purchasing/includes/ui/invoice_ui.inc Mon Apr 09 10:13:30 2012 +0200 +++ b/purchasing/includes/ui/invoice_ui.inc Mon Apr 09 11:32:29 2012 +0200 @@ -468,7 +468,8 @@ if ($supp_trans->trans_type == ST_SUPPCREDIT) { echo "</td>"; - date_cells(_("Received between"), 'receive_begin', "", null, -30, 0, 0, "valign=middle"); + date_cells(_("Received between"), 'receive_begin', "", null, + -$_SESSION["wa_current_user"]->prefs->transaction_days(), 0, 0, "valign=middle"); date_cells(_("and"), 'receive_end', '', null, 1, 0, 0, "valign=middle"); submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true); echo "<td>"; diff -r 9f6f9ac5ce67 -r 5974923eeedf purchasing/inquiry/po_search.php --- a/purchasing/inquiry/po_search.php Mon Apr 09 10:13:30 2012 +0200 +++ b/purchasing/inquiry/po_search.php Mon Apr 09 11:32:29 2012 +0200 @@ -61,7 +61,7 @@ start_row(); ref_cells(_("#:"), 'order_number', '',null, '', true); -date_cells(_("from:"), 'OrdersAfterDate', '', null, -30); +date_cells(_("from:"), 'OrdersAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("to:"), 'OrdersToDate'); locations_list_cells(_("Location:"), 'StockLocation', null, true); diff -r 9f6f9ac5ce67 -r 5974923eeedf purchasing/inquiry/po_search_completed.php --- a/purchasing/inquiry/po_search_completed.php Mon Apr 09 10:13:30 2012 +0200 +++ b/purchasing/inquiry/po_search_completed.php Mon Apr 09 11:32:29 2012 +0200 @@ -59,7 +59,7 @@ start_row(); ref_cells(_("#:"), 'order_number', '',null, '', true); -date_cells(_("from:"), 'OrdersAfterDate', '', null, -30); +date_cells(_("from:"), 'OrdersAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("to:"), 'OrdersToDate'); locations_list_cells(_("into location:"), 'StockLocation', null, true); diff -r 9f6f9ac5ce67 -r 5974923eeedf purchasing/inquiry/supplier_allocation_inquiry.php --- a/purchasing/inquiry/supplier_allocation_inquiry.php Mon Apr 09 10:13:30 2012 +0200 +++ b/purchasing/inquiry/supplier_allocation_inquiry.php Mon Apr 09 11:32:29 2012 +0200 @@ -47,7 +47,7 @@ supplier_list_cells(_("Select a supplier: "), 'supplier_id', $_POST['supplier_id'], true); -date_cells(_("From:"), 'TransAfterDate', '', null, -30); +date_cells(_("From:"), 'TransAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("To:"), 'TransToDate', '', null, 1); supp_allocations_list_cell("filterType", null); diff -r 9f6f9ac5ce67 -r 5974923eeedf purchasing/inquiry/supplier_inquiry.php --- a/purchasing/inquiry/supplier_inquiry.php Mon Apr 09 10:13:30 2012 +0200 +++ b/purchasing/inquiry/supplier_inquiry.php Mon Apr 09 11:32:29 2012 +0200 @@ -47,7 +47,7 @@ if (!$page_nested) supplier_list_cells(_("Select a supplier:"), 'supplier_id', null, true, false, false, true); -date_cells(_("From:"), 'TransAfterDate', '', null, -30); +date_cells(_("From:"), 'TransAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("To:"), 'TransToDate'); supp_transactions_list_cell("filterType", null, true); diff -r 9f6f9ac5ce67 -r 5974923eeedf sales/inquiry/customer_allocation_inquiry.php --- a/sales/inquiry/customer_allocation_inquiry.php Mon Apr 09 10:13:30 2012 +0200 +++ b/sales/inquiry/customer_allocation_inquiry.php Mon Apr 09 11:32:29 2012 +0200 @@ -41,7 +41,7 @@ customer_list_cells(_("Select a customer: "), 'customer_id', $_POST['customer_id'], true); -date_cells(_("from:"), 'TransAfterDate', '', null, -30); +date_cells(_("from:"), 'TransAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("to:"), 'TransToDate', '', null, 1); cust_allocations_list_cells(_("Type:"), 'filterType', null); diff -r 9f6f9ac5ce67 -r 5974923eeedf sales/inquiry/customer_inquiry.php --- a/sales/inquiry/customer_inquiry.php Mon Apr 09 10:13:30 2012 +0200 +++ b/sales/inquiry/customer_inquiry.php Mon Apr 09 11:32:29 2012 +0200 @@ -43,7 +43,7 @@ if (!$page_nested) customer_list_cells(_("Select a customer: "), 'customer_id', null, true, false, false, !@$_GET['popup']); -date_cells(_("From:"), 'TransAfterDate', '', null, -30); +date_cells(_("From:"), 'TransAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("To:"), 'TransToDate', '', null, 1); if (!isset($_POST['filterType'])) diff -r 9f6f9ac5ce67 -r 5974923eeedf sales/inquiry/sales_deliveries_view.php --- a/sales/inquiry/sales_deliveries_view.php Mon Apr 09 10:13:30 2012 +0200 +++ b/sales/inquiry/sales_deliveries_view.php Mon Apr 09 11:32:29 2012 +0200 @@ -101,7 +101,7 @@ start_table(TABLESTYLE_NOBORDER); start_row(); ref_cells(_("#:"), 'DeliveryNumber', '',null, '', true); -date_cells(_("from:"), 'DeliveryAfterDate', '', null, -30); +date_cells(_("from:"), 'DeliveryAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("to:"), 'DeliveryToDate', '', null, 1); locations_list_cells(_("Location:"), 'StockLocation', null, true); diff -r 9f6f9ac5ce67 -r 5974923eeedf sales/inquiry/sales_orders_view.php --- a/sales/inquiry/sales_orders_view.php Mon Apr 09 10:13:30 2012 +0200 +++ b/sales/inquiry/sales_orders_view.php Mon Apr 09 11:32:29 2012 +0200 @@ -225,7 +225,7 @@ ref_cells(_("Ref"), 'OrderReference', '',null, '', true); if ($show_dates) { - date_cells(_("from:"), 'OrdersAfterDate', '', null, -30); + date_cells(_("from:"), 'OrdersAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("to:"), 'OrdersToDate', '', null, 1); } locations_list_cells(_("Location:"), 'StockLocation', null, true); diff -r 9f6f9ac5ce67 -r 5974923eeedf sql/alter2.4.sql --- a/sql/alter2.4.sql Mon Apr 09 10:13:30 2012 +0200 +++ b/sql/alter2.4.sql Mon Apr 09 11:32:29 2012 +0200 @@ -44,4 +44,5 @@ WHERE tr.`type`=td.trans_type AND tr.trans_no=td.trans_no AND td.included_in_price ALTER TABLE `0_bank_accounts` ADD COLUMN `bank_charge_act` varchar(15) NOT NULL DEFAULT '' AFTER `id`; UPDATE `0_bank_accounts` SET `bank_charge_act`=(SELECT `value` FROM 0_sys_prefs WHERE name='bank_charge_act'); - \ No newline at end of file +ALTER TABLE `0_users` ADD `transaction_days` INT( 6 ) NOT NULL COMMENT 'Transaction days' AFTER `startup_tab`; +UPDATE `0_users` SET `transaction_days`=30; diff -r 9f6f9ac5ce67 -r 5974923eeedf sql/en_US-demo.sql --- a/sql/en_US-demo.sql Mon Apr 09 10:13:30 2012 +0200 +++ b/sql/en_US-demo.sql Mon Apr 09 11:32:29 2012 +0200 @@ -2322,6 +2322,7 @@ `rep_popup` tinyint(1) default '1', `sticky_doc_date` tinyint(1) default '0', `startup_tab` varchar(20) NOT NULL default '', + `transaction_days` smallint(6) NOT NULL default '0', `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `user_id` (`user_id`) @@ -2331,8 +2332,8 @@ -- Dumping data for table `0_users` -- -INSERT INTO `0_users` VALUES(1, 'admin', '5f4dcc3b5aa765d61d8327deb882cf99', 'Administrator', 2, '', 'ad...@ad...', 'en_US', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 4, 1, 1, 0, 0, '2010-05-11 23:27:46', 10, 1, 1, '1', 1, 0, 'orders', 0); |