From b9fbdffab25d1e561e0c272dc88946b7ddadf51d Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 14 Mar 2014 22:56:54 +0100
Subject: [PATCH 1/2] Fix bug 1298 : category nav on member 	modified:  
 htdocs/categories/categorie.php

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

diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index 8232da94989..a0be24c3e46 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -410,7 +410,7 @@ else if ($id || $ref)
 		// Ref
 		print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
 		print '<td class="valeur">';
-		print $form->showrefnav($member,'rowid');
+		print $form->showrefnav($member,'id','',1,'rowid','nom','','&type='.$type);
 		print '</td></tr>';
 
         // Login

From 3131b929883827a2449d5c935d5c534c058dd387 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 14 Mar 2014 23:18:46 +0100
Subject: [PATCH 2/2] Fix bug 1293 : numbering failed

---
 htdocs/categories/categorie.php    | 2 +-
 htdocs/core/lib/functions2.lib.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index a0be24c3e46..e3925ddb232 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -410,7 +410,7 @@ else if ($id || $ref)
 		// Ref
 		print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
 		print '<td class="valeur">';
-		print $form->showrefnav($member,'id','',1,'rowid','nom','','&type='.$type);
+		print $form->showrefnav($member,'id');
 		print '</td></tr>';
 
         // Login
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index c315939d327..20af2917fa4 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -716,7 +716,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
 
     // Define $sqlstring
-    $posnumstart=strpos($maskwithnocode,$maskcounter);	// Pos of counter in final string (from 0 to ...)
+    $posnumstart=strrpos($maskwithnocode,$maskcounter);	// Pos of counter in final string (from 0 to ...)
     if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
     $sqlstring='SUBSTRING('.$field.', '.($posnumstart+1).', '.dol_strlen($maskcounter).')';