X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fallocations%2Fsupplier_allocate.php;h=d26ed61bf796ce02c4e51dbf09c0f11c22ea8bd1;hb=40e5dda3847073d8f86c558eafbbc5372133bedd;hp=4997b2de51255889b3770ad0f853f4a857e641c6;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git diff --git a/purchasing/allocations/supplier_allocate.php b/purchasing/allocations/supplier_allocate.php index 4997b2de..d26ed61b 100644 --- a/purchasing/allocations/supplier_allocate.php +++ b/purchasing/allocations/supplier_allocate.php @@ -21,12 +21,12 @@ include_once($path_to_root . "/sales/includes/sales_db.inc"); //include_once($path_to_root . "/purchasing/includes/ui/supp_alloc_ui.inc"); $js = ""; -if ($use_popup_windows) +if ($SysPrefs->use_popup_windows) $js .= get_js_open_window(900, 500); add_js_file('allocate.js'); -page(_("Allocate Supplier Payment or Credit Note"), false, false, "", $js); +page(_($help_context = "Allocate Supplier Payment or Credit Note"), false, false, "", $js); //-------------------------------------------------------------------------------- @@ -37,25 +37,37 @@ function clear_allocations() unset($_SESSION['alloc']->allocs); unset($_SESSION['alloc']); } - session_register("alloc"); + //session_register("alloc"); } //-------------------------------------------------------------------------------- function edit_allocations_for_transaction($type, $trans_no) { + global $systypes_array; + start_form(); - display_heading(_("Allocation of") . " " . $systypes_array[$_SESSION['alloc']->type] . " # " . $_SESSION['alloc']->trans_no); + $cart = $_SESSION['alloc']; + + display_heading(_("Allocation of") . " " . $systypes_array[$cart->type] . " # " . $cart->trans_no); + + display_heading($cart->person_name); - display_heading($_SESSION['alloc']->person_name); + display_heading2(_("Date:") . " " . $cart->date_ . ""); - display_heading2(_("Date:") . " " . $_SESSION['alloc']->date_ . ""); - display_heading2(_("Total:") . " " . price_format(-$_SESSION['alloc']->amount) . ""); + display_heading2(_("Total:"). " " . price_format(-$cart->bank_amount).' '.$cart->currency.""); + if (floatcmp($cart->bank_amount, $cart->amount)) + { + $total = _("Amount ot be settled:") . " " . price_format(-$cart->amount).' '.$cart->person_curr.""; + if ($cart->currency != $cart->person_curr) + $total .= sprintf(" (%s %s/%s)", exrate_format($cart->bank_amount/$cart->amount), $cart->currency, $cart->person_curr); + display_heading2($total); + } echo "
"; div_start('alloc_tbl'); - if (count($_SESSION['alloc']->allocs) > 0) + if (count($cart->allocs) > 0) { show_allocatable(true); @@ -98,7 +110,7 @@ if (isset($_POST['Cancel'])) if (isset($_GET['trans_no']) && isset($_GET['trans_type'])) { - $_SESSION['alloc'] = new allocation($_GET['trans_type'], $_GET['trans_no']); + $_SESSION['alloc'] = new allocation($_GET['trans_type'], $_GET['trans_no'], @$_GET['supplier_id'], PT_SUPPLIER); } if (get_post('UpdateDisplay')) @@ -116,4 +128,3 @@ if (isset($_SESSION['alloc'])) end_page(); -?> \ No newline at end of file