<?php
-
+/**********************************************************************
+ Copyright (C) FrontAccounting, LLC.
+ Released under the terms of the GNU General Public License, GPL,
+ as published by the Free Software Foundation, either version 3
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
function display_bank_header(&$order)
{
global $table_style2, $Ajax;
$payment = $order->trans_type == systypes::bank_payment();
div_start('pmt_header');
- start_table("width=90% $table_style2"); // outer table
- echo "<tr><td valign=top width=33%>";
- echo "<table>"; // inner table
+ start_outer_table("width=90% $table_style2"); // outer table
+ table_section(1);
+
bank_accounts_list_row( $payment ? _("From:") : _("To:"), 'bank_account', null, true);
- date_row(_("Date:"), 'date_');
-
- echo "</table>"; // inner table
+ date_row(_("Date:"), 'date_', '', null, 0, 0, 0, null, true);
- echo "</td><td width=33%>";
-
- echo "<table>"; // inner table
+ table_section(2, "33%");
if (!isset($_POST['PayType']))
{
text_row_ex($payment ?_("To the Order of:"):_("Name:"),
'person_id', 40, 50);
break;
- case payment_person_types::WorkOrder() :
- workorders_list_row(_("Work Order:"), 'person_id', null);
- break;
+ //case payment_person_types::WorkOrder() :
+ // workorders_list_row(_("Work Order:"), 'person_id', null);
+ // break;
case payment_person_types::supplier() :
supplier_list_row(_("Supplier:"), 'person_id', null, false, true);
break;
hidden('PersonDetailID');
}
break;
+
+ case payment_person_types::QuickEntry() :
+ quick_entries_list_row(_("Type").":", 'person_id', null, ($payment ? QE_PAYMENT : QE_DEPOSIT), true);
+ $qid = get_quick_entry(get_post('person_id'));
+ if (list_updated('person_id')) {
+ unset($_POST['totamount']); // enable default
+ $Ajax->activate('totamount');
+ }
+ amount_row($qid['base_desc'].":", 'totamount', price_format($qid['base_amount']),
+ null, " ".submit('go', _("Go"), false, false, true));
+ break;
//case payment_person_types::Project() :
// dimensions_list_row(_("Dimension:"), 'person_id', $_POST['person_id'], false, null, true);
// break;
exchange_rate_display($bank_currency, $person_currency, $_POST['date_']);
- echo "</table>"; // inner table
-
- echo "</td><td>";
-
- echo "<table>"; // inner table
-
- bank_trans_types_list_row(_("Type:"), 'type', null);
+ table_section(3, "33%");
if (isset($_GET['NewPayment']))
ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_payment()));
else
ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_deposit()));
- echo "</table>"; // inner table
-
- echo "</td></tr>";
+ end_outer_table(1); // outer table
- end_table(1); // outer table
div_end();
}
//---------------------------------------------------------------------------------
if ($dim == 2)
$th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
- _("Dimension")." 2", _("Amount"), _("Memo"));
+ _("Dimension")." 2", _("Amount"), _("Memo"), "");
else if ($dim == 1)
$th = array(_("Account Code"), _("Account Description"), _("Dimension"),
- _("Amount"), _("Memo"));
+ _("Amount"), _("Memo"), "");
else
$th = array(_("Account Code"), _("Account Description"),
- _("Amount"), _("Memo"));
+ _("Amount"), _("Memo"), "");
if (count($order->gl_items)) $th[] = '';
$k = 0; //row colour counter
$id = find_submit('Edit');
- foreach ($order->gl_items as $item)
+ foreach ($order->gl_items as $line => $item)
{
- if ($id != $item->index)
+ if ($id != $line)
{
alt_table_row_color($k);
label_cell(get_dimension_string($item->dimension_id, true));
if ($dim > 1)
label_cell(get_dimension_string($item->dimension2_id, true));
- amount_cell(abs($item->amount));
+ //amount_cell(abs($item->amount));
+ if ($order->trans_type == systypes::bank_deposit())
+ amount_cell(-$item->amount);
+ else
+ amount_cell($item->amount);
label_cell($item->reference);
- edit_button_cell("Edit$item->index", _("Edit"),
+ edit_button_cell("Edit$line", _("Edit"),
_('Edit document line'));
- edit_button_cell("Delete$item->index", _("Delete"),
+ delete_button_cell("Delete$line", _("Delete"),
_('Remove line from document'));
end_row();
}
else
{
- gl_edit_item_controls($order, $dim, $item->index);
+ gl_edit_item_controls($order, $dim, $line);
}
}
gl_edit_item_controls($order, $dim);
if ($order->count_gl_items())
- label_row(_("Total"), number_format2(abs($order->gl_items_total()), user_price_dec()),"colspan=" . $colspan . " align=right", "align=right");
-
+ {
+ $total = $order->gl_items_total();
+ if ($order->trans_type == systypes::bank_deposit())
+ $total *= -1;
+ label_row(_("Total"), number_format2($total, user_price_dec()),"colspan=" . $colspan . " align=right", "align=right",3);
+ }
end_table();
div_end();
}
$_POST['description'] = $item->description;
$_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);
$acc = get_supplier_accounts($_POST['person_id']);
$_POST['code_id'] = $acc['payable_account'];
}
- elseif ($_POST['PayType'] == payment_person_types::WorkOrder())
- $_POST['code_id'] = get_company_pref('default_assembly_act');
+ //elseif ($_POST['PayType'] == payment_person_types::WorkOrder())
+ // $_POST['code_id'] = get_company_pref('default_assembly_act');
else {
$_POST['code_id'] =
get_company_pref($payment ? 'default_cogs_act':'default_inv_sales_act');
}
- gl_all_accounts_list('code_id', null, true, false, true);
+ gl_all_accounts_list('code_id', null, false, true);
if ($dim >= 1)
dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
if ($dim > 1)
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
projects / fa-stable.git / blobdiff