projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0001307: Insufficent quantities "marker" use wrong date in Sales Order
[fa-stable.git]
/
reporting
/
rep409.php
diff --git
a/reporting/rep409.php
b/reporting/rep409.php
index 2974d647fae7f98d4b654937ad10bf8b76ecb5d3..57ed978d603d8d340024bc2518df4f4ed7d1c292 100644
(file)
--- a/
reporting/rep409.php
+++ b/
reporting/rep409.php
@@
-37,14
+37,12
@@
function print_workorders()
$email = $_POST['PARAM_2'];
$comments = $_POST['PARAM_3'];
$email = $_POST['PARAM_2'];
$comments = $_POST['PARAM_3'];
- if ($from == null)
- $from = 0;
- if ($to == null)
- $to = 0;
- $dec = user_price_dec();
+ if (!$from || !$to) return;
$fno = explode("-", $from);
$tno = explode("-", $to);
$fno = explode("-", $from);
$tno = explode("-", $to);
+ $from = min($fno[0], $tno[0]);
+ $to = max($fno[0], $tno[0]);
$cols = array(4, 60, 190, 255, 320, 385, 450, 515);
$cols = array(4, 60, 190, 255, 320, 385, 450, 515);
@@
-64,7
+62,7
@@
function print_workorders()
$rep->Info($params, $cols, null, $aligns);
}
$rep->Info($params, $cols, null, $aligns);
}
- for ($i = $f
no[0]; $i <= $tno[0]
; $i++)
+ for ($i = $f
rom; $i <= $to
; $i++)
{
$myrow = get_work_order($i);
if ($myrow === false)
{
$myrow = get_work_order($i);
if ($myrow === false)
@@
-133,13
+131,13
@@
function print_workorders()
$rep->NewLine(1);
$rep->TextCol(0, 5," *** = "._("Insufficient stock"), -2);
$rep->NewLine(1);
$rep->TextCol(0, 5," *** = "._("Insufficient stock"), -2);
- $
comments = get_comments
(ST_WORKORDER, $i);
- if ($
comments && db_num_rows($comments)
)
+ $
memo = get_comments_string
(ST_WORKORDER, $i);
+ if ($
memo != ""
)
{
$rep->NewLine();
{
$rep->NewLine();
- while ($comment=db_fetch($comments))
- $rep->TextColLines(0, 6, $comment['memo_'], -2);
+ $rep->TextColLines(1, 5, $memo, -2);
}
}
+
if ($email == 1)
{
$myrow['DebtorName'] = $myrow['contact'];
if ($email == 1)
{
$myrow['DebtorName'] = $myrow['contact'];