projects
/
fa-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
938f8bf
)
Fixed empty inventory sales report for all customers.
author
Janusz Dobrowolski
<janusz@frontaccouting.eu>
Wed, 20 Jul 2011 11:53:56 +0000
(13:53 +0200)
committer
Janusz Dobrowolski
<janusz@frontaccouting.eu>
Wed, 20 Jul 2011 11:53:56 +0000
(13:53 +0200)
reporting/rep304.php
patch
|
blob
|
history
diff --git
a/reporting/rep304.php
b/reporting/rep304.php
index a84e53d2babddb8b92da6e10d8816fbbf4756834..db9fbd98971874f0cee16d87506804c188f905ea 100644
(file)
--- a/
reporting/rep304.php
+++ b/
reporting/rep304.php
@@
-60,12
+60,13
@@
function getTransactions($category, $location, $fromcust, $from, $to)
AND (".TB_PREF."stock_master.mb_flag='B' OR ".TB_PREF."stock_master.mb_flag='M')";
if ($category != 0)
$sql .= " AND ".TB_PREF."stock_master.category_id = ".db_escape($category);
AND (".TB_PREF."stock_master.mb_flag='B' OR ".TB_PREF."stock_master.mb_flag='M')";
if ($category != 0)
$sql .= " AND ".TB_PREF."stock_master.category_id = ".db_escape($category);
- if ($location != '
all
')
+ if ($location != '')
$sql .= " AND ".TB_PREF."stock_moves.loc_code = ".db_escape($location);
$sql .= " AND ".TB_PREF."stock_moves.loc_code = ".db_escape($location);
- if ($fromcust !=
-1
)
+ if ($fromcust !=
''
)
$sql .= " AND ".TB_PREF."debtors_master.debtor_no = ".db_escape($fromcust);
$sql .= " GROUP BY ".TB_PREF."stock_master.stock_id, ".TB_PREF."debtors_master.name ORDER BY ".TB_PREF."stock_master.category_id,
".TB_PREF."stock_master.stock_id, ".TB_PREF."debtors_master.name";
$sql .= " AND ".TB_PREF."debtors_master.debtor_no = ".db_escape($fromcust);
$sql .= " GROUP BY ".TB_PREF."stock_master.stock_id, ".TB_PREF."debtors_master.name ORDER BY ".TB_PREF."stock_master.category_id,
".TB_PREF."stock_master.stock_id, ".TB_PREF."debtors_master.name";
+_vd($sql);
return db_query($sql,"No transactions were returned");
}
return db_query($sql,"No transactions were returned");
}
@@
-97,14
+98,12
@@
function print_inventory_sales()
else
$cat = get_category_name($category);
else
$cat = get_category_name($category);
- if ($location == ALL_TEXT)
- $location = 'all';
- if ($location == 'all')
+ if ($location == '')
$loc = _('All');
else
$loc = get_location_name($location);
$loc = _('All');
else
$loc = get_location_name($location);
- if ($fromcust ==
ALL_TEXT
)
+ if ($fromcust ==
''
)
$fromc = _('All');
else
$fromc = get_customer_name($fromcust);
$fromc = _('All');
else
$fromc = get_customer_name($fromcust);
@@
-112,8
+111,8
@@
function print_inventory_sales()
$cols = array(0, 75, 175, 250, 300, 375, 450, 515);
$headers = array(_('Category'), _('Description'), _('Customer'), _('Qty'), _('Sales'), _('Cost'), _('Contribution'));
$cols = array(0, 75, 175, 250, 300, 375, 450, 515);
$headers = array(_('Category'), _('Description'), _('Customer'), _('Qty'), _('Sales'), _('Cost'), _('Contribution'));
- if ($fromcust !=
ALL_TEXT
)
- $headers[2] = '';
+ if ($fromcust !=
''
)
+ $headers[2] = '';
$aligns = array('left', 'left', 'left', 'right', 'right', 'right', 'right');
$aligns = array('left', 'left', 'left', 'right', 'right', 'right', 'right');