Added missing due date on direct invoice entry.

[fa-stable.git] / purchasing / includes / db / invoice_db.inc

diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc
index 63935f9de47195d65d5e814a9967dc5a6a41a246..4094e449d101c53bd0af6f9fbbfb55fbe74c7a35 100644 (file)
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -17,11 +17,13 @@ function read_supplier_details_to_trans(&$supp_trans, $supplier_id)
 {
        $sql = "SELECT supp.supp_name, terms.terms, terms.days_before_due,
                terms.day_in_following_month, supp.tax_included,
-               supp.tax_group_id, tax_group.name AS tax_group_name
-               FROM ".TB_PREF."suppliers supp, ".TB_PREF."payment_terms terms, ".TB_PREF."tax_groups tax_group
+               supp.tax_group_id, tax_group.name AS tax_group_name,
+               supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1) 
+                       * (ov_amount + ov_gst + ov_discount),0)) as cur_credit
+               FROM ".TB_PREF."suppliers supp LEFT JOIN ".TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id, ".TB_PREF."payment_terms terms, ".TB_PREF."tax_groups tax_group
                WHERE supp.tax_group_id = tax_group.id
                AND supp.payment_terms=terms.terms_indicator
-               AND supp.supplier_id = ".db_escape($supplier_id);
+               AND supp.supplier_id = ".db_escape($supplier_id)." GROUP BY supp.supp_name";
 
        $result = db_query($sql, "The supplier record selected: " . $supplier_id . " cannot be retrieved");
 
@@ -30,16 +32,13 @@ function read_supplier_details_to_trans(&$supp_trans, $supplier_id)
     $supp_trans->supplier_id = $supplier_id;
     $supp_trans->tax_included = $myrow['tax_included'];
     $supp_trans->supplier_name = $myrow['supp_name'];
-       $supp_trans->terms_description = $myrow['terms'];
+       $supp_trans->terms = array( 
+               'description' => $myrow['terms'],
+               'days_before_due' => $myrow['days_before_due'], 
+               'day_in_following_month' => $myrow['day_in_following_month'] );
+               
+       $supp_trans->credit = $myrow['cur_credit'];
 
-       if ($myrow['days_before_due'] == 0)
-       {
-               $supp_trans->terms = "1" . $myrow['day_in_following_month'];
-       }
-       else
-       {
-               $supp_trans->terms = "0" . $myrow['days_before_due'];
-       }
        $supp_trans->tax_description = $myrow['tax_group_name'];
        $supp_trans->tax_group_id = $myrow['tax_group_id'];
 
@@ -347,7 +346,6 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
                }
        }
        
-
     commit_transaction();
 
     return $invoice_id;