X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fui%2Fgl_journal_ui.inc;h=f9e5585c975669d0c32ab96227828aa5041ca007;hb=50606312fee0bb0dbe984e2c08af53b7dab229bd;hp=01a22ad330ff8c1c7fa9ec6fc87d0de0d1273222;hpb=5ddbc6107f4823f6b3629846aba63814bf958d38;p=fa-stable.git
diff --git a/gl/includes/ui/gl_journal_ui.inc b/gl/includes/ui/gl_journal_ui.inc
index 01a22ad3..f9e5585c 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,85 +16,105 @@ include_once($path_to_root . "/includes/ui/items_cart.inc");
function display_order_header(&$Order)
{
- global $table_style2;
+ global $Ajax;
- $qes = has_quick_entries(-1, 0);
- start_table("$table_style2 width=90%");
- if ($qes)
- echo "
"; // outer table
+ $qes = has_quick_entries(QE_JOURNAL);
+ $new = $Order->order_id==0;
+ start_outer_table(TABLESTYLE2, "width=90%");
+ table_section(1, $qes ? "20%" : "");
- echo "";
start_row();
- date_cells(_("Date:"), 'date_');
- ref_cells(_("Reference:"), 'ref', '', references::get_next(0));
+ date_cells(_("Date:"), 'date_', '', $new);
+
+ table_section(2, $qes ? "20%" : "50%");
+ ref_cells(_("Reference:"), 'ref', '');
+ hidden('ref_original');
end_row();
- echo " ";
- if ($qes)
- echo " | "; // outer table
- else
- echo " | "; // outer table
+ if ($new) {
+ table_section(3, "20%");
+ start_row();
+ check_cells(_("Reverse Transaction:"), 'Reverse', null);
+ end_row();
+ }
- echo "";
- start_row();
- check_cells(_("Reverse Transaction:"), 'Reverse', null);
- end_row();
- echo " ";
if ($qes !== false)
{
- echo " | "; // outer table
- echo "";
+ table_section(3, "40%");
start_row();
- quick_entries_list_cells(_("Quick Entry:"), 'person_id', null, -1, 0);
- amount_cells(_("Total Amount"), 'totamount', null, null, " ".submit('go', _("Go"), false, false, true));
+ quick_entries_list_cells(_("Quick Entry").":", 'quick', null, QE_JOURNAL, true);
+ $qid = get_quick_entry(get_post('quick'));
+ if (list_updated('quick')) {
+ unset($_POST['totamount']); // enable default
+ $Ajax->activate('totamount');
+ }
+ if ($qid['bal_type'] == 1)
+ {
+ end_row();
+ start_row();
+ $accname = get_gl_account_name($qid['base_desc']);
+ label_cell(($qid['base_amount'] == 0 ? _("Yearly") : _("Monthly")) . " ". _("balance from account")." ".
+ $qid['base_desc']." ".$accname." ".submit('go', _("Go"), false, false, true), "colspan=2");
+ }
+ else
+ amount_cells($qid['base_desc'].":", 'totamount', price_format($qid['base_amount']),
+ null, " ".submit('go', _("Go"), false, false, true));
end_row();
- echo " ";
+
}
-
- echo " |
"; // outer table
- end_table(1);
+ end_outer_table(1);
}
//---------------------------------------------------------------------------------
function display_gl_items($title, &$order)
{
- global $table_style, $path_to_root;
+ global $path_to_root;
display_heading($title);
$dim = get_company_pref('use_dimension');
+ $sub_type = is_subledger_account(get_post('code_id'));
+ $has_subaccounts = $order->has_sub_accounts();
+
div_start('items_table');
- start_table("$table_style colspan=7 width=95%");
+ start_table(TABLESTYLE, "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[] = '';
+ if ($sub_type || $has_subaccounts)
+ array_insert($th, 2, _("Counterparty"));
- table_header($th);
+ table_header($th);
$k = 0;
$id = find_submit('Edit');
- foreach ($order->gl_items as $item)
+ if ($id == -1)
+ $id = get_post('Index', -1);
+
+ foreach ($order->gl_items as $line => $item)
{
- if ($id != $item->index)
+ if ($id != $line)
{
alt_table_row_color($k);
- label_cells($item->code_id, $item->description);
+ $acc = $item->code_id . ($item->person_id ? sprintf(' %05d', $item->person_id) : '');
+ label_cells($acc, $item->description);
+
+ label_cell($item->person_name);
+
if ($dim >= 1)
label_cell(get_dimension_string($item->dimension_id, true));
if ($dim > 1)
@@ -94,7 +123,7 @@ function display_gl_items($title, &$order)
{
amount_cell(abs($item->amount));
label_cell("");
- }
+ }
else
{
label_cell("");
@@ -102,20 +131,20 @@ function display_gl_items($title, &$order)
}
label_cell($item->reference);
- edit_button_cell("Edit$item->index", _("Edit"),
+ edit_button_cell("Edit$line", _("Edit"),
_('Edit journal line'));
- edit_button_cell("Delete$item->index", _("Delete"),
+ 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, $item->person_id, $line);
}
}
if ($id == -1)
- gl_edit_item_controls($order, $dim);
+ gl_edit_item_controls($order, $dim, $sub_type);
if ($order->count_gl_items())
{
@@ -124,6 +153,7 @@ 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();
}
@@ -133,35 +163,47 @@ function display_gl_items($title, &$order)
//---------------------------------------------------------------------------------
-function gl_edit_item_controls(&$order, $dim, $Index=null)
+function gl_edit_item_controls(&$order, $dim, $sub_accounts, $Index=null)
{
global $Ajax;
start_row();
$id = find_submit('Edit');
+ if ($id == -1)
+ $continue = $id = get_post('Index', -1);
+
if ($Index != -1 && $Index == $id)
{
+ // Modifying an existing row
$item = $order->gl_items[$Index];
- $_POST['code_id'] = $item->code_id;
- $_POST['dimension_id'] = $item->dimension_id;
- $_POST['dimension2_id'] = $item->dimension2_id;
- if ($item->amount > 0)
+ if (!isset($continue))
{
- $_POST['AmountDebit'] = price_format($item->amount);
- $_POST['AmountCredit'] = "";
+ $_POST['code_id'] = $item->code_id;
+ $_POST['dimension_id'] = $item->dimension_id;
+ $_POST['dimension2_id'] = $item->dimension2_id;
+ $_POST['person_id'] = $item->person_id;
+ if ($item->amount > 0)
+ {
+ $_POST['AmountDebit'] = price_format($item->amount);
+ $_POST['AmountCredit'] = "";
+ }
+ else
+ {
+ $_POST['AmountDebit'] = "";
+ $_POST['AmountCredit'] = price_format(abs($item->amount));
+ }
+ $_POST['description'] = $item->description;
+ $_POST['LineMemo'] = $item->reference;
}
- else
+ hidden('Index', $id);
+ $skip_bank = !$_SESSION["wa_current_user"]->can_access('SA_BANKJOURNAL');
+ echo gl_all_accounts_list('code_id', null, $skip_bank, true, _('[Select account]'), true, false, false);
+
+ if (is_subledger_account(get_post('code_id')))
{
- $_POST['AmountDebit'] = "";
- $_POST['AmountCredit'] = price_format(abs($item->amount));
- }
- $_POST['description'] = $item->description;
- $_POST['LineMemo'] = $item->reference;
-
- hidden('Index', $item->index);
- hidden('code_id', $item->code_id);
- label_cell($_POST['code_id']);
- label_cell($item->description);
+ subledger_list_cells(null, 'person_id', get_post('code_id'));
+ } elseif ($order->has_sub_accounts())
+ label_cell('');
if ($dim >= 1)
dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
if ($dim > 1)
@@ -170,19 +212,32 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
}
else
{
- $_POST['AmountDebit'] = ''; //price_format(0);
- $_POST['AmountCredit'] = ''; //price_format(0);
- $_POST['dimension_id'] = 0;
- $_POST['dimension2_id'] = 0;
- $_POST['LineMemo'] = "";
- $_POST['_code_id_edit'] = "";
- $_POST['code_id'] = "";
+
+ if (!list_updated('code_id'))
+ {
+ // Adding a new row
+ $_POST['AmountDebit'] = ''; //price_format(0);
+ $_POST['AmountCredit'] = ''; //price_format(0);
+ $_POST['dimension_id'] = 0;
+ $_POST['dimension2_id'] = 0;
+ //$_POST['LineMemo'] = ""; // let memo go to next line Joe Hunt 2010-05-30
+ $_POST['_code_id_edit'] = "";
+ $_POST['code_id'] = "";
+ }
if(isset($_POST['_code_id_update'])) {
- $Ajax->activate('code_id');
+ $Ajax->activate('code_id');
+ }
+
+ $skip_bank = !$_SESSION["wa_current_user"]->can_access('SA_BANKJOURNAL');
+ echo gl_all_accounts_list('code_id', null, $skip_bank, true, _('[Select account]'), true, false, false);
+
+ if ($sub_accounts)
+ {
+ subledger_list_cells(null, 'person_id', get_post('code_id'));
}
-
- $skip_bank = ($_SESSION["wa_current_user"]->access != 2);
- gl_all_accounts_list('code_id', null, $skip_bank, false, true);
+ elseif ($order->has_sub_accounts())
+ label_cell('');
+
if ($dim >= 1)
dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
if ($dim > 1)
@@ -195,14 +250,14 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
small_amount_cells(null, 'AmountDebit');
small_amount_cells(null, 'AmountCredit');
- text_cells_ex(null, 'LineMemo', 35, 50);
+ text_cells_ex(null, 'LineMemo', 35, 255);
if ($id != -1)
{
- edit_button_cell('UpdateItem', _("Update"),
- _('Confirm changes'));
- edit_button_cell('CancelItemChanges', _("Cancel"),
- _('Cancel changes'));
+ button_cell('UpdateItem', _("Update"),
+ _('Confirm changes'), ICON_UPDATE);
+ button_cell('CancelItemChanges', _("Cancel"),
+ _('Cancel changes'), ICON_CANCEL);
set_focus('amount');
}
else