X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep115.php;h=d75e8cf5785df31bcd4f7f7cb064d7853ea47156;hb=bddfd188fc7b9c754623c0ffd978ca9f0c4fd4e5;hp=74ef3c0a63bcaecf89c804b77286ffb578a0d1be;hpb=d7b2df429bf66654536ffafeb5a3d1e034653374;p=fa-stable.git diff --git a/reporting/rep115.php b/reporting/rep115.php index 74ef3c0a..d75e8cf5 100644 --- a/reporting/rep115.php +++ b/reporting/rep115.php @@ -1,6 +1,6 @@ 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 .= "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." 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; 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(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 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." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.")), - t.alloc * -1, t.alloc)) AS Allocated,"; - $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 - FROM ".TB_PREF."debtor_trans t - WHERE t.debtor_no = ".db_escape($debtorno) - ." AND t.type <> ".ST_CUSTDELIVERY; - if ($to) - $sql .= " AND t.tran_date < '$to'"; - $sql .= " GROUP BY debtor_no"; + $sql .= " AND t.tran_date < '$to'"; + $sql .= " GROUP BY debtor_no"; $result = db_query($sql,"No transactions were returned"); return db_fetch($result); } -function get_transactions($debtorno, $from, $to, $only_rec) +function get_transactions($debtorno, $from, $to) { $from = date2sql($from); $to = date2sql($to); + $sign = "IF(trans.type IN(".implode(',', array(ST_CUSTCREDIT,ST_CUSTPAYMENT,ST_BANKDEPOSIT))."), -1, 1)"; + $allocated_from = "(SELECT trans_type_from as trans_type, trans_no_from as trans_no, date_alloc, sum(amt) amount FROM ".TB_PREF."cust_allocations alloc @@ -72,8 +75,9 @@ function get_transactions($debtorno, $from, $to, $only_rec) GROUP BY trans_type_to, trans_no_to) alloc_to"; $sql = "SELECT trans.*, comments.memo_, - (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, + $sign*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, + $sign*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 LEFT JOIN ".TB_PREF."voided voided ON trans.type=voided.type AND trans.trans_no=voided.id @@ -114,7 +118,6 @@ function print_customer_balances() $folk = $_POST['PARAM_4']; // added by Faisal to filter by sales person $currency = $_POST['PARAM_5']; $no_zeros = $_POST['PARAM_6']; - $hide_trans = 1; $comments = $_POST['PARAM_7']; $orientation = $_POST['PARAM_8']; $destination = $_POST['PARAM_9']; @@ -156,17 +159,19 @@ function print_customer_balances() if ($no_zeros) $nozeros = _('Yes'); else $nozeros = _('No'); - $cols = array(0, 70, 140, 180, 230, 270, 350, 445, 495, 555); + $cols = array(0, 100, 130, 190, 250, 320, 385, 450, 515); - $headers = array(_('Name'), '', '', _('Open Balance'), '', _('Debit'), _('Credit'), '', _('Balance')); + $headers = array(_('Name'), '', '', _('Open Balance'), _('Debit'), _('Credit'), '', _('Balance')); - $aligns = array('left', 'left', 'left', 'right', 'left', 'right', 'right', 'right', 'right'); + $aligns = array('left', 'left', 'left', 'right', 'right', 'right', 'right', 'right'); $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' => _('Sales Areas'), 'from' => $sarea, 'to' => ''), + 4 => array('text' => _('Sales Folk'), 'from' => $salesfolk, 'to' => ''), + 5 => array('text' => _('Currency'), 'from' => $currency, 'to' => ''), + 6 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => '')); $rep = new FrontReport(_('Customer Trial Balance'), "CustomerTB", user_pagesize(), 9, $orientation); if ($orientation == 'L') @@ -206,97 +211,65 @@ function print_customer_balances() $result = db_query($sql, "The customers could not be retrieved"); - $tot_cur_cr = $tot_cur_db = 0; + $tot_cur_cr = $tot_cur_db = $tot_open = $tot_bal = 0; while ($myrow = db_fetch($result)) { if (!$convert && $currency != $myrow['curr_code']) continue; - $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); - $init[3] = $init[0] - $init[1]; - $accumulate += $init[3]; - - $res = get_transactions($myrow['debtor_no'], $from, $to, false); - - $total = array(0,0,0,0); - for ($i = 0; $i < 4; $i++) - { - $total[$i] += $init[$i]; - $grandtotal[$i] += $init[$i]; - } + $bal = get_open_balance($myrow['debtor_no'], $from); + $init = array(); + $curr_db = $bal ? round2(abs($bal['charges'] * $rate), $dec) : 0; // db + $curr_cr = $bal ? round2(abs($bal['credits'] * $rate), $dec) : 0; // cr +// $curr_alloc = $bal ? round2($bal['Allocated'] * $rate, $dec) : 0; // allocated + $curr_open = $curr_db-$curr_cr; // balance + $tot_open += $curr_open; - if ($no_zeros && $init[3] == 0) continue; + $res = get_transactions($myrow['debtor_no'], $from, $to); - if (db_num_rows($res) == 0) + if (db_num_rows($res) == 0 && !$no_zeros) { - $rep->TextCol(0, 2, $myrow['name']); - $rep->AmountCol(3, 4, $init[3], $dec); - $rep->AmountCol(8, 9, $init[3], $dec); - //$rep->Line($rep->row - 2); + $rep->TextCol(0, 2, $myrow['name']); + $rep->AmountCol(3, 4, $curr_open, $dec); + $rep->AmountCol(7, 8, $curr_open, $dec); $rep->NewLine(1); continue; } - $curr_cr = $curr_db = 0; + $curr_db = $curr_cr = 0; while ($trans = db_fetch($res)) //Detail starts here { - $item[0] = $item[1] = 0.0; - //modified below by faisal - if ($trans['type'] == ST_CUSTCREDIT || $trans['type'] == ST_CUSTPAYMENT || $trans['type'] == ST_BANKDEPOSIT) - $trans['TotalAmount'] *= -1; + if ($trans['TotalAmount'] > 0.0) - { - $item[0] = round2(abs($trans['TotalAmount']) * $rate, $dec); - $accumulate += $item[0]; - $curr_db += $item[0]; - $tot_cur_db += $item[0]; - $item[2] = round2($trans['Allocated'] * $rate, $dec); - } - else - { - $item[1] = round2(Abs($trans['TotalAmount']) * $rate, $dec); - $accumulate -= $item[1]; - $curr_cr += $item[1]; - $tot_cur_cr +=$item[1]; - $item[2] = round2($trans['Allocated'] * $rate, $dec) * -1; - } - - if ($trans['type'] == ST_JOURNAL || $trans['type'] == ST_SALESINVOICE || $trans['type'] == ST_BANKPAYMENT) - $item[3] = $item[0] - $item[2]; + $curr_db += round2(($trans['TotalAmount']) * $rate, $dec); else - $item[3] = -$item[1] - $item[2]; - - for ($i = 0; $i < 4; $i++) - { - $total[$i] += $item[$i]; - $grandtotal[$i] += $item[$i]; - } - $total[3] = $total[0] - $total[1]; + $curr_cr += -round2(($trans['TotalAmount']) * $rate, $dec); } + $tot_cur_db += $curr_db; + $tot_cur_cr += $curr_cr; + + if ($no_zeros && $curr_open == 0.0 && $curr_db == 0.0 && $curr_cr == 0.0) continue; $rep->TextCol(0, 2, $myrow['name']); - $rep->AmountCol(3, 4, $total[3] + $curr_cr - $curr_db, $dec); - $rep->AmountCol(5, 6, $curr_db, $dec); - $rep->AmountCol(6, 7, $curr_cr, $dec); - $rep->AmountCol(8, 9, $total[3], $dec); - //$rep->Line($rep->row - 2); + $rep->AmountCol(3, 4, $curr_open, $dec); + $rep->AmountCol(4, 5, $curr_db, $dec); + $rep->AmountCol(5, 6, $curr_cr, $dec); + $rep->AmountCol(7, 8, $curr_open+$curr_db-$curr_cr, $dec); $rep->NewLine(1); + } + $rep->Line($rep->row + 4); $rep->NewLine(); $rep->fontSize += 2; $rep->TextCol(0, 3, _('Grand Total')); $rep->fontSize -= 2; - $grandtotal[3] = $grandtotal[0] - $grandtotal[1]; - $rep->AmountCol(3, 4, $grandtotal[3] - $tot_cur_db + $tot_cur_cr, $dec); - $rep->AmountCol(5, 6, $tot_cur_db, $dec); - $rep->AmountCol(6, 7, $tot_cur_cr, $dec); - $rep->AmountCol(8, 9, $grandtotal[3], $dec); + $tot_bal = $tot_open+$tot_cur_db-$tot_cur_cr; + + $rep->AmountCol(3, 4, $tot_open, $dec); + $rep->AmountCol(4, 5, $tot_cur_db, $dec); + $rep->AmountCol(5, 6, $tot_cur_cr, $dec); + $rep->AmountCol(7, 8, $tot_bal, $dec); $rep->Line($rep->row - 6, 1); $rep->NewLine(); $rep->End();