X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep109.php;h=845d0ac746301e19fb1643c60e8380e068b9f91b;hb=46c5f7a65a7659a44ae8254c63152074363d3987;hp=c5faf7692b4c7aa3cdb21e73acea1aabf54139f4;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git diff --git a/reporting/rep109.php b/reporting/rep109.php index c5faf769..845d0ac7 100644 --- a/reporting/rep109.php +++ b/reporting/rep109.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 @@ -22,6 +23,7 @@ include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/sales/includes/sales_db.inc"); +include_once($path_to_root . "/taxes/tax_calc.inc"); //---------------------------------------------------------------------------------------------------- @@ -38,10 +40,9 @@ function print_sales_orders() $from = $_POST['PARAM_0']; $to = $_POST['PARAM_1']; $currency = $_POST['PARAM_2']; - $bankaccount = $_POST['PARAM_3']; - $email = $_POST['PARAM_4']; - $print_as_quote = $_POST['PARAM_5']; - $comments = $_POST['PARAM_6']; + $email = $_POST['PARAM_3']; + $print_as_quote = $_POST['PARAM_4']; + $comments = $_POST['PARAM_5']; if ($from == null) $from = 0; @@ -54,10 +55,8 @@ function print_sales_orders() // $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) @@ -66,6 +65,7 @@ function print_sales_orders() $rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk", user_pagesize()); else $rep = new FrontReport(_("QUOTE"), "QuoteBulk", user_pagesize()); + $rep->SetHeaderType('Header2'); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); @@ -73,11 +73,14 @@ function print_sales_orders() for ($i = $from; $i <= $to; $i++) { - $myrow = get_sales_order_header($i); + $myrow = get_sales_order_header($i, ST_SALESORDER); + $baccount = get_default_bank_account($myrow['curr_code']); + $params['bankaccount'] = $baccount['id']; $branch = get_branch($myrow["branch_code"]); if ($email == 1) { $rep = new FrontReport("", "", user_pagesize()); + $rep->SetHeaderType('Header2'); $rep->currency = $cur; $rep->Font(); if ($print_as_quote == 1) @@ -94,14 +97,20 @@ function print_sales_orders() } else $rep->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER")); - $rep->Header2($myrow, $branch, $myrow, $baccount, 9); - $result = get_sales_order_details($i); + $contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no']); + $rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESORDER, $contacts); + $rep->NewPage(); + + $result = get_sales_order_details($i, ST_SALESORDER); $SubTotal = 0; + $items = $prices = array(); while ($myrow2=db_fetch($result)) { $Net = round2(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]), user_price_dec()); + $prices[] = $Net; + $items[] = $myrow2['stk_code']; $SubTotal += $Net; $DisplayPrice = number_format2($myrow2["unit_price"],$dec); $DisplayQty = number_format2($myrow2["quantity"],get_qty_dec($myrow2['stk_code'])); @@ -123,7 +132,7 @@ function print_sales_orders() $rep->row = $newrow; //$rep->NewLine(1); if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight)) - $rep->Header2($myrow, $branch, $myrow, $baccount, 9); + $rep->NewPage(); } if ($myrow['comments'] != "") { @@ -135,15 +144,8 @@ function print_sales_orders() $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight); $linetype = true; - $doctype = 9; - if ($rep->currency != $myrow['curr_code']) - { - include($path_to_root . "/reporting/includes/doctext2.inc"); - } - else - { - include($path_to_root . "/reporting/includes/doctext.inc"); - } + $doctype = ST_SALESORDER; + include($path_to_root . "/reporting/includes/doctext.inc"); $rep->TextCol(3, 6, $doc_Sub_total, -2); $rep->TextCol(6, 7, $DisplaySubTot, -2); @@ -151,19 +153,68 @@ function print_sales_orders() $rep->TextCol(3, 6, $doc_Shipping, -2); $rep->TextCol(6, 7, $DisplayFreight, -2); $rep->NewLine(); + + $DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec); + if ($myrow['tax_included'] == 0) { + $rep->TextCol(3, 6, $doc_TOTAL_ORDER, - 2); + $rep->TextCol(6, 7, $DisplayTotal, -2); + $rep->NewLine(); + } + + $tax_items = get_tax_for_items($items, $prices, $myrow["freight_cost"], + $myrow['tax_group_id'], $myrow['tax_included'], null); + $first = true; + foreach($tax_items as $tax_item) + { + $DisplayTax = number_format2($tax_item['Value'], $dec); + + if (isset($suppress_tax_rates) && $suppress_tax_rates == 1) + $tax_type_name = $tax_item['tax_type_name']; + else + $tax_type_name = $tax_item['tax_type_name']." (".$tax_item['rate']."%) "; + + if ($myrow['tax_included']) + { + 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_type_name, -2); + $rep->TextCol(6, 7, $DisplayTax, -2); + $first = false; + } + else + $rep->TextCol(3, 7, $doc_Included . " " . $tax_type_name . $doc_Amount . ": " . $DisplayTax, -2); + } + else + { + $SubTotal += $tax_item['Value']; + $rep->TextCol(3, 6, $tax_type_name, -2); + $rep->TextCol(6, 7, $DisplayTax, -2); + } + $rep->NewLine(); + } + + $rep->NewLine(); + $DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec); $rep->Font('bold'); - $rep->TextCol(3, 6, $doc_TOTAL_ORDER, - 2); + $rep->TextCol(3, 6, $doc_TOTAL_ORDER2, - 2); $rep->TextCol(6, 7, $DisplayTotal, -2); + $words = price_in_words($myrow["freight_cost"] + $SubTotal, ST_SALESORDER); + if ($words != "") + { + $rep->NewLine(1); + $rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2); + } $rep->Font(); if ($email == 1) { - if ($myrow['contact_email'] == '') - { - $myrow['contact_email'] = $branch['email']; - $myrow['DebtorName'] = $branch['br_name']; - } - $rep->End($email, $doc_Invoice_no . " " . $myrow['reference'], $myrow); + $rep->End($email, $doc_Invoice_no . " " . $i, $myrow); } } if ($email == 0)