X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fallocations%2Fcustomer_allocate.php;h=7c88dc9553af855b3fb42be8bfc6696756551b69;hb=d58fa50bb3c97cabf0646db613018690a12dbb46;hp=058605c6ff481dcee3d20eaf40998c0522056a37;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git
diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index 058605c6..7c88dc95 100644
--- a/sales/allocations/customer_allocate.php
+++ b/sales/allocations/customer_allocate.php
@@ -20,7 +20,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
//include_once($path_to_root . "/sales/includes/ui/cust_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');
@@ -36,47 +36,42 @@ function clear_allocations()
unset($_SESSION['alloc']->allocs);
unset($_SESSION['alloc']);
}
- session_register('alloc');
+ //session_register('alloc');
}
-
-//--------------------------------------------------------------------------------
-
-if (isset($_POST['Process']))
-{
- if (check_allocations())
- {
- $_SESSION['alloc']->write();
- clear_allocations();
- $_POST['Cancel'] = 1;
- }
-}
-//--------------------------------------------------------------------------------
-
-if (isset($_POST['Cancel']))
-{
- clear_allocations();
- meta_forward($path_to_root . "/sales/allocations/customer_allocation_main.php");
-}
//--------------------------------------------------------------------------------
function edit_allocations_for_transaction($type, $trans_no)
{
global $systypes_array;
- display_heading(sprintf(_("Allocation of %s # %d"), $systypes_array[$_SESSION['alloc']->type],
- $_SESSION['alloc']->trans_no));
+ $cart = $_SESSION['alloc'];
+
+ if ($cart->type == ST_JOURNAL && $cart->bank_amount < 0)
+ {
+ $cart->bank_amount = -$cart->bank_amount;
+ $cart->amount = -$cart->amount;
+ }
+ display_heading(sprintf(_("Allocation of %s # %d"), $systypes_array[$cart->type], $cart->trans_no));
- display_heading($_SESSION['alloc']->person_name);
+ display_heading($cart->person_name);
- display_heading2(_("Date:") . " " . $_SESSION['alloc']->date_ . "");
- display_heading2(_("Total:") . " " . price_format($_SESSION['alloc']->amount) . "");
+ display_heading2(_("Date:") . " " . $cart->date_ . "");
+ display_heading2(_("Total:"). " " . price_format($cart->bank_amount).' '.$cart->currency."");
+
+ if (floatcmp($cart->bank_amount, $cart->amount))
+ {
+ $total = _("Amount to 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 "
";
start_form();
div_start('alloc_tbl');
- if (count($_SESSION['alloc']->allocs) > 0)
+ if (count($cart->allocs) > 0)
{
show_allocatable(true);
submit_center_first('UpdateDisplay', _("Refresh"), _('Start again allocation of selected amount'), true);
@@ -96,17 +91,34 @@ function edit_allocations_for_transaction($type, $trans_no)
//--------------------------------------------------------------------------------
+if (isset($_POST['Process']))
+{
+ if (check_allocations())
+ {
+ $_SESSION['alloc']->write();
+ clear_allocations();
+ $_POST['Cancel'] = 1;
+ }
+}
+//--------------------------------------------------------------------------------
+
+if (isset($_POST['Cancel']))
+{
+ clear_allocations();
+ meta_forward($path_to_root . "/sales/allocations/customer_allocation_main.php");
+}
+
+//--------------------------------------------------------------------------------
+
if (isset($_GET['trans_no']) && isset($_GET['trans_type']))
{
clear_allocations();
- $_SESSION['alloc'] = new allocation($_GET['trans_type'], $_GET['trans_no']);
+ $_SESSION['alloc'] = new allocation($_GET['trans_type'], $_GET['trans_no'], @$_GET['debtor_no'], PT_CUSTOMER);
}
+
if(get_post('UpdateDisplay'))
{
- $trans_no = $_SESSION['alloc']->trans_no;
- $type = $_SESSION['alloc']->type;
- clear_allocations();
- get_allocations_for_transaction($type, $trans_no);
+ $_SESSION['alloc']->read();
$Ajax->activate('alloc_tbl');
}
@@ -119,4 +131,3 @@ if (isset($_SESSION['alloc']))
end_page();
-?>
\ No newline at end of file