X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fallocations%2Fsupplier_allocation_main.php;h=9d1cb8d9b238236d4ab99e340c5c9ec432b3c924;hb=5077f4be9a7cdf330f63584863f5861bf09cbbd2;hp=d4fef6408ec545e7833dd6daed9a713a48f0ff87;hpb=5e63c6ace55729bbb5ee3b060035a25a4426eb0a;p=fa-stable.git diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php index d4fef640..9d1cb8d9 100644 --- a/purchasing/allocations/supplier_allocation_main.php +++ b/purchasing/allocations/supplier_allocation_main.php @@ -69,12 +69,12 @@ function alloc_link($row) { 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) { - 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) @@ -92,7 +92,7 @@ $sql = get_allocatable_from_supp_sql($supplier_id, $settled); $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'=>''),