Added credit info in supplier invoice and supplier credit note.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 517440442c86b00487941a5ee4be5c2f2cbadce9..c80d54bba7e7dbc90dc244b31233dbfc909854e8 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,12 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+21-Oct-2010 Joe Hunt
++ Added credit info in supplier invoice and supplier credit note.
+$ /purchasing/includes/db/invoice_db.inc
+  /purchasing/includes/ui/invoice_ui.inc
+  /purchasing/includes/supp_trans_class.inc
+  
 21-Oct-2010 Janusz Dobrowolski
 ! Optimized bank transaction edition code, [0000270] invalid next reference update in journal/bank trans
 $ /gl/gl_bank.php

diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc
index 63935f9de47195d65d5e814a9967dc5a6a41a246..a35ae8b5203853f17c3dd8eaa4547dd8a6e12900 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");
 
@@ -31,6 +33,7 @@ function read_supplier_details_to_trans(&$supp_trans, $supplier_id)
     $supp_trans->tax_included = $myrow['tax_included'];
     $supp_trans->supplier_name = $myrow['supp_name'];
        $supp_trans->terms_description = $myrow['terms'];
+       $supp_trans->credit = $myrow['cur_credit'];
 
        if ($myrow['days_before_due'] == 0)
        {

diff --git a/purchasing/includes/supp_trans_class.inc b/purchasing/includes/supp_trans_class.inc
index db940d62feb8300e815af650128ac38e5c36325a..21e5e5fbb32d3846593f9f8de5615c6b578052ca 100644 (file)
--- a/purchasing/includes/supp_trans_class.inc
+++ b/purchasing/includes/supp_trans_class.inc
@@ -40,6 +40,7 @@ class supp_trans
        var $ov_discount;
        var $ov_gst;
        var $gl_codes_counter=0;
+       var $credit = 0;
 
        function supp_trans($trans_type)
        {

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index ae71ad8a649aa89789c3c65cebd5340e6ab72da3..c1600229c8a55ca379248416899f6704351cb604 100644 (file)
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -128,6 +128,7 @@ function invoice_header(&$supp_trans)
        }
 
        label_row(_("Tax Group:"), $supp_trans->tax_description);
+       supplier_credit_row($supp_trans->supplier_id, $supp_trans->credit);
 
        end_outer_table(1);
 }