X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep110.php;h=6b392cd0ab3fe987d107348586c74b7d8726c636;hb=a749d48dad4cdb0708ff272129338fa46fff7c2c;hp=271b0fc079eea60859f415f95e6fd2f84af53b22;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git diff --git a/reporting/rep110.php b/reporting/rep110.php index 271b0fc0..6b392cd0 100644 --- a/reporting/rep110.php +++ b/reporting/rep110.php @@ -25,6 +25,7 @@ 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"); +$packing_slip = 0; //---------------------------------------------------------------------------------------------------- print_deliveries(); @@ -33,14 +34,15 @@ print_deliveries(); function print_deliveries() { - global $path_to_root; + global $path_to_root, $packing_slip, $alternative_tax_include_on_docs, $suppress_tax_rates; include_once($path_to_root . "/reporting/includes/pdf_report.inc"); $from = $_POST['PARAM_0']; $to = $_POST['PARAM_1']; $email = $_POST['PARAM_2']; - $comments = $_POST['PARAM_3']; + $packing_slip = $_POST['PARAM_3']; + $comments = $_POST['PARAM_4']; if ($from == null) $from = 0; @@ -62,7 +64,11 @@ function print_deliveries() if ($email == 0) { - $rep = new FrontReport(_('DELIVERY'), "DeliveryNoteBulk", user_pagesize()); + if ($packing_slip == 0) + $rep = new FrontReport(_('DELIVERY'), "DeliveryNoteBulk", user_pagesize()); + else + $rep = new FrontReport(_('PACKING SLIP'), "PackingSlipBulk", user_pagesize()); + $rep->SetHeaderType('Header2'); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); @@ -70,28 +76,42 @@ function print_deliveries() for ($i = $fno[0]; $i <= $tno[0]; $i++) { - if (!exists_customer_trans(13, $i)) + if (!exists_customer_trans(ST_CUSTDELIVERY, $i)) continue; - $myrow = get_customer_trans($i, 13); + $myrow = get_customer_trans($i, ST_CUSTDELIVERY); $branch = get_branch($myrow["branch_code"]); - $sales_order = get_sales_order_header($myrow["order_"]); // ? + $sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER); // ? if ($email == 1) { $rep = new FrontReport("", "", user_pagesize()); + $rep->SetHeaderType('Header2'); $rep->currency = $cur; $rep->Font(); + if ($packing_slip == 0) + { $rep->title = _('DELIVERY NOTE'); $rep->filename = "Delivery" . $myrow['reference'] . ".pdf"; + } + else + { + $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); + $contacts = get_branch_contacts($branch['branch_code'], 'delivery', $branch['debtor_no']); + $rep->SetCommonData($myrow, $branch, $sales_order, '', ST_CUSTDELIVERY, $contacts); + $rep->NewPage(); - $result = get_customer_trans_details(13, $i); + $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; @@ -109,16 +129,19 @@ function print_deliveries() $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); + 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(13, $i); + $comments = get_comments(ST_CUSTDELIVERY, $i); if ($comments && db_num_rows($comments)) { $rep->NewLine(); @@ -131,55 +154,68 @@ function print_deliveries() $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight); $linetype = true; - $doctype=13; - if ($rep->currency != $myrow['curr_code']) + $doctype=ST_CUSTDELIVERY; + include($path_to_root . "/reporting/includes/doctext.inc"); + if ($packing_slip == 0) { - include($path_to_root . "/reporting/includes/doctext2.inc"); - } - else - { - include($path_to_root . "/reporting/includes/doctext.inc"); - } - - $rep->TextCol(3, 6, $doc_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); - while ($tax_item = db_fetch($tax_items)) - { - $DisplayTax = number_format2($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); - } - else - { - $rep->TextCol(3, 6, $tax_item['tax_type_name'] . " (" . - $tax_item['rate'] . "%)", -2); - $rep->TextCol(6, 7, $DisplayTax, -2); - } + $rep->TextCol(3, 6, $doc_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(); - } - $rep->NewLine(); - $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(6, 7, $DisplayTotal, -2); - $rep->Font(); + $tax_items = get_trans_tax_details(ST_CUSTDELIVERY, $i); + $first = true; + while ($tax_item = db_fetch($tax_items)) + { + $DisplayTax = number_format2($tax_item['amount'], $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 ($tax_item['included_in_price']) + { + 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, $doc_Included . " " . $tax_type_name . $doc_Amount . ": " . $DisplayTax, -2); + } + else + { + $rep->TextCol(3, 6, $tax_type_name, -2); + $rep->TextCol(6, 7, $DisplayTax, -2); + } + $rep->NewLine(); + } + $rep->NewLine(); + $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(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) { - $myrow['dimension_id'] = $paylink; // helper for pmt link - 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, $doc_Delivery_no . " " . $myrow['reference'], $myrow, ST_CUSTDELIVERY); } } if ($email == 0)