";
-
- echo ""; // inner table
- bank_accounts_list_row( $payment ? _("From:") : _("To:"), 'bank_account', null, true);
+ start_outer_table(TABLESTYLE2, "width='90%'"); // outer table
- date_row(_("Date:"), 'date_');
+ table_section(1);
+
+ date_row(_("Date:"), 'date_', '', true, 0, 0, 0, null, true);
- echo " "; // inner table
+ ref_row(_("Reference:"), 'ref', '', $order->reference, false, $order->trans_type, get_post('date_'));
- echo " | ";
-
- echo ""; // inner table
+ table_section(2, "33%");
if (!isset($_POST['PayType']))
{
@@ -39,86 +45,112 @@ function display_bank_header(&$order)
$_POST['person_id'] = '';
$Ajax->activate('pmt_header');
$Ajax->activate('code_id');
+ $Ajax->activate('pagehelp');
+ $Ajax->activate('editors');
+ $Ajax->activate('footer');
}
payment_person_types_list_row( $payment ? _("Pay To:"):_("From:"),
'PayType', $_POST['PayType'], true);
switch ($_POST['PayType'])
{
- case payment_person_types::misc() :
+ case PT_MISC :
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::supplier() :
- supplier_list_row(_("Supplier:"), 'person_id', null, false, true);
+ case PT_SUPPLIER :
+ supplier_list_row(_("Supplier:"), 'person_id', null, false, true, false, true);
break;
- case payment_person_types::customer() :
- customer_list_row(_("Customer:"), 'person_id', null, false, true);
+ case PT_CUSTOMER :
+ customer_list_row(_("Customer:"), 'person_id', null, false, true, false, true);
if (db_customer_has_branches($_POST['person_id']))
{
- customer_branches_list_row(_("Branch:"), $_POST['person_id'], 'PersonDetailID', null, false, true, true);
+ customer_branches_list_row(_("Branch:"), $_POST['person_id'],
+ 'PersonDetailID', null, false, true, true, true);
}
else
{
- $_POST['PersonDetailID'] = reserved_words::get_any_numeric();
+ $_POST['PersonDetailID'] = ANY_NUMERIC;
hidden('PersonDetailID');
}
+ $trans = get_customer_habit($_POST['person_id']); // take care of customers on hold
+ if ($trans['dissallow_invoices'] != 0)
+ {
+ if ($payment)
+ {
+ $customer_error = true;
+ display_error(_("This customer account is on hold."));
+ }
+ else
+ display_warning(_("This customer account is on hold."));
+ }
break;
- //case payment_person_types::Project() :
- // dimensions_list_row(_("Dimension:"), 'person_id', $_POST['person_id'], false, null, true);
- // break;
- }
-
- $person_currency = payment_person_types::person_currency($_POST['PayType'], $_POST['person_id']);
- $bank_currency = get_bank_account_currency($_POST['bank_account']);
-
- exchange_rate_display($bank_currency, $person_currency, $_POST['date_']);
- echo " "; // inner table
-
- echo " | ";
+ case PT_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('footer');
+ $Ajax->activate('totamount');
+ }
+ amount_row($qid['base_desc'].":", 'totamount', price_format($qid['base_amount']),
+ null, " ".submit('go', _("Go"), false, false, true));
+ break;
+ }
- echo ""; // inner table
+ table_section(3, "33%");
- bank_trans_types_list_row(_("Type:"), 'type', null);
+ if (!$order->order_id && !get_post('bank_account'))
+ {
+ if ($_POST['PayType'] == PT_CUSTOMER)
+ $_POST['bank_account'] = get_default_customer_bank_account($_POST['person_id']);
+ elseif ($_POST['PayType'] == PT_SUPPLIER)
+ $_POST['bank_account'] = get_default_supplier_bank_account($_POST['person_id']);
+ else
+ unset($_POST['bank_account']);
+ }
+
+ bank_accounts_list_row( $payment ? _("From:") : _("Into:"), 'bank_account', null, true);
+ if ($payment)
+ bank_balance_row($_POST['bank_account']);
- 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()));
+ $bank_currency = get_bank_account_currency($_POST['bank_account']);
- echo " "; // inner table
+ exchange_rate_display(get_company_currency(), $bank_currency, $_POST['date_']);
- echo " |
";
+ end_outer_table(1); // outer table
- end_table(1); // outer table
div_end();
+ if ($customer_error)
+ {
+ end_form();
+ end_page();
+ exit;
+ }
}
//---------------------------------------------------------------------------------
function display_gl_items($title, &$order)
{
- global $table_style, $path_to_root;
+ global $path_to_root;
$dim = get_company_pref('use_dimension');
$colspan = ($dim == 2 ? 4 : ($dim == 1 ? 3 : 2));
display_heading($title);
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", _("Amount"), _("Memo"));
- else if ($dim == 1)
+ _("Dimension")." 2", _("Amount"), _("Memo"), "");
+ elseif ($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[] = '';
@@ -126,9 +158,9 @@ function display_gl_items($title, &$order)
$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);
@@ -138,18 +170,21 @@ function display_gl_items($title, &$order)
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));
+ if ($order->trans_type == ST_BANKDEPOSIT)
+ 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);
}
}
@@ -157,7 +192,7 @@ function display_gl_items($title, &$order)
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");
+ label_row(_("Total"), number_format2(abs($order->gl_items_total()), user_price_dec()),"colspan=" . $colspan . " align=right", "align=right",3);
end_table();
div_end();
@@ -168,7 +203,7 @@ function display_gl_items($title, &$order)
function gl_edit_item_controls(&$order, $dim, $Index=null)
{
global $Ajax;
- $payment = $order->trans_type == systypes::bank_payment();
+ $payment = $order->trans_type == ST_BANKPAYMENT;
start_row();
$id = find_submit('Edit');
@@ -182,10 +217,8 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
$_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);
+ hidden('Index', $id);
+ echo gl_all_accounts_list('code_id', null, true, true);
if ($dim >= 1)
dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
if ($dim > 1)
@@ -197,28 +230,25 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
$_POST['amount'] = price_format(0);
$_POST['dimension_id'] = 0;
$_POST['dimension2_id'] = 0;
- $_POST['LineMemo'] = "";
if(isset($_POST['_code_id_update'])) {
$Ajax->activate('code_id');
}
- if ($_POST['PayType'] == payment_person_types::customer())
+ if ($_POST['PayType'] == PT_CUSTOMER)
{
$acc = get_branch_accounts($_POST['PersonDetailID']);
$_POST['code_id'] = $acc['receivables_account'];
}
- elseif ($_POST['PayType'] == payment_person_types::supplier())
+ elseif ($_POST['PayType'] == PT_SUPPLIER)
{
$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');
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);
+ echo gl_all_accounts_list('code_id', null, true, true);
if ($dim >= 1)
dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
if ($dim > 1)
@@ -230,14 +260,14 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
hidden('dimension2_id', 0);
amount_cells(null, 'amount');
- 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
@@ -252,16 +282,29 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
//---------------------------------------------------------------------------------
-function gl_options_controls()
+function gl_options_controls($order)
{
+ div_start('footer');
echo "