lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7934 from aspangaro/6.0

Browse Source 
FIX : Edit accountancy account and warning message on loan
This commit is contained in:
Laurent Destailleur 2017-12-10 20:56:34 +01:00 committed by GitHub
commit 59aa49076c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 671 additions and 661 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/loan/card.php
View File

@ -344,13 +344,13 @@ if ($action == 'create')
print '</td></tr>'; print '</td></tr>';
// Accountancy_account_insurance // Accountancy_account_insurance
print '<tr><td>'.$langs->trans("LoanAccountancyInsuranceCode").'</td>'; print '<tr><td class="fieldrequired">'.$langs->trans("LoanAccountancyInsuranceCode").'</td>';
print '<td>'; print '<td>';
print $formaccounting->select_account($object->accountancy_account_insurance, 'accountancy_account_insurance', 1, '', 0, 1); print $formaccounting->select_account($object->accountancy_account_insurance, 'accountancy_account_insurance', 1, '', 0, 1);
print '</td></tr>'; print '</td></tr>';
// Accountancy_account_interest // Accountancy_account_interest
print '<tr><td>'.$langs->trans("LoanAccountancyInterestCode").'</td>'; print '<tr><td class="fieldrequired">'.$langs->trans("LoanAccountancyInterestCode").'</td>';
print '<td>'; print '<td>';
print $formaccounting->select_account($object->accountancy_account_interest, 'accountancy_account_interest', 1, '', 0, 1); print $formaccounting->select_account($object->accountancy_account_interest, 'accountancy_account_interest', 1, '', 0, 1);
print '</td></tr>'; print '</td></tr>';
@ -556,7 +556,7 @@ if ($id > 0)
{ {
if (! empty($conf->accounting->enabled)) if (! empty($conf->accounting->enabled))
{ {
print $formaccounting->select_account($object->account_capital, 'accountancy_account_capital', 1, '', 0, 1); print $formaccounting->select_account($object->account_capital, 'accountancy_account_capital', 1, '', 1, 1);
} }
else else
{ {
@ -581,7 +581,7 @@ if ($id > 0)
{ {
if (! empty($conf->accounting->enabled)) if (! empty($conf->accounting->enabled))
{ {
print $formaccounting->select_account($object->account_insurance, 'accountancy_account_insurance', 1, '', 0, 1); print $formaccounting->select_account($object->account_insurance, 'accountancy_account_insurance', 1, '', 1, 1);
} }
else else
{ {
@ -606,7 +606,7 @@ if ($id > 0)
{ {
if (! empty($conf->accounting->enabled)) if (! empty($conf->accounting->enabled))
{ {
print $formaccounting->select_account($object->account_interest, 'accountancy_account_interest', 1, '', 0, 1); print $formaccounting->select_account($object->account_interest, 'accountancy_account_interest', 1, '', 1, 1);
} }
else else
{ {

14
htdocs/loan/class/loan.class.php
View File

@ -153,9 +153,19 @@ class Loan extends CommonObject
$this->error="ErrorBadParameter"; $this->error="ErrorBadParameter";
return -2; return -2;
} }
if (($conf->accounting->enabled) && empty($this->account_capital) && empty($this->account_insurance) && empty($this->account_interest)) if (($conf->accounting->enabled) && empty($this->account_capital))
{ {
$this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Accounting")); $this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("LoanAccountancyCapitalCode"));
return -2;
}
if (($conf->accounting->enabled) && empty($this->account_insurance))
{
$this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("LoanAccountancyInsuranceCode"));
return -2;
}
if (($conf->accounting->enabled) && empty($this->account_interest))
{
$this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("LoanAccountancyInterestCode"));
return -2; return -2;
} }