From 116988febdc7128831bb04305005c1d7b8a86677 Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Fri, 26 Jul 2013 12:49:11 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=20Fix=20[=20bug=20#1001=20]=20Charge=20soc?= =?UTF-8?q?iale=20:=20=C3=A9tat=20incorrect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/compta/payment_sc/fiche.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php index 0bf129c567b..a5c1e8f07b2 100644 --- a/htdocs/compta/payment_sc/fiche.php +++ b/htdocs/compta/payment_sc/fiche.php @@ -262,7 +262,7 @@ if ($resql) // Expected to pay print ''.price($objp->sc_amount).''; // Status - print ''.$socialcontrib->LibStatut($objp->fk_statut,2).''; + print ''.$socialcontrib->getLibStatut(4).''; // Amount payed print ''.price($objp->amount).''; print "\n"; From 7af45ccdf3abafdd8939b7d1abaac6785b3a8c49 Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Fri, 26 Jul 2013 12:52:51 +0200 Subject: [PATCH 2/2] update changelog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 59549e19355..06189a39564 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 #934 ] Error on proformat invoice creation (pgsql) - 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 *****