From: Janusz Dobrowolski Date: Mon, 11 Feb 2013 07:30:08 +0000 (+0100) Subject: Fixed current purchasing credit display. X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=2bc5db5d39b31151a459cf8b4624d5fc422a23be;p=textcart.git Fixed current purchasing credit display. --- diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index 3ffc35d..6cc3f15 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -18,8 +18,7 @@ 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, - supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1) - * (ov_amount + ov_gst + ov_discount),0)) as cur_credit + supp.credit_limit - Sum(IFNULL(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 @@ -38,7 +37,7 @@ function read_supplier_details_to_trans(&$supp_trans, $supplier_id) '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']; $supp_trans->tax_description = $myrow['tax_group_name']; diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc index ec2c600..a7e383e 100644 --- a/purchasing/includes/ui/po_ui.inc +++ b/purchasing/includes/ui/po_ui.inc @@ -47,8 +47,7 @@ function copy_to_cart() function get_supplier_details_to_order(&$order, $supplier_id) { $sql = "SELECT curr_code, supp_name, tax_group_id, supp.tax_included, - supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1) - * (ov_amount + ov_gst + ov_discount),0)) as cur_credit, + supp.credit_limit - Sum(IFNULL(ov_amount + ov_gst + ov_discount,0)) as cur_credit, terms.terms, terms.days_before_due, terms.day_in_following_month FROM ".TB_PREF."suppliers supp LEFT JOIN ".TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id