projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup
[fa-stable.git]
/
reporting
/
rep107.php
diff --git
a/reporting/rep107.php
b/reporting/rep107.php
index 774acf9205bc8a7214aa7e8179d7b952d68f558e..e3bd2065207de7463d6ea976ae327143362d651c 100644
(file)
--- a/
reporting/rep107.php
+++ b/
reporting/rep107.php
@@
-9,7
+9,8
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
-$page_security = 2;
+$page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ?
+ 'SA_SALESTRANSVIEW' : 'SA_SALESBULKREP';
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
@@
-25,7
+26,6
@@
include_once($path_to_root . "/sales/includes/sales_db.inc");
//----------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------
-// trial_inquiry_controls();
print_invoices();
//----------------------------------------------------------------------------------------------------
print_invoices();
//----------------------------------------------------------------------------------------------------
@@
-33,16
+33,15
@@
print_invoices();
function print_invoices()
{
global $path_to_root;
function print_invoices()
{
global $path_to_root;
-
+
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
$from = $_POST['PARAM_0'];
$to = $_POST['PARAM_1'];
$currency = $_POST['PARAM_2'];
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;
if ($from == null)
$from = 0;
@@
-50,7
+49,7
@@
function print_invoices()
$to = 0;
$dec = user_price_dec();
$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);
$tno = explode("-", $to);
$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
@@
-58,15
+57,13
@@
function print_invoices()
// $headers in doctext.inc
$aligns = array('left', 'left', 'right', 'left', 'right', 'right', 'right');
// $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)
{
$cur = get_company_Pref('curr_default');
if ($email == 0)
{
- $rep = new FrontReport(_('INVOICE'), "InvoiceBulk
.pdf
", user_pagesize());
+ $rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize());
$rep->currency = $cur;
$rep->Font();
$rep->Info($params, $cols, null, $aligns);
$rep->currency = $cur;
$rep->Font();
$rep->Info($params, $cols, null, $aligns);
@@
-74,18
+71,21
@@
function print_invoices()
for ($i = $fno[0]; $i <= $tno[0]; $i++)
{
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;
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);
$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
$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)
else
$sales_order = null;
if ($email == 1)
@@
-93,7
+93,7
@@
function print_invoices()
$rep = new FrontReport("", "", user_pagesize());
$rep->currency = $cur;
$rep->Font();
$rep = new FrontReport("", "", user_pagesize());
$rep->currency = $cur;
$rep->Font();
- if ($j ==
10
)
+ if ($j ==
ST_SALESINVOICE
)
{
$rep->title = _('INVOICE');
$rep->filename = "Invoice" . $myrow['reference'] . ".pdf";
{
$rep->title = _('INVOICE');
$rep->filename = "Invoice" . $myrow['reference'] . ".pdf";
@@
-106,13
+106,16
@@
function print_invoices()
$rep->Info($params, $cols, null, $aligns);
}
else
$rep->Info($params, $cols, null, $aligns);
}
else
- $rep->title = ($j ==
10
) ? _('INVOICE') : _('CREDIT NOTE');
+ $rep->title = ($j ==
ST_SALESINVOICE
) ? _('INVOICE') : _('CREDIT NOTE');
$rep->Header2($myrow, $branch, $sales_order, $baccount, $j);
$result = get_customer_trans_details($j, $i);
$SubTotal = 0;
while ($myrow2=db_fetch($result))
{
$rep->Header2($myrow, $branch, $sales_order, $baccount, $j);
$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;
$Net = round2($sign * ((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
user_price_dec());
$SubTotal += $Net;
@@
-192,6
+195,12
@@
function print_invoices()
$rep->Font('bold');
$rep->TextCol(3, 6, $doc_TOTAL_INVOICE, - 2);
$rep->TextCol(6, 7, $DisplayTotal, -2);
$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)
{
$rep->Font();
if ($email == 1)
{