function display_order_header(&$Order)
{
- global $table_style2, $Ajax;
+ global $Ajax;
$qes = has_quick_entries(QE_JOURNAL);
$new = $Order->order_id==0;
- start_outer_table("$table_style2 width=90%");
- table_section(1);
-
- start_row();
- date_cells(_("Date:"), 'date_', '', $new);
- table_section(2, $qes ? "20%" : "50%");
- ref_cells(_("Reference:"), 'ref', '');
hidden('ref_original');
- end_row();
+ start_outer_table(TABLESTYLE2, "width='90%'");
+ table_section(1, $qes ? "20%" : "");
+ date_row(_("Date:"), 'date_', '', $new);
+
+ table_section(2, $qes ? "20%" : "50%");
+ ref_row(_("Reference:"), 'ref', '');
if ($new) {
table_section(3, "20%");
if ($qes !== false)
{
- table_section(3, "50%");
+ table_section(3, "40%");
start_row();
quick_entries_list_cells(_("Quick Entry").":", 'person_id', null, QE_JOURNAL, true);
$qid = get_quick_entry(get_post('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));
+ 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();
}
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');
div_start('items_table');
- start_table("$table_style colspan=7 width=95%");
+ start_table(TABLESTYLE, "width='95%'");
if ($dim == 2)
$th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
_("Dimension")." 2", _("Debit"), _("Credit"), _("Memo"), "");
$_POST['AmountCredit'] = ''; //price_format(0);
$_POST['dimension_id'] = 0;
$_POST['dimension2_id'] = 0;
- $_POST['LineMemo'] = "";
+ //$_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'])) {
if ($dim > 1)
dimensions_list_cells(null, 'dimension2_id', null, true, " ", false, 2);
}
+
if ($dim < 1)
hidden('dimension_id', 0);
if ($dim < 2)