From 37f4a02e0f4bea58e5b2097d583bf9395ffc515f Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Sat, 21 Jul 2007 09:06:28 +0000 Subject: [PATCH] Added option to handle Jalali and Islamic Calendars Changed parameters on report Sales Order. Option to print as Quote Added Budget Entry in General Ledger. Includes Dimensions --- CHANGELOG.txt | 38 +- applications/generalledger.php | 1 + config.php | 16 +- gl/gl_budget.php | 176 + gl/includes/db/gl_db_trans.inc | 7 +- includes/date_functions.inc | 488 +- includes/ui/ui_input.inc | 13 +- includes/ui/ui_lists.inc | 2 + includes/ui/ui_view.inc | 88 +- lang/en_US/LC_MESSAGES/en_US.mo | Bin 596 -> 600 bytes .../LC_MESSAGES/empty.po | 4053 +++++++++++++++-- purchasing/includes/ui/invoice_ui.inc | 12 +- purchasing/includes/ui/po_ui.inc | 4 +- purchasing/po_receive_items.php | 2 +- reporting/includes/doctext.inc | 2 +- reporting/includes/doctext2.inc | 2 +- reporting/includes/pdf_report.inc | 2 +- reporting/includes/reports_classes.inc | 4 +- reporting/rep109.php | 26 +- reporting/rep705.php | 6 +- reporting/reports_main.php | 1 + sales/includes/db/sales_order_db.inc | 6 +- sales/includes/ui/sales_order_ui.inc | 4 +- 23 files changed, 4506 insertions(+), 447 deletions(-) create mode 100644 gl/gl_budget.php diff --git a/CHANGELOG.txt b/CHANGELOG.txt index f24b17fd..b4c6a37f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,8 +19,42 @@ Legend: ! -> Note $ -> Affected files +-------------------- 1.12 Stable Released ---------------------- +21-Jul-2007 Joe Hunt + + Added option to handle Jalali and Islamic Calendars + ! Minor adjustments + $ config.php + /gl/includes/db/gl_db_trans.inc + /includes/date_functions.inc + /includes/ui/ui_input.inc + /includes/ui/ui_lists.inc + /includes/ui/ui_view.inc + /purchasing/po_receive_items.php + /purchasing/includes/ui/invoice_ui.inc + /purchasing/includes/ui/po_ui.inc + /reporting/rep705.php + /sales/includes/db/sales_order_db.inc + /sales/includes/ui/sales_order_ui.inc + +20-Jul-2007 Joe Hunt + ! Changed parameters on report Sales Order. Option to print as Quote. + $ /reporting/reports_main.php + /reporting/rep109.php + /reporting/includes/pdf_report.inc + /reporting/includes/doctext.inc + /reporting/includes/doctext2.inc + +19-Jul-2007 Joe Hunt + + Added Budget Entry in General Ledger. Includes Dimensions. + $ config.php + /applications/generalledger.php + /gl/gl_budget.php (New File!) + /gl/includes/db/gl_db_trans.inc + /includes/date_functions.inc + /reporting/report_classes.inc + -------------------- 1.11 Stable Released ---------------------- -04-jul-2007 Joe Hunt +04-Jul-2007 Joe Hunt ! Option for using alpha numeric chart of accounts. $ config.php /gl/manage/gl_accounts.php @@ -47,7 +81,6 @@ $ -> Affected files $ /includes/db/manufacturing_db.inc /manufacturing/includes/db/work_order_requirements_db.inc - 02-May-2007 Joe Hunt # Missing details on Purchase Order when emailing and printing $ /reporting/rep209.php @@ -76,7 +109,6 @@ $ -> Affected files install.html update.html (New file!) - 01-May-2007 Joe Hunt # Missing measure of units when printing sales orders # Update of Sales People caused a database error diff --git a/applications/generalledger.php b/applications/generalledger.php index 8c3cc731..3a715824 100644 --- a/applications/generalledger.php +++ b/applications/generalledger.php @@ -13,6 +13,7 @@ $this->add_lapp_function(0, _("Deposits"),"gl/gl_deposit.php?NewDeposit=Yes"); $this->add_lapp_function(0, _("Bank Account Transfers"),"gl/bank_transfer.php?"); $this->add_rapp_function(0, _("Journal Entry"),"gl/gl_journal.php?NewJournal=Yes"); + $this->add_rapp_function(0, _("Budget Entry"),"gl/gl_budget.php?"); $this->add_module(_("Inquiries and Reports")); $this->add_lapp_function(1, _("Bank Account Inquiry"),"gl/inquiry/bank_inquiry.php?"); diff --git a/config.php b/config.php index 0b26866e..6e0fced3 100644 --- a/config.php +++ b/config.php @@ -52,21 +52,21 @@ // Main Title $app_title = "FrontAccounting"; // application version - $version = "1.11"; + $version = "1.12"; // Build for development purposes - $build_version = "23"; + $build_version = "31"; // Powered by $power_by = "FrontAccounting"; - $power_url = "http://frontaccounting.com"; - - /* use popup windows for views */ - $use_popup_windows = 1; + $power_url = "http://frontaccounting.net/ftac"; /*Stock units array*/ $stock_units = array(_("ea."), _("m"), _("kgg"), _("tons"), _("l"), _("lbs"), _("dozen"), _("pack"), _("hrs")); + /* use popup windows for views */ + $use_popup_windows = 1; + /* use date picker for all date fields */ $use_date_picker = 1; @@ -78,6 +78,10 @@ /* default start-up tab (orders/AP/stock/manuf/proj/GL/system) */ $def_app = "orders"; + + /* Date systems. 0 = traditional, 1 = Jalali used by Iran, nabour countries, Afghanistan and some other Central Asian nations, + 2 = Islamic used by other arabic nations */ + $date_system = 0; $dateformats = array("MMDDYYYY", "DDMMYYYY", "YYYYMMDD"); $dateseps = array("/", ".", "-", " "); diff --git a/gl/gl_budget.php b/gl/gl_budget.php new file mode 100644 index 00000000..988e6026 --- /dev/null +++ b/gl/gl_budget.php @@ -0,0 +1,176 @@ + 0); +} + +function add_update_gl_budget_trans($date_, $account, $dimension, $dimension2, $amount) +{ + $date = date2sql($date_); + + if (exists_gl_budget($date, $account, $dimension, $dimension2)) + $sql = "UPDATE ".TB_PREF."budget_trans SET amount=$amount WHERE account='$account' AND + dimension_id=$dimension AND dimension2_id=$dimension2 AND tran_date='$date'"; + else + $sql = "INSERT INTO ".TB_PREF."budget_trans (tran_date, + account, dimension_id, dimension2_id, amount) VALUES ('$date', + '$account', $dimension, $dimension2, $amount)"; + + db_query($sql, "The GL budget transaction could not be saved"); +} + +function delete_gl_budget_trans($date_, $account, $dimension, $dimension2) +{ + $date = date2sql($date_); + + $sql = "DELETE FROM ".TB_PREF."budget_trans WHERE account='$account' AND + dimension_id=$dimension AND dimension2_id=$dimension2 AND tran_date='$date'"; + db_query($sql, "The GL budget transaction could not be deleted"); +} + +function get_only_budget_trans_from_to($from_date, $to_date, $account, $dimension=0, $dimension2=0) +{ + + $from = date2sql($from_date); + $to = date2sql($to_date); + + $sql = "SELECT SUM(amount) FROM ".TB_PREF."budget_trans + WHERE account='$account' AND tran_date >= '$from' AND tran_date <= '$to' + AND dimension_id = $dimension AND dimension2_id = $dimension2"; + $result = db_query($sql,"No budget accounts were returned"); + + $row = db_fetch_row($result); + return $row[0]; +} + +//------------------------------------------------------------------------------------- + +if (isset($_POST['add']) || isset($_POST['delete'])) +{ + begin_transaction(); + + for ($i = 0, $da = $_POST['begin']; date1_greater_date2($_POST['end'], $da); $i++) + { + if (isset($_POST['add'])) + add_update_gl_budget_trans($da, $_POST['account'], $_POST['dim1'], $_POST['dim2'], $_POST['amount'.$i]); + else + delete_gl_budget_trans($da, $_POST['account'], $_POST['dim1'], $_POST['dim2']); + $da = add_months($da, 1); + } + commit_transaction(); + + if (isset($_POST['add'])) + display_notification_centered(_("The Budget has been saved.")); + else + display_notification_centered(_("The Budget has been deleted.")); + + //meta_forward($_SERVER['PHP_SELF']); +} + +//------------------------------------------------------------------------------------- + +start_form(); + +if (db_has_gl_accounts()) +{ + $dim = get_company_pref('use_dimension'); + start_table($table_style2); + fiscalyears_list_row(_("Fiscal Year:"), 'fyear', null); + gl_all_accounts_list_row(_("Account Code:"), 'account', null); + if (!isset($_POST['dim1'])) + $_POST['dim1'] = 0; + if (!isset($_POST['dim2'])) + $_POST['dim2'] = 0; + if ($dim == 2) + { + dimensions_list_row(_("Dimension")." 1", 'dim1', $_POST['dim1'], true, null, false, 1); + dimensions_list_row(_("Dimension")." 2", 'dim2', $_POST['dim2'], true, null, false, 2); + } + else if ($dim == 1) + { + dimensions_list_row(_("Dimension"), 'dim1', $_POST['dim1'], true, null, false, 1); + hidden('dim2', 0); + } + else + { + hidden('dim1', 0); + hidden('dim2', 0); + } + submit_row('submit', _("Get")); + end_table(1); + start_table($table_style2); + $showdims = (($dim == 1 && $_POST['dim1'] == 0) || + ($dim == 2 && $_POST['dim1'] == 0 && $_POST['dim2'] == 0)); + if ($showdims) + $th = array(_("Period"), _("Amount"), _("Dim. incl."), _("Last Year")); + else + $th = array(_("Period"), _("Amount"), _("Last Year")); + table_header($th); + $year = $_POST['fyear']; + $sql = "SELECT * FROM ".TB_PREF."fiscal_year WHERE id=$year"; + + $result = db_query($sql, "could not get current fiscal year"); + + $fyear = db_fetch($result); + $begin = sql2date($fyear['begin']); + $end = sql2date($fyear['end']); + hidden('begin', $begin); + hidden('end', $end); + $total = $btotal = $ltotal = 0; + for ($i = 0, $date_ = $begin; date1_greater_date2($end, $date_); $i++) + { + start_row(); + $_POST['amount'.$i] = get_only_budget_trans_from_to($date_, $date_, $_POST['account'], $_POST['dim1'], $_POST['dim2']); + + label_cell($date_); + if (!isset($_POST['amount'.$i])) + $_POST['amount'.$i] = "0"; + text_cells(null, 'amount'.$i, null, 15); + if ($showdims) + { + $d = get_budget_trans_from_to($date_, $date_, $_POST['account'], $_POST['dim1'], $_POST['dim2']); + label_cell(number_format2($d, 0), "nowrap align=right"); + $btotal += $d; + } + $lamount = get_gl_trans_from_to(add_years($date_, -1), add_years(end_month($date_), -1), $_POST['account'], $_POST['dim1'], $_POST['dim2']); + $total += $_POST['amount'.$i]; + $ltotal += $lamount; + label_cell(number_format2($lamount, 0), "nowrap align=right"); + $date_ = add_months($date_, 1); + end_row(); + } + start_row(); + label_cell(""._("Total").""); + label_cell("".number_format2($total, 0).""); + if ($showdims) + label_cell("".number_format2($btotal, 0)."", "nowrap align=right"); + label_cell("".number_format2($ltotal, 0)."", "nowrap align=right"); + end_row(); + end_table(1); + submit_center_first('add', _("Save")); + submit_center_last('delete', _("Delete")); +} +end_form(); + +end_page(); + +?> diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc index d2e766ad..911fd58a 100644 --- a/gl/includes/db/gl_db_trans.inc +++ b/gl/includes/db/gl_db_trans.inc @@ -167,7 +167,7 @@ function get_budget_trans_from_to($from_date, $to_date, $account, $dimension=0, $to = date2sql($to_date); $sql = "SELECT SUM(amount) FROM ".TB_PREF."budget_trans - WHERE account=$account "; + WHERE account='$account' "; if ($from_date != "") $sql .= " AND tran_date >= '$from' "; if ($to_date != "") @@ -214,8 +214,9 @@ function add_journal_entries($items, $date_, $ref, $reverse, $memo_=null) if ($reverse) { - $reversingDate = date(user_date_display(), - Mktime(0,0,0,get_month($date_)+1,1,get_year($date_))); + //$reversingDate = date(user_date_display(), + // Mktime(0,0,0,get_month($date_)+1,1,get_year($date_))); + $reversingDate = begin_month(add_months($date_, 1)); $trans_id_reverse = get_next_trans_no($trans_type); diff --git a/includes/date_functions.inc b/includes/date_functions.inc index 9c51a68e..484d5a8e 100644 --- a/includes/date_functions.inc +++ b/includes/date_functions.inc @@ -10,6 +10,26 @@ this can be a string either "d/m/Y" for UK/Australia/New Zealand dates or */ +function __date($year, $month, $day) +{ + global $dateseps; + + $how = user_date_format(); + $sep = $dateseps[user_date_sep()]; + $day = (int)$day; + $month = (int)$month; + if ($day < 10) + $day = "0".$day; + if ($month < 10) + $month = "0".$month; + if ($how == 0) + return $month.$sep.$day.$sep.$year; + else if ($how == 1) + return $day.$sep.$month.$sep.$year; + else + return $year.$sep.$month.$sep.$day; +} + function is_date($date_) { global $dateseps; @@ -21,57 +41,62 @@ function is_date($date_) $date_ = trim($date_); $date_ = str_replace($sep, "", $date_); - if (strlen($date_) == 6) + if (strlen($date_) == 6) { - if ($how == 0) + if ($how == 0) { - $date_array[0] = substr($date_,2,2); - $date_array[1] = substr($date_,0,2); - $date_array[2] = substr($date_,4,2); + $day = substr($date_,2,2); + $month = substr($date_,0,2); + $year = substr($date_,4,2); } - elseif ($how == 1) + elseif ($how == 1) { - $date_array[0] = substr($date_,0,2); - $date_array[1] = substr($date_,2,2); - $date_array[2] = substr($date_,4,2); + $day = substr($date_,0,2); + $month = substr($date_,2,2); + $year = substr($date_,4,2); } - else + else { - $date_array[0] = substr($date_,2,2); - $date_array[1] = substr($date_,4,2); - $date_array[2] = substr($date_,0,2); + $day = substr($date_,4,2); + $month = substr($date_,2,2); + $year = substr($date_,0,2); } - } - elseif (strlen($date_) == 8) + } + elseif (strlen($date_) == 8) { - if ($how == 0) + if ($how == 0) { - $date_array[0] = substr($date_,2,2); - $date_array[1] = substr($date_,0,2); - $date_array[2] = substr($date_,4,4); + $day = substr($date_,2,2); + $month = substr($date_,0,2); + $year = substr($date_,4,4); } - elseif ($how == 1) + elseif ($how == 1) { - $date_array[0] = substr($date_,0,2); - $date_array[1] = substr($date_,2,2); - $date_array[2] = substr($date_,4,4); + $day = substr($date_,0,2); + $month = substr($date_,2,2); + $year = substr($date_,4,4); } - else + else { - $date_array[0] = substr($date_,6,2); - $date_array[1] = substr($date_,4,2); - $date_array[2] = substr($date_,0,4); + $day = substr($date_,6,2); + $month = substr($date_,4,2); + $year = substr($date_,0,4); } } - if ((int)$date_array[2] > 9999) + if ((int)$year > 9999) { return 0; } - if (is_long((int)$date_array[0]) && is_long((int)$date_array[1]) && is_long((int)$date_array[2])) + if (is_long((int)$day) && is_long((int)$month) && is_long((int)$year)) { - if (checkdate((int)$date_array[1],(int)$date_array[0],(int)$date_array[2])) + global $date_system; + if ($date_system == 1) + list($year, $month, $day) = jalali_to_gregorian($year, $month, $day); + else if ($date_system == 2) + list($year, $month, $day) = islamic_to_gregorian($year, $month, $day); + if (checkdate((int)$month, (int)$day, (int)$year)) { return 1; } @@ -86,10 +111,18 @@ function is_date($date_) } } //end of is_date function - function Today() { - return date(user_date_display()); + global $date_system; + + $year = date("Y"); + $month = date("n"); + $day = date("j"); + if ($date_system == 1) + list($year, $month, $day) = gregorian_to_jalali($year, $month, $day); + else if ($date_system == 2) + list($year, $month, $day) = gregorian_to_islamic($year, $month, $day); + return __date($year, $month, $day); } function Now() @@ -141,80 +174,116 @@ function end_fiscalyear() function begin_month($date) { - $date_array = explode_date_to_dmy($date); - return date(user_date_display(), Mktime(0,0,0, $date_array[1], 1, $date_array[2])); + global $date_system; + list($day, $month, $year) = explode_date_to_dmy($date); + if ($date_system == 1) + list($year, $month, $day) = gregorian_to_jalali($year, $month, $day); + else if ($date_system == 2) + list($year, $month, $day) = gregorian_to_islamic($year, $month, $day); + return __date($year, $month, 1); } -function enc_month($date) +function end_month($date) { - $date_array = explode_date_to_dmy($date); - return date(user_date_display(), Mktime(0,0,0, $date_array[1] + 1, 0, $date_array[2])); + global $date_system; + list($day, $month, $year) = explode_date_to_dmy($date); + if ($date_system == 1) + { + list($year, $month, $day) = gregorian_to_jalali($year, $month, $day); + $days_in_month = array(31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, ((((((($year - (($year > 0) ? 474 : 473)) % 2820) + 474) + 38) * 682) % 2816) < 682 ? 30 : 29)); + } + else if ($date_system == 2) + { + list($year, $month, $day) = gregorian_to_islamic($year, $month, $day); + $days_in_month = array(30, 29, 30, 29, 30, 29, 30, 29, 30, 29, 30, (((((11 * $year) + 14) % 30) < 11) ? 30 : 29)); + } + else // gregorian date + $days_in_month = array(31, ((!($year % 4 ) && (($year % 100) || !($year % 400)))?29:28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); + return __date($year, $month, $days_in_month[$month - 1]); } -function add_days($date, $days) // accepts - values as well +function add_days($date, $days) // accepts negative values as well { - $date_array = explode_date_to_dmy($date); - return date(user_date_display(), Mktime(0,0,0, $date_array[1], $date_array[0] + $days, $date_array[2])); + global $date_system; + list($day, $month, $year) = explode_date_to_dmy($date); + $timet = Mktime(0,0,0, $month, $day + $days, $year); + if ($date_system == 1 || $date_system == 2) + { + if ($date_system == 1) + list($year, $month, $day) = gregorian_to_jalali(date("Y", $timet), date("n", $timet), date("j", $timet)); + else if ($date_system == 2) + list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet)); + return __date($year, $month, $day); + } + return date(user_date_display(), $timet); } -function add_months($date, $months) +function add_months($date, $months) // accepts negative values as well { - $date_array = explode_date_to_dmy($date); - return date(user_date_display(), Mktime(0,0,0, $date_array[1] + $months, $date_array[0], $date_array[2])); + global $date_system; + list($day, $month, $year) = explode_date_to_dmy($date); + $timet = Mktime(0,0,0, $month + $months, $day, $year); + if ($date_system == 1 || $date_system == 2) + { + if ($date_system == 1) + list($year, $month, $day) = gregorian_to_jalali(date("Y", $timet), date("n", $timet), date("j", $timet)); + else if ($date_system == 2) + list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet)); + return __date($year, $month, $day); + } + return date(user_date_display(), $timet); } -function add_years($date, $years) +function add_years($date, $years) // accepts negative values as well { - $date_array = explode_date_to_dmy($date); - return date(user_date_display(), Mktime(0,0,0, $date_array[1], $date_array[0], $date_array[2] + $years)); + global $date_system; + list($day, $month, $year) = explode_date_to_dmy($date); + $timet = Mktime(0,0,0, $month, $day, $year + $years); + if ($date_system == 1 || $date_system == 2) + { + if ($date_system == 1) + list($year, $month, $day) = gregorian_to_jalali(date("Y", $timet), date("n", $timet), date("j", $timet)); + else if ($date_system == 2) + list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet)); + return __date($year, $month, $day); + } + return date(user_date_display(), $timet); } //_______________________________________________________________ function sql2date($date_) { - global $dateseps; + global $date_system; //for MySQL dates are in the format YYYY-mm-dd - $date_array = array(); - $how = user_date_format(); - $sep = $dateseps[user_date_sep()]; if ($date_ == null || strlen($date_) == 0) return ""; if (strpos($date_, "/")) { // In MySQL it could be either / or - - $date_array = explode("/",$date_); + list($year, $month, $day) = explode("/", $date_); } elseif (strpos ($date_, "-")) { - $date_array = explode("-",$date_); + list($year, $month, $day) = explode("-", $date_); } - if (strlen($date_array[2]) > 4) + if (strlen($day) > 4) { /*chop off the time stuff */ - $date_array[2]= substr($date_array[2],0,2); - } - - if ($how == 1) - { - return $date_array[2].$sep.$date_array[1].$sep.$date_array[0]; - } - elseif ($how == 0) - { - return $date_array[1].$sep.$date_array[2].$sep.$date_array[0]; - } - else - { - return $date_array[0].$sep.$date_array[1].$sep.$date_array[2]; + $day = substr($day, 0, 2); } - + if ($date_system == 1) + list($year, $month, $day) = gregorian_to_jalali($year, $month, $day); + else if ($date_system == 2) + list($year, $month, $day) = gregorian_to_islamic($year, $month, $day); + return __date($year, $month, $day); } // end function sql2date function date2sql($date_) { - global $dateseps; + global $dateseps, $date_system; /* takes a date in a the format specified in $DefaultDateFormat and converts to a yyyy/mm/dd format */ @@ -224,67 +293,73 @@ and converts to a yyyy/mm/dd format */ if ($date_ == null || strlen($date_) == 0) return ""; - $date_ =trim($date_); + $date_ = trim($date_); $date_ = str_replace($sep, "", $date_); if (strlen($date_) == 6) { if ($how == 0) { - $date_array[0] = substr($date_,2,2); - $date_array[1] = substr($date_,0,2); - $date_array[2] = substr($date_,4,2); + $day = substr($date_,2,2); + $month = substr($date_,0,2); + $year = substr($date_,4,2); } elseif ($how == 1) { - $date_array[0] = substr($date_,0,2); - $date_array[1] = substr($date_,2,2); - $date_array[2] = substr($date_,4,2); + $day = substr($date_,0,2); + $month = substr($date_,2,2); + $year = substr($date_,4,2); } else { - $date_array[0]= substr($date_,4,2); - $date_array[1]= substr($date_,2,2); - $date_array[2]= substr($date_,0,2); + $day = substr($date_,4,2); + $month = substr($date_,2,2); + $year = substr($date_,0,2); } } elseif (strlen($date_) == 8) { if ($how == 0) { - $date_array[0] = substr($date_,2,2); - $date_array[1] = substr($date_,0,2); - $date_array[2] = substr($date_,4,4); + $day = substr($date_,2,2); + $month = substr($date_,0,2); + $year = substr($date_,4,4); } elseif ($how == 1) { - $date_array[0] = substr($date_,0,2); - $date_array[1] = substr($date_,2,2); - $date_array[2] = substr($date_,4,4); + $day = substr($date_,0,2); + $month = substr($date_,2,2); + $year = substr($date_,4,4); } else { - $date_array[0] = substr($date_,6,2); - $date_array[1] = substr($date_,4,2); - $date_array[2] = substr($date_,0,4); + $day = substr($date_,6,2); + $month = substr($date_,4,2); + $year = substr($date_,0,4); } } //to modify assumption in 2030 - - if ((int)$date_array[2] < 60) + if ($date_system == 0) { - $date_array[2] = "20".$date_array[2]; - } - elseif ((int)$date_array[2] > 59 && (int)$date_array[2] < 100) - { - $date_array[2] = "19".$date_array[2]; - } - elseif ((int)$date_array[2] > 9999) + if ((int)$year < 60) + { + $year = "20".$year; + } + elseif ((int)$year > 59 && (int)$year < 100) + { + $year = "19".$year; + } + } + if ((int)$year > 9999) { return 0; } - return $date_array[2]."/".$date_array[1]."/".$date_array[0]; + if ($date_system == 1) + list($year, $month, $day) = jalali_to_gregorian($year, $month, $day); + else if ($date_system == 2) + list($year, $month, $day) = islamic_to_gregorian($year, $month, $day); + return $year."/".$month."/".$day; }// end of function function date1_greater_date2 ($date1, $date2) @@ -294,24 +369,22 @@ function date1_greater_date2 ($date1, $date2) $date1 = date2sql($date1); $date2 = date2sql($date2); - $date1_array = explode("/", $date1); - $date2_array = explode("/", $date2); - - /*The 0 element of the array will be the year in either d/m/Y or m/d/Y formats */ + list($year1, $month1, $day1) = explode("/", $date1); + list($year2, $month2, $day2) = explode("/", $date2); - if ($date1_array[0] > $date2_array[0]) + if ($year1 > $year2) { return 1; } - elseif ($date1_array[0] == $date2_array[0]) + elseif ($year1 == $year2) { - if ($date1_array[1] > $date2_array[1]) + if ($month1 > $month2) { return 1; } - elseif ($date1_array[1] == $date2_array[1]) + elseif ($month1 == $month2) { - if ($date1_array[2] > $date2_array[2]) + if ($day1 > $day2) { return 1; } @@ -330,75 +403,210 @@ provided that both dates are after 1970. Also only works for dates up to the yea $date1 = date2sql($date1); $date2 = date2sql($date2); - $date1_array = explode("/", $date1); - $date2_array = explode("/", $date2); + list($year1, $month1, $day1) = explode("/", $date1); + list($year2, $month2, $day2) = explode("/", $date2); - $date1_Stamp = mktime(0,0,0, (int)$date1_array[1],(int)$date1_array[2],(int)$date1_array[0]); - $date2_Stamp = mktime(0,0,0, (int)$date2_array[1],(int)$date2_array[2],(int)$date2_array[0]); - $difference = $date1_Stamp - $date2_Stamp; + $stamp1 = mktime(0,0,0, (int)$month1, (int)$day1, (int)$year1); + $stamp2 = mktime(0,0,0, (int)$month2, (int)$day2, (int)$year2); + $difference = $stamp1 - $stamp2; /* difference is the number of seconds between each date negative if date_ 2 > date_ 1 */ switch ($period) { case "d": - return (int) ($difference/(24*60*60)); - break; + return (int)($difference / (24 * 60 * 60)); case "w": - return (int) ($difference/(24*60*60*7)); - break; + return (int)($difference / (24 * 60 * 60 * 7)); case "m": - return (int) ($difference/(24*60*60*30)); - break; + return (int)($difference / (24 * 60 * 60 * 30)); case "s": return $difference; - break; case "y": - return (int) ($difference/(24*60*60*365.25)); - break; + return (int)($difference / (24 * 60 * 60 * 365.25)); default: Return 0; } } -Function explode_date_to_dmy($date_) +function explode_date_to_dmy($date_) { - $date_ = date2sql($date_); - if ($date_ == "") + $date = date2sql($date_); + if ($date == "") { $disp = user_date_display(); echo "
Dates must be entered in the format $disp. Sent was $date_
"; exit; } - $date_array = explode("/", $date_); - $temp = $date_array[0]; - $date_array[0] = $date_array[2]; - $date_array[2] = $temp; - return $date_array; + list($year, $month, $day) = explode("/", $date); + return array($day, $month, $year); } -Function get_day($date_) +function div($a, $b) { - $date_array = explode_date_to_dmy($date_); - - return $date_array[0]; + return (int) ($a / $b); } +/* Based on convertor to and from Gregorian and Jalali calendars. + Copyright (C) 2000 Roozbeh Pournader and Mohammad Toossi + Released under GNU General Public License */ -Function get_month($date_) +function gregorian_to_jalali ($g_y, $g_m, $g_d) { - $date_array = explode_date_to_dmy($date_); + $g_days_in_month = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); + $j_days_in_month = array(31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29); + + $gy = $g_y - 1600; + $gm = $g_m - 1; + $gd = $g_d - 1; + + $g_day_no = 365 * $gy + div($gy + 3, 4) - div($gy + 99, 100) + div($gy + 399, 400); + + for ($i = 0; $i < $gm; ++$i) + $g_day_no += $g_days_in_month[$i]; + if ($gm > 1 && (($gy % 4 == 0 && $gy % 100 != 0) || ($gy % 400 == 0))) + /* leap and after Feb */ + $g_day_no++; + $g_day_no += $gd; + $j_day_no = $g_day_no - 79; + + $j_np = div($j_day_no, 12053); /* 12053 = 365*33 + 32/4 */ + $j_day_no %= 12053; - return $date_array[1]; + $jy = 979 + 33 * $j_np + 4 * div($j_day_no, 1461); /* 1461 = 365*4 + 4/4 */ + + $j_day_no %= 1461; + + if ($j_day_no >= 366) + { + $jy += div($j_day_no - 1, 365); + $j_day_no = ($j_day_no - 1) % 365; + } + + for ($i = 0; $i < 11 && $j_day_no >= $j_days_in_month[$i]; ++$i) + $j_day_no -= $j_days_in_month[$i]; + $jm = $i + 1; + $jd = $j_day_no + 1; + + return array($jy, $jm, $jd); } -Function get_year($date_) +function jalali_to_gregorian($j_y, $j_m, $j_d) { - $date_array = explode_date_to_dmy($date_); + $g_days_in_month = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); + $j_days_in_month = array(31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29); - return $date_array[2]; -} + $jy = $j_y - 979; + $jm = $j_m - 1; + $jd = $j_d - 1; + + $j_day_no = 365 * $jy + div($jy, 33) * 8 + div($jy % 33 + 3, 4); + for ($i = 0; $i < $jm; ++$i) + $j_day_no += $j_days_in_month[$i]; + + $j_day_no += $jd; + + $g_day_no = $j_day_no + 79; + + $gy = 1600 + 400 * div($g_day_no, 146097); /* 146097 = 365*400 + 400/4 - 400/100 + 400/400 */ + $g_day_no %= 146097; + + $leap = true; + if ($g_day_no >= 36525) /* 36525 = 365*100 + 100/4 */ + { + $g_day_no--; + $gy += 100 * div($g_day_no, 36524); /* 36524 = 365*100 + 100/4 - 100/100 */ + $g_day_no %= 36524; + if ($g_day_no >= 365) + $g_day_no++; + else + $leap = false; + } + $gy += 4 * div($g_day_no, 1461); /* 1461 = 365*4 + 4/4 */ + $g_day_no %= 1461; + if ($g_day_no >= 366) + { + $leap = false; + $g_day_no--; + $gy += div($g_day_no, 365); + $g_day_no %= 365; + } + + for ($i = 0; $g_day_no >= $g_days_in_month[$i] + ($i == 1 && $leap); $i++) + $g_day_no -= $g_days_in_month[$i] + ($i == 1 && $leap); + $gm = $i + 1; + $gd = $g_day_no + 1; + + return array($gy, $gm, $gd); +} +/* Based on Hidri Date Script + Released under GNU General Public License */ +function gregorian_to_islamic($g_y, $g_m, $g_d) +{ + $y = $g_y; + $m = $g_m; + $d = $g_d; + if (($y > 1582) || (($y == 1582) && ($m > 10)) || (($y == 1582) && + ($m == 10) && ($d > 14))) + { + $jd = (int)((1461 * ($y + 4800 + (int)(($m - 14) / 12)))/ 4) + + (int)((367 * ($m - 2 - 12 * ((int)(($m - 14) / 12)))) / 12) - + (int)((3 * ((int)(($y + 4900 + (int)(($m - 14) / 12)) / 100))) / 4) + $d - 32075; + } + else + { + $jd = 367 * $y - (int)((7 * ($y + 5001 + (int)(($m - 9) / 7))) / 4) + + (int)((275 * $m) / 9) + $d + 1729777; + } + $l = $jd - 1948440 + 10632; + $n = (int)(($l - 1) / 10631); + $l = $l - 10631 * $n + 354; + $j = ((int)((10985 - $l) / 5316)) * ((int)((50 * $l) / 17719)) + + ((int)($l / 5670)) * ((int)((43 * $l) / 15238)); + $l = $l - ((int)((30 - $j) / 15)) * ((int)((17719 * $j) / 50)) - + ((int)($j / 16)) * ((int)((15238 * $j) / 43)) + 29; + $m = (int)((24 * $l) / 709); + $d = $l - (int)((709 * $m) / 24); + $y = 30 * $n + $j - 30; + return array($y, $m, $d); +} + +function islamic_to_gregorian($i_y, $i_m, $i_d) +{ + $y = $i_y; + $m = $i_m; + $d = $i_d; + + $jd = (int)((11 * $y + 3) / 30) + 354 * $y + 30 * $m - (int)(($m - 1) / 2) + $d + 1948440 - 385; + if ($jd > 2299160) + { + $l = $jd + 68569; + $n = (int)((4 * $l) / 146097); + $l = $l - (int)((146097 * $n + 3) / 4); + $i = (int)((4000 * ($l + 1)) / 1461001); + $l = $l - (int)((1461 * $i) / 4) + 31; + $j = (int)((80 * $l) / 2447); + $d = $l - (int)((2447 * $j) / 80); + $l= (int)($j / 11); + $m = $j + 2 - 12 * $l; + $y = 100 * ($n - 49) + $i + $l; + } + else + { + $j = $jd + 1402; + $k = (int)(($j - 1) / 1461); + $l = $j - 1461 * $k; + $n = (int)(($l - 1) / 365) - (int)($l / 1461); + $i = $l - 365 * $n + 30; + $j = (int)((80 * $i) / 2447); + $d = $i - (int)((2447 * $j) / 80); + $i = (int)($j / 11); + $m = $j + 2 - 12 * $i; + $y = 4 * $k + $n + $i - 4716; + } + return array($y, $m, $d); +} ?> diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc index e1b03b34..0220b7be 100644 --- a/includes/ui/ui_input.inc +++ b/includes/ui/ui_input.inc @@ -244,8 +244,17 @@ function date_cells($label, $name, $init=null, $inc_days=0, $inc_months=0, $inc_ { if ($inc_years == 1001) $_POST[$name] = null; - else - $_POST[$name] = date(user_date_display(), Mktime(0,0,0,date("m") + $inc_months,date("d") + $inc_days,date("Y") + $inc_years)); + else + { + $dd = Today(); + if ($inc_days != 0) + $dd = add_days($dd, $inc_days); + if ($inc_months != 0) + $dd = add_months($dd, $inc_months); + if ($inc_years != 0) + $dd = add_years($dd, $inc_years); + $_POST[$name] = $dd; + } } else $_POST[$name] = $init; diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc index f0c268e9..56290071 100644 --- a/includes/ui/ui_lists.inc +++ b/includes/ui/ui_lists.inc @@ -393,6 +393,8 @@ function fiscalyears_list($name, &$selected_id, $submit_on_change=false) $how = _('Active'); else $how = _('Closed'); + $row[1] = sql2date($row[1]); + $row[2] = sql2date($row[2]); echo $row[1] . " - " . $row[2] . "  " . $how . "\n"; } diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index e5afafbb..a2e96564 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -623,19 +623,18 @@ function get_js_png_fix() function get_js_date_picker() { - global $dateseps; - //global $dateseps $path_to_root; - - //$encoding = "iso-8859-1"; // character encoding - //$encoding = $_SESSION['language']->encoding; // character encoding - //$dir = "ltr"; // left to right, right to left - //$dir = $_SESSION['language']->dir; // left to right, right to left + global $dateseps, $date_system; + $how = user_date_format(); // 0 = us/ca, 1 = eu, au, nz, 2 = jp, sw $sep = $dateseps[user_date_sep()]; // date separator - $wstart = ($how == 0 ? 0 : 1); // weekstart (sun = 0, mon = 1) + $wstart = (($date_system == 1 || $date_system == 2) ? 6 : ($how == 0 ? 0 : 1)); // weekstart (sun = 0, mon = 1) $months = array(_("January"),_("February"),_("March"),_("April"),_("May"),_("June"),_("July"),_("August"),_("September"),_("October"),_("November"),_("December")); $wdays = array(_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa")); $back = _("Back"); + if ($date_system == 1) + list($cyear, $cmon, $cday) = gregorian_to_jalali(date("Y"), date("n"), date("j")); + else if ($date_system == 2) + list($cyear, $cmon, $cday) = gregorian_to_islamic(date("Y"), date("n"), date("j")); $js = "