<?php
+/**********************************************************************
+ Copyright (C) FrontAccounting, LLC.
+ Released under the terms of the GNU General Public License, GPL,
+ as published by the Free Software Foundation, either version 3
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
//------------------------------------------------------------------------------
// Retreive parent document number(s) for given transaction
//
// date_ is display date (non-sql)
function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
$date_, $reference, $Total, $discount=0, $Tax=0, $Freight=0, $FreightTax=0,
- $sales_type=0, $order_no=0, $trans_link=0, $ship_via="", $due_date=null,
- $AllocAmt=0)
+ $sales_type=0, $order_no=0, $trans_link=0, $ship_via=0, $due_date="",
+ $AllocAmt=0, $rate=0, $dimension_id=0, $dimension2_id=0)
{
-
+ $new = $trans_no==0;
$curr = get_customer_currency($debtor_no);
- $rate = get_exchange_rate_from_home_currency($curr, $date_);
+ if ($rate == 0)
+ $rate = get_exchange_rate_from_home_currency($curr, $date_);
$SQLDate = date2sql($date_);
- $SQLDueDate = date2sql($due_date);
-
- if ($trans_no==0) {
+ if ($due_date == "")
+ $SQLDueDate = "0000-00-00";
+ else
+ $SQLDueDate = date2sql($due_date);
+
+ if ($trans_type == ST_BANKPAYMENT)
+ $Total = -$Total;
+
+ if ($new) {
$trans_no = get_next_trans_no($trans_type);
$sql = "INSERT INTO ".TB_PREF."debtor_trans (
reference, tpe,
order_, ov_amount, ov_discount,
ov_gst, ov_freight, ov_freight_tax,
- rate, ship_via, alloc, trans_link
- ) VALUES ($trans_no, $trans_type, '$debtor_no', '$BranchNo',
- '$SQLDate', '$SQLDueDate', '$reference',
- '$sales_type', $order_no, $Total, $discount, $Tax, $Freight,
- $FreightTax, $rate, '$ship_via', $AllocAmt, $trans_link)";
+ rate, ship_via, alloc, trans_link,
+ dimension_id, dimension2_id
+ ) VALUES ($trans_no, $trans_type,
+ ".db_escape($debtor_no).", ".db_escape($BranchNo).",
+ '$SQLDate', '$SQLDueDate', ".db_escape($reference).",
+ ".db_escape($sales_type).", $order_no, $Total, ".db_escape($discount).", $Tax,
+ ".db_escape($Freight).",
+ $FreightTax, $rate, ".db_escape($ship_via).", $AllocAmt, ".db_escape($trans_link).",
+ $dimension_id, $dimension2_id)";
} else { // may be optional argument should stay unchanged ?
$sql = "UPDATE ".TB_PREF."debtor_trans SET
- debtor_no='$debtor_no' , branch_code='$BranchNo',
+ debtor_no=".db_escape($debtor_no)." , branch_code=".db_escape($BranchNo).",
tran_date='$SQLDate', due_date='$SQLDueDate',
- reference='$reference', tpe='$sales_type', order_=$order_no,
- ov_amount=$Total, ov_discount=$discount, ov_gst=$Tax,
- ov_freight=$Freight, ov_freight_tax=$FreightTax, rate=$rate,
- ship_via='$ship_via', alloc=$AllocAmt, trans_link=$trans_link
+ reference=".db_escape($reference).", tpe=".db_escape($sales_type).", order_=$order_no,
+ ov_amount=$Total, ov_discount=".db_escape($discount).", ov_gst=$Tax,
+ ov_freight=".db_escape($Freight).", ov_freight_tax=$FreightTax, rate=$rate,
+ ship_via=".db_escape($ship_via).", alloc=$AllocAmt, trans_link=$trans_link,
+ dimension_id=$dimension_id, dimension2_id=$dimension2_id
WHERE trans_no=$trans_no AND type=$trans_type";
}
db_query($sql, "The debtor transaction record could not be inserted");
+ add_audit_trail($trans_type, $trans_no, $date_, $new ? '': _("Updated."));
+
return $trans_no;
}
{
$sql = "SELECT ".TB_PREF."debtor_trans.*,
ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,
- ".TB_PREF."debtors_master.name AS DebtorName, ".TB_PREF."debtors_master.address, ".TB_PREF."debtors_master.email,
+ ".TB_PREF."debtors_master.name AS DebtorName, ".TB_PREF."debtors_master.address, ".TB_PREF."debtors_master.email AS email2,
".TB_PREF."debtors_master.curr_code, ".TB_PREF."debtors_master.tax_id, ".TB_PREF."debtors_master.payment_terms ";
- if ($trans_type == systypes::cust_payment()) {
+ if ($trans_type == ST_CUSTPAYMENT) {
// it's a payment so also get the bank account
$sql .= ", ".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name,
- ".TB_PREF."bank_trans_types.name AS BankTransType ";
+ ".TB_PREF."bank_accounts.account_type AS BankTransType ";
}
if ($trans_type == 10 OR $trans_type == 11 OR $trans_type == 13) {
$sql .= " FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtors_master ";
- if ($trans_type == systypes::cust_payment()) {
+ if ($trans_type == ST_CUSTPAYMENT) {
// it's a payment so also get the bank account
- $sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts, ".TB_PREF."bank_trans_types ";
+ $sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts";
}
if ($trans_type == 10 OR $trans_type == 11 OR $trans_type == 13) {
AND ".TB_PREF."debtor_trans.type=$trans_type
AND ".TB_PREF."debtor_trans.debtor_no=".TB_PREF."debtors_master.debtor_no";
- if ($trans_type == systypes::cust_payment()) {
+ if ($trans_type == ST_CUSTPAYMENT) {
// it's a payment so also get the bank account
$sql .= " AND ".TB_PREF."bank_trans.trans_no =$trans_id
AND ".TB_PREF."bank_trans.type=$trans_type
- AND ".TB_PREF."bank_trans_types.id = ".TB_PREF."bank_trans.bank_trans_type_id
- AND ".TB_PREF."bank_accounts.account_code=".TB_PREF."bank_trans.bank_act ";
+ AND ".TB_PREF."bank_accounts.id=".TB_PREF."bank_trans.bank_act ";
}
if ($trans_type == 10 OR $trans_type == 11 OR $trans_type == 13) {
// it's an invoice so also get the shipper
exit;
}
- return db_fetch($result);
-}
-
-//----------------------------------------------------------------------------------------
-
-function get_customer_transactions($extra_fields=null, $extra_conditions=null, $extra_tables=null)
-{
- $sql = "SELECT ".TB_PREF."debtor_trans.*,
- ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,
- ".TB_PREF."debtors_master.name AS DebtorName, ".TB_PREF."debtors_master.address,
- ".TB_PREF."debtors_master.curr_code, ".TB_PREF."debtor_trans.version ";
-
- if ($extra_fields)
- $sql .= ", $extra_fields ";
-
- $sql .= " FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtors_master ";
- if ($extra_tables)
- $sql .= ",$extra_tables ";
-
- $sql .= " WHERE ".TB_PREF."debtor_trans.debtor_no=".TB_PREF."debtors_master.debtor_no";
-
- if ($extra_conditions)
- $sql .= " AND $extra_conditions ";
-
- $sql .= " ORDER BY trans_no";
-
- return db_query($sql, "Cannot retreive debtor transactions");
+ //return db_fetch($result);
+ $row = db_fetch($result);
+ $row['email'] = $row['email2'];
+ return $row;
}
//----------------------------------------------------------------------------------------
projects / fa-stable.git / blobdiff