projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed slow sql for po related invoices/credits.
[fa-stable.git]
/
reporting
/
rep105.php
diff --git
a/reporting/rep105.php
b/reporting/rep105.php
index e3cd6de775a3becf785c7271ad8335b34e357954..ad6e6ce4628f9b8d270c949b20613b1c2366f59f 100644
(file)
--- a/
reporting/rep105.php
+++ b/
reporting/rep105.php
@@
-9,7
+9,7
@@
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 =
'SA_SALESBULKREP'
;
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
@@
-49,7
+49,9
@@
function GetSalesOrders($from, $to, $category=0, $location=null, $backorder=0)
".TB_PREF."sales_order_details.qty_sent
FROM ".TB_PREF."sales_orders
INNER JOIN ".TB_PREF."sales_order_details
".TB_PREF."sales_order_details.qty_sent
FROM ".TB_PREF."sales_orders
INNER JOIN ".TB_PREF."sales_order_details
- ON ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no
+ ON (".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no
+ AND ".TB_PREF."sales_orders.trans_type = ".TB_PREF."sales_order_details.trans_type
+ AND ".TB_PREF."sales_orders.trans_type = ".ST_SALESORDER.")
INNER JOIN ".TB_PREF."stock_master
ON ".TB_PREF."sales_order_details.stk_code = ".TB_PREF."stock_master.stock_id
WHERE ".TB_PREF."sales_orders.ord_date >='$fromdate'
INNER JOIN ".TB_PREF."stock_master
ON ".TB_PREF."sales_order_details.stk_code = ".TB_PREF."stock_master.stock_id
WHERE ".TB_PREF."sales_orders.ord_date >='$fromdate'
@@
-83,9
+85,9
@@
function print_order_status_list()
else
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
else
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
- if ($category ==
reserved_words::get_all_numeric()
)
+ if ($category ==
ALL_NUMERIC
)
$category = 0;
$category = 0;
- if ($location ==
reserved_words::get_all()
)
+ if ($location ==
ALL_TEXT
)
$location = null;
if ($category == 0)
$cat = _('All');
$location = null;
if ($category == 0)
$cat = _('All');
@@
-94,7
+96,7
@@
function print_order_status_list()
if ($location == null)
$loc = _('All');
else
if ($location == null)
$loc = _('All');
else
- $loc =
$location
;
+ $loc =
get_location_name($location)
;
if ($backorder == 0)
$back = _('All Orders');
else
if ($backorder == 0)
$back = _('All Orders');
else
@@
-123,7
+125,7
@@
function print_order_status_list()
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2);
- $rep->
Header
();
+ $rep->
NewPage
();
$orderno = 0;
$result = GetSalesOrders($from, $to, $category, $location, $backorder);
$orderno = 0;
$result = GetSalesOrders($from, $to, $category, $location, $backorder);
@@
-133,7
+135,7
@@
function print_order_status_list()
if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
{
$orderno = 0;
if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
{
$orderno = 0;
- $rep->
Header
();
+ $rep->
NewPage
();
}
$rep->NewLine(0, 2, false, $orderno);
if ($orderno != $myrow['order_no'])
}
$rep->NewLine(0, 2, false, $orderno);
if ($orderno != $myrow['order_no'])
@@
-169,7
+171,7
@@
function print_order_status_list()
if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
{
$orderno = 0;
if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
{
$orderno = 0;
- $rep->
Header
();
+ $rep->
NewPage
();
}
}
$rep->Line($rep->row);
}
}
$rep->Line($rep->row);