Merge remote-tracking branch 'origin/3.7' into develop
This commit is contained in:
commit
c3b62ce201
@ -346,8 +346,11 @@ if ($action == 'create')
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Accountancy journal
|
// Accountancy journal
|
||||||
print '<tr><td valign="top">'.$langs->trans("AccountancyJournal").'</td>';
|
if (! empty($conf->accounting->enabled))
|
||||||
print '<td colspan="3"><input type="text" name="accountancy_journal" value="'.$account->accountancy_journal.'"></td></tr>';
|
{
|
||||||
|
print '<tr><td valign="top">'.$langs->trans("AccountancyJournal").'</td>';
|
||||||
|
print '<td colspan="3"><input type="text" name="accountancy_journal" value="'.$account->accountancy_journal.'"></td></tr>';
|
||||||
|
}
|
||||||
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
|
||||||
@ -470,8 +473,11 @@ else
|
|||||||
print '<td colspan="3">'.$account->account_number.'</td></tr>';
|
print '<td colspan="3">'.$account->account_number.'</td></tr>';
|
||||||
|
|
||||||
// Accountancy journal
|
// Accountancy journal
|
||||||
print '<tr><td valign="top">'.$langs->trans("AccountancyJournal").'</td>';
|
if (! empty($conf->accounting->enabled))
|
||||||
print '<td colspan="3">'.$account->accountancy_journal.'</td></tr>';
|
{
|
||||||
|
print '<tr><td valign="top">'.$langs->trans("AccountancyJournal").'</td>';
|
||||||
|
print '<td colspan="3">'.$account->accountancy_journal.'</td></tr>';
|
||||||
|
}
|
||||||
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
|
||||||
@ -633,8 +639,11 @@ else
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Accountancy journal
|
// Accountancy journal
|
||||||
print '<tr><td valign="top">'.$langs->trans("AccountancyJournal").'</td>';
|
if (! empty($conf->accounting->enabled))
|
||||||
print '<td colspan="3"><input type="text" name="accountancy_journal" value="'.(isset($_POST["accountancy_journal"])?$_POST["accountancy_journal"]:$account->accountancy_journal).'"></td></tr>';
|
{
|
||||||
|
print '<tr><td valign="top">'.$langs->trans("AccountancyJournal").'</td>';
|
||||||
|
print '<td colspan="3"><input type="text" name="accountancy_journal" value="'.(isset($_POST["accountancy_journal"])?$_POST["accountancy_journal"]:$account->accountancy_journal).'"></td></tr>';
|
||||||
|
}
|
||||||
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user