X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep107.php;h=e3bd2065207de7463d6ea976ae327143362d651c;hb=303eb17e9cdd9702eee9fdfcaee51e654a1da541;hp=f4e43cc0f3b85e80a621f54aae9691991b807777;hpb=45b9663b6305cb70c2f3f1782406232d3ed0d755;p=fa-stable.git diff --git a/reporting/rep107.php b/reporting/rep107.php index f4e43cc0..e3bd2065 100644 --- a/reporting/rep107.php +++ b/reporting/rep107.php @@ -1,15 +1,16 @@ . + See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ? + 'SA_SALESTRANSVIEW' : 'SA_SALESBULKREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -25,7 +26,6 @@ include_once($path_to_root . "/sales/includes/sales_db.inc"); //---------------------------------------------------------------------------------------------------- -// trial_inquiry_controls(); print_invoices(); //---------------------------------------------------------------------------------------------------- @@ -33,16 +33,15 @@ print_invoices(); function print_invoices() { global $path_to_root; - + include_once($path_to_root . "/reporting/includes/pdf_report.inc"); $from = $_POST['PARAM_0']; $to = $_POST['PARAM_1']; $currency = $_POST['PARAM_2']; - $bankaccount = $_POST['PARAM_3']; - $email = $_POST['PARAM_4']; - $paylink = $_POST['PARAM_5']; - $comments = $_POST['PARAM_6']; + $email = $_POST['PARAM_3']; + $paylink = $_POST['PARAM_4']; + $comments = $_POST['PARAM_5']; if ($from == null) $from = 0; @@ -50,7 +49,7 @@ function print_invoices() $to = 0; $dec = user_price_dec(); - $fno = explode("-", $from); + $fno = explode("-", $from); $tno = explode("-", $to); $cols = array(4, 60, 225, 300, 325, 385, 450, 515); @@ -58,15 +57,13 @@ function print_invoices() // $headers in doctext.inc $aligns = array('left', 'left', 'right', 'left', 'right', 'right', 'right'); - $params = array('comments' => $comments, - 'bankaccount' => $bankaccount); + $params = array('comments' => $comments); - $baccount = get_bank_account($params['bankaccount']); $cur = get_company_Pref('curr_default'); if ($email == 0) { - $rep = new FrontReport(_('INVOICE'), "InvoiceBulk.pdf", user_pagesize()); + $rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize()); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); @@ -74,18 +71,21 @@ function print_invoices() for ($i = $fno[0]; $i <= $tno[0]; $i++) { - for ($j = 10; $j <= 11; $j++) + for ($j = ST_SALESINVOICE; $j <= ST_CUSTCREDIT; $j++) { - if (isset($_POST['PARAM_7']) && $_POST['PARAM_7'] != $j) + if (isset($_POST['PARAM_6']) && $_POST['PARAM_6'] != $j) continue; if (!exists_customer_trans($j, $i)) continue; - $sign = $j==10 ? 1 : -1; + $sign = $j==ST_SALESINVOICE ? 1 : -1; $myrow = get_customer_trans($i, $j); + $baccount = get_default_bank_account($myrow['curr_code']); + $params['bankaccount'] = $baccount['id']; + $branch = get_branch($myrow["branch_code"]); $branch['disable_branch'] = $paylink; // helper - if ($j == 10) - $sales_order = get_sales_order_header($myrow["order_"]); + if ($j == ST_SALESINVOICE) + $sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER); else $sales_order = null; if ($email == 1) @@ -93,7 +93,7 @@ function print_invoices() $rep = new FrontReport("", "", user_pagesize()); $rep->currency = $cur; $rep->Font(); - if ($j == 10) + if ($j == ST_SALESINVOICE) { $rep->title = _('INVOICE'); $rep->filename = "Invoice" . $myrow['reference'] . ".pdf"; @@ -106,13 +106,16 @@ function print_invoices() $rep->Info($params, $cols, null, $aligns); } else - $rep->title = ($j == 10) ? _('INVOICE') : _('CREDIT NOTE'); + $rep->title = ($j == ST_SALESINVOICE) ? _('INVOICE') : _('CREDIT NOTE'); $rep->Header2($myrow, $branch, $sales_order, $baccount, $j); $result = get_customer_trans_details($j, $i); $SubTotal = 0; while ($myrow2=db_fetch($result)) { + if ($myrow2["quantity"] == 0) + continue; + $Net = round2($sign * ((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]), user_price_dec()); $SubTotal += $Net; @@ -124,13 +127,17 @@ function print_invoices() else $DisplayDiscount = number_format2($myrow2["discount_percent"]*100,user_percent_dec()) . "%"; $rep->TextCol(0, 1, $myrow2['stock_id'], -2); - $rep->TextCol(1, 2, $myrow2['StockDescription'], -2); + $oldrow = $rep->row; + $rep->TextColLines(1, 2, $myrow2['StockDescription'], -2); + $newrow = $rep->row; + $rep->row = $oldrow; $rep->TextCol(2, 3, $DisplayQty, -2); $rep->TextCol(3, 4, $myrow2['units'], -2); $rep->TextCol(4, 5, $DisplayPrice, -2); $rep->TextCol(5, 6, $DisplayDiscount, -2); $rep->TextCol(6, 7, $DisplayNet, -2); - $rep->NewLine(1); + $rep->row = $newrow; + //$rep->NewLine(1); if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight)) $rep->Header2($myrow, $branch, $sales_order, $baccount,$j); } @@ -146,7 +153,7 @@ function print_invoices() $DisplaySubTot = number_format2($SubTotal,$dec); $DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec); - $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight); + $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight); $linetype = true; $doctype = $j; if ($rep->currency != $myrow['curr_code']) @@ -164,7 +171,7 @@ function print_invoices() $rep->TextCol(3, 6, $doc_Shipping, -2); $rep->TextCol(6, 7, $DisplayFreight, -2); $rep->NewLine(); - $tax_items = get_customer_trans_tax_details($j, $i); + $tax_items = get_trans_tax_details($j, $i); while ($tax_item = db_fetch($tax_items)) { $DisplayTax = number_format2($sign*$tax_item['amount'], $dec); @@ -188,6 +195,12 @@ function print_invoices() $rep->Font('bold'); $rep->TextCol(3, 6, $doc_TOTAL_INVOICE, - 2); $rep->TextCol(6, 7, $DisplayTotal, -2); + $words = price_in_words($myrow['Total'], $j); + if ($words != "") + { + $rep->NewLine(1); + $rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2); + } $rep->Font(); if ($email == 1) {