projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes form main trunk (2.2.8, 2.2.9)
[fa-stable.git]
/
reporting
/
rep209.php
diff --git
a/reporting/rep209.php
b/reporting/rep209.php
index b9a8a049509fd75b3252f9abc339b2bced951cd1..c2892cf0b37254b2110ff23bf87920335527fb54 100644
(file)
--- a/
reporting/rep209.php
+++ b/
reporting/rep209.php
@@
-9,7
+9,9
@@
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_SUPPTRANSVIEW' : 'SA_SUPPBULKREP';
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
@@
-21,6
+23,7
@@
$path_to_root="..";
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 . "/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 . "/includes/db/crm_contacts_db.inc");
//----------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------
@@
-29,13
+32,14
@@
print_po();
//----------------------------------------------------------------------------------------------------
function get_po($order_no)
{
//----------------------------------------------------------------------------------------------------
function get_po($order_no)
{
- $sql = "SELECT ".TB_PREF."purch_orders.*, ".TB_PREF."suppliers.supp_name, ".TB_PREF."suppliers.supp_account_no,
+ $sql = "SELECT ".TB_PREF."purch_orders.*, ".TB_PREF."suppliers.supp_name, "
+ .TB_PREF."suppliers.supp_account_no,
".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.payment_terms, ".TB_PREF."locations.location_name,
".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.payment_terms, ".TB_PREF."locations.location_name,
- ".TB_PREF."suppliers.
email, ".TB_PREF."suppliers.
address, ".TB_PREF."suppliers.contact
+ ".TB_PREF."suppliers.address, ".TB_PREF."suppliers.contact
FROM ".TB_PREF."purch_orders, ".TB_PREF."suppliers, ".TB_PREF."locations
WHERE ".TB_PREF."purch_orders.supplier_id = ".TB_PREF."suppliers.supplier_id
AND ".TB_PREF."locations.loc_code = into_stock_location
FROM ".TB_PREF."purch_orders, ".TB_PREF."suppliers, ".TB_PREF."locations
WHERE ".TB_PREF."purch_orders.supplier_id = ".TB_PREF."suppliers.supplier_id
AND ".TB_PREF."locations.loc_code = into_stock_location
- AND ".TB_PREF."purch_orders.order_no = "
. $order_no
;
+ AND ".TB_PREF."purch_orders.order_no = "
.db_escape($order_no)
;
$result = db_query($sql, "The order cannot be retrieved");
return db_fetch($result);
}
$result = db_query($sql, "The order cannot be retrieved");
return db_fetch($result);
}
@@
-46,7
+50,7
@@
function get_po_details($order_no)
FROM ".TB_PREF."purch_order_details
LEFT JOIN ".TB_PREF."stock_master
ON ".TB_PREF."purch_order_details.item_code=".TB_PREF."stock_master.stock_id
FROM ".TB_PREF."purch_order_details
LEFT JOIN ".TB_PREF."stock_master
ON ".TB_PREF."purch_order_details.item_code=".TB_PREF."stock_master.stock_id
- WHERE order_no =
$order_no
";
+ WHERE order_no =
".db_escape($order_no)."
";
$sql .= " ORDER BY po_detail_item";
return db_query($sql, "Retreive order Line Items");
}
$sql .= " ORDER BY po_detail_item";
return db_query($sql, "Retreive order Line Items");
}
@@
-60,9
+64,8
@@
function print_po()
$from = $_POST['PARAM_0'];
$to = $_POST['PARAM_1'];
$currency = $_POST['PARAM_2'];
$from = $_POST['PARAM_0'];
$to = $_POST['PARAM_1'];
$currency = $_POST['PARAM_2'];
- $bankaccount = $_POST['PARAM_3'];
- $email = $_POST['PARAM_4'];
- $comments = $_POST['PARAM_5'];
+ $email = $_POST['PARAM_3'];
+ $comments = $_POST['PARAM_4'];
if ($from == null)
$from = 0;
if ($from == null)
$from = 0;
@@
-75,15
+78,14
@@
function print_po()
// $headers in doctext.inc
$aligns = array('left', 'left', 'left', 'right', 'left', 'right', 'right');
// $headers in doctext.inc
$aligns = array('left', 'left', 'left', 'right', 'left', '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)
{
$rep = new FrontReport(_('PURCHASE ORDER'), "PurchaseOrderBulk", user_pagesize());
$cur = get_company_Pref('curr_default');
if ($email == 0)
{
$rep = new FrontReport(_('PURCHASE ORDER'), "PurchaseOrderBulk", user_pagesize());
+ $rep->SetHeaderType('Header2');
$rep->currency = $cur;
$rep->Font();
$rep->Info($params, $cols, null, $aligns);
$rep->currency = $cur;
$rep->Font();
$rep->Info($params, $cols, null, $aligns);
@@
-92,10
+94,13
@@
function print_po()
for ($i = $from; $i <= $to; $i++)
{
$myrow = get_po($i);
for ($i = $from; $i <= $to; $i++)
{
$myrow = get_po($i);
+ $baccount = get_default_bank_account($myrow['curr_code']);
+ $params['bankaccount'] = $baccount['id'];
if ($email == 1)
{
$rep = new FrontReport("", "", user_pagesize());
if ($email == 1)
{
$rep = new FrontReport("", "", user_pagesize());
+ $rep->SetHeaderType('Header2');
$rep->currency = $cur;
$rep->Font();
$rep->title = _('PURCHASE ORDER');
$rep->currency = $cur;
$rep->Font();
$rep->title = _('PURCHASE ORDER');
@@
-104,7
+109,9
@@
function print_po()
}
else
$rep->title = _('PURCHASE ORDER');
}
else
$rep->title = _('PURCHASE ORDER');
- $rep->Header2($myrow, null, $myrow, $baccount, 8);
+ $contacts = get_supplier_contacts($myrow['supplier_id'], 'order');
+ $rep->SetCommonData($myrow, null, $myrow, $baccount, ST_PURCHORDER, $contacts);
+ $rep->NewPage();
$result = get_po_details($i);
$SubTotal = 0;
$result = get_po_details($i);
$SubTotal = 0;
@@
-138,7
+145,7
@@
function print_po()
$rep->TextCol(6, 7, $DisplayNet, -2);
$rep->NewLine(1);
if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
$rep->TextCol(6, 7, $DisplayNet, -2);
$rep->NewLine(1);
if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
- $rep->
Header2($myrow, $branch, $myrow, $baccount, 8
);
+ $rep->
NewPage(
);
}
if ($myrow['comments'] != "")
{
}
if ($myrow['comments'] != "")
{
@@
-149,15
+156,8
@@
function print_po()
$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
$linetype = true;
$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
$linetype = true;
- $doctype = 8;
- 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_PURCHORDER;
+ include($path_to_root . "/reporting/includes/doctext.inc");
$rep->TextCol(3, 6, $doc_Sub_total, -2);
$rep->TextCol(6, 7, $DisplaySubTot, -2);
$rep->TextCol(3, 6, $doc_Sub_total, -2);
$rep->TextCol(6, 7, $DisplaySubTot, -2);
@@
-166,13
+166,20
@@
function print_po()
$rep->Font('bold');
$rep->TextCol(3, 6, $doc_TOTAL_PO, - 2);
$rep->TextCol(6, 7, $DisplayTotal, -2);
$rep->Font('bold');
$rep->TextCol(3, 6, $doc_TOTAL_PO, - 2);
$rep->TextCol(6, 7, $DisplayTotal, -2);
+ $words = price_in_words($SubTotal, ST_PURCHORDER);
+ if ($words != "")
+ {
+ $rep->NewLine(1);
+ $rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2);
+ }
$rep->Font();
if ($email == 1)
{
$rep->Font();
if ($email == 1)
{
-
$myrow['contact_email'] = $myrow['email'];
+
//
$myrow['contact_email'] = $myrow['email'];
$myrow['DebtorName'] = $myrow['supp_name'];
$myrow['DebtorName'] = $myrow['supp_name'];
- if ($myrow['contact'] != '') $myrow['DebtorName'] = $myrow['contact'];
- $myrow['reference'] = $myrow['order_no'];
+
+ if ($myrow['reference'] == "")
+ $myrow['reference'] = $myrow['order_no'];
$rep->End($email, $doc_Order_no . " " . $myrow['reference'], $myrow);
}
}
$rep->End($email, $doc_Order_no . " " . $myrow['reference'], $myrow);
}
}