projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Strict SQL related error when background journal transaction was saved. Fixed.
[fa-stable.git]
/
purchasing
/
allocations
/
supplier_allocation_main.php
diff --git
a/purchasing/allocations/supplier_allocation_main.php
b/purchasing/allocations/supplier_allocation_main.php
index 039db9a5094c41d775a3c2e6b47cbd1fac786a65..9d1cb8d9b238236d4ab99e340c5c9ec432b3c924 100644
(file)
--- a/
purchasing/allocations/supplier_allocation_main.php
+++ b/
purchasing/allocations/supplier_allocation_main.php
@@
-21,7
+21,7
@@
include_once($path_to_root . "/includes/banking.inc");
include_once($path_to_root . "/sales/includes/sales_db.inc");
$js = "";
include_once($path_to_root . "/sales/includes/sales_db.inc");
$js = "";
-if ($use_popup_windows)
+if ($
SysPrefs->
use_popup_windows)
$js .= get_js_open_window(900, 500);
page(_($help_context = "Supplier Allocations"), false, false, "", $js);
$js .= get_js_open_window(900, 500);
page(_($help_context = "Supplier Allocations"), false, false, "", $js);
@@
-69,12
+69,12
@@
function alloc_link($row)
{
return pager_link(_("Allocate"),
"/purchasing/allocations/supplier_allocate.php?trans_no="
{
return pager_link(_("Allocate"),
"/purchasing/allocations/supplier_allocate.php?trans_no="
- .$row["trans_no"] . "&trans_type=" . $row["type"], ICON_ALLOC);
+ .$row["trans_no"] . "&trans_type=" . $row["type"]
. "&supplier_id=" . $row["supplier_id"]
, ICON_ALLOC);
}
function amount_left($row)
{
}
function amount_left($row)
{
- return price_format(-$row["Total"]-$row["alloc"]);
+ return price_format(
$row['type'] == ST_JOURNAL ? abs($row["Total"])-$row["alloc"] :
-$row["Total"]-$row["alloc"]);
}
function amount_total($row)
}
function amount_total($row)
@@
-92,7
+92,7
@@
$sql = get_allocatable_from_supp_sql($supplier_id, $settled);
$cols = array(
_("Transaction Type") => array('fun'=>'systype_name'),
$cols = array(
_("Transaction Type") => array('fun'=>'systype_name'),
- _("#") => array('fun'=>'trans_view'),
+ _("#") => array('fun'=>'trans_view'
, 'align'=>'right'
),
_("Reference"),
_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
_("Supplier") => array('ord'=>''),
_("Reference"),
_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
_("Supplier") => array('ord'=>''),
@@
-116,4
+116,3
@@
display_db_pager($table);
end_form();
end_page();
end_form();
end_page();
-?>
\ No newline at end of file