From: Janusz Dobrowolski Date: Mon, 8 Oct 2012 12:03:18 +0000 (+0200) Subject: Merged latest changes from stable branch. X-Git-Tag: v2.4.2~19^2~343 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=0c760ea65c8c6f0a45ea8328abab53be649f2105;p=fa-stable.git Merged latest changes from stable branch. --- 0c760ea65c8c6f0a45ea8328abab53be649f2105 diff --cc config.default.php index a932d258,49486957..1eeba6e4 --- a/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 4330a2ad,3921f136..c667c887 --- a/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/db/inventory_db.inc index e0ea2ef7,037d4101..5613ecb8 --- a/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/sysnames.inc index 7c296ad9,440ff528..52f96c64 --- a/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 reporting/includes/doctext.inc index f39254af,73bdaa10..21b3a847 --- a/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 8523359d,0a412ce8..682b8af3 --- a/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 1131a350,343f9f7d..b74ac209 --- a/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