X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fui%2Fgl_journal_ui.inc;h=5a27c53cd2f15721e70ca4837be20820f1233c6f;hb=6571578cace314a46f71d9cda50c45bbde0e2abe;hp=046430caac1516f92eeb5a49fab5922beb53221d;hpb=0ad7b92c6cf2e4e65ca0fa94ba31f30f7b292ba8;p=fa-stable.git
diff --git a/gl/includes/ui/gl_journal_ui.inc b/gl/includes/ui/gl_journal_ui.inc
index 046430ca..5a27c53c 100644
--- a/gl/includes/ui/gl_journal_ui.inc
+++ b/gl/includes/ui/gl_journal_ui.inc
@@ -1,5 +1,14 @@
.
+***********************************************************************/
include_once($path_to_root . "/includes/ui.inc");
include_once($path_to_root . "/includes/ui/items_cart.inc");
@@ -7,29 +16,43 @@ include_once($path_to_root . "/includes/ui/items_cart.inc");
function display_order_header(&$Order)
{
- global $table_style2;
+ global $table_style2, $Ajax;
+
+ $qes = has_quick_entries(QE_JOURNAL);
- start_table("$table_style2 width=90%");
- echo "
"; // outer table
+ start_outer_table("$table_style2 width=90%");
+ table_section(1);
- echo "";
start_row();
- date_cells(_("Date:"), 'date_');
- ref_cells(_("Reference:"), 'ref', references::get_next(0));
+ date_cells(_("Date:"), 'date_', '', true);
+ ref_cells(_("Reference:"), 'ref', '', references::get_next(0));
end_row();
- echo " ";
-
- echo " | "; // outer table
+ if ($qes)
+ table_section(2, "20%");
+ else
+ table_section(2, "50%");
- echo "";
-
- check_row(_("Reverse Transaction:"), 'Reverse', null);
-
- echo " ";
+ start_row();
+ check_cells(_("Reverse Transaction:"), 'Reverse', null);
+ end_row();
+ if ($qes !== false)
+ {
+ table_section(3, "50%");
+ start_row();
+ quick_entries_list_cells(_("Quick Entry").":", 'person_id', null, QE_JOURNAL, true);
+ $qid = get_quick_entry(get_post('person_id'));
+ if (list_updated('person_id')) {
+ unset($_POST['totamount']); // enable default
+ $Ajax->activate('totamount');
+ }
+ amount_cells($qid['base_desc'].":", 'totamount', price_format($qid['base_amount']),
+ null, " ".submit('go', _("Go"), false, false, true));
+ end_row();
- echo " |
"; // outer table
- end_table(1);
+ }
+
+ end_outer_table(1);
}
//---------------------------------------------------------------------------------
@@ -42,16 +65,17 @@ function display_gl_items($title, &$order)
$dim = get_company_pref('use_dimension');
+ div_start('items_table');
start_table("$table_style colspan=7 width=95%");
if ($dim == 2)
$th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
- _("Dimension")." 2", _("Debit"), _("Credit"), _("Memo"));
+ _("Dimension")." 2", _("Debit"), _("Credit"), _("Memo"), "");
else if ($dim == 1)
$th = array(_("Account Code"), _("Account Description"), _("Dimension"),
- _("Debit"), _("Credit"), _("Memo"));
+ _("Debit"), _("Credit"), _("Memo"), "");
else
$th = array(_("Account Code"), _("Account Description"),
- _("Debit"), _("Credit"), _("Memo"));
+ _("Debit"), _("Credit"), _("Memo"), "");
if (count($order->gl_items)) $th[] = '';
@@ -59,9 +83,10 @@ function display_gl_items($title, &$order)
$k = 0;
- foreach ($order->gl_items as $item)
+ $id = find_submit('Edit');
+ foreach ($order->gl_items as $line => $item)
{
- if (!isset($_GET['Edit']) || $_GET['Edit'] != $item->index)
+ if ($id != $line)
{
alt_table_row_color($k);
@@ -81,17 +106,20 @@ function display_gl_items($title, &$order)
amount_cell(abs($item->amount));
}
label_cell($item->reference);
- edit_link_cell("Edit=$item->index");
- delete_link_cell("Delete=$item->index");
- end_row();;
+
+ edit_button_cell("Edit$line", _("Edit"),
+ _('Edit journal line'));
+ delete_button_cell("Delete$line", _("Delete"),
+ _('Remove line from journal'));
+ end_row();
}
else
{
- gl_edit_item_controls($order, $dim, $item->index);
+ gl_edit_item_controls($order, $dim, $line);
}
}
- if (!isset($_GET['Edit']))
+ if ($id == -1)
gl_edit_item_controls($order, $dim);
if ($order->count_gl_items())
@@ -101,47 +129,50 @@ function display_gl_items($title, &$order)
label_cell(_("Total"), "align=right colspan=" . $colspan);
amount_cell($order->gl_items_total_debit());
amount_cell(abs($order->gl_items_total_credit()));
+ label_cell('', "colspan=3");
end_row();
}
end_table();
+ div_end();
}
//---------------------------------------------------------------------------------
function gl_edit_item_controls(&$order, $dim, $Index=null)
{
+ global $Ajax;
start_row();
- if (isset($_GET['Edit']) && $Index != null)
+ $id = find_submit('Edit');
+ if ($Index != -1 && $Index == $id)
{
$item = $order->gl_items[$Index];
- if (!isset($_POST['code_id']))
- $_POST['code_id'] = $item->code_id;
- if (!isset($_POST['dimension_id']))
- $_POST['dimension_id'] = $item->dimension_id;
- if (!isset($_POST['dimension2_id']))
- $_POST['dimension2_id'] = $item->dimension2_id;
-
- if ((!isset($_POST['AmountDebit']) || ($_POST['AmountDebit']=="")) && $item->amount > 0)
+ $_POST['code_id'] = $item->code_id;
+ $_POST['dimension_id'] = $item->dimension_id;
+ $_POST['dimension2_id'] = $item->dimension2_id;
+ if ($item->amount > 0)
+ {
$_POST['AmountDebit'] = price_format($item->amount);
-
- if ((!isset($_POST['AmountCredit']) || ($_POST['AmountCredit']=="")) && $item->amount <= 0)
+ $_POST['AmountCredit'] = "";
+ }
+ else
+ {
+ $_POST['AmountDebit'] = "";
$_POST['AmountCredit'] = price_format(abs($item->amount));
+ }
+ $_POST['description'] = $item->description;
+ $_POST['LineMemo'] = $item->reference;
- if (!isset($_POST['description']) || ($_POST['description'] == ""))
- $_POST['description'] = $item->description;
- if (!isset($_POST['LineMemo']) || ($_POST['LineMemo'] == ""))
- $_POST['LineMemo'] = $item->reference;
-
- hidden('Index', $item->index);
+ hidden('Index', $id);
hidden('code_id', $item->code_id);
label_cell($_POST['code_id']);
label_cell($item->description);
if ($dim >= 1)
- dimensions_list_cells(null, 'dimension_id', $_POST['dimension_id'], true, " ", false, 1);
+ dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
if ($dim > 1)
- dimensions_list_cells(null, 'dimension2_id', $_POST['dimension2_id'], true, " ", false, 2);
+ dimensions_list_cells(null, 'dimension2_id', null, true, " ", false, 2);
+ $Ajax->activate('items_table');
}
else
{
@@ -150,12 +181,14 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
$_POST['dimension_id'] = 0;
$_POST['dimension2_id'] = 0;
$_POST['LineMemo'] = "";
- $_POST['CodeID2'] = "";
+ $_POST['_code_id_edit'] = "";
$_POST['code_id'] = "";
+ if(isset($_POST['_code_id_update'])) {
+ $Ajax->activate('code_id');
+ }
- text_cells(null, "CodeID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if(event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, false)'");
$skip_bank = ($_SESSION["wa_current_user"]->access != 2);
- gl_all_accounts_list_cells(null, 'code_id', null, $skip_bank, false, "return setAccount(1, false)");
+ gl_all_accounts_list('code_id', null, $skip_bank, true);
if ($dim >= 1)
dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
if ($dim > 1)
@@ -170,18 +203,21 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
small_amount_cells(null, 'AmountCredit');
text_cells_ex(null, 'LineMemo', 35, 50);
- if (isset($_GET['Edit']))
+ if ($id != -1)
{
- submit_cells('UpdateItem', _("Update"));
- submit_cells('CancelItemChanges', _("Cancel"));
+ button_cell('UpdateItem', _("Update"),
+ _('Confirm changes'), ICON_UPDATE);
+ button_cell('CancelItemChanges', _("Cancel"),
+ _('Cancel changes'), ICON_CANCEL);
+ set_focus('amount');
}
else
- submit_cells('AddItem', _("Add item"), "colspan=2");
+ submit_cells('AddItem', _("Add Item"), "colspan=2",
+ _('Add new line to journal'), true);
end_row();
}
-
//---------------------------------------------------------------------------------
function gl_options_controls()