projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed foreign currency bank deposit/payment reedition.
[fa-stable.git]
/
gl
/
includes
/
ui
/
gl_bank_ui.inc
diff --git
a/gl/includes/ui/gl_bank_ui.inc
b/gl/includes/ui/gl_bank_ui.inc
index 4693ec34b0b3d571df6cb94caf1fb90485df0274..6454edbda9bb9cfa4fe631ed07cb0b2044239ab3 100644
(file)
--- a/
gl/includes/ui/gl_bank_ui.inc
+++ b/
gl/includes/ui/gl_bank_ui.inc
@@
-11,12
+11,12
@@
***********************************************************************/
function display_bank_header(&$order)
{
***********************************************************************/
function display_bank_header(&$order)
{
- global $
table_style2, $Ajax
;
- $payment = $order->trans_type ==
systypes::bank_payment()
;
+ global $
Ajax, $Refs
;
+ $payment = $order->trans_type ==
ST_BANKPAYMENT
;
div_start('pmt_header');
div_start('pmt_header');
- start_outer_table(
"width=90% $table_style2
"); // outer table
+ start_outer_table(
TABLESTYLE2, "width=90%
"); // outer table
table_section(1);
table_section(1);
@@
-44,36
+44,39
@@
function display_bank_header(&$order)
$_POST['person_id'] = '';
$Ajax->activate('pmt_header');
$Ajax->activate('code_id');
$_POST['person_id'] = '';
$Ajax->activate('pmt_header');
$Ajax->activate('code_id');
+ $Ajax->activate('pagehelp');
+ $Ajax->activate('editors');
}
payment_person_types_list_row( $payment ? _("Pay To:"):_("From:"),
'PayType', $_POST['PayType'], true);
switch ($_POST['PayType'])
{
}
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;
text_row_ex($payment ?_("To the Order of:"):_("Name:"),
'person_id', 40, 50);
break;
- //case
payment_person_types::WorkOrder()
:
+ //case
PT_WORKORDER
:
// workorders_list_row(_("Work Order:"), 'person_id', null);
// break;
// 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;
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']))
{
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
{
}
else
{
- $_POST['PersonDetailID'] =
reserved_words::get_any_numeric()
;
+ $_POST['PersonDetailID'] =
ANY_NUMERIC
;
hidden('PersonDetailID');
}
break;
hidden('PersonDetailID');
}
break;
- case
payment_person_types::QuickEntry()
:
+ 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')) {
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')) {
@@
-88,17
+91,14
@@
function display_bank_header(&$order)
// break;
}
// break;
}
- $person_currency = payment_person_
types::person_
currency($_POST['PayType'], $_POST['person_id']);
+ $person_currency = payment_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_']);
table_section(3, "33%");
$bank_currency = get_bank_account_currency($_POST['bank_account']);
exchange_rate_display($bank_currency, $person_currency, $_POST['date_']);
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()));
+ ref_row(_("Reference:"), 'ref', '');
end_outer_table(1); // outer table
end_outer_table(1); // outer table
@@
-108,14
+108,14
@@
function display_bank_header(&$order)
function display_gl_items($title, &$order)
{
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');
$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, "
colspan=7 width=95%");
if ($dim == 2)
$th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
if ($dim == 2)
$th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
@@
-146,7
+146,7
@@
function display_gl_items($title, &$order)
if ($dim > 1)
label_cell(get_dimension_string($item->dimension2_id, true));
//amount_cell(abs($item->amount));
if ($dim > 1)
label_cell(get_dimension_string($item->dimension2_id, true));
//amount_cell(abs($item->amount));
- if ($order->trans_type ==
systypes::bank_deposit()
)
+ if ($order->trans_type ==
ST_BANKDEPOSIT
)
amount_cell(-$item->amount);
else
amount_cell($item->amount);
amount_cell(-$item->amount);
else
amount_cell($item->amount);
@@
-179,7
+179,7
@@
function display_gl_items($title, &$order)
function gl_edit_item_controls(&$order, $dim, $Index=null)
{
global $Ajax;
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');
start_row();
$id = find_submit('Edit');
@@
-194,9
+194,7
@@
function gl_edit_item_controls(&$order, $dim, $Index=null)
$_POST['LineMemo'] = $item->reference;
hidden('Index', $id);
$_POST['LineMemo'] = $item->reference;
hidden('Index', $id);
- hidden('code_id', $item->code_id);
- label_cell($_POST['code_id']);
- label_cell($item->description);
+ 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)
if ($dim >= 1)
dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
if ($dim > 1)
@@
-208,28
+206,28
@@
function gl_edit_item_controls(&$order, $dim, $Index=null)
$_POST['amount'] = price_format(0);
$_POST['dimension_id'] = 0;
$_POST['dimension2_id'] = 0;
$_POST['amount'] = 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
if(isset($_POST['_code_id_update'])) {
$Ajax->activate('code_id');
}
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'];
}
{
$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'];
}
{
$acc = get_supplier_accounts($_POST['person_id']);
$_POST['code_id'] = $acc['payable_account'];
}
- //elseif ($_POST['PayType'] ==
payment_person_types::WorkOrder()
)
+ //elseif ($_POST['PayType'] ==
PT_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');
}
// $_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, fals
e, true);
+
echo gl_all_accounts_list('code_id', null, tru
e, true);
if ($dim >= 1)
dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
if ($dim > 1)
if ($dim >= 1)
dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
if ($dim > 1)
@@
-241,7
+239,7
@@
function gl_edit_item_controls(&$order, $dim, $Index=null)
hidden('dimension2_id', 0);
amount_cells(null, 'amount');
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)
{
if ($id != -1)
{