X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep101.php;h=1a800d0077336c50c097970e6ba35382c9341b6b;hb=af03975abbd624d17cc6c4f61b71808a0a5c82ea;hp=634b2d69bf78c1f1c926c3ba50a416671be05c01;hpb=f8377d0cb0e9f06bf8de4a00e6ce8f83408a6045;p=fa-stable.git diff --git a/reporting/rep101.php b/reporting/rep101.php index 634b2d69..1a800d00 100644 --- a/reporting/rep101.php +++ b/reporting/rep101.php @@ -33,15 +33,16 @@ function get_open_balance($debtorno, $to) { if($to) $to = date2sql($to); + $sql = "SELECT SUM(IF(t.type = ".ST_SALESINVOICE." OR (t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.") AND t.ov_amount>0), + -abs(IF(t.prep_amount, t.prep_amount, t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount)), 0)) AS charges,"; - $sql = "SELECT SUM(IF(t.type = ".ST_SALESINVOICE." OR (t.type = ".ST_JOURNAL." AND t.ov_amount>0), - -abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount), 0)) AS charges,"; - $sql .= "SUM(IF(t.type != ".ST_SALESINVOICE." AND NOT(t.type = ".ST_JOURNAL." AND t.ov_amount>0), - abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) * -1, 0)) AS credits,"; - $sql .= "SUM(IF(t.type != ".ST_SALESINVOICE." AND NOT(t.type = ".ST_JOURNAL." AND t.ov_amount>0), t.alloc * -1, t.alloc)) AS Allocated,"; + $sql .= "SUM(IF(t.type != ".ST_SALESINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.") AND t.ov_amount>0), + abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) * -1, 0)) AS credits,"; - $sql .= "SUM(IF(t.type = ".ST_SALESINVOICE.", 1, -1) * - (abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) - abs(t.alloc))) AS OutStanding + $sql .= "SUM(IF(t.type != ".ST_SALESINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.")), t.alloc * -1, t.alloc)) AS Allocated,"; + + $sql .= "SUM(IF(t.type = ".ST_SALESINVOICE." OR (t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.") AND t.ov_amount>0), 1, -1) * + (IF(t.prep_amount, t.prep_amount, abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount)) - abs(t.alloc))) AS OutStanding FROM ".TB_PREF."debtor_trans t WHERE t.debtor_no = ".db_escape($debtorno) ." AND t.type <> ".ST_CUSTDELIVERY; @@ -72,7 +73,8 @@ function get_transactions($debtorno, $from, $to) GROUP BY trans_type_to, trans_no_to) alloc_to"; $sql = "SELECT trans.*, - (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount) AS TotalAmount, + IF(trans.prep_amount, trans.prep_amount, trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount) + AS TotalAmount, IFNULL(alloc_from.amount, alloc_to.amount) AS Allocated, ((trans.type = ".ST_SALESINVOICE.") AND trans.due_date < '$to') AS OverDue FROM ".TB_PREF."debtor_trans trans @@ -114,7 +116,10 @@ function print_customer_balances() $cust = _('All'); else $cust = get_customer_name($fromcust); - $dec = user_price_dec(); + $dec = user_price_dec(); + + if ($show_balance) $sb = _('Yes'); + else $sb = _('No'); if ($currency == ALL_TEXT) { @@ -129,7 +134,7 @@ function print_customer_balances() $cols = array(0, 95, 140, 200, 250, 320, 385, 450, 515); - $headers = array(_('Trans Type'), _('#'), _('Date'), _('Due Date'), _('Charges'), _('Credits'), + $headers = array(_('Trans Type'), _('#'), _('Date'), _('Due Date'), _('Debits'), _('Credits'), _('Allocated'), _('Outstanding')); if ($show_balance) @@ -139,8 +144,9 @@ function print_customer_balances() $params = array( 0 => $comments, 1 => array('text' => _('Period'), 'from' => $from, 'to' => $to), 2 => array('text' => _('Customer'), 'from' => $cust, 'to' => ''), - 3 => array('text' => _('Currency'), 'from' => $currency, 'to' => ''), - 4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => '')); + 3 => array('text' => _('Show Balance'), 'from' => $sb, 'to' => ''), + 4 => array('text' => _('Currency'), 'from' => $currency, 'to' => ''), + 5 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => '')); $rep = new FrontReport(_('Customer Balances'), "CustomerBalances", user_pagesize(), 9, $orientation); if ($orientation == 'L') @@ -151,7 +157,7 @@ function print_customer_balances() $grandtotal = array(0,0,0,0); - $sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master "; + $sql = "SELECT debtor_no, name, curr_code, inactive FROM ".TB_PREF."debtors_master "; if ($fromcust != ALL_TEXT) $sql .= "WHERE debtor_no=".db_escape($fromcust); $sql .= " ORDER BY name"; @@ -163,24 +169,25 @@ function print_customer_balances() $accumulate = 0; $rate = $convert ? get_exchange_rate_from_home_currency($myrow['curr_code'], Today()) : 1; - $bal = get_open_balance($myrow['debtor_no'], $from, $convert); - $init[0] = $init[1] = 0.0; - $init[0] = round2(abs($bal['charges']*$rate), $dec); - $init[1] = round2(Abs($bal['credits']*$rate), $dec); - $init[2] = round2($bal['Allocated']*$rate, $dec); + $bal = get_open_balance($myrow['debtor_no'], $from); + $init = array(); + + $init[0] = round2(($bal != false ? abs($bal['charges']) : 0)*$rate, $dec); + $init[1] = round2(($bal != false ? abs($bal['credits']) : 0)*$rate, $dec); + $init[2] = round2(($bal != false ? $bal['Allocated'] : 0)*$rate, $dec); if ($show_balance) { $init[3] = $init[0] - $init[1]; $accumulate += $init[3]; } else - $init[3] = round2($bal['OutStanding']*$rate, $dec); + $init[3] = round2(($bal != false ? $bal['OutStanding'] : 0)*$rate, $dec); $res = get_transactions($myrow['debtor_no'], $from, $to); if ($no_zeros && db_num_rows($res) == 0) continue; $rep->fontSize += 2; - $rep->TextCol(0, 2, $myrow['name']); + $rep->TextCol(0, 2, $myrow['name'].($myrow['inactive']==1 ? " ("._("Inactive").")" : "")); if ($convert) $rep->TextCol(2, 3, $myrow['curr_code']); $rep->fontSize -= 2; @@ -203,7 +210,13 @@ function print_customer_balances() } while ($trans = db_fetch($res)) { - if ($no_zeros && floatcmp($trans['TotalAmount'], $trans['Allocated']) == 0) continue; + if ($no_zeros) { + if ($show_balance) { + if ($trans['TotalAmount'] == 0) continue; + } else { + if (floatcmp(abs($trans['TotalAmount']), $trans['Allocated']) == 0) continue; + } + } $rep->NewLine(1, 2); $rep->TextCol(0, 1, $systypes_array[$trans['type']]); $rep->TextCol(1, 2, $trans['reference']); @@ -215,20 +228,20 @@ function print_customer_balances() $trans['TotalAmount'] *= -1; if ($trans['TotalAmount'] > 0.0) { - $item[0] = round2(abs($trans['TotalAmount']) * $rate, $dec); + $item[0] = round2($trans['TotalAmount'] * $rate, $dec); $rep->AmountCol(4, 5, $item[0], $dec); $accumulate += $item[0]; $item[2] = round2($trans['Allocated'] * $rate, $dec); } else { - $item[1] = round2(Abs($trans['TotalAmount']) * $rate, $dec); + $item[1] = round2(abs($trans['TotalAmount']) * $rate, $dec); $rep->AmountCol(5, 6, $item[1], $dec); $accumulate -= $item[1]; $item[2] = round2($trans['Allocated'] * $rate, $dec) * -1; } $rep->AmountCol(6, 7, $item[2], $dec); - if ($trans['type'] == ST_SALESINVOICE || $trans['type'] == ST_BANKPAYMENT) + if (($trans['type'] == ST_JOURNAL && $item[0]) || $trans['type'] == ST_SALESINVOICE || $trans['type'] == ST_BANKPAYMENT) $item[3] = $item[0] - $item[2]; else $item[3] = -$item[1] - $item[2];