X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsuppliers_db.inc;h=6b7d0cde787265665cfc21c5a188a0bf6f5f0f43;hb=3b06c6c4718610a408cae2e9b76c3134ca30b84c;hp=972d552a04ba3f0fb9644df3d13de32e01032561;hpb=bd3023c1b5e64429043358a691b3aae20eb54c09;p=fa-stable.git diff --git a/purchasing/includes/db/suppliers_db.inc b/purchasing/includes/db/suppliers_db.inc index 972d552a..6b7d0cde 100644 --- a/purchasing/includes/db/suppliers_db.inc +++ b/purchasing/includes/db/suppliers_db.inc @@ -13,12 +13,13 @@ function add_supplier($supp_name, $supp_ref, $address, $supp_address, $gst_no, $website, $supp_account_no, $bank_account, $credit_limit, $dimension_id, $dimension2_id, $curr_code, $payment_terms, $payable_account, $purchase_account, $payment_discount_account, - $notes, $tax_group_id) + $notes, $tax_group_id, $tax_included, $tax_algorithm) { $sql = "INSERT INTO ".TB_PREF."suppliers (supp_name, supp_ref, address, supp_address, gst_no, website, supp_account_no, bank_account, credit_limit, dimension_id, dimension2_id, curr_code, - payment_terms, payable_account, purchase_account, payment_discount_account, notes, tax_group_id) - VALUES (".db_escape($_POST['supp_name']). ", " + payment_terms, payable_account, purchase_account, payment_discount_account, notes, + tax_group_id, tax_included, tax_algorithm) + VALUES (".db_escape($supp_name). ", " .db_escape($supp_ref). ", " .db_escape($address) . ", " .db_escape($supp_address) . ", " @@ -35,7 +36,9 @@ function add_supplier($supp_name, $supp_ref, $address, $supp_address, $gst_no, .db_escape($purchase_account). ", " .db_escape($payment_discount_account). ", " .db_escape($notes). ", " - .db_escape($tax_group_id). ")"; + .db_escape($tax_group_id). ", " + .db_escape($tax_included). ", " + .db_escape($tax_algorithm). ")"; db_query($sql,"The supplier could not be added"); } @@ -43,7 +46,7 @@ function add_supplier($supp_name, $supp_ref, $address, $supp_address, $gst_no, function update_supplier($supplier_id, $supp_name, $supp_ref, $address, $supp_address, $gst_no, $website, $supp_account_no, $bank_account, $credit_limit, $dimension_id, $dimension2_id, $curr_code, $payment_terms, $payable_account, $purchase_account, $payment_discount_account, - $notes, $tax_group_id) + $notes, $tax_group_id, $tax_included, $tax_algorithm) { $sql = "UPDATE ".TB_PREF."suppliers SET supp_name=".db_escape($supp_name) . ", supp_ref=".db_escape($supp_ref) . ", @@ -62,7 +65,9 @@ function update_supplier($supplier_id, $supp_name, $supp_ref, $address, $supp_ad purchase_account=".db_escape($purchase_account) . ", payment_discount_account=".db_escape($payment_discount_account) . ", notes=".db_escape($notes) . ", - tax_group_id=".db_escape($tax_group_id) + tax_group_id=".db_escape($tax_group_id). ", + tax_included=".db_escape($tax_included).", + tax_algorithm=".db_escape($tax_algorithm) ." WHERE supplier_id = ".db_escape($supplier_id); db_query($sql,"The supplier could not be updated"); @@ -74,7 +79,7 @@ function delete_supplier($supplier_id) db_query($sql,"check failed"); } -function get_supplier_details($supplier_id, $to=null) +function get_supplier_details($supplier_id, $to=null, $all=true) { if ($to == null) @@ -85,68 +90,42 @@ function get_supplier_details($supplier_id, $to=null) $past2 = 2 * $past1; // removed - supp_trans.alloc from all summations - $value = "(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount)"; - $due = "IF (".TB_PREF."supp_trans.type=".ST_SUPPINVOICE." OR ".TB_PREF."supp_trans.type=".ST_SUPPCREDIT.",".TB_PREF."supp_trans.due_date,".TB_PREF."supp_trans.tran_date)"; - $sql = "SELECT ".TB_PREF."suppliers.supp_name, ".TB_PREF."suppliers.curr_code, ".TB_PREF."payment_terms.terms, + if ($all) + $value = "(trans.ov_amount + trans.ov_gst + trans.ov_discount)"; + else + $value = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_BANKDEPOSIT.", + (trans.ov_amount + trans.ov_gst + trans.ov_discount - trans.alloc), + (trans.ov_amount + trans.ov_gst + trans.ov_discount + trans.alloc))"; + $due = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_SUPPCREDIT.",trans.due_date,trans.tran_date)"; + $sql = "SELECT supp.supp_name, supp.curr_code, ".TB_PREF."payment_terms.terms, - Sum($value) AS Balance, + Sum(IFNULL($value,0)) AS Balance, Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= 0,$value,0)) AS Due, Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $past1,$value,0)) AS Overdue1, - Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $past2,$value,0)) AS Overdue2 + Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $past2,$value,0)) AS Overdue2, + supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1) + * (ov_amount + ov_gst + ov_discount),0)) as cur_credit, + supp.tax_group_id - FROM ".TB_PREF."suppliers, - ".TB_PREF."payment_terms, - ".TB_PREF."supp_trans + FROM ".TB_PREF."suppliers supp + LEFT JOIN ".TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id AND trans.tran_date <= '$todate', + ".TB_PREF."payment_terms WHERE - ".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator - AND ".TB_PREF."suppliers.supplier_id = $supplier_id - AND ".TB_PREF."supp_trans.tran_date <= '$todate' - AND ".TB_PREF."suppliers.supplier_id = ".TB_PREF."supp_trans.supplier_id - - GROUP BY - ".TB_PREF."suppliers.supp_name, + supp.payment_terms = ".TB_PREF."payment_terms.terms_indicator + AND supp.supplier_id = $supplier_id "; + if (!$all) + $sql .= "AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc > ".FLOAT_COMP_DELTA." "; + $sql .= "GROUP BY + supp.supp_name, ".TB_PREF."payment_terms.terms, ".TB_PREF."payment_terms.days_before_due, ".TB_PREF."payment_terms.day_in_following_month"; - $result = db_query($sql,"The customer details could not be retrieved"); - - if (db_num_rows($result) == 0) - { - - /*Because there is no balance - so just retrieve the header information about the customer - the choice is do one query to get the balance and transactions for those customers who have a balance and two queries for those who don't have a balance OR always do two queries - I opted for the former */ - - $nil_balance = true; - - $sql = "SELECT ".TB_PREF."suppliers.supp_name, ".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.supplier_id, ".TB_PREF."payment_terms.terms - FROM ".TB_PREF."suppliers, - ".TB_PREF."payment_terms - WHERE - ".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator - AND ".TB_PREF."suppliers.supplier_id = ".db_escape($supplier_id); - - $result = db_query($sql,"The customer details could not be retrieved"); - - } - else - { - $nil_balance = false; - } - $supp = db_fetch($result); - if ($nil_balance == true) - { - $supp["Balance"] = 0; - $supp["Due"] = 0; - $supp["Overdue1"] = 0; - $supp["Overdue2"] = 0; - } - return $supp; - } function get_supplier($supplier_id) @@ -188,4 +167,34 @@ function get_supplier_contacts($supplier_id, $action=null) return $results; } -?> \ No newline at end of file +function get_current_supp_credit($supplier_id) +{ + $suppdet = get_supplier_details($supplier_id); + return $suppdet['cur_credit']; + +} + +function is_new_supplier($id) +{ + $tables = array('supp_trans', 'grn_batch', 'purch_orders', 'purch_data'); + + return !key_in_foreign_table($id, $tables, 'supplier_id'); +} + +function update_supp_tax_algorithm($supplier_id, $tax_algorithm) +{ + $sql = "UPDATE ".TB_PREF."suppliers SET tax_algorithm=".db_escape($tax_algorithm) + . " WHERE supplier_id=".db_escape($supplier_id); + return db_query($sql, "cannot update supplier's tax calculation algorithm"); +} + +function get_supplier_currency($supplier_id) +{ + $sql = "SELECT curr_code FROM ".TB_PREF."suppliers WHERE supplier_id = ".db_escape($supplier_id); + + $result = db_query($sql, "Retreive currency of supplier $supplier_id"); + + $myrow=db_fetch_row($result); + return $myrow[0]; +} +