projects
/
fa-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b72c2a0
)
Rerun bug 4601: memo line not cleared after enter new payment item. @Braath Waate.
author
Joe Hunt
<joe.hunt.consulting@gmail.com>
Fri, 31 Aug 2018 13:27:27 +0000
(15:27 +0200)
committer
Joe Hunt
<joe.hunt.consulting@gmail.com>
Fri, 31 Aug 2018 13:27:27 +0000
(15:27 +0200)
gl/includes/ui/gl_journal_ui.inc
patch
|
blob
|
history
gl/inquiry/bank_inquiry.php
patch
|
blob
|
history
includes/dashboard.inc
patch
|
blob
|
history
includes/ui/ui_input.inc
patch
|
blob
|
history
diff --git
a/gl/includes/ui/gl_journal_ui.inc
b/gl/includes/ui/gl_journal_ui.inc
index 44762f7e753e4c1c902206f2c800a7a0cc36de3c..69ed170ce15652ebf177d3639681ebbeca197339 100644
(file)
--- a/
gl/includes/ui/gl_journal_ui.inc
+++ b/
gl/includes/ui/gl_journal_ui.inc
@@
-256,6
+256,7
@@
function gl_edit_item_controls(&$order, $dim, $sub_accounts, $Index=null)
dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
if ($dim > 1)
dimensions_list_cells(null, 'dimension2_id', null, true, " ", false, 2);
dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
if ($dim > 1)
dimensions_list_cells(null, 'dimension2_id', null, true, " ", false, 2);
+ $_POST['LineMemo'] = "";
}
if (get_post('_code_id_update'))
}
if (get_post('_code_id_update'))
diff --git
a/gl/inquiry/bank_inquiry.php
b/gl/inquiry/bank_inquiry.php
index b03893decfd6d542047fd96bad74f8358c85da65..e273099db7fa6dc721723df38cc0b9b2493050ad 100644
(file)
--- a/
gl/inquiry/bank_inquiry.php
+++ b/
gl/inquiry/bank_inquiry.php
@@
-26,7
+26,7
@@
if ($SysPrefs->use_popup_windows)
$js .= get_js_open_window(800, 500);
if (user_use_date_picker())
$js .= get_js_date_picker();
$js .= get_js_open_window(800, 500);
if (user_use_date_picker())
$js .= get_js_date_picker();
-page(_($help_context = "Bank Account Inquiry"), isset($_GET['
no_header
']), false, "", $js, false, "", true);
+page(_($help_context = "Bank Account Inquiry"), isset($_GET['
bank_account']) && !isset($_GET['TransAfterDate
']), false, "", $js, false, "", true);
check_db_has_bank_accounts(_("There are no bank accounts defined in the system."));
check_db_has_bank_accounts(_("There are no bank accounts defined in the system."));
diff --git
a/includes/dashboard.inc
b/includes/dashboard.inc
index fa15e1c12cd1e437fee845bc7436ce0a6b83be10..bb6e6e258335fd231bd3bc75f987f302b663426e 100644
(file)
--- a/
includes/dashboard.inc
+++ b/
includes/dashboard.inc
@@
-610,7
+610,7
@@
function bank_balance($today, $width)
while ($myrow = db_fetch($result))
{
alt_table_row_color($k);
while ($myrow = db_fetch($result))
{
alt_table_row_color($k);
- label_cell(viewer_link($myrow["bank_account_name"], 'gl/inquiry/bank_inquiry.php?bank_account='.$myrow["bank_act"]
.'&no_header=1'
));
+ label_cell(viewer_link($myrow["bank_account_name"], 'gl/inquiry/bank_inquiry.php?bank_account='.$myrow["bank_act"]));
label_cell($myrow["bank_curr_code"]);
amount_cell($myrow['balance']);
end_row();
label_cell($myrow["bank_curr_code"]);
amount_cell($myrow['balance']);
end_row();
diff --git
a/includes/ui/ui_input.inc
b/includes/ui/ui_input.inc
index dbcdee67de47e2568a181bec8cc6d56d9f7e451d..6ff977ad096d1eec3c64490e926f6c27e1877c30 100644
(file)
--- a/
includes/ui/ui_input.inc
+++ b/
includes/ui/ui_input.inc
@@
-1005,7
+1005,7
@@
function bank_balance_row($bank_acc, $parms='')
$bal = get_balance_before_for_bank_account($bank_acc, $to);
label_row( _("Bank Balance:"),
"<a target='_blank' " . ($bal<0 ? 'class="redfg"' : '')
$bal = get_balance_before_for_bank_account($bank_acc, $to);
label_row( _("Bank Balance:"),
"<a target='_blank' " . ($bal<0 ? 'class="redfg"' : '')
- ."href='$path_to_root/gl/inquiry/bank_inquiry.php?bank_account=".$bank_acc."
&no_header=1"."'"
+ ."href='$path_to_root/gl/inquiry/bank_inquiry.php?bank_account=".$bank_acc."
'"
." onclick=\"javascript:openWindow(this.href,this.target); return false;\" > "
. price_format($bal)
."</a>", $parms);
." onclick=\"javascript:openWindow(this.href,this.target); return false;\" > "
. price_format($bal)
."</a>", $parms);