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

Fix project loan data

Browse Source
This commit is contained in:
ATM john 2020-02-02 06:36:06 +01:00
parent ec649bc0a3
commit e59d118b8c
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -556,7 +556,7 @@ class Loan extends CommonObject
$table = 'payment_loan'; $table = 'payment_loan';
$field = 'fk_loan'; $field = 'fk_loan';
$sql = 'SELECT sum(amount) as amount'; $sql = 'SELECT sum(amount_capital) as amount';
$sql .= ' FROM '.MAIN_DB_PREFIX.$table; $sql .= ' FROM '.MAIN_DB_PREFIX.$table;
$sql .= ' WHERE '.$field.' = '.$this->id; $sql .= ' WHERE '.$field.' = '.$this->id;

22
htdocs/projet/element.php
View File

@ -829,11 +829,13 @@ foreach ($listofreferent as $key => $value)
// Amount HT // Amount HT
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("AmountHT").'</td>'; //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("AmountHT").'</td>';
//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("Amount").'</td>'; //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("Amount").'</td>';
if (empty($value['disableamount'])) print '<td class="right" width="120">'.$langs->trans("AmountHT").'</td>'; if ($key == 'loan') print '<td class="right" width="120">'.$langs->trans("LoanCapital").'</td>';
elseif (empty($value['disableamount'])) print '<td class="right" width="120">'.$langs->trans("AmountHT").'</td>';
else print '<td width="120"></td>'; else print '<td width="120"></td>';
// Amount TTC // Amount TTC
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("AmountTTC").'</td>'; //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("AmountTTC").'</td>';
if (empty($value['disableamount'])) print '<td class="right" width="120">'.$langs->trans("AmountTTC").'</td>'; if ($key == 'loan') print '<td class="right" width="120">'.$langs->trans("RemainderToPay").'</td>';
elseif (empty($value['disableamount'])) print '<td class="right" width="120">'.$langs->trans("AmountTTC").'</td>';
else print '<td width="120"></td>'; else print '<td width="120"></td>';
// Status // Status
if (in_array($tablename, array('projet_task'))) print '<td class="right" width="200">'.$langs->trans("ProgressDeclared").'</td>'; if (in_array($tablename, array('projet_task'))) print '<td class="right" width="200">'.$langs->trans("ProgressDeclared").'</td>';
@ -928,6 +930,10 @@ foreach ($listofreferent as $key => $value)
print $element->getNomUrl(1, 'withproject', 'time'); print $element->getNomUrl(1, 'withproject', 'time');
print ' - '.dol_trunc($element->label, 48); print ' - '.dol_trunc($element->label, 48);
} }
elseif ($key == 'loan'){
print $element->getNomUrl(1);
print ' - '.dol_trunc($element->label, 48);
}
else print $element->getNomUrl(1); else print $element->getNomUrl(1);
$element_doc = $element->element; $element_doc = $element->element;
@ -977,6 +983,10 @@ foreach ($listofreferent as $key => $value)
if (empty($date)) $date = $element->datev; if (empty($date)) $date = $element->datev;
} }
} }
elseif ($key == 'loan'){
$date = $element->datestart;
}
print '<td class="center">'; print '<td class="center">';
if ($tablename == 'actioncomm') if ($tablename == 'actioncomm')
{ {
@ -1050,6 +1060,7 @@ foreach ($listofreferent as $key => $value)
$othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled")); $othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
} }
} }
elseif ($key == 'loan') $total_ht_by_line = $element->capital;
else else
{ {
$total_ht_by_line = $element->total_ht; $total_ht_by_line = $element->total_ht;
@ -1097,6 +1108,7 @@ foreach ($listofreferent as $key => $value)
$othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled")); $othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
} }
} }
elseif ($key == 'loan') $total_ttc_by_line = $element->capital - $element->getSumPayment();
else else
{ {
$total_ttc_by_line = $element->total_ttc; $total_ttc_by_line = $element->total_ttc;
@ -1204,7 +1216,8 @@ foreach ($listofreferent as $key => $value)
print '<td class="right">'; print '<td class="right">';
if (empty($value['disableamount'])) if (empty($value['disableamount']))
{ {
if ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print ''.$langs->trans("TotalHT").' : '.price($total_ht); if ($key == 'loan') print $langs->trans("Total").' '.$langs->trans("LoanCapital").' : '.price($total_ttc);
elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print ''.$langs->trans("TotalHT").' : '.price($total_ht);
} }
print '</td>'; print '</td>';
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="100">'.$langs->trans("TotalTTC").' : '.price($total_ttc).'</td>'; //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="100">'.$langs->trans("TotalTTC").' : '.price($total_ttc).'</td>';
@ -1212,7 +1225,8 @@ foreach ($listofreferent as $key => $value)
print '<td class="right">'; print '<td class="right">';
if (empty($value['disableamount'])) if (empty($value['disableamount']))
{ {
if ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print $langs->trans("TotalTTC").' : '.price($total_ttc); if ($key == 'loan') print $langs->trans("Total").' '.$langs->trans("RemainderToPay").' : '.price($total_ttc);
elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print $langs->trans("TotalTTC").' : '.price($total_ttc);
} }
print '</td>'; print '</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';