Merge pull request #1134 from FHenry/3.3
Fix [ bug #1001 ] Charge sociale : état incorrect
This commit is contained in:
commit
3cd46d5e20
@ -7,6 +7,7 @@ English Dolibarr ChangeLog
|
|||||||
- Fix: [ bug #903 ] Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php
|
- Fix: [ bug #903 ] Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php
|
||||||
- Fix: [ bug #934 ] Error on proformat invoice creation (pgsql)
|
- Fix: [ bug #934 ] Error on proformat invoice creation (pgsql)
|
||||||
- Fix: [ bug #947 ] Can't create proposal lines with unit price = 0
|
- Fix: [ bug #947 ] Can't create proposal lines with unit price = 0
|
||||||
|
- Fix: [ bug #1001 ] Social Contribution : State not correct
|
||||||
|
|
||||||
***** ChangeLog for 3.3.2 compared to 3.3.1 *****
|
***** ChangeLog for 3.3.2 compared to 3.3.1 *****
|
||||||
|
|
||||||
|
|||||||
@ -262,7 +262,7 @@ if ($resql)
|
|||||||
// Expected to pay
|
// Expected to pay
|
||||||
print '<td align="right">'.price($objp->sc_amount).'</td>';
|
print '<td align="right">'.price($objp->sc_amount).'</td>';
|
||||||
// Status
|
// Status
|
||||||
print '<td align="center">'.$socialcontrib->LibStatut($objp->fk_statut,2).'</td>';
|
print '<td align="center">'.$socialcontrib->getLibStatut(4).'</td>';
|
||||||
// Amount payed
|
// Amount payed
|
||||||
print '<td align="right">'.price($objp->amount).'</td>';
|
print '<td align="right">'.price($objp->amount).'</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user