Merged changes from main CVS (up to 2.2.10)
authorJanusz Dobrowolski <janusz@frontaccounting.eu>
Sun, 13 Jun 2010 16:33:37 +0000 (16:33 +0000)
committerJanusz Dobrowolski <janusz@frontaccounting.eu>
Sun, 13 Jun 2010 16:33:37 +0000 (16:33 +0000)
19 files changed:
CHANGELOG.txt
admin/payment_terms.php
config.default.php
gl/includes/ui/gl_bank_ui.inc
gl/includes/ui/gl_journal_ui.inc
includes/current_user.inc
includes/ui/allocation_cart.inc
includes/ui/ui_input.inc
js/behaviour.js
js/inserts.js
reporting/includes/excel_report.inc
reporting/includes/reports_classes.inc
reporting/rep704.php
sales/customer_credit_invoice.php
sales/includes/db/cust_trans_db.inc
sales/view/view_sales_order.php
sql/en_US-demo.sql
sql/en_US-new.sql
update.html

index 40c22395e2ce30e2cce78142213d64d80c79be3c..8fa1511313954a92693a03b82462bc28961c23ba 100644 (file)
@@ -19,6 +19,60 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+13-Jun-2010 Merged changes from main trunk (2.2.10) as follows
+------------------------------- Release 2.2.10 ----------------------------------
+11-Jun-2010 Joe Hunt
+! Release 2.2.10
+$ config.default.php
+  update.html
+  
+10-Jun-2010 Joe Hunt
+! Changed Wiki help url and site url in config.default.php
+$ config.default.php
+
+07-Jun-2010 Joe Hunt
+# HTML decode text when printing to Excel.
+$ /reporting/includes/excel_report.inc
+
+06-Jun-2010 Janusz Dobrowolski
+# False overallocation fixed.
+$ /includes/ui/allocation_cart.inc
++ Allowed optional long timeout on default/cancel/selector buttons
+$ /includes/ui/ui_input.inc
+  /js/behaviour.js
+  /js/inserts.js
+# Long ajax timeout on all reports
+$ /reporting/includes/reports_classes.inc
+# [0000232] Fixed list of related invoices/credits in SO view.
+$ /sales/view/view_sales_order.php
+# Small bug on final screen redirection
+$ /sales/customer_credit_invoice.php
+
+03-Jun-2010 Joe Hunt
+# Rounding bug when decimals greater than or equal to 6.
+$ /includes/current_user.inc
+
+31-May-2010 Joe Hunt
+# No limit on 30 days in Payment terms if end of month.
+$ /admin/payment_terms.php
+
+30-May-2010 Joe Hunt
+! Global variabel, $def_print_destination, config.php can be set to 0 or 1
+$ config.default.php
+  /reporting/includes/reports_classes.inc
+! copy line memo to next line in journal entries and bank payments/deposits
+$ /gl/includes/ui/gl_bank_ui.inc
+  /gl/includes/ui/gl_journal_ui.inc
+! Report GL Transactions now prints line memos
+$ /reporting/rep704.php
+
+29-May-2010 Janusz Dobrowolski
+# Smaller fixes initial COAs
+$ /sql/en_US-demo.sql
+  /sql/en_US-new.sql
+
+---------- End of changes from main trunk 2.2.7-2.2.9
+
 05-Jun-2010 Joe Hunt
 ! Allowing SA_MULTIFISCALYEAR access to enter transactions on open fiscal years
 $ /admin/db/fiscalyears_db.inc
index 4e07c6e4a95706d9fe7e76e13d537361dc8d891d..e58a9fded3bf811a622c8a11887524673229e7a4 100644 (file)
@@ -36,13 +36,13 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
                $inpug_error = 1;
                display_error( _("The Terms description must be entered."));
                set_focus('terms');
-       } 
-       elseif ($_POST['DayNumber'] > 30 && !check_value('DaysOrFoll')) 
-       {
-               $inpug_error = 1;
-               display_error( _("When the check box to indicate a day in the following month is the due date, the due date cannot be a day after the 30th. A number between 1 and 30 is expected."));
-               set_focus('DayNumber');
-       } 
+       } // there should be no limits by 30 here if they want longer payment terms. Joe Hunt 2010-05-31
+       //elseif ($_POST['DayNumber'] > 30 && !check_value('DaysOrFoll')) 
+       //{
+       //      $inpug_error = 1;
+       //      display_error( _("When the check box to indicate a day in the following month is the due date, the due date cannot be a day after the 30th. A number between 1 and 30 is expected."));
+       //      set_focus('DayNumber');
+       //
        elseif ($_POST['DayNumber'] > 500 && check_value('DaysOrFoll')) 
        {
                $inpug_error = 1;
index 44b0d8e252a21d39b6f085091cd4cde265bd6840..747d6f26b9fe20b6b56a14d020e8ab599de03a9f 100644 (file)
@@ -56,7 +56,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        // Main Title
        $app_title = "FrontAccounting";
        // application version
-       $version                = "2.3 CVS (m9)";
+       $version                = "2.3 CVS (m10)";
         // src-data compatibility check. Do not change.
        $core_version = "2.3";
 
@@ -65,7 +65,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 
        // Powered by
        $power_by               = "FrontAccounting";
-       $power_url              = "http://frontaccounting.net";
+       $power_url              = "http://frontaccounting.com";
 
        /* use popup windows for views */
        $use_popup_windows = 1;
@@ -82,13 +82,16 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        /* show users online discretely in the footer */
        $show_users_online = 0;
 
+       /* default print destination. 0 = PDF/Printer, 1 = Excel */
+       $def_print_destination = 0;
+
        // Wiki context help configuration
        // If your help wiki use translated page titles uncomment next line
        // $old_style_help = 1; // this setting is depreciated and subject to removal in next FA versions
        //      locally installed wiki module
        // $help_base_url = $path_to_root.'/modules/wiki/index.php?n='._('Help').'.';
        //      context help feed from frontaccounting.net
-       // $help_base_url = 'http://frontaccounting.net/fawiki/index.php?n=Help.';
+       // $help_base_url = 'http://frontaccounting.com/fawiki/index.php?n=Help.';
        //      not used
        $help_base_url = null;
 
index 1c36613c64b024ecffcb8e22189a5460187bd18f..0e624f377cbe80590b89d30d731c36ce8b2274df 100644 (file)
@@ -209,7 +209,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
                $_POST['amount'] = price_format(0);
                $_POST['dimension_id'] = 0;
                $_POST['dimension2_id'] = 0;
-               $_POST['LineMemo'] = "";
+               //$_POST['LineMemo'] = ""; // let memo go to next line Joe Hunt 2010-05-30
                if(isset($_POST['_code_id_update'])) {
                            $Ajax->activate('code_id');
                }
index f48e5178135e1c41ca461db454feaded350ad36f..8c4aec6ae44d2b27e7db29c0c6013add32e4a7b4 100644 (file)
@@ -193,7 +193,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
                $_POST['AmountCredit'] = ''; //price_format(0);
                $_POST['dimension_id'] = 0;
                $_POST['dimension2_id'] = 0;
-               $_POST['LineMemo'] = "";
+               //$_POST['LineMemo'] = ""; // let memo go to next line Joe Hunt 2010-05-30
                $_POST['_code_id_edit'] = "";
                $_POST['code_id'] = "";
                if(isset($_POST['_code_id_update'])) {
index 8a167e3ffe7acb0dd7ae39a6f0cff2cde818ac1b..c1c68e439a287070a98d1d543b9a2566b7eca056 100644 (file)
@@ -183,7 +183,7 @@ class current_user
 
 function round2($number, $decimals=0)
 {
-       $delta = ($number < 0 ? -.000001 : .000001);
+       $delta = ($number < 0 ? -.0000000001 : .0000000001);
        return round($number+$delta, $decimals);
 }
 
@@ -193,7 +193,7 @@ function number_format2($number, $decimals=0)
        $tsep = $thoseps[$_SESSION["wa_current_user"]->prefs->tho_sep()];
        $dsep = $decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()];
        //return number_format($number, $decimals, $dsep,       $tsep);
-       $delta = ($number < 0 ? -.000001 : .000001);
+       $delta = ($number < 0 ? -.0000000001 : .0000000001);
        return number_format($number+$delta, $decimals, $dsep,  $tsep);
 }
 //
index 8d1e400186f5ce06ae83ec2bcde5170d2b4e4f98..0446600213998e7213bbeac7f3235b4d943d8d3e 100644 (file)
@@ -330,7 +330,7 @@ function check_allocations()
 
                  /*Now check to see that the AllocAmt is no greater than the
                 amount left to be allocated against the transaction under review */
-                if (input_num('amount' . $counter) > get_post('un_allocated' . $counter))
+                if (input_num('amount' . $counter) > input_num('un_allocated' . $counter))
                 {
                        display_error(_("At least one transaction is overallocated."));
                        set_focus('amount'.$counter);
index 36f99e9ce01bf0e7bd5fc69095c14a804bd3ea59..00bae3128d7ecf0829b150615e436fa19648781e 100644 (file)
@@ -107,35 +107,43 @@ function hidden($name, $value=null, $echo=true)
                null  - button visible only in fallback mode; optional icon
         Ajax submit:
                true      - standard button; optional icon
-               'process' - displays progress bar during call; optional icon
+
                'default' - default form submit on Ctrl-Enter press; dflt ICON_OK icon
                'selector' - ditto with closing current popup editor window
                'cancel'  - cancel form entry on Escape press; dflt ICON_CANCEL
+               'process' - displays progress bar during call; optional icon
+
+       $atype can contain also multiply type selectors separated by space, 
+       however make sense only combination of 'process' and one of defualt/selector/cancel
 */
 function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=false)
 {
        global $path_to_root;
 
        $aspect='';
-       if (!is_bool($atype)) // necessary: switch uses '=='
-         switch($atype) {
-               case 'process':
-                       $aspect = " aspect='process'"; break;
-               case 'selector':
-                       $aspect = " aspect='selector' rel = '$value'"; 
-                       $value = _("Select");
-                       if ($icon===false) $icon=ICON_SUBMIT; break;
-               case 'default':
-                       $aspect = " aspect='default'"; 
-                       if ($icon===false) $icon=ICON_SUBMIT; break;
-               case 'cancel':
-                       $aspect = " aspect='cancel'"; 
-                       if ($icon===false) $icon=ICON_ESCAPE; break;
-               case null: 
-                       $aspect = fallback_mode() ? 
-                               " aspect='fallback'" : " style='display:none;'"; break;
-        }
+       if ($atype === null) {
+               $aspect = fallback_mode() ? " aspect='fallback'" : " style='display:none;'";
+
+       } elseif (!is_bool($atype)) { // necessary: switch uses '=='
+
+               $aspect = "aspect='$atype' ";
+               $types = explode(' ', $atype);
 
+               foreach ($types as $type) {
+                       switch($type) {
+                               case 'selector':
+                                       $aspect = " aspect='selector' rel = '$value'"; 
+                                       $value = _("Select");
+                                       if ($icon===false) $icon=ICON_SUBMIT; break;
+
+                               case 'default':
+                                       if ($icon===false) $icon=ICON_SUBMIT; break;
+
+                               case 'cancel':
+                                       if ($icon===false) $icon=ICON_ESCAPE; break;
+                       }
+               }
+       }
        $submit_str = "<button class=\""
            .($atype ? 'ajaxsubmit' : 'inputsubmit')
                ."\" type=\"submit\""
index a5ed0480fa74a9b3845fe734b11c79f95672de0d..b225ca204f76609385c51aa0af0dc49f0e1213fa 100644 (file)
@@ -200,19 +200,19 @@ document.getElementsBySelector = function(selector) {
           checkFunction = function(e) { return (e.getAttribute(attrName) == attrValue); };
           break;
         case '~': // Match one of space seperated words 
-          checkFunction = function(e) { return (e.getAttribute(attrName).match(new RegExp('\\b'+attrValue+'\\b'))); };
+          checkFunction = function(e) { var a=e.getAttribute(attrName); return (a && a.match(new RegExp('\\b'+attrValue+'\\b'))); };
           break;
         case '|': // Match start with value followed by optional hyphen
-          checkFunction = function(e) { return (e.getAttribute(attrName).match(new RegExp('^'+attrValue+'-?'))); };
+          checkFunction = function(e) { var a=e.getAttribute(attrName); return (a && a.match(new RegExp('^'+attrValue+'-?'))); };
           break;
         case '^': // Match starts with value
-          checkFunction = function(e) { return (e.getAttribute(attrName).indexOf(attrValue) == 0); };
+          checkFunction = function(e) { var a=e.getAttribute(attrName); return (a && a.indexOf(attrValue) == 0); };
           break;
         case '$': // Match ends with value - fails with "Warning" in Opera 7
-          checkFunction = function(e) { return (e.getAttribute(attrName).lastIndexOf(attrValue) == e.getAttribute(attrName).length - attrValue.length); };
+          checkFunction = function(e) { var a=e.getAttribute(attrName); return (a && a.lastIndexOf(attrValue) == e.getAttribute(attrName).length - attrValue.length); };
           break;
-        case '*': // Match ends with value
-          checkFunction = function(e) { return (e.getAttribute(attrName).indexOf(attrValue) > -1); };
+        case '*': // Match contains value
+          checkFunction = function(e) { var a=e.getAttribute(attrName); return (a && a.indexOf(attrValue) > -1); };
           break;
         default :
           // Just test for existence of attribute
index e01c806a5f35407c0b311455706e44896441a209..4513d2e84de8c57b758c48c588c1fc4cf3df85d3 100644 (file)
@@ -220,10 +220,11 @@ var inserts = {
        function(e) {
                    e.onclick = function() {
                            save_focus(e);
-                                       if (e.getAttribute('aspect') == 'process')
-                                               JsHttpRequest.request(this, null, 60000);
-                                       else
-                                               JsHttpRequest.request(this);
+                           var asp = e.getAttribute('aspect')
+                               if (asp && asp.indexOf('process') !== -1)
+                                       JsHttpRequest.request(this, null, 60000);
+                               else
+                                       JsHttpRequest.request(this);
                                return false;
                    }
        },
@@ -265,7 +266,7 @@ var inserts = {
                                }
                        }
        },
-       'button[aspect=selector], button[aspect=abort], input[aspect=selector]': function(e) {
+       'button[aspect*selector], button[aspect*abort], input[aspect*selector]': function(e) {
                e.onclick = function() {
                        passBack(this.getAttribute('rel'));
                        return false;
@@ -301,7 +302,7 @@ var inserts = {
        'a.printlink':  function(l) {
                l.onclick = function() {
                    save_focus(this);
-                       JsHttpRequest.request(this);
+                       JsHttpRequest.request(this, null, 60000);
                        return false;
                }
        },
@@ -411,13 +412,19 @@ function setHotKeys() {
                                for (var i=0; i<form.elements.length; i++){
                                        var el = form.elements[i];
                                        var asp = el.getAttribute('aspect');
-                                       if (el.className!='editbutton' && asp=='selector' && (key==13 || key==27)) {
+                                       
+
+                                       if (el.className!='editbutton' && (asp && asp.indexOf('selector') !== -1) && (key==13 || key==27)) {
                                                passBack(key==13 ? el.getAttribute('rel') : false);
                                                ev.returnValue = false;
                                                return false;
                                        }
-                                       if ((asp=='default' && key==13)||(asp=='cancel' && key==27)) {
-                                               JsHttpRequest.request(el);
+                                       if (((asp && asp.indexOf('default') !== -1) && key==13)||((asp && asp.indexOf('cancel') !== -1) && key==27)) {
+
+                                               if (asp.indexOf('process') !== -1)
+                                                       JsHttpRequest.request(el, null, 60000);
+                                               else
+                                                       JsHttpRequest.request(el);
                                                ev.returnValue = false;
                                                return false;
                                        }
index 15b63c472db807f74fa2c12ac25a1b37d4336d11..ecffc7d3bba2401636e441d2cb46a76cb8c162ed 100644 (file)
@@ -523,6 +523,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 
        function TextCol($c, $n, $txt, $corr=0, $r=0, $border=0, $fill=0, $link=NULL, $stretch=0)
        {
+               $txt = html_entity_decode($txt);        
                if ($this->aligns[$c] == 'right')
                        $this->sheet->writeString($this->y, $c, $txt, $this->formatRight);
                else    
@@ -556,6 +557,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 
        function TextCol2($c, $n, $txt, $corr=0, $r=0, $border=0, $fill=0, $link=NULL, $stretch=0)
        {
+               $txt = html_entity_decode($txt);        
                $this->sheet->writeString($this->y, $c, $txt, $this->formatLeft);
                if ($n - $c > 1)
                        $this->sheet->mergeCells($this->y, $c, $this->y, $n - 1);
index 51012b11a487ecaf3bb2b3b3013b7e586284585b..cffe6cb3e793f6fab0f85100fb0a51bcf7171fc0 100644 (file)
@@ -81,7 +81,7 @@ class BoxReports
                                                . "<form method='POST' action='$action' target='_blank'>\n";
                                        $st_params .= submit('Rep'.$report->id,  
                                                _("Display: ") . access_string($report->name, true),
-                                               false, '', $pdf_debug ? false : 'default') . hidden('REP_ID', $report->id, false).'<br><br>';
+                                               false, '', $pdf_debug ? false : 'default process') . hidden('REP_ID', $report->id, false).'<br><br>';
                                        $st_params .= $this->getOptions($report->get_controls());
                                        $st_params .= "\n</form></td></tr></table>\n";
                                        set_focus('Rep'.$report->id);
@@ -164,7 +164,7 @@ class BoxReports
        //
        function get_ctrl($name, $type)
        {
-               global $path_to_root, $use_date_picker, $pdf_debug, $print_invoice_no;
+               global $path_to_root, $use_date_picker, $pdf_debug, $print_invoice_no, $def_print_destination;
 
                $st = '';
                        switch ($type)
@@ -221,7 +221,10 @@ class BoxReports
 
                                case 'DESTINATION':
                                        $sel = array(_("PDF/Printer"), "Excel");
-                                       return array_selector($name, null, $sel);
+                                       $def = 0;
+                                       if (isset($def_print_destination) && $def_print_destination == 1)
+                                               $def = 1;
+                                       return array_selector($name, $def, $sel);
 
                                case 'COMPARE':
                                        $sel = array(_("Accumulated"), _("Period Y-1"), _("Budget"));
index ff39ccd16cd99bfac58f8d27ceb2660401ff6259..08391fbd07b51c491c9d0b1495c0340cf50f5c77 100644 (file)
@@ -157,7 +157,16 @@ function print_GL_transactions()
                                        $rep->TextCol(4, 5,     get_dimension_string($myrow['dimension_id']));
                                if ($dim > 1)
                                        $rep->TextCol(5, 6,     get_dimension_string($myrow['dimension2_id']));
-                               $rep->TextCol(6, 7,     payment_person_name($myrow["person_type_id"],$myrow["person_id"], false));
+                               $txt = payment_person_name($myrow["person_type_id"],$myrow["person_id"], false);
+                               $memo = $myrow['memo_'];
+                               if ($txt != "")
+                               {
+                                       if ($memo != "")
+                                               $txt = $txt."/".$memo;
+                               }
+                               else
+                                       $txt = $memo;
+                               $rep->TextCol(6, 7,     $txt, -2);
                                if ($myrow['amount'] > 0.0)
                                        $rep->AmountCol(7, 8, abs($myrow['amount']), $dec);
                                else
index c86f82b3dde26c2889dd8e7454fa41d8b9aab6cf..c086d431fb0eb57532e022784d520438f4b3383c 100644 (file)
@@ -206,7 +206,7 @@ function copy_from_cart()
 
 if (isset($_POST['ProcessCredit']) && can_process()) {
 
-    $newcredit = ($_SESSION['Items']->trans_no == 0);
+    $new_credit = ($_SESSION['Items']->trans_no == 0);
 
     if (!isset($_POST['WriteOffGLCode']))
                $_POST['WriteOffGLCode'] = 0;
@@ -215,8 +215,8 @@ if (isset($_POST['ProcessCredit']) && can_process()) {
        if ($new_credit) new_doc_date($_SESSION['Items']->document_date);
     $credit_no = $_SESSION['Items']->write($_POST['WriteOffGLCode']);
 
-       processing_end();
-       if ($newcredit) {
+       processing_end();exit;
+       if ($new_credit) {
                meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no");
        } else {
                meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$credit_no");
index ab560acefd2cf6e9105656d8a9b84a3573ce19fe..59115d8756083cfdc3e54cb8c7fc8b39881f60c9 100644 (file)
@@ -304,6 +304,20 @@ function get_related_documents($type, $trans_no)
 }
 //----------------------------------------------------------------------------------------
 
+function get_related_credits($inv_numbers)
+{
+       // FIXME -  credit notes retrieved here should be those linked to invoices containing 
+       // at least one line from this order
+       
+       $sql = "SELECT * FROM ".TB_PREF."debtor_trans WHERE type=".ST_CUSTCREDIT
+               ." AND trans_link IN(". implode(',', array_values($inv_numbers)).")";
+
+       $result = db_query($sql,"The related credit notes could not be retreived");
+
+}
+
+//----------------------------------------------------------------------------------------
+
 function get_customer_details_from_trans($type, $type_no)
 {
        $sql = "SELECT ".TB_PREF."debtors_master.name, ".TB_PREF."debtors_master.curr_code, ".TB_PREF."cust_branch.br_name
index 5f5c67712e0ae618945efabcddaf1adafef37fa2..6f70b4173e6fa9fa9130c0335b14bb2b0222615f 100644 (file)
@@ -98,12 +98,13 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
 
        $delivery_total = 0;
        $k = 0;
-
+       $dn_numbers = array();
+       
        while ($del_row = db_fetch($result))
        {
 
                alt_table_row_color($k);
-
+               $dn_numbers[] = $del_row["trans_link"];
                $this_total = $del_row["ov_freight"]+ $del_row["ov_amount"] + $del_row["ov_freight_tax"]  + $del_row["ov_gst"] ;
                $delivery_total += $this_total;
 
@@ -125,11 +126,15 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
 
        $th = array(_("#"), _("Ref"), _("Date"), _("Total"));
        table_header($th);
+       
+       $sql = "SELECT * FROM ".TB_PREF."debtor_trans WHERE type=".ST_SALESINVOICE
+               ." AND trans_no IN(". implode(',', array_values($dn_numbers)).")";
 
        $result = get_related_documents(ST_SALESINVOICE, $_GET['trans_no']);
 
        $invoices_total = 0;
        $k = 0;
+       $inv_numbers = array();
 
        while ($inv_row = db_fetch($result))
        {
@@ -139,6 +144,7 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
                $this_total = $inv_row["ov_freight"] + $inv_row["ov_freight_tax"]  + $inv_row["ov_gst"] + $inv_row["ov_amount"];
                $invoices_total += $this_total;
 
+               $inv_numbers[] = $inv_row["trans_no"];
                label_cell(get_customer_trans_view_str($inv_row["type"], $inv_row["trans_no"]));
                label_cell($inv_row["reference"]);
                label_cell(sql2date($inv_row["tran_date"]));
@@ -157,7 +163,7 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
        $th = array(_("#"), _("Ref"), _("Date"), _("Total"));
        table_header($th);
 
-       $result = get_related_documents(ST_CUSTCREDIT, $_GET['trans_no']);
+       $result = get_related_credits($inv_numbers);
 
        $credits_total = 0;
        $k = 0;
index bc24f3fc1b72d729a879e5a8b1af47a24855e064..0236cea6524ebe4074df879b377173af76e87148 100644 (file)
@@ -826,8 +826,6 @@ INSERT INTO `0_fiscal_year` VALUES(1, '2008-01-01', '2008-12-31', 0);
 INSERT INTO `0_fiscal_year` VALUES(2, '2009-01-01', '2009-12-31', 0);
 INSERT INTO `0_fiscal_year` VALUES(3, '2010-01-01', '2010-12-31', 0);
 
--- --------------------------------------------------------
-
 --
 -- Table structure for table `0_gl_trans`
 --
index a9455510976deee0bb5db0d908bd7f5b9fec2e79..730b1e1d07b5f324c57644d862ae36d94fe1564c 100644 (file)
@@ -468,7 +468,6 @@ CREATE TABLE IF NOT EXISTS `0_crm_contacts` (
 -- Dumping data for table `0_crm_contacts`
 --
 
-
 -- --------------------------------------------------------
 
 --
@@ -763,8 +762,7 @@ CREATE TABLE IF NOT EXISTS `0_fiscal_year` (
 
 INSERT INTO `0_fiscal_year` VALUES(1, '2008-01-01', '2008-12-31', 0);
 INSERT INTO `0_fiscal_year` VALUES(2, '2009-01-01', '2009-12-31', 0);
-
--- --------------------------------------------------------
+INSERT INTO `0_fiscal_year` VALUES(3, '2010-01-01', '2010-12-31', 0);
 
 --
 -- Table structure for table `0_gl_trans`
index 5544853ef95161795c0d1784b3f41f6c50149a60..1d31aa0f80a1a0e56d3066d01644176af5bbd5e0 100644 (file)
@@ -18,7 +18,7 @@ these files. </li></ul><ol>
         </ol>
 
       </li><li>Upload all the new files.
-      </li><li>Look into the file, <span style="font-weight: bold; font-style: italic;">config.default.php and compare with your own config.php</span> file. You should update the the following in your config.php:<br /><br /></li><ul><li><small>Change the $version in your <span style="font-weight: bold;">config.php</span> file, about line 59, from "2.X.X" to "2.2.9".<br /><br />if this is an update from 2.2.6, 2.2.7, 2.2.8 to 2.2.9&nbsp;</small><small> </small><small>you are<span style="font-weight: bold;"> </span><span style="font-style: italic; font-weight: bold;">done and &nbsp;should ignore the the rest of the items in this note</span>.</small></li><li><small>Copy &nbsp;the 2 lines from config.default file, about line &nbsp;122:<br /><br /><span style="font-family: monospace;">$table_style &nbsp;&nbsp;&nbsp; = "class='tablestyle'";</span><br style="font-family: monospace;" /><span style="font-family: monospace;">$table_style2 &nbsp;&nbsp;&nbsp; = "class='tablestyle2'";</span><br style="font-family: monospace;" /><br />into&nbsp;config.php about line &nbsp;122 and replace these 4 lines:<br /><br /><span style="font-family: monospace;">if (!isset($_SESSION['bordercolor']))</span><br style="font-family: monospace;" /><span style="font-family: monospace;">&nbsp;&nbsp;&nbsp; $_SESSION['bordercolor'] = "#8cacbb";</span><br style="font-family: monospace;" /><span style="font-family: monospace;">$table_style &nbsp;&nbsp;&nbsp; = "cellpadding=3 border=1 bordercolor='".$_SESSION['bordercolor']."' class='tablestyle'";</span><br style="font-family: monospace;" /><span style="font-family: monospace;">$table_style2 &nbsp;&nbsp;&nbsp; = "cellpadding=3 border=1 bordercolor='#cccccc' class='tablestyle2'";</span><br style="font-family: monospace;" /><br />If this is an update from 2.2.3, 2.2.4 , 2.2.5 to 2.2.9&nbsp; </small><small>you are<span style="font-weight: bold;"> </span><span style="font-style: italic; font-weight: bold;">done and &nbsp;should ignore the the rest of the items in this note</span>.<br /></small></li><li><small>Copy these 2 lines from <span style="font-weight: bold;">config.default.php</span> about line 80-82 into <span style="font-weight: bold;">config.php</span> about line 80:<br /><br /><span style="font-family: monospace;">/* Show users online discretetely in the footer */</span><br style="font-family: monospace;" /><span style="font-family: monospace;">$show_users_online = 0;</span><br style="font-family: monospace;" /><span style="font-family: monospace;">Change this to 1 if you want to show users online.</span><br style="font-family: monospace;" /></small></li><li><small>Remove these 2 lines from <span style="font-weight: bold;">config.php</span> about line 176-177:<br /><br /><span style="font-family: monospace;">/* default start-up tab (orders/AP/stock/manuf/proj/GL/system) */</span><br style="font-family: monospace;" /><span style="font-family: monospace;">$def_app = "orders";</span><br style="font-family: monospace;" /></small></li><li><small>Copy these 3 lines from config.default.php about line 113-115<br /><br /><span style="font-family: monospace;">// defalt dateformats and dateseps indexes used before user login</span></small><br style="font-family: monospace;" /><small style="font-family: monospace;">$dflt_date_fmt = 0;</small><br style="font-family: monospace;" /><small><span style="font-family: monospace;">$dflt_date_sep = 0;</span><br style="font-family: monospace;" /></small></li><li><small>Copy these 2 lines from <span style="font-weight: bold;">config.default.php</span> about line 211-212:<br /><br /><span style="font-family: monospace;">define("ICON_SUBMIT", "ok.gif");&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; // new in 2.2</span><br style="font-family: monospace;" /><span style="font-family: monospace;">define("ICON_ESCAPE", "escape.png");&nbsp;&nbsp;&nbsp; // new in 2.2</span><br style="font-family: monospace;" /></small></li><li><small>And paste them into <span style="font-weight: bold;">config.php</span> about line 209</small></li><li><small>If you use gregorian calendar and have non-workdays on Friday and first day of week = Saturday<br />then you &nbsp;should &nbsp;set this line in <span style="font-weight: bold;">config.php</span> about line&nbsp; 95.<br /></small><pre><small>$date_system = 3;</small></pre></li><li><small>If you want to use FrontAccounting help wiki then set this line in config.php about line 85<br /></small><pre><small>$help_base_url = "http://frontaccounting.net/fawiki?n=Help.";<br /></small></pre></li></ul><li>Rename or remove the /install folder (you have already performed the install
+      </li><li>Look into the file, <span style="font-weight: bold; font-style: italic;">config.default.php and compare with your own config.php</span> file. You should update the the following in your config.php:<br /><br /></li><ul><li><small>Change the $version in your <span style="font-weight: bold;">config.php</span> file, about line 59, from "2.X.X" to "2.2.10".</small></li><li><small>Change in line &nbsp;67 to:<br />$power_url &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; = "http://frontaccounting.com";<br /></small><small><br />Change in line 92 to:<br />// $help_base_url = 'http://frontaccounting.com/fawiki/index.php?n=Help.';<br /><br />Paste these 2 lines into line 83:<br />&nbsp;/* default print destination. 0 = PDF/Printer, 1 = Excel */<br />&nbsp;$def_print_destination = 0;<br /><br />if this is an update from 2.2.6, 2.2.7, 2.2.8 , 2.2.9 to 2.2.10&nbsp;</small><small> </small><small>you are<span style="font-weight: bold;"> </span><span style="font-style: italic; font-weight: bold;">done and &nbsp;should ignore the the rest of the items in this note</span>.</small></li><li><small>Copy &nbsp;the 2 lines from config.default file, about line &nbsp;122:<br /><br /><span style="font-family: monospace;">$table_style &nbsp;&nbsp;&nbsp; = "class='tablestyle'";</span><br style="font-family: monospace;" /><span style="font-family: monospace;">$table_style2 &nbsp;&nbsp;&nbsp; = "class='tablestyle2'";</span><br style="font-family: monospace;" /><br />into&nbsp;config.php about line &nbsp;122 and replace these 4 lines:<br /><br /><span style="font-family: monospace;">if (!isset($_SESSION['bordercolor']))</span><br style="font-family: monospace;" /><span style="font-family: monospace;">&nbsp;&nbsp;&nbsp; $_SESSION['bordercolor'] = "#8cacbb";</span><br style="font-family: monospace;" /><span style="font-family: monospace;">$table_style &nbsp;&nbsp;&nbsp; = "cellpadding=3 border=1 bordercolor='".$_SESSION['bordercolor']."' class='tablestyle'";</span><br style="font-family: monospace;" /><span style="font-family: monospace;">$table_style2 &nbsp;&nbsp;&nbsp; = "cellpadding=3 border=1 bordercolor='#cccccc' class='tablestyle2'";</span><br style="font-family: monospace;" /><br />If this is an update from 2.2.3, 2.2.4 , 2.2.5 to 2.2.10&nbsp; </small><small>you are<span style="font-weight: bold;"> </span><span style="font-style: italic; font-weight: bold;">done and &nbsp;should ignore the the rest of the items in this note</span>.<br /></small></li><li><small>Copy these 2 lines from <span style="font-weight: bold;">config.default.php</span> about line 80-82 into <span style="font-weight: bold;">config.php</span> about line 80:<br /><br /><span style="font-family: monospace;">/* Show users online discretetely in the footer */</span><br style="font-family: monospace;" /><span style="font-family: monospace;">$show_users_online = 0;</span><br style="font-family: monospace;" /><span style="font-family: monospace;">Change this to 1 if you want to show users online.</span><br style="font-family: monospace;" /></small></li><li><small>Remove these 2 lines from <span style="font-weight: bold;">config.php</span> about line 176-177:<br /><br /><span style="font-family: monospace;">/* default start-up tab (orders/AP/stock/manuf/proj/GL/system) */</span><br style="font-family: monospace;" /><span style="font-family: monospace;">$def_app = "orders";</span><br style="font-family: monospace;" /></small></li><li><small>Copy these 3 lines from config.default.php about line 113-115<br /><br /><span style="font-family: monospace;">// defalt dateformats and dateseps indexes used before user login</span></small><br style="font-family: monospace;" /><small style="font-family: monospace;">$dflt_date_fmt = 0;</small><br style="font-family: monospace;" /><small><span style="font-family: monospace;">$dflt_date_sep = 0;</span><br style="font-family: monospace;" /></small></li><li><small>Copy these 2 lines from <span style="font-weight: bold;">config.default.php</span> about line 211-212:<br /><br /><span style="font-family: monospace;">define("ICON_SUBMIT", "ok.gif");&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; // new in 2.2</span><br style="font-family: monospace;" /><span style="font-family: monospace;">define("ICON_ESCAPE", "escape.png");&nbsp;&nbsp;&nbsp; // new in 2.2</span><br style="font-family: monospace;" /></small></li><li><small>And paste them into <span style="font-weight: bold;">config.php</span> about line 209</small></li><li><small>If you use gregorian calendar and have non-workdays on Friday and first day of week = Saturday<br />then you &nbsp;should &nbsp;set this line in <span style="font-weight: bold;">config.php</span> about line&nbsp; 95.<br /></small><pre><small>$date_system = 3;</small></pre></li><li><small>If you want to use FrontAccounting help wiki then set this line in config.php about line 85<br /></small><pre><small>$help_base_url = "http://frontaccounting.net/fawiki?n=Help.";<br /></small></pre></li></ul><li>Rename or remove the /install folder (you have already performed the install
 process earlier).<br /></li></ul><ol>