Thread: [Frontaccounting-cvs_updates] frontaccount/purchasing/allocations supplier_allocate.php, 1.1.2.5, 1
Brought to you by:
frontaccounting,
itronics
From: FrontAccounting <fro...@us...> - 2008-05-26 11:03:20
|
Update of /cvsroot/frontaccounting/frontaccount/purchasing/allocations In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv31754/purchasing/allocations Modified Files: Tag: unstable supplier_allocate.php Log Message: Fixed many minor bugs, new ones as well as debtor_trans related. Changed to use DOCTYPE html 4.01 transitional. Some files/css needed change. Index: supplier_allocate.php =================================================================== RCS file: /cvsroot/frontaccounting/frontaccount/purchasing/allocations/supplier_allocate.php,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** supplier_allocate.php 16 May 2008 18:18:56 -0000 1.1.2.5 --- supplier_allocate.php 26 May 2008 11:02:48 -0000 1.1.2.6 *************** *** 111,115 **** if (isset($_POST['Process'])) { ! if (check_data()) { handle_process(); --- 111,115 ---- if (isset($_POST['Process'])) { ! if (check_data()) { handle_process(); *************** *** 191,197 **** { start_table($table_style); ! $th = array(_("Transaction Type"), _("#"), _("Date"), _("Due Date"), _("Amount"), _("Other Allocations"), _("This Allocation"), _("Left to Allocate"),''); ! table_header($th); $k = $counter = $total_allocated = 0; --- 191,197 ---- { start_table($table_style); ! $th = array(_("Transaction Type"), _("#"), _("Date"), _("Due Date"), _("Amount"), _("Other Allocations"), _("This Allocation"), _("Left to Allocate"),''); ! table_header($th); $k = $counter = $total_allocated = 0; *************** *** 213,222 **** $un_allocated = round($alloc_item->amount - $alloc_item->amount_allocated, 6); ! hidden("un_allocated" . $counter, $un_allocated); amount_cell($un_allocated); label_cell("<a href='#' name=Alloc$counter onclick='allocate_all(this.name.substr(5));return true;'>" . _("All") . "</a>"); label_cell("<a href='#' name=DeAll$counter onclick='allocate_none(this.name.substr(5));return true;'>" ! . _("None") . "</a>"); // label_cell("<a href='#' onclick='forms[0].amount$counter.value=forms[0].un_allocated$counter.value; return true;'>" . _("All") . "</a>"); --- 213,222 ---- $un_allocated = round($alloc_item->amount - $alloc_item->amount_allocated, 6); ! //hidden("un_allocated" . $counter, $un_allocated); amount_cell($un_allocated); label_cell("<a href='#' name=Alloc$counter onclick='allocate_all(this.name.substr(5));return true;'>" . _("All") . "</a>"); label_cell("<a href='#' name=DeAll$counter onclick='allocate_none(this.name.substr(5));return true;'>" ! . _("None") . "</a>".hidden("un_allocated" . $counter, $un_allocated, false)); // label_cell("<a href='#' onclick='forms[0].amount$counter.value=forms[0].un_allocated$counter.value; return true;'>" . _("All") . "</a>"); *************** *** 227,231 **** $counter++; } ! label_row(_("Total Allocated"), number_format2($total_allocated,user_price_dec()), "colspan=6 align=right", "align=right id='total_allocated'"); --- 227,231 ---- $counter++; } ! label_row(_("Total Allocated"), number_format2($total_allocated,user_price_dec()), "colspan=6 align=right", "align=right id='total_allocated'"); *************** *** 234,244 **** $font1 = "<font color=red>"; $font2 = "</font>"; ! } else $font1 = $font2 = ""; ! $left_to_allocate = price_format(-$_SESSION['alloc']->amount - $total_allocated); ! label_row(_("Left to Allocate"), $font1 . $left_to_allocate . $font2, "colspan=6 align=right", "nowrap align=right id='left_to_allocate'"); ! end_table(); hidden('TotalNumberOfAllocs', $counter); --- 234,244 ---- $font1 = "<font color=red>"; $font2 = "</font>"; ! } else $font1 = $font2 = ""; ! $left_to_allocate = price_format(-$_SESSION['alloc']->amount - $total_allocated); ! label_row(_("Left to Allocate"), $font1 . $left_to_allocate . $font2, "colspan=6 align=right", "nowrap align=right id='left_to_allocate'"); ! end_table(); hidden('TotalNumberOfAllocs', $counter); *************** *** 249,254 **** submit('Process', _("Process")); echo " "; ! } ! else { display_note(_("There are no unsettled transactions to allocate."), 0, 1); --- 249,254 ---- submit('Process', _("Process")); echo " "; ! } ! else { display_note(_("There are no unsettled transactions to allocate."), 0, 1); |