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

ChangeLog

@@ -351,7 +351,7 @@ For users:
        Use accesskey on form search.
 - New: Intervention documents are now available in ECM module.
 - New: Add attachments on user card + in ECM module.
-- New: Can add __PROJECT_REF__ and __TIHRPARTY_NAME__ into email topic or content template.
+- New: Can add __PROJECT_REF__ and __THIRDPARTY_NAME__ into email topic or content template.
 - New: [ task #1204 ] add Numering contrat module free (like leopard in product module).
 - New: [ task #712 ] Add warning when creating invoice from proposal or order, when there is already one invoice.
 - New: Enable supplier price log table.

build/launchpad/README

@@ -41,69 +41,67 @@ If you want to build/test package locally:
 # Push/declare Dolibarr sources to Launchpad
 #----------------------------------
 - From Launchpad project (https://launchpad.net/dolibarr), register a series: 
-    Call it 'trunk' or 'beta' or 'stable'
+    Call it 'trunk' or 'stable'
     Use branch (dev):
-    ~eldy/dolibarr/develop
-    ~eldy/dolibarr/beta
-    ~eldy/dolibarr/stable
+    https://launchpad.net/~eldy/dolibarr/develop
+    https://launchpad.net/~eldy/dolibarr/stable
     or 
-    Use URL pattern (beta or stable):
+    Use URL pattern (stable):
     For stable: http://www.dolibarr.org/files/lastbuild/package_debian-ubuntu/dolibarr_x.z.*.tar.gz
-    For beta: http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_x.y.*.tar.gz
 
 - For Dev, you can also add link serie to GIT HEAD.
-- For beta and stable, you can init from command line
-	cd bzr/dolibarr-[beta|stable]
+- For stable, you can init from command line
+	cd bzr/dolibarr-stable
     bzr init
     bzr add
     bzr commit -m "Init"
-    bzr push lp:~yourlogin/dolibarr/[beta|stable]
+    bzr push lp:~yourlogin/dolibarr/stable
 
 - List of series are visible here: https://launchpad.net/dolibarr/+series
 
 # To update Dolibarr into launchpad (when remote repository for sources already exists)
 #----------------------------------
 	# create local repository
 	cd bzr
-	bzr branch lp:~yourlogin/dolibarr/[develop|beta|stable] dolibarr-[dev|beta|stable]
-    cd dolibarr-[dev|beta|stable]
+	bzr branch lp:~yourlogin/dolibarr/[develop|stable] dolibarr-[dev|stable]
+    cd dolibarr-[dev|stable]
     # Update
     bzr update
-	-- Update files here. Remove all and overwrite --
+	-- Update files here: Remove all (except .bzr dir) and overwrite --
     bzr status
 	bzr add *
-    bzr commit -m "Description of change"
+    bzr commit -m "Upstream version x.y"
     bzr push
 
 # Init debian dir repository into launchpad (when repository for sources does not exist)
 #----------------------------------
--  Create debian directory and upload it onto bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
+-  Create debian directory and upload it onto bzr branch lp:~yourlogin/+junk/debian-[dev|stable]
     cd bzr
     mkdir debian
     cd debian
     cp -pr dolibarr_root/debian bzr/debian
     bzr init
     bzr add
     bzr commit -m "Init control files"
-    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]    (put here any branch name or just bzr push if into a known branch)
+    bzr push lp:~yourlogin/+junk/debian-[dev|stable]    (put here any branch name or just bzr push if into a known branch)
 - or download it from launchpad bazaar:
     cd bzr
-    bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
+    bzr branch lp:~yourlogin/+junk/debian-[dev|stable]
 
 # Get debian dir repository from launchpad (when repository for sources already exists)
 #----------------------------------
 	cd bzr
-	bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
+	bzr branch lp:~yourlogin/+junk/debian-[dev|stable]
 
 # To update debian dir into launchpad (when repository for sources already exists)
 #----------------------------------
 	cd bzr
-	bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
-    cd debian-[dev|beta|stable]
+	bzr branch lp:~yourlogin/+junk/debian-[dev|stable]
+    cd debian-[dev|stable]
     bzr status
 	-- Update files here --
     bzr commit -m "Description of change"
-    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]
+    bzr push lp:~yourlogin/+junk/debian-[dev|stable]
 
 
 # Define a recipe into launchpad (a rule to build packages into a PPA)
@@ -115,24 +113,19 @@ If you want to build/test package locally:
 	    # bzr-builder format 0.3 deb-version {debupstream}-0~{revno}
 		lp:dolibarr
 		merge packaging lp:~yourlogin/+junk/debian-dev
-    	For beta:
-	    # bzr-builder format 0.3 deb-version {debupstream}-1~{revno}
-		lp:dolibarr/beta
-		merge packaging lp:~yourlogin/+junk/debian-beta
     	For stable:
 	    # bzr-builder format 0.3 deb-version {debupstream}-2~{revno}
 		lp:dolibarr/stable
 		merge packaging lp:~yourlogin/+junk/debian-stable
 - Run command
     cd bzr
     bzr dailydeb dolibarr.recipe working-dir
-  This will create a directory "working-dir" with dolibarr sources and will add sources from ~yourlogin/+junk/debian-[dev|beta|stable]
+  This will create a directory "working-dir" with dolibarr sources and will add sources from ~yourlogin/+junk/debian-[dev|stable]
 - Test package sources
     sudo pbuilder build <working-dir>/<project>_<version>.dsc
 
 List of recipes created
 https://code.launchpad.net/~eldy/+recipe/dolibarr-dev
-https://code.launchpad.net/~eldy/+recipe/dolibarr-beta
 https://code.launchpad.net/~eldy/+recipe/dolibarr-stable
 
 
@@ -147,9 +140,6 @@ https://code.launchpad.net/~eldy/+recipe/dolibarr-stable
 For the development snapshot version: 
 deb http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main 
 deb-src http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main 
-For the beta version: 
-deb http://ppa.launchpad.net/yourlogin/dolibarr-beta/ubuntu precise main 
-deb-src http://ppa.launchpad.net/yourlogin/dolibarr-beta/ubuntu precise main 
 For the stable version:
 deb http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main 
 deb-src http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main 

htdocs/adherents/cotisations.php

@@ -38,6 +38,7 @@
 $search_note=GETPOST('search_note');
 $search_account=GETPOST('search_account','int');
 $search_amount=GETPOST('search_amount','int');
+$optioncss = GETPOST('optioncss','alpha');
 
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
@@ -139,17 +140,17 @@
 	if ($search_login)    $param.="&search_login=".$search_login;
 	if ($search_acount)   $param.="&search_account=".$search_account;
 	if ($search_amount)   $param.="&search_amount=".$search_amount;
+	if ($optioncss != '') $param.='&optioncss='.$optioncss;
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num);
 
 	if ($sall)
 	{
 		print $langs->trans("Filter")." (".$langs->trans("Ref").", ".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("EMail").", ".$langs->trans("Address")." ".$langs->trans("or")." ".$langs->trans("Town")."): ".$sall;
 	}
 
-    $param="";
-    $param.="&statut=$statut&date_select=$date_select";
 
     print '<form method="POST" action="'.$_SERVER["PHP_SELF"].($param?'?'.$param:'').'">';
+    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     print '<table class="noborder" width="100%">';
 
     print '<tr class="liste_titre">';

htdocs/adherents/list.php

@@ -48,6 +48,7 @@
 $search_categ = GETPOST("search_categ",'int');
 $catid        = GETPOST("catid",'int');
 $sall=GETPOST("sall");
+$optioncss = GETPOST('optioncss','alpha');
 
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
@@ -176,6 +177,7 @@
 	if ($search_email) $param.="&search_email=".$search_email;
 	if ($filter)       $param.="&filter=".$filter;
 	if ($type > 0)     $param.="&type=".$type;
+	if ($optioncss != '') $param.='&optioncss='.$optioncss;
 	print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
 
 	if ($sall)
@@ -185,6 +187,7 @@
 	}
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].($param?'?'.$param:'').'">';
+    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
 	// Filter on categories

htdocs/admin/commande.php

@@ -204,11 +204,11 @@
     }
 }
 
-else if ($action == 'set_COMMANDE_FREE_TEXT')
+else if ($action == 'set_ORDER_FREE_TEXT')
 {
-	$freetext = GETPOST("COMMANDE_FREE_TEXT");	// No alpha here, we want exact string
+	$freetext = GETPOST("ORDER_FREE_TEXT");	// No alpha here, we want exact string
 
-	$res = dolibarr_set_const($db, "COMMANDE_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
+	$res = dolibarr_set_const($db, "ORDER_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
 	if (! $res > 0) $error++;
 
@@ -552,10 +552,10 @@
 $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_COMMANDE_FREE_TEXT">';
+print '<input type="hidden" name="action" value="set_ORDER_FREE_TEXT">';
 print '<tr '.$bc[$var].'><td colspan="2">';
 print $langs->trans("FreeLegalTextOnOrders").' ('.$langs->trans("AddCRIfTooLong").')<br>';
-$variablename='COMMANDE_FREE_TEXT';
+$variablename='ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';

htdocs/admin/facture.php

@@ -226,11 +226,11 @@
     }
 }
 
-if ($action == 'set_FACTURE_FREE_TEXT')
+if ($action == 'set_INVOICE_FREE_TEXT')
 {
-	$freetext = GETPOST('FACTURE_FREE_TEXT');	// No alpha here, we want exact string
+	$freetext = GETPOST('INVOICE_FREE_TEXT');	// No alpha here, we want exact string
 
-    $res = dolibarr_set_const($db, "FACTURE_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
+    $res = dolibarr_set_const($db, "INVOICE_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
 	if (! $res > 0) $error++;
 
@@ -753,10 +753,10 @@
 $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
-print '<input type="hidden" name="action" value="set_FACTURE_FREE_TEXT" />';
+print '<input type="hidden" name="action" value="set_INVOICE_FREE_TEXT" />';
 print '<tr '.$bc[$var].'><td colspan="2">';
 print $langs->trans("FreeLegalTextOnInvoices").' ('.$langs->trans("AddCRIfTooLong").')<br>';
-$variablename='FACTURE_FREE_TEXT';
+$variablename='INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';