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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2019-03-09 01:06:19 +01:00
commit 1a715e794c
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
/** /**
* Class DataPolicy * Class DataPolicy
*/ */
Class DataPolicy class DataPolicy
{ {
/** /**
* getAllContactNotInformed * getAllContactNotInformed

10
htdocs/loan/createschedule.php
View File

@ -154,12 +154,12 @@ print '</th>';
print '</tr>'; print '</tr>';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
Print '<th width="5%" class="center">'.$langs->trans("Term").'</th>'; print '<th width="5%" class="center">'.$langs->trans("Term").'</th>';
Print '<th width="5%" class="center">'.$langs->trans("Date").'</th>'; print '<th width="5%" class="center">'.$langs->trans("Date").'</th>';
print '<th width="15%" class="center">'.$langs->trans("Insurance"); print '<th width="15%" class="center">'.$langs->trans("Insurance");
Print '<th width="15%" class="center">'.$langs->trans("InterestAmount").'</th>'; print '<th width="15%" class="center">'.$langs->trans("InterestAmount").'</th>';
Print '<th width="10%" class="center">'.$langs->trans("Amount").'</th>'; print '<th width="10%" class="center">'.$langs->trans("Amount").'</th>';
Print '<th width="40%" class="center">'.$langs->trans("CapitalRemain"); print '<th width="40%" class="center">'.$langs->trans("CapitalRemain");
print ' ('.price2num($object->capital).')'; print ' ('.price2num($object->capital).')';
print '<input type="hidden" name="hi_capital0" id ="hi_capital0" value="'.$object->capital.'">'; print '<input type="hidden" name="hi_capital0" id ="hi_capital0" value="'.$object->capital.'">';
print '</th>'; print '</th>';

10
htdocs/loan/schedule.php
View File

@ -160,12 +160,12 @@ print '</th>';
print '</tr>'; print '</tr>';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
Print '<th width="5%" class="center">'.$langs->trans("Term").'</th>'; print '<th width="5%" class="center">'.$langs->trans("Term").'</th>';
Print '<th width="5%" class="center">'.$langs->trans("Date").'</th>'; print '<th width="5%" class="center">'.$langs->trans("Date").'</th>';
print '<th width="15%" class="center">'.$langs->trans("Insurance"); print '<th width="15%" class="center">'.$langs->trans("Insurance");
Print '<th width="15%" class="center">'.$langs->trans("InterestAmount").'</th>'; print '<th width="15%" class="center">'.$langs->trans("InterestAmount").'</th>';
Print '<th width="10%" class="center">'.$langs->trans("Amount").'</th>'; print '<th width="10%" class="center">'.$langs->trans("Amount").'</th>';
Print '<th width="40%" class="center">'.$langs->trans("CapitalRemain"); print '<th width="40%" class="center">'.$langs->trans("CapitalRemain");
print ' ('.price2num($object->capital).')'; print ' ('.price2num($object->capital).')';
print '<input type="hidden" name="hi_capital0" id ="hi_capital0" value="'.$object->capital.'">'; print '<input type="hidden" name="hi_capital0" id ="hi_capital0" value="'.$object->capital.'">';
print '</th>'; print '</th>';

34
htdocs/product/class/product.class.php
View File

@ -4159,23 +4159,23 @@ class Product extends CommonObject
if ($type == 2) { if ($type == 2) {
switch ($mode) switch ($mode)
{ {
case 0: case 0:
return ($status == 0 ? $langs->trans('ProductStatusNotOnBatch') : $langs->trans('ProductStatusOnBatch')); return ($status == 0 ? $langs->trans('ProductStatusNotOnBatch') : $langs->trans('ProductStatusOnBatch'));
case 1: case 1:
return ($status == 0 ? $langs->trans('ProductStatusNotOnBatchShort') : $langs->trans('ProductStatusOnBatchShort')); return ($status == 0 ? $langs->trans('ProductStatusNotOnBatchShort') : $langs->trans('ProductStatusOnBatchShort'));
case 2: case 2:
return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 1, 2); return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 1, 2);
case 3: case 3:
if ($status == 0) { if ($status == 0) {
return img_picto($langs->trans('ProductStatusNotOnBatch'), 'statut5'); return img_picto($langs->trans('ProductStatusNotOnBatch'), 'statut5');
} }
return img_picto($langs->trans('ProductStatusOnBatch'), 'statut4'); return img_picto($langs->trans('ProductStatusOnBatch'), 'statut4');
case 4: case 4:
return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 0, 2); return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 0, 2);
case 5: case 5:
return $this->LibStatut($status, 1, 2).' '.$this->LibStatut($status, 3, 2); return $this->LibStatut($status, 1, 2).' '.$this->LibStatut($status, 3, 2);
default: default:
return $langs->trans('Unknown'); return $langs->trans('Unknown');
} }
} }
if ($mode == 0) { if ($mode == 0) {