X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep110.php;h=f32b1264605166b1bb8894233acfc5051a304452;hb=de09a35c9e55aceaf1c71052cbb40f44e4b3bbc7;hp=fc330428b7f6af2f030b9dd28198f467b8cf6489;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git diff --git a/reporting/rep110.php b/reporting/rep110.php index fc330428..f32b1264 100644 --- a/reporting/rep110.php +++ b/reporting/rep110.php @@ -34,7 +34,7 @@ print_deliveries(); function print_deliveries() { - global $path_to_root, $packing_slip; + global $path_to_root, $packing_slip, $alternative_tax_include_on_docs, $suppress_tax_rates, $no_zero_lines_amount; include_once($path_to_root . "/reporting/includes/pdf_report.inc"); @@ -43,15 +43,17 @@ function print_deliveries() $email = $_POST['PARAM_2']; $packing_slip = $_POST['PARAM_3']; $comments = $_POST['PARAM_4']; + $orientation = $_POST['PARAM_5']; - if ($from == null) - $from = 0; - if ($to == null) - $to = 0; + if (!$from || !$to) return; + + $orientation = ($orientation ? 'L' : 'P'); $dec = user_price_dec(); $fno = explode("-", $from); $tno = explode("-", $to); + $from = min($fno[0], $tno[0]); + $to = max($fno[0], $tno[0]); $cols = array(4, 60, 225, 300, 325, 385, 450, 515); @@ -65,15 +67,13 @@ function print_deliveries() if ($email == 0) { if ($packing_slip == 0) - $rep = new FrontReport(_('DELIVERY'), "DeliveryNoteBulk", user_pagesize()); + $rep = new FrontReport(_('DELIVERY'), "DeliveryNoteBulk", user_pagesize(), 9, $orientation); else - $rep = new FrontReport(_('PACKING SLIP'), "PackingSlipBulk", user_pagesize()); - $rep->currency = $cur; - $rep->Font(); - $rep->Info($params, $cols, null, $aligns); + $rep = new FrontReport(_('PACKING SLIP'), "PackingSlipBulk", user_pagesize(), 9, $orientation); } - - for ($i = $fno[0]; $i <= $tno[0]; $i++) + if ($orientation == 'L') + recalculate_cols($cols); + for ($i = $from; $i <= $to; $i++) { if (!exists_customer_trans(ST_CUSTDELIVERY, $i)) continue; @@ -82,9 +82,7 @@ function print_deliveries() $sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER); // ? if ($email == 1) { - $rep = new FrontReport("", "", user_pagesize()); - $rep->currency = $cur; - $rep->Font(); + $rep = new FrontReport("", "", user_pagesize(), 9, $orientation); if ($packing_slip == 0) { $rep->title = _('DELIVERY NOTE'); @@ -95,16 +93,23 @@ function print_deliveries() $rep->title = _('PACKING SLIP'); $rep->filename = "Packing_slip" . $myrow['reference'] . ".pdf"; } - $rep->Info($params, $cols, null, $aligns); } - else - $rep->title = _('DELIVERY NOTE'); - $rep->Header2($myrow, $branch, $sales_order, '', 13); + $rep->SetHeaderType('Header2'); + $rep->currency = $cur; + $rep->Font(); + $rep->Info($params, $cols, null, $aligns); - $result = get_customer_trans_details(13, $i); + $contacts = get_branch_contacts($branch['branch_code'], 'delivery', $branch['debtor_no'], true); + $rep->SetCommonData($myrow, $branch, $sales_order, '', ST_CUSTDELIVERY, $contacts); + $rep->NewPage(); + + $result = get_customer_trans_details(ST_CUSTDELIVERY, $i); $SubTotal = 0; while ($myrow2=db_fetch($result)) { + if ($myrow2["quantity"] == 0) + continue; + $Net = round2(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]), user_price_dec()); $SubTotal += $Net; @@ -120,63 +125,79 @@ function print_deliveries() $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); - if ($packing_slip == 0) - { - $rep->TextCol(4, 5, $DisplayPrice, -2); - $rep->TextCol(5, 6, $DisplayDiscount, -2); - $rep->TextCol(6, 7, $DisplayNet, -2); + if ($Net != 0.0 || !is_service($myrow2['mb_flag']) || !isset($no_zero_lines_amount) || $no_zero_lines_amount == 0) + { + $rep->TextCol(2, 3, $DisplayQty, -2); + $rep->TextCol(3, 4, $myrow2['units'], -2); + if ($packing_slip == 0) + { + $rep->TextCol(4, 5, $DisplayPrice, -2); + $rep->TextCol(5, 6, $DisplayDiscount, -2); + $rep->TextCol(6, 7, $DisplayNet, -2); + } } $rep->row = $newrow; //$rep->NewLine(1); if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight)) - $rep->Header2($myrow, $branch, $sales_order,'',13); + $rep->NewPage(); } - $comments = get_comments(ST_CUSTDELIVERY, $i); - if ($comments && db_num_rows($comments)) + $memo = get_comments_string(ST_CUSTDELIVERY, $i); + if ($memo != "") { $rep->NewLine(); - while ($comment=db_fetch($comments)) - $rep->TextColLines(0, 6, $comment['memo_'], -2); + $rep->TextColLines(1, 5, $memo, -2); } $DisplaySubTot = number_format2($SubTotal,$dec); - $DisplayFreight = number_format2($myrow["ov_freight"],$dec); $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight); - $linetype = true; - $doctype=13; - 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_CUSTDELIVERY; if ($packing_slip == 0) { - $rep->TextCol(3, 6, $doc_Sub_total, -2); + $rep->TextCol(3, 6, _("Sub-total"), -2); $rep->TextCol(6, 7, $DisplaySubTot, -2); $rep->NewLine(); - $rep->TextCol(3, 6, $doc_Shipping, -2); - $rep->TextCol(6, 7, $DisplayFreight, -2); - $rep->NewLine(); - $tax_items = get_trans_tax_details(13, $i); + if ($myrow['ov_freight'] != 0.0) + { + $DisplayFreight = number_format2($myrow["ov_freight"],$dec); + $rep->TextCol(3, 6, _("Shipping"), -2); + $rep->TextCol(6, 7, $DisplayFreight, -2); + $rep->NewLine(); + } + $tax_items = get_trans_tax_details(ST_CUSTDELIVERY, $i); + $first = true; while ($tax_item = db_fetch($tax_items)) { + if ($tax_item['amount'] == 0) + continue; $DisplayTax = number_format2($tax_item['amount'], $dec); - if ($tax_item['included_in_price']) + + 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 ($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($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, _("Included") . " " . $tax_type_name . _("Amount") . ": " . $DisplayTax, -2); } else { - $rep->TextCol(3, 6, $tax_item['tax_type_name'] . " (" . - $tax_item['rate'] . "%)", -2); + $rep->TextCol(3, 6, $tax_type_name, -2); $rep->TextCol(6, 7, $DisplayTax, -2); } $rep->NewLine(); @@ -185,18 +206,19 @@ function print_deliveries() $DisplayTotal = number_format2($myrow["ov_freight"] +$myrow["ov_freight_tax"] + $myrow["ov_gst"] + $myrow["ov_amount"],$dec); $rep->Font('bold'); - $rep->TextCol(3, 6, $doc_TOTAL_DELIVERY, - 2); + $rep->TextCol(3, 6, _("TOTAL DELIVERY INCL. VAT"), - 2); $rep->TextCol(6, 7, $DisplayTotal, -2); + $words = price_in_words($myrow['Total'], ST_CUSTDELIVERY); + if ($words != "") + { + $rep->NewLine(1); + $rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2); + } $rep->Font(); } if ($email == 1) { - if ($myrow['email'] == '') - { - $myrow['email'] = $branch['email']; - $myrow['DebtorName'] = $branch['br_name']; - } - $rep->End($email, $doc_Delivery_no . " " . $myrow['reference'], $myrow, 13); + $rep->End($email); } } if ($email == 0)