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 4796399d97770ef515a47560b6165b411abb9e6f..9d1cb8d9b238236d4ab99e340c5c9ec432b3c924 100644
(file)
--- a/
purchasing/allocations/supplier_allocation_main.php
+++ b/
purchasing/allocations/supplier_allocation_main.php
@@
-21,30
+21,23
@@
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);
$js .= get_js_open_window(900, 500);
-page(_("Supplier Allocations"), false, false, "", $js);
+page(_(
$help_context =
"Supplier Allocations"), false, false, "", $js);
//--------------------------------------------------------------------------------
start_form();
/* show all outstanding receipts and credits to be allocated */
//--------------------------------------------------------------------------------
start_form();
/* show all outstanding receipts and credits to be allocated */
- /*Clear any previous allocation records */
- if (isset($_SESSION['alloc']))
- {
- unset($_SESSION['alloc']->allocs);
- unset($_SESSION['alloc']);
- }
if (!isset($_POST['supplier_id']))
$_POST['supplier_id'] = get_global_supplier();
echo "<center>" . _("Select a Supplier: ") . " ";
if (!isset($_POST['supplier_id']))
$_POST['supplier_id'] = get_global_supplier();
echo "<center>" . _("Select a Supplier: ") . " ";
- supplier_list('supplier_id', $_POST['supplier_id'], true, true);
+
echo
supplier_list('supplier_id', $_POST['supplier_id'], true, true);
echo "<br>";
check(_("Show Settled Items:"), 'ShowSettled', null, true);
echo "</center><br><br>";
echo "<br>";
check(_("Show Settled Items:"), 'ShowSettled', null, true);
echo "</center><br><br>";
- end_form();
set_global_supplier($_POST['supplier_id']);
if (isset($_POST['supplier_id']) && ($_POST['supplier_id'] == ALL_TEXT))
set_global_supplier($_POST['supplier_id']);
if (isset($_POST['supplier_id']) && ($_POST['supplier_id'] == ALL_TEXT))
@@
-76,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_MONEY
);
+ .$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)
@@
-99,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'=>''),
@@
-118,10
+111,8
@@
$table =& new_db_pager('alloc_tbl', $sql, $cols);
$table->set_marker('check_settled', _("Marked items are settled."), 'settledbg', 'settledfg');
$table->width = "80%";
$table->set_marker('check_settled', _("Marked items are settled."), 'settledbg', 'settledfg');
$table->width = "80%";
-start_form();
display_db_pager($table);
end_form();
end_page();
display_db_pager($table);
end_form();
end_page();
-?>
\ No newline at end of file