X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsuppliers_db.inc;h=602b86bf60049a52f50d3c385785510480909acb;hb=2f3375b4493c1b1e0b17c2801298275f22f8d76e;hp=80cc0f8dd70f08902c7709bdda1f1a5c03450c25;hpb=e6cf9a74a7852b3ae2e4ebb794a755b6a90ad486;p=fa-stable.git diff --git a/purchasing/includes/db/suppliers_db.inc b/purchasing/includes/db/suppliers_db.inc index 80cc0f8d..602b86bf 100644 --- a/purchasing/includes/db/suppliers_db.inc +++ b/purchasing/includes/db/suppliers_db.inc @@ -10,25 +10,21 @@ See the License here . ***********************************************************************/ -function add_supplier($supp_name, $supp_ref, $address, $supp_address, $phone, $phone2, $fax, $gst_no, $email, - $website, $contact, $supp_account_no, $bank_account, $credit_limit, $dimension_id, $dimension2_id, +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, $rep_lang) + $notes, $tax_group_id, $tax_included) { - $sql = "INSERT INTO ".TB_PREF."suppliers (supp_name, supp_ref, address, supp_address, phone, phone2, fax, gst_no, email, website, - contact, 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, rep_lang) - VALUES (".db_escape($_POST['supp_name']). ", " + $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, tax_included) + VALUES (".db_escape($supp_name). ", " .db_escape($supp_ref). ", " .db_escape($address) . ", " .db_escape($supp_address) . ", " - .db_escape($phone). ", " - .db_escape($phone2). ", " - .db_escape($fax). ", " .db_escape($gst_no). ", " - .db_escape($email). ", " .db_escape($website). ", " - .db_escape($contact). ", " .db_escape($supp_account_no). ", " .db_escape($bank_account). ", " .$credit_limit. ", " @@ -41,27 +37,22 @@ function add_supplier($supp_name, $supp_ref, $address, $supp_address, $phone, $p .db_escape($payment_discount_account). ", " .db_escape($notes). ", " .db_escape($tax_group_id). ", " - .db_escape($rep_lang ? $rep_lang : null, true). ")"; + .db_escape($tax_included). ")"; db_query($sql,"The supplier could not be added"); } -function update_supplier($supplier_id, $supp_name, $supp_ref, $address, $supp_address, $phone, $phone2, $fax, $gst_no, - $email, $website, $contact, $supp_account_no, $bank_account, $credit_limit, $dimension_id, $dimension2_id, +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, $rep_lang) + $notes, $tax_group_id, $tax_included) { $sql = "UPDATE ".TB_PREF."suppliers SET supp_name=".db_escape($supp_name) . ", supp_ref=".db_escape($supp_ref) . ", address=".db_escape($address) . ", supp_address=".db_escape($supp_address) . ", - phone=".db_escape($phone) . ", - phone2=".db_escape($phone2) . ", - fax=".db_escape($fax) . ", gst_no=".db_escape($gst_no) . ", - email=".db_escape($email) . ", website=".db_escape($website) . ", - contact=".db_escape($contact) . ", supp_account_no=".db_escape($supp_account_no) . ", bank_account=".db_escape($bank_account) . ", credit_limit=".$credit_limit . ", @@ -73,8 +64,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) . ", - rep_lang=".db_escape($rep_lang ? $rep_lang : null, true) . " WHERE supplier_id = ".db_escape($supplier_id); + tax_group_id=".db_escape($tax_group_id). ", + tax_included=".db_escape($tax_included) + ." WHERE supplier_id = ".db_escape($supplier_id); db_query($sql,"The supplier could not be updated"); } @@ -85,7 +77,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) @@ -96,68 +88,43 @@ 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." + OR (trans.type=".ST_JOURNAL." AND (trans.ov_amount + trans.ov_gst + trans.ov_discount)>0), 1, -1)* + ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc"; - Sum($value) AS Balance, + $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(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(IFNULL($value,0)) AS Balance, - FROM ".TB_PREF."suppliers, - ".TB_PREF."payment_terms, - ".TB_PREF."supp_trans + 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, + 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 - 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 + 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 - GROUP BY - ".TB_PREF."suppliers.supp_name, + WHERE + 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) @@ -182,12 +149,64 @@ function get_supplier_name($supplier_id) function get_supplier_accounts($supplier_id) { - $sql = "SELECT payable_account,purchase_account,payment_discount_account FROM ".TB_PREF."suppliers WHERE supplier_id=".db_escape($supplier_id); + $sql = "SELECT payable_account,purchase_account,payment_discount_account, dimension_id, dimension2_id FROM ".TB_PREF."suppliers WHERE supplier_id=".db_escape($supplier_id); $result = db_query($sql, "could not get supplier"); return db_fetch($result); } +function get_supplier_contacts($supplier_id, $action=null) +{ + $results = array(); + $res = get_crm_persons('supplier', $action, $supplier_id); + while($contact = db_fetch($res)) + $results[] = $contact; + + return $results; +} + +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 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 ? $myrow[0] : get_company_currency(); +} + +function get_suppliers_search($supplier) +{ + global $SysPrefs; + + if (isset($SysPrefs->max_rows_in_search)) + $limit = $SysPrefs->max_rows_in_search; + else + $limit = 10; + + $sql = "SELECT supplier_id, supp_name, supp_ref, address, gst_no + FROM ".TB_PREF."suppliers + WHERE (supp_name LIKE " . db_escape("%" . $supplier. "%") . " OR + supp_ref LIKE " . db_escape("%" . $supplier. "%") . " OR + address LIKE " . db_escape("%" . $supplier. "%") . " OR + gst_no LIKE " . db_escape("%" . $supplier. "%") . ") + ORDER BY supp_name LIMIT 0,".(int)($limit); + + return db_query($sql, "Failed in retreiving supplier list."); +} -?> \ No newline at end of file