X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep107.php;h=275498c9d184b06f92baf88756132f7d74f2cecc;hb=7fae690528df9b851fba309b71bf7c3b961c9dd9;hp=d9f8aa22b5da82fc05eae1522b24960645008ac9;hpb=ad96cd0abbfd826592b851b8e0cb6d89e450fdf4;p=fa-stable.git diff --git a/reporting/rep107.php b/reporting/rep107.php index d9f8aa22..275498c9 100644 --- a/reporting/rep107.php +++ b/reporting/rep107.php @@ -9,7 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 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 @@ -31,17 +32,16 @@ print_invoices(); function print_invoices() { - global $path_to_root; - + global $path_to_root, $alternative_tax_include_on_docs; + 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; @@ -49,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); @@ -57,15 +57,14 @@ 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", user_pagesize()); + $rep->SetHeaderType('Header2'); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); @@ -73,26 +72,30 @@ 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) { $rep = new FrontReport("", "", user_pagesize()); + $rep->SetHeaderType('Header2'); $rep->currency = $cur; $rep->Font(); - if ($j == 10) + if ($j == ST_SALESINVOICE) { $rep->title = _('INVOICE'); $rep->filename = "Invoice" . $myrow['reference'] . ".pdf"; @@ -105,13 +108,17 @@ function print_invoices() $rep->Info($params, $cols, null, $aligns); } else - $rep->title = ($j == 10) ? _('INVOICE') : _('CREDIT NOTE'); - $rep->Header2($myrow, $branch, $sales_order, $baccount, $j); + $rep->title = ($j == ST_SALESINVOICE) ? _('INVOICE') : _('CREDIT NOTE'); + $rep->SetCommonData($myrow, $branch, $sales_order, $baccount, $j); + $rep->NewPage(); $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; @@ -135,7 +142,7 @@ function print_invoices() $rep->row = $newrow; //$rep->NewLine(1); if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight)) - $rep->Header2($myrow, $branch, $sales_order, $baccount,$j); + $rep->NewPage(); } $comments = get_comments($j, $i); @@ -152,14 +159,7 @@ function print_invoices() $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight); $linetype = true; $doctype = $j; - if ($rep->currency != $myrow['curr_code']) - { - include($path_to_root . "/reporting/includes/doctext2.inc"); - } - else - { - include($path_to_root . "/reporting/includes/doctext.inc"); - } + include($path_to_root . "/reporting/includes/doctext.inc"); $rep->TextCol(3, 6, $doc_Sub_total, -2); $rep->TextCol(6, 7, $DisplaySubTot, -2); @@ -168,14 +168,29 @@ function print_invoices() $rep->TextCol(6, 7, $DisplayFreight, -2); $rep->NewLine(); $tax_items = get_trans_tax_details($j, $i); + $first = true; while ($tax_item = db_fetch($tax_items)) { $DisplayTax = number_format2($sign*$tax_item['amount'], $dec); if ($tax_item['included_in_price']) { - $rep->TextCol(3, 7, $doc_Included . " " . $tax_item['tax_type_name'] . - " (" . $tax_item['rate'] . "%) " . $doc_Amount . ":" . $DisplayTax, -2); + if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1) + { + if ($first) + { + $rep->TextCol(3, 6, _("Total Tax Excluded"), -2); + $rep->TextCol(6, 7, number_format2($sign*$tax_item['net_amount'], $dec), -2); + $rep->NewLine(); + } + $rep->TextCol(3, 6, $tax_item['tax_type_name'] . " (" . + $tax_item['rate'] . "%)", -2); + $rep->TextCol(6, 7, $DisplayTax, -2); + $first = false; + } + else + $rep->TextCol(3, 7, $doc_Included . " " . $tax_item['tax_type_name'] . + " (" . $tax_item['rate'] . "%) " . $doc_Amount . ": " . $DisplayTax, -2); } else { @@ -191,6 +206,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) {