Merged latest changes from stable branch.

diff --cc admin/display_prefs.php
Simple merge

diff --cc config.default.php
index a932d258b149060ce871d21628f0176dd7b6d320,4948695794a091d13162e520a195052cb52740bf..1eeba6e41c992b5cfc92388898ed08c57f4b499e
--- 1/config.default.php
--- 2/config.default.php
+++ b/config.default.php
@@@ -135,11 -135,8 +135,11 @@@ if (!isset($path_to_root) || isset($_GE
  
        /* suppress tax rates on documents. 0 = no, 1 = yes. */
        $suppress_tax_rates = 0;
 -      
 +
 +      /* allow reopening closed transactions */
 +      $allow_gl_reopen = 0;
 +
-       $dateformats    = array("MMDDYYYY", "DDMMYYYY", "YYYYMMDD");
+       $dateformats    = array("MMDDYYYY", "DDMMYYYY", "YYYYMMDD","MmmDDYYYY", "DDMmmYYYY", "YYYYMmmDD");
        $dateseps               = array("/", ".", "-", " ");
        $thoseps                = array(",", ".", " ");
        $decseps                = array(".", ",");

diff --cc gl/inquiry/bank_inquiry.php
index 4330a2ade68f54fd6de21a716c05fc9df2fcdc48,3921f136c401eb4e08b5b061bdbeccce4c4053d7..c667c8873641321b2b36ddd685967189aa2fd4f9
--- 1/gl/inquiry/bank_inquiry.php
--- 2/gl/inquiry/bank_inquiry.php
+++ b/gl/inquiry/bank_inquiry.php
@@@ -102,7 -102,8 +102,8 @@@ while ($myrow = db_fetch($result)
        label_cell($trandate);
        display_debit_or_credit_cells($myrow["amount"]);
        amount_cell($running_total);
 -      label_cell(payment_person_name($myrow["person_type_id"],$myrow["person_id"]));
 +      label_cell(get_counterparty_name($myrow["type"], $myrow["trans_no"]));
+       label_cell(get_comments_string($myrow["type"], $myrow["trans_no"]));
        label_cell(get_gl_view_str($myrow["type"], $myrow["trans_no"]));
        end_row();
        if ($myrow["amount"] > 0 ) 

diff --cc includes/current_user.inc
Simple merge

diff --cc includes/date_functions.inc
Simple merge

diff --cc includes/db/inventory_db.inc
index e0ea2ef7646f00d33338e2ab29246d0561b5dcf0,037d410171470823e988887dc3d1600c887f921d..5613ecb8d8eba24b13f1b3839a4914da9323056f
--- 1/includes/db/inventory_db.inc
--- 2/includes/db/inventory_db.inc
+++ b/includes/db/inventory_db.inc
@@@ -381,10 -381,7 +381,8 @@@ function get_stock_moves($type, $type_n
  
  function void_stock_move($type, $type_no)
  {
-     $sql = "SELECT stock_id, standard_cost, loc_code, tran_date, reference, person_id, visible, discount_percent, price, 
-       sum(qty) qty FROM ".TB_PREF."stock_moves WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no)." 
-       GROUP BY stock_id, standard_cost, loc_code, tran_date, reference, person_id, visible, discount_percent, price HAVING sum(qty) <> 0";
+     $sql = "SELECT * from ".TB_PREF."stock_moves WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
 +
      $result = db_query($sql, "Could not void stock moves");
      while ($row = db_fetch($result))
      {

diff --cc includes/prefs/userprefs.inc
Simple merge

diff --cc includes/session.inc
Simple merge

diff --cc includes/sysnames.inc
index 7c296ad9632ab1ef910b4884bb44d4bf09d8149e,440ff528bda86b88d0ba9de6724cb6e2c4f4230e..52f96c64b95a288a23498259281bbd4ebff44a56
--- 1/includes/sysnames.inc
--- 2/includes/sysnames.inc
+++ b/includes/sysnames.inc
@@@ -183,17 -182,8 +183,20 @@@ $pterm_types = array
        PTT_FOLLOWING => _("Day In Following Month")
  );
  
 +$tax_algorithms = array( 
 +      TCA_LINES => _("Sum per line taxes"), 
 +      TCA_TOTALS => _("Taxes from totals")
 +);
  //----------------------------------------------------------------------------------
 +
 +$bank_owner_types = array(
 +      BO_UNKNOWN => _("Unknown"),
 +      BO_COMPANY => _("Company"),
 +      BO_CUSTBRANCH => _("Customer"),
 +      BO_SUPPLIER => _("Supplier")
 +);
 +
+ // This month array is for use with the last 3 dateformats. 
+ $tmonths = array("", _("Jan"),_("Feb"),_("Mar"),_("Apr"),_("May"),_("Jun"),_("Jul"),_("Aug"),_("Sep"),_("Oct"),_("Nov"),_("Dec"));
+ 
  ?>

diff --cc includes/ui/ui_input.inc
Simple merge

diff --cc includes/ui/ui_view.inc
Simple merge

diff --cc reporting/includes/doctext.inc
index f39254afee2f4a8fd830c47fd5188f43231b6296,73bdaa10ed9353971145b0b0459f252d249c8810..21b3a8479508d2d59a31a2cad12d5e5fb3eaa4db
--- 1/reporting/includes/doctext.inc
--- 2/reporting/includes/doctext.inc
+++ b/reporting/includes/doctext.inc
@@@ -128,21 -115,12 +128,21 @@@
                                }
                        }
                        $aux_info = array(
-                               _("Customers Reference") => $this->formData["customer_ref"],
+                               _("Customer's Reference") => $this->formData["customer_ref"],
                                _("Sales Person") => get_salesman_name($this->formData['salesman']),
                                _("Your VAT no.") => $this->formData['tax_id'],
 -                              _("Delivery Note No.") => implode(',', $deliveries),
 -                              _("Due Date") => sql2date($this->formData['due_date']),
                        );
 +                      if ($this->formData['prepaid']=='partial')
 +                      {
 +                              $aux_info[_("Date of Payment")] = sql2date(get_oldest_payment_date($this->formData['trans_no']));
 +                              $aux_info[_("Our Order No")]  = $this->formData['order_'];
 +                      } else {
 +                              if ($this->formData['prepaid'] =='final')
 +                                      $aux_info[_("Invoice Date")] = sql2date($this->formData['tran_date']);
 +                              else
 +                                      $aux_info[_("Date of Sale")] = sql2date(get_oldest_delivery_date($this->formData['trans_no']));
 +                              $aux_info[_("Due Date")]  = sql2date($this->formData['due_date']);
 +                      }
                        break;
  
                case ST_SUPPAYMENT:

diff --cc reporting/includes/pdf_report.inc
index 8523359d9c6919b336127e7c91eb897d35f5f9db,0a412ce87aadcc5d5d718a2433f60710108c144d..682b8af319c5a61e644677ce1600f97582cd9eed
--- 1/reporting/includes/pdf_report.inc
--- 2/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@@ -386,7 -386,7 +386,7 @@@ class FrontReport extends Cpd
                        'DebtorName', 'supp_account_no', 'wo_ref', 'debtor_ref','type', 'trans_no', 
                        'StockItemName', 'tax_id', 'order_', 'delivery_date', 'units_issued',
                        'due_date', 'required_by', 'payment_terms', 'curr_code',
-                       'ov_freight', 'ov_gst', 'ov_amount', 'prepaid'),
 -                      'ov_freight', 'ov_gst', 'ov_amount', 'requisition_no', 'contact'),
++                      'ov_freight', 'ov_gst', 'ov_amount', 'prepaid', 'requisition_no', 'contact'),
                'branch' => array('br_address', 'br_name', 'salesman', 'disable_branch'),
                'sales_order' => array('deliver_to', 'delivery_address', 'customer_ref'),
                'bankaccount' => array('bank_name', 'bank_account_number', 'payment_service')

diff --cc reporting/rep209.php
index 1131a350464478182e6962f7ad57ceccc7042dfd,343f9f7dee5f35dcdbaecdde094e85e6aa31703d..b74ac209845ce4cc8abd5446e6b9943ac5193280
--- 1/reporting/rep209.php
--- 2/reporting/rep209.php
+++ b/reporting/rep209.php
@@@ -34,7 -34,7 +34,7 @@@ print_po()
  function get_po($order_no)
  {
        $sql = "SELECT ".TB_PREF."purch_orders.*, ".TB_PREF."suppliers.supp_name,  "
-               .TB_PREF."suppliers.supp_account_no,".TB_PREF."suppliers.tax_included,".TB_PREF."suppliers.tax_algorithm,
 -              .TB_PREF."suppliers.supp_account_no,".TB_PREF."suppliers.tax_included,".TB_PREF."suppliers.gst_no AS tax_id,
++              .TB_PREF."suppliers.supp_account_no,".TB_PREF."suppliers.tax_included,".TB_PREF."suppliers.tax_algorithm,".TB_PREF."suppliers.gst_no AS tax_id,
                ".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.payment_terms, ".TB_PREF."locations.location_name,
                ".TB_PREF."suppliers.address, ".TB_PREF."suppliers.contact, ".TB_PREF."suppliers.tax_group_id
                FROM ".TB_PREF."purch_orders, ".TB_PREF."suppliers, ".TB_PREF."locations