X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep201.php;h=88db421d46639433a7f4747c08b6d6026ed9e461;hb=0ce53780d575e7bf4eefaa1b7edc0603131cc2b3;hp=6a9f2c2edf15fa5b912ea90130e4e16a5b5ca1d7;hpb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;p=fa-stable.git diff --git a/reporting/rep201.php b/reporting/rep201.php index 6a9f2c2e..88db421d 100644 --- a/reporting/rep201.php +++ b/reporting/rep201.php @@ -1,6 +1,6 @@ 0), + -abs(t.ov_amount + t.ov_gst + t.ov_discount), 0)) AS charges,"; + + $sql .= "SUM(IF(t.type != ".ST_SUPPINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.") AND t.ov_amount>0), + abs(t.ov_amount + t.ov_gst + t.ov_discount) * -1, 0)) AS credits,"; - $sql = "SELECT SUM(IF(".TB_PREF."supp_trans.type = ".ST_SUPPINVOICE." OR ".TB_PREF."supp_trans.type = ".ST_BANKDEPOSIT.", - (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount)"; - if ($convert) - $sql .= " * rate"; - $sql .= ", 0)) AS charges, - SUM(IF(".TB_PREF."supp_trans.type <> ".ST_SUPPINVOICE." AND ".TB_PREF."supp_trans.type <> ".ST_BANKDEPOSIT.", - (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount)"; - if ($convert) - $sql .= "* rate"; - $sql .= ", 0)) AS credits, - SUM(".TB_PREF."supp_trans.alloc"; - if ($convert) - $sql .= " * rate"; - $sql .= ") AS Allocated, - SUM(IF(".TB_PREF."supp_trans.type = ".ST_SUPPINVOICE." OR ".TB_PREF."supp_trans.type = ".ST_BANKDEPOSIT.", - (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount - ".TB_PREF."supp_trans.alloc), - (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount + ".TB_PREF."supp_trans.alloc))"; - if ($convert) - $sql .= " * rate"; - $sql .= ") AS OutStanding - FROM ".TB_PREF."supp_trans - WHERE ".TB_PREF."supp_trans.tran_date < '$to' - AND ".TB_PREF."supp_trans.supplier_id = '$supplier_id' GROUP BY supplier_id"; + $sql .= "SUM(IF(t.type != ".ST_SUPPINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.")), t.alloc * -1, t.alloc)) + AS Allocated,"; + + $sql .= "SUM(IF(t.type = ".ST_SUPPINVOICE.", 1, -1) * + (abs(t.ov_amount + t.ov_gst + t.ov_discount) - abs(t.alloc))) AS OutStanding + FROM ".TB_PREF."supp_trans t + WHERE t.supplier_id = ".db_escape($supplier_id); + if ($to) + $sql .= " AND t.tran_date < '$to'"; + $sql .= " GROUP BY supplier_id"; $result = db_query($sql,"No transactions were returned"); return db_fetch($result); @@ -64,15 +58,14 @@ function getTransactions($supplier_id, $from, $to) $from = date2sql($from); $to = date2sql($to); - $sql = "SELECT ".TB_PREF."supp_trans.*, - (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount) - AS TotalAmount, ".TB_PREF."supp_trans.alloc AS Allocated, - ((".TB_PREF."supp_trans.type = ".ST_SUPPINVOICE.") - AND ".TB_PREF."supp_trans.due_date < '$to') AS OverDue - FROM ".TB_PREF."supp_trans - WHERE ".TB_PREF."supp_trans.tran_date >= '$from' AND ".TB_PREF."supp_trans.tran_date <= '$to' - AND ".TB_PREF."supp_trans.supplier_id = '$supplier_id' AND ".TB_PREF."supp_trans.ov_amount!=0 - ORDER BY ".TB_PREF."supp_trans.tran_date"; + $sql = "SELECT *, + (ov_amount + ov_gst + ov_discount) AS TotalAmount, + alloc AS Allocated, + ((type = ".ST_SUPPINVOICE.") AND due_date < '$to') AS OverDue + FROM ".TB_PREF."supp_trans + WHERE tran_date >= '$from' AND tran_date <= '$to' + AND supplier_id = '$supplier_id' AND ov_amount!=0 + ORDER BY tran_date"; $TransResult = db_query($sql,"No transactions were returned"); @@ -83,15 +76,15 @@ function getTransactions($supplier_id, $from, $to) function print_supplier_balances() { - global $path_to_root, $systypes_array; - - $from = $_POST['PARAM_0']; - $to = $_POST['PARAM_1']; - $fromsupp = $_POST['PARAM_2']; - $show_balance = $_POST['PARAM_3']; - $currency = $_POST['PARAM_4']; - $no_zeros = $_POST['PARAM_5']; - $comments = $_POST['PARAM_6']; + global $path_to_root, $systypes_array; + + $from = $_POST['PARAM_0']; + $to = $_POST['PARAM_1']; + $fromsupp = $_POST['PARAM_2']; + $show_balance = $_POST['PARAM_3']; + $currency = $_POST['PARAM_4']; + $no_zeros = $_POST['PARAM_5']; + $comments = $_POST['PARAM_6']; $orientation = $_POST['PARAM_7']; $destination = $_POST['PARAM_8']; if ($destination) @@ -117,7 +110,7 @@ function print_supplier_balances() if ($no_zeros) $nozeros = _('Yes'); else $nozeros = _('No'); - $cols = array(0, 100, 130, 190, 250, 320, 385, 450, 515); + $cols = array(0, 95, 140, 200, 250, 320, 385, 450, 515); $headers = array(_('Trans Type'), _('#'), _('Date'), _('Due Date'), _('Charges'), _('Credits'), _('Allocated'), _('Outstanding')); @@ -130,7 +123,7 @@ function print_supplier_balances() 1 => array('text' => _('Period'), 'from' => $from, 'to' => $to), 2 => array('text' => _('Supplier'), 'from' => $supp, 'to' => ''), 3 => array( 'text' => _('Currency'),'from' => $currency, 'to' => ''), - 4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => '')); + 4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => '')); $rep = new FrontReport(_('Supplier Balances'), "SupplierBalances", user_pagesize(), 9, $orientation); if ($orientation == 'L') @@ -154,24 +147,23 @@ function print_supplier_balances() if (!$convert && $currency != $myrow['curr_code']) continue; $accumulate = 0; - $bal = get_open_balance($myrow['supplier_id'], $from, $convert); - $init[0] = $init[1] = 0.0; - $init[0] = round2(abs($bal['charges']), $dec); - $init[1] = round2(Abs($bal['credits']), $dec); - $init[2] = round2($bal['Allocated'], $dec); + $rate = $convert ? get_exchange_rate_from_home_currency($myrow['curr_code'], Today()) : 1; + $bal = get_open_balance($myrow['supplier_id'], $from); + $init = array(); + $bal['charges'] = isset($bal['charges']) ? $bal['charges'] : 0; + $bal['credits'] = isset($bal['credits']) ? $bal['credits'] : 0; + $bal['Allocated'] = isset($bal['Allocated']) ? $bal['Allocated'] : 0; + $bal['OutStanding'] = isset($bal['OutStanding']) ? $bal['OutStanding'] : 0; + $init[0] = round2(abs($bal['charges']*$rate), $dec); + $init[1] = round2(Abs($bal['credits']*$rate), $dec); + $init[2] = round2($bal['Allocated']*$rate, $dec); if ($show_balance) { $init[3] = $init[0] - $init[1]; $accumulate += $init[3]; } else - $init[3] = round2($bal['OutStanding'], $dec); - $total = array(0,0,0,0); - for ($i = 0; $i < 4; $i++) - { - $total[$i] += $init[$i]; - $grandtotal[$i] += $init[$i]; - } + $init[3] = round2($bal['OutStanding']*$rate, $dec); $res = getTransactions($myrow['supplier_id'], $from, $to); if ($no_zeros && db_num_rows($res) == 0) continue; @@ -184,10 +176,18 @@ function print_supplier_balances() $rep->AmountCol(5, 6, $init[1], $dec); $rep->AmountCol(6, 7, $init[2], $dec); $rep->AmountCol(7, 8, $init[3], $dec); + $total = array(0,0,0,0); + for ($i = 0; $i < 4; $i++) + { + $total[$i] += $init[$i]; + $grandtotal[$i] += $init[$i]; + } $rep->NewLine(1, 2); - if (db_num_rows($res)==0) continue; - $rep->Line($rep->row + 4); + if (db_num_rows($res)==0) { + $rep->NewLine(1, 2); + continue; + } while ($trans=db_fetch($res)) { if ($no_zeros && floatcmp(abs($trans['TotalAmount']), $trans['Allocated']) == 0) continue; @@ -198,28 +198,25 @@ function print_supplier_balances() if ($trans['type'] == ST_SUPPINVOICE) $rep->DateCol(3, 4, $trans['due_date'], true); $item[0] = $item[1] = 0.0; - if ($convert) - $rate = $trans['rate']; - else - $rate = 1.0; if ($trans['TotalAmount'] > 0.0) { $item[0] = round2(abs($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); $rep->AmountCol(5, 6, $item[1], $dec); $accumulate -= $item[1]; + $item[2] = round2($trans['Allocated'] * $rate, $dec) * -1; } - $item[2] = round2($trans['Allocated'] * $rate, $dec); $rep->AmountCol(6, 7, $item[2], $dec); if ($trans['TotalAmount'] > 0.0) $item[3] = $item[0] - $item[2]; else - $item[3] = ($item[1] - $item[2]) * -1; + $item[3] = -$item[1] - $item[2]; if ($show_balance) $rep->AmountCol(7, 8, $accumulate, $dec); else @@ -255,4 +252,3 @@ function print_supplier_balances() $rep->End(); } -?>