From 6d83882a5d355b0c3b6a09a4e8047ff039e5505f Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Tue, 8 Jul 2014 09:00:41 +0200
Subject: [PATCH 1/2] FIX : Bad rank when a bill was made by multiple orders

---
 htdocs/commande/orderstoinvoice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index 5ea4e5b72cb..7411d3a9368 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -285,7 +285,7 @@ if (($action == 'create' || $action == 'add') && empty($mesgs))
 												'HT',
 												0,
 												$product_type,
-												$lines[$i]->rang,
+												$ii,
 												$lines[$i]->special_code,
 												$object->origin,
 												$lines[$i]->rowid,

From ff5ea31452e1796ba2022cf73915e42f417d2139 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jul 2014 12:40:30 +0200
Subject: [PATCH 2/2] Fix: Date error

---
 build/rpm/dolibarr_fedora.spec   | 2 +-
 build/rpm/dolibarr_generic.spec  | 2 +-
 build/rpm/dolibarr_mandriva.spec | 2 +-
 build/rpm/dolibarr_opensuse.spec | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 9bcb450bb44..fb1deb610c5 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -331,7 +331,7 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Tue July 1 2014 Laurent Destailleur 3.5.4-0.3
+* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
 - Upstream release
 
 * Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index bf844b8c766..f5532934b35 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -567,7 +567,7 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Tue July 1 2014 Laurent Destailleur 3.5.4-0.3
+* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
 - Upstream release
 
 * Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 68c6c505b65..da1aa858535 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -336,7 +336,7 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Tue July 1 2014 Laurent Destailleur 3.5.4-0.3
+* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
 - Upstream release
 
 * Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 3da1b2003ec..9ae11b015f8 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -347,7 +347,7 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Tue July 1 2014 Laurent Destailleur 3.5.4-0.3
+* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
 - Upstream release
 
 * Fri May 2 2014 Laurent Destailleur 3.5.3-0.3