X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep107.php;h=580e3abe4359b1d5280fb0fa61b55bc518567247;hb=25379bdc9f10bda4aae4b37f04d16eb1bbe7e4f6;hp=69b95c97054df1d1c7b2138eee301284e382f396;hpb=fa43a9c974d05b77517a0d8e3e510ef4a088632e;p=fa-stable.git diff --git a/reporting/rep107.php b/reporting/rep107.php index 69b95c97..580e3abe 100644 --- a/reporting/rep107.php +++ b/reporting/rep107.php @@ -27,17 +27,16 @@ include_once($path_to_root . "/sales/includes/sales_db.inc"); //---------------------------------------------------------------------------------------------------- function get_invoice_range($from, $to) { - global $print_invoice_no; + global $SysPrefs; - $ref = ($print_invoice_no == 1 ? "trans_no" : "reference"); + $ref = ($SysPrefs->print_invoice_no() == 1 ? "trans_no" : "reference"); $sql = "SELECT trans.trans_no, trans.reference FROM ".TB_PREF."debtor_trans trans LEFT JOIN ".TB_PREF."voided voided ON trans.type=voided.type AND trans.trans_no=voided.id WHERE trans.type=".ST_SALESINVOICE ." AND ISNULL(voided.id)" - ." AND trans.reference>=".db_escape(get_reference(ST_SALESINVOICE, $from)) - ." AND trans.reference<=".db_escape(get_reference(ST_SALESINVOICE, $to)) + ." AND trans.trans_no BETWEEN ".db_escape($from)." AND ".db_escape($to) ." ORDER BY trans.tran_date, trans.$ref"; return db_query($sql, "Cant retrieve invoice range"); @@ -49,7 +48,7 @@ print_invoices(); function print_invoices() { - global $path_to_root, $alternative_tax_include_on_docs, $suppress_tax_rates, $no_zero_lines_amount; + global $path_to_root, $SysPrefs; $show_this_payment = true; // include payments invoiced here in summary @@ -92,12 +91,15 @@ function print_invoices() $range = get_invoice_range($from, $to); while($row = db_fetch($range)) { - if (!exists_customer_trans(ST_SALESINVOICE, $i)) + if (!exists_customer_trans(ST_SALESINVOICE, $row['trans_no'])) continue; $sign = 1; - $myrow = get_customer_trans($i, ST_SALESINVOICE); + $myrow = get_customer_trans($row['trans_no'], ST_SALESINVOICE); - if($customer && $myrow['debtor_no'] != $customer) { + if ($customer && $myrow['debtor_no'] != $customer) { + continue; + } + if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) { continue; } $baccount = get_default_bank_account($myrow['curr_code']); @@ -111,7 +113,6 @@ function print_invoices() $rep->title = _('INVOICE'); $rep->filename = "Invoice" . $myrow['reference'] . ".pdf"; } - $rep->SetHeaderType('Header2'); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); @@ -119,6 +120,7 @@ function print_invoices() $contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'], true); $baccount['payment_service'] = $pay_service; $rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_SALESINVOICE, $contacts); + $rep->SetHeaderType('Header2'); $rep->NewPage(); // calculate summary start row for later use $summary_start_row = $rep->bottomMargin + (15 * $rep->lineHeight); @@ -130,7 +132,7 @@ function print_invoices() while($inv = db_fetch($result)) { $prepayments[] = $inv; - if ($inv['trans_no'] == $i) + if ($inv['trans_no'] == $row['trans_no']) break; } @@ -140,7 +142,7 @@ function print_invoices() unset($prepayments); } - $result = get_customer_trans_details(ST_SALESINVOICE, $i); + $result = get_customer_trans_details(ST_SALESINVOICE, $row['trans_no']); $SubTotal = 0; while ($myrow2=db_fetch($result)) { @@ -163,7 +165,7 @@ function print_invoices() $rep->TextColLines($c++, $c, $myrow2['StockDescription'], -2); $newrow = $rep->row; $rep->row = $oldrow; - if ($Net != 0.0 || !is_service($myrow2['mb_flag']) || !isset($no_zero_lines_amount) || $no_zero_lines_amount == 0) + if ($Net != 0.0 || !is_service($myrow2['mb_flag']) || !$SysPrefs->no_zero_lines_amount()) { $rep->TextCol($c++, $c, $DisplayQty, -2); $rep->TextCol($c++, $c, $myrow2['units'], -2); @@ -177,22 +179,20 @@ function print_invoices() $rep->NewPage(); } - $memo = get_comments_string(ST_SALESINVOICE, $i); + $memo = get_comments_string(ST_SALESINVOICE, $row['trans_no']); if ($memo != "") { $rep->NewLine(); - $rep->TextColLines(1, 5, $memo, -2); + $rep->TextColLines(1, 3, $memo, -2); } $DisplaySubTot = number_format2($SubTotal,$dec); - $DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec); // set to start of summary line: $rep->row = $summary_start_row; if (isset($prepayments)) { // Partial invoices table - //$rep->NewLine(); $rep->TextCol(0, 3,_("Prepayments invoiced to this order up to day:")); $rep->TextCol(0, 3, str_pad('', 150, '_')); $rep->cols[2] -= 20; @@ -231,10 +231,14 @@ function print_invoices() $rep->TextCol(3, 6, _("Sub-total"), -2); $rep->TextCol(6, 7, $DisplaySubTot, -2); $rep->NewLine(); - $rep->TextCol(3, 6, _("Shipping"), -2); - $rep->TextCol(6, 7, $DisplayFreight, -2); - $rep->NewLine(); - $tax_items = get_trans_tax_details(ST_SALESINVOICE, $i); + if ($myrow['ov_freight'] != 0.0) + { + $DisplayFreight = number_format2($sign*$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_SALESINVOICE, $row['trans_no']); $first = true; while ($tax_item = db_fetch($tax_items)) { @@ -242,14 +246,14 @@ function print_invoices() continue; $DisplayTax = number_format2($sign*$tax_item['amount'], $dec); - if (isset($suppress_tax_rates) && $suppress_tax_rates == 1) + if ($SysPrefs->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 ($SysPrefs->alternative_tax_include_on_docs() == 1) { if ($first) { @@ -262,7 +266,7 @@ function print_invoices() $first = false; } else - $rep->TextCol(3, 7, _("Included") . " " . $tax_type_name . _("Amount") . ": " . $DisplayTax, -2); + $rep->TextCol(3, 6, _("Included") . " " . $tax_type_name . _("Amount") . ": " . $DisplayTax, -2); } else { @@ -303,4 +307,3 @@ function print_invoices() $rep->End(); } -?>