projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug in update_person_contact().
[fa-stable.git]
/
gl
/
accruals.php
diff --git
a/gl/accruals.php
b/gl/accruals.php
index 8636dde9fef016ff68551d7cfa28756f02e396f4..091458c90fa28cc580ac87151e3679e9cabe4226 100644
(file)
--- a/
gl/accruals.php
+++ b/
gl/accruals.php
@@
-54,10
+54,11
@@
if (isset($_POST['go']) || isset($_POST['show']))
if ($input_error == 0)
{
$periods = input_num('periods');
if ($input_error == 0)
{
$periods = input_num('periods');
+ $per = $periods - 1;
$date_ = get_post('date_');
$freq = get_post('freq');
$date_ = get_post('date_');
$freq = get_post('freq');
- $lastdate = ($freq== 1?add_days($date_,7*$per
iods):($freq==2?add_days($date_,14*$periods
):
- ($freq==3?add_months($date_,$per
iods):add_months($date_,3*$periods
))));
+ $lastdate = ($freq== 1?add_days($date_,7*$per
):($freq==2?add_days($date_,14*$per
):
+ ($freq==3?add_months($date_,$per
):add_months($date_,3*$per
))));
if (!is_date_in_fiscalyears($lastdate, false))
{
display_error(_("Some of the period dates are outside the fiscal year. Create a new fiscal year first!"));
if (!is_date_in_fiscalyears($lastdate, false))
{
display_error(_("Some of the period dates are outside the fiscal year. Create a new fiscal year first!"));
@@
-169,7
+170,7
@@
if (isset($_POST['go']) || isset($_POST['show']))
function frequency_list_row($label, $name, $selected=null)
{
echo "<tr>\n";
function frequency_list_row($label, $name, $selected=null)
{
echo "<tr>\n";
- label_cell($label);
+ label_cell($label
, "class='label'"
);
echo "<td>\n";
$freq = array(
'1'=> _("Weekly"),
echo "<td>\n";
$freq = array(
'1'=> _("Weekly"),
@@
-189,7
+190,8
@@
start_table(TABLESTYLE2);
date_row(_("Date"), 'date_', _('First date of Accruals'), true, 0, 0, 0, null, true);
start_row();
date_row(_("Date"), 'date_', _('First date of Accruals'), true, 0, 0, 0, null, true);
start_row();
-gl_all_accounts_list_cells(_("Accrued Balance Account"), 'acc_act', null, true, false, false, true);
+label_cell(_("Accrued Balance Account"), "class='label'");
+gl_all_accounts_list_cells(null, 'acc_act', null, true, false, false, true);
end_row();
gl_all_accounts_list_row(_("Revenue / Cost Account"), 'res_act', null, true);
end_row();
gl_all_accounts_list_row(_("Revenue / Cost Account"), 'res_act', null, true);