Merge remote-tracking branch 'origin/3.6' into develop

Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php

ChangeLog

@@ -108,7 +108,8 @@ For users:
 - New: More options to create a credit note (can be filled autatically according to remain to pay).
 - New: Can define custom fields for categories.
 - New: Prepare generation of SEPA files into module withdrawal.
-- New: Can filter on status for supplier order.
+- New: [ task #1164 ] Add "Ref. supplier" search box in supplier orders
+- New: [ task #1345 ] Can filter on status for supplier order.
 - New: Add option FACTURE_SENDBYEMAIL_FOR_ALL_STATUS to allow to send invoice by email 
        whatever is its status.
 - New: Add filter date in bank writing list page.
@@ -141,9 +142,6 @@ For users:
 - Fix: [ bug #1517 ] Packages sizes.
 - Fix: [ bug #1521 ] The second order's page from a provider shows all orders
 
-TODO
-- New: Predefined product and free product use same form.
-
 For translators:
 - Update language files.
 
@@ -183,6 +181,8 @@ removed. You must now use the 6 parameters way. See file modMyModule.class.php f
 - Remove add_photo_web() that is ot used anymore by core code.
 
 
+***** ChangeLog for 3.5.5 compared to 3.5.4 *****
+Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas.
 
 ***** ChangeLog for 3.5.4 compared to 3.5.3 *****
 Fix: Hide title of event when agenda module disabled.

build/debian/changelog

@@ -1,9 +1,16 @@
-dolibarr (3.6.0-2) unstable; urgency=low
+dolibarr (3.6.0-3) unstable; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * New upstream release.
     
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Sat, 9 May 2014 12:00:00 +0100      
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 15 July 2014 12:00:00 +0100      
+
+dolibarr (3.5.5-3) unstable; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * New upstream release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 8 July 2014 12:00:00 +0100     
 
 dolibarr (3.5.4-3) unstable; urgency=low
 

build/doxygen/dolibarr-doxygen-build.pl

@@ -24,14 +24,31 @@ if (! -s $CONFFILE)
     print "Error: current directory for building Dolibarr doxygen documentation is not correct.\n";
     print "\n";
 	print "Change your current directory then, to launch the script, run:\n";
-	print '> perl ..\dolibarr-doxygen-build.pl  (on Windows)'."\n";
+	print '> perl .\dolibarr-doxygen-build.pl  (on Windows)'."\n";
 	print '> perl ../dolibarr-doxygen-build.pl  (on Linux or BSD)'."\n";
     sleep 4;
     exit 1;   
 }
 
-print "Running doxygen, please wait...\n";
+$SOURCE="../..";
-$result=`doxygen $OPTIONS $CONFFILE 2>&1`;
+
+# Get version $MAJOR, $MINOR and $BUILD
+$result = open( IN, "< " . $SOURCE . "/htdocs/filefunc.inc.php" );
+if ( !$result ) { die "Error: Can't open descriptor file " . $SOURCE . "/htdocs/filefunc.inc.php\n"; }
+while (<IN>) {
+	if ( $_ =~ /define\('DOL_VERSION','([\d\.a-z\-]+)'\)/ ) { $PROJVERSION = $1; break; }
+}
+close IN;
+($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
+if ($MINOR eq '') { die "Error can't detect version into ".$SOURCE . "/htdocs/filefunc.inc.php"; }
+
+
+$version=$MAJOR.".".$MINOR.".".$BUILD;
+
+
+print "Running doxygen for version ".$version.", please wait...\n";
+print "cat $CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n";
+$result=`cat $CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`;
 
 print $result;
 

build/doxygen/dolibarr-doxygen.doxyfile

@@ -31,7 +31,7 @@ PROJECT_NAME = dolibarr
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER = 3.6.0
+PROJECT_NUMBER = x.y.z
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.

build/doxygen/doxygen_header.html

@@ -35,15 +35,15 @@ File added into doxygen generated documentation
 				<div class="bannergroupmybanner">
 
 				<div class="banneritemmybanner">
-<script type="text/javascript"><!--
+<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-google_ad_client = "pub-1071905880519467";
+<!-- BAN_728x90_DOXYGEN -->
-/* PUBBANDEAUDOLIBARR */
+<ins class="adsbygoogle"
-google_ad_slot = "1421205532";
+     style="display:inline-block;width:728px;height:90px"
-google_ad_width = 468;
+     data-ad-client="ca-pub-1465985984238664"
-google_ad_height = 60;
+     data-ad-slot="4297390217"></ins>
-//-->
+<script>
+(adsbygoogle = window.adsbygoogle || []).push({});
 </script>
-<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
 				<div class="clr"></div>
 				</div>
 

build/exe/doliwamp/doliwamp.iss

@@ -17,9 +17,9 @@
 ; ----- Change this -----
 AppName=DoliWamp
 ; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-AppVerName=DoliWamp-3.6.0-beta
+AppVerName=DoliWamp-3.6.0
 ; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-OutputBaseFilename=DoliWamp-3.6.0-beta
+OutputBaseFilename=DoliWamp-3.6.0
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 ; Define full path from which all relative path are defined

build/makepack-dolibarr.pl

@@ -973,12 +973,15 @@ if ($nboftargetok) {
     		"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
     		"$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
     	);
+    	use POSIX qw/strftime/;
     	foreach my $file (sort keys %filestoscansf)
     	{
     		$found=0;
     		my $filesize = -s $file;
+    		my $filedate = (stat $file)[9];
     		print $file." ".($filesize?"(found)":"(not found)");
     		print ($filesize?" - ".$filesize:"");
+    		print ($filedate?" - ".strftime("%Y-%m-%d %H:%M:%S",localtime($filedate)):"");
     		print "\n";
     	}
 

build/makepack-howto.txt

@@ -13,8 +13,6 @@ beta version of Dolibarr, step by step.
 - Update version number with x.y.z-w in build/debian/changelog
 - Update version number with x.y.z-w in build/exe/doliwamp/doliwamp.iss
 - Update version number with x.y.z-w in build/rpm/*.spec
-- Update version number with x.y.z   in build/doxygen/dolibarr-doxygen.doxyfile
-- Update version number with x.y.z   in build/perl/virtualmin/dolibarr.pl
 - Commit all changes.
 - Add a Tag (x.y.betaz_YYYYMMDD) and push it: git push --tags
 - Create a branch (x.y).

build/perl/virtualmin/dolibarr.pl

@@ -30,7 +30,8 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "3.6.0", "3.5.3", "3.5.2", "3.5.1", "3.5.0", "3.4.1", "3.4.0", "3.3.3", "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" );
+	# TODO Replace this with version of Dolibar we want to install 
+	return ( "x.y.z", "3.6.0");
 }
 
 sub script_dolibarr_category

build/rpm/dolibarr_fedora.spec

@@ -333,7 +333,10 @@ 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
-* Wed Jul 2 2014 Laurent Destailleur 3.6.0-0.2.b
+* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
+- Upstream release
+
+* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
 - Upstream release
 
 * Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3

build/rpm/dolibarr_generic.spec

@@ -569,7 +569,10 @@ 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
-* Wed Jul 2 2014 Laurent Destailleur 3.6.0-0.2.b
+* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
+- Upstream release
+
+* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
 - Upstream release
 
 * Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3

build/rpm/dolibarr_mandriva.spec

@@ -338,7 +338,10 @@ 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
-* Wed Jul 2 2014 Laurent Destailleur 3.6.0-0.2.b
+* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
+- Upstream release
+
+* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
 - Upstream release
 
 * Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3

build/rpm/dolibarr_opensuse.spec

@@ -349,7 +349,10 @@ 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
-* Wed Jul 2 2014 Laurent Destailleur 3.6.0-0.2.b
+* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
+- Upstream release
+
+* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
 - Upstream release
 
 * Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3

htdocs/adherents/liste.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2013      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -189,7 +189,7 @@ if ($resql)
 	}
 
 	$param="";
-	if (isset($_GET["statut"]))       $param.="&statut=".$statut;
+	if ($statut != "") $param.="&statut=".$statut;
 	if ($search_nom)   $param.="&search_nom=".$search_nom;
 	if ($search_login) $param.="&search_login=".$search_login;
 	if ($search_email) $param.="&search_email=".$search_email;
@@ -202,7 +202,7 @@ if ($resql)
 		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;
 	}
 
-	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].($param?'?'.$param:'').'">';
 	print "<table class=\"noborder\" width=\"100%\">";
 
 	// Filter on categories

htdocs/categories/class/categorie.class.php

@@ -75,6 +75,9 @@ class Categorie extends CommonObject
 	{
 		global $conf;
 		
+		// Check parameters
+		if (empty($id) && empty($label)) return -1;
+
 		$sql = "SELECT rowid, fk_parent, entity, label, description, fk_soc, visible, type";
 		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
 		if ($id)

htdocs/compta/facture/impayees.php

@@ -363,6 +363,7 @@ $(document).ready(function() {
 $now=dol_now();
 
 $search_ref = GETPOST("search_ref");
+$search_refcustomer=GETPOST('search_refcustomer');
 $search_societe = GETPOST("search_societe");
 $search_montant_ht = GETPOST("search_montant_ht");
 $search_montant_ttc = GETPOST("search_montant_ttc");
@@ -381,7 +382,7 @@ if (! $sortorder) $sortorder="ASC";
 $limit = $conf->liste_limit;
 
 $sql = "SELECT s.nom, s.rowid as socid, s.email";
-$sql.= ", f.rowid as facid, f.facnumber, f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.localtax1, f.localtax2, f.revenuestamp";
+$sql.= ", f.rowid as facid, f.facnumber, f.ref_client, f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.localtax1, f.localtax2, f.revenuestamp";
 $sql.= ", f.datef as df, f.date_lim_reglement as datelimite";
 $sql.= ", f.paye as paye, f.fk_statut, f.type";
 $sql.= ", sum(pf.amount) as am";
@@ -407,6 +408,7 @@ if (GETPOST('filtre'))
 	}
 }
 if ($search_ref)         $sql .= " AND f.facnumber LIKE '%".$db->escape($search_ref)."%'";
+if ($search_refcustomer) $sql .= " AND f.ref_client LIKE '%".$db->escape($search_refcustomer)."%'";
 if ($search_societe)     $sql .= " AND s.nom LIKE '%".$db->escape($search_societe)."%'";
 if ($search_montant_ht)  $sql .= " AND f.total = '".$db->escape($search_montant_ht)."'";
 if ($search_montant_ttc) $sql .= " AND f.total_ttc = '".$db->escape($search_montant_ttc)."'";
@@ -435,6 +437,7 @@ if ($resql)
 	$param.=(! empty($socid)?"&socid=".$socid:"");
 	$param.=(! empty($option)?"&option=".$option:"");
 	if ($search_ref)         $param.='&search_ref='.urlencode($search_ref);
+    	if ($search_refcustomer) $param.='&search_ref='.urlencode($search_refcustomer);
 	if ($search_societe)     $param.='&search_societe='.urlencode($search_societe);
 	if ($search_montant_ht)  $param.='&search_montant_ht='.urlencode($search_montant_ht);
 	if ($search_montant_ttc) $param.='&search_montant_ttc='.urlencode($search_montant_ttc);
@@ -521,6 +524,7 @@ if ($resql)
 	print '<table class="liste" width="100%">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.facnumber","",$param,"",$sortfield,$sortorder);
+    	print_liste_field_titre($langs->trans('RefCustomer'),$_SERVER["PHP_SELF"],'f.ref_client','',$param,'',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"f.datef","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"f.date_lim_reglement","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
@@ -545,6 +549,9 @@ if ($resql)
 	// Ref
 	print '<td class="liste_titre">';
 	print '<input class="flat" size="10" type="text" name="search_ref" value="'.$search_ref.'"></td>';
+        print '<td class="liste_titre">';
+        print '<input class="flat" size="6" type="text" name="search_refcustomer" value="'.$search_refcustomer.'">';
+        print '</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre" align="left"><input class="flat" type="text" size="10" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
@@ -619,6 +626,11 @@ if ($resql)
 
 			print "</td>\n";
 
+	                // Customer ref
+	                print '<td class="nowrap">';
+	                print $objp->ref_client;
+	                print '</td>';
+
 			print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->df),'day').'</td>'."\n";
 			print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->datelimite),'day').'</td>'."\n";
 
@@ -676,7 +688,7 @@ if ($resql)
 		}
 
 		print '<tr class="liste_total">';
-		print '<td colspan="4" align="left">'.$langs->trans("Total").'</td>';
+		print '<td colspan="5" align="left">'.$langs->trans("Total").'</td>';
 		print '<td align="right"><b>'.price($total_ht).'</b></td>';
 		print '<td align="right"><b>'.price($total_tva).'</b></td>';
 		print '<td align="right"><b>'.price($total_ttc).'</b></td>';

htdocs/core/boxes/box_graph_invoices_permonth.php

@@ -197,6 +197,12 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				}
 			}
 
+			if (empty($conf->use_javascript_ajax))
+			{
+				$langs->load("errors");
+				$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+			}
+
 			if (! $mesg)
 			{
 				$stringtoshow='';

htdocs/core/boxes/box_graph_invoices_supplier_permonth.php

@@ -196,6 +196,12 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				}
 			}
 
+			if (empty($conf->use_javascript_ajax))
+			{
+				$langs->load("errors");
+				$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+			}
+
 			if (! $mesg)
 			{
 				$stringtoshow='';

htdocs/core/boxes/box_graph_orders_permonth.php

@@ -197,6 +197,12 @@ class box_graph_orders_permonth extends ModeleBoxes
 				}
 			}
 
+			if (empty($conf->use_javascript_ajax))
+			{
+				$langs->load("errors");
+				$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+			}
+
 			if (! $mesg)
 			{
 				$stringtoshow='';

htdocs/core/boxes/box_graph_orders_supplier_permonth.php

@@ -196,6 +196,12 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 				}
 			}
 
+			if (empty($conf->use_javascript_ajax))
+			{
+				$langs->load("errors");
+				$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+			}
+
 			if (! $mesg)
 			{
 				$stringtoshow='';

htdocs/core/boxes/box_graph_product_distribution.php

@@ -301,6 +301,12 @@ class box_graph_product_distribution extends ModeleBoxes
 			}
 		}
 
+		if (empty($conf->use_javascript_ajax))
+		{
+			$langs->load("errors");
+			$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+		}
+
 		if (! $mesg)
 		{
 			$stringtoshow='';

htdocs/core/boxes/box_graph_propales_permonth.php

@@ -202,6 +202,12 @@ class box_graph_propales_permonth extends ModeleBoxes
 				}
 			}
 
+			if (empty($conf->use_javascript_ajax))
+			{
+				$langs->load("errors");
+				$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+			}
+
 			if (! $mesg)
 			{
 				$stringtoshow='';

htdocs/core/class/html.formother.class.php

@@ -927,6 +927,7 @@ class FormOther
         $arrayboxtoactivatelabel=array();
         if (! empty($user->conf->$confuserzone))
         {
+        	$boxorder='';
         	$langs->load("boxes");	// Load label of boxes
         	foreach($boxactivated as $box)
         	{
@@ -935,8 +936,23 @@ class FormOther
         		if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';
         		$arrayboxtoactivatelabel[$box->id]=$label;			// We keep only boxes not shown for user, to show into combo list
         	}
-			// Class Form must have been already loaded
+            foreach($boxidactivatedforuser as $boxid)
-            $selectboxlist=Form::selectarray('boxcombo', $arrayboxtoactivatelabel,'',1);
+        	{
+       			if (empty($boxorder)) $boxorder.='A:';
+  				$boxorder.=$boxid.',';
+        	}
+
+        	//var_dump($boxidactivatedforuser);
+
+        	// Class Form must have been already loaded
+			$selectboxlist.='<form name="addbox" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+			$selectboxlist.='<input type="hidden" name="addbox" value="addbox">';
+			$selectboxlist.='<input type="hidden" name="userid" value="'.$user->id.'">';
+			$selectboxlist.='<input type="hidden" name="areacode" value="'.$areacode.'">';
+			$selectboxlist.='<input type="hidden" name="boxorder" value="'.$boxorder.'">';
+			$selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel,'',1);
+            if (empty($conf->use_javascript_ajax)) $selectboxlist.=' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
+            $selectboxlist.='</form>';
         }
 
         // Javascript code for dynamic actions

htdocs/core/menus/standard/eldy.lib.php

@@ -690,7 +690,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
                 $newmenu->add("/commande/liste.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);
                 if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
                 if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);
-                if (empty($leftmenu) || $leftmenu=="orders" && ! empty($conf->expedition->enabled)) $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=2", $langs->trans("StatusOrderOnProcessShort"), 2, $user->rights->commande->lire);
+                if (empty($leftmenu) || $leftmenu=="orders" && ! empty($conf->expedition->enabled)) $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);
                 if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=3", $langs->trans("StatusOrderToBill"), 2, $user->rights->commande->lire);  // The translation key is StatusOrderToBill but it means StatusDelivered. TODO We should renamed this later
                 if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);
                 if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);

htdocs/core/modules/product/mod_codeproduct_leopard.php

@@ -68,6 +68,7 @@ class mod_codeproduct_leopard extends ModeleProductCode
 	 */
 	function info($langs)
 	{
+		$langs->load("companies");
 		return $langs->trans("LeopardNumRefModelDesc");
 	}
 

htdocs/core/modules/societe/mod_codeclient_leopard.php

@@ -67,6 +67,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 	 */
 	function info($langs)
 	{
+		$langs->load("companies");
 		return $langs->trans("LeopardNumRefModelDesc");
 	}
 

htdocs/expedition/liste.php

@@ -58,7 +58,7 @@ $shipment=new Expedition($db);
 $helpurl='EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones';
 llxHeader('',$langs->trans('ListOfSendings'),$helpurl);
 
-$sql = "SELECT e.rowid, e.ref, e.date_delivery, e.date_expedition, e.fk_statut";
+$sql = "SELECT e.rowid, e.ref, e.date_delivery as date_expedition, l.date_delivery as date_livraison, e.fk_statut";
 $sql.= ", s.nom as socname, s.rowid as socid";
 $sql.= " FROM (".MAIN_DB_PREFIX."expedition as e";
 if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
@@ -67,6 +67,8 @@ if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no p
 }
 $sql.= ")";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping'";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target AND ee.targettype = 'delivery'";
 $sql.= " WHERE e.entity = ".$conf->entity;
 if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
 {
@@ -104,7 +106,9 @@ if ($resql)
 	print_liste_field_titre($langs->trans("Ref"),"liste.php","e.ref","",$param,'',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Company"),"liste.php","s.nom", "", $param,'align="left"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("DateDeliveryPlanned"),"liste.php","e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DateReceived"),"liste.php","e.date_expedition","",$param, 'align="center"',$sortfield,$sortorder);
+	if($conf->livraison_bon->enabled) {
+		print_liste_field_titre($langs->trans("DateReceived"),"liste.php","e.date_expedition","",$param, 'align="center"',$sortfield,$sortorder);
+	}
 	print_liste_field_titre($langs->trans("Status"),"liste.php","e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
 	print "</tr>\n";
 	$var=True;
@@ -129,16 +133,18 @@ if ($resql)
 		print '</td>';
 		// Date delivery  planed
 		print "<td align=\"center\">";
-		print dol_print_date($db->jdate($objp->date_delivery),"day");
+		print dol_print_date($db->jdate($objp->date_expedition),"day");
 		/*$now = time();
 		if ( ($now - $db->jdate($objp->date_expedition)) > $conf->warnings->lim && $objp->statutid == 1 )
 		{
 		}*/
 		print "</td>\n";
-		// Date real
+		if($conf->livraison_bon->enabled) {
-		print "<td align=\"center\">";
+			// Date real
-		print dol_print_date($db->jdate($objp->date_expedition),"day");
+			print "<td align=\"center\">";
-		print "</td>\n";
+			print dol_print_date($db->jdate($objp->date_livraison),"day");
+			print "</td>\n";
+		}
 
 		print '<td align="right">'.$expedition->LibStatut($objp->fk_statut,5).'</td>';
 		print "</tr>\n";

htdocs/index.php

@@ -46,6 +46,17 @@ if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_IN
     exit;
 }
 
+if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax disabled)
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
+	$zone=GETPOST('areacode');
+	$userid=GETPOST('userid');
+	$boxorder=GETPOST('boxorder');
+	$boxorder.=GETPOST('boxcombo');
+
+	$result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
+}
+
 
 
 /*

htdocs/langs/en_US/admin.lang

@@ -1444,8 +1444,8 @@ ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
 TaxSetup=Taxes, social contributions and dividends module setup
 OptionVatMode=VAT due 
-OptionVATDefault=Standard
+OptionVATDefault=Cash basis
-OptionVATDebitOption=Option services on Debit
+OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option: 

htdocs/langs/en_US/errors.lang

@@ -153,3 +153,4 @@ WarningCloseAlways=Warning, closing is done even if amount differs between sourc
 WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
 WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
 WarningNotRelevant=Irrelevant operation for this dataset
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.

htdocs/langs/en_US/main.lang

@@ -677,6 +677,7 @@ AccountCurrency=Account Currency
 ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
+AddBox=Add box
 
 # Week day
 Monday=Monday

htdocs/opensurvey/class/opensurveysondage.class.php

@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2013-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2014 Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2014      Marcos García	    <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -100,7 +100,12 @@ class Opensurveysondage extends CommonObject
 		$this->cleanParameters();
 
 		// Check parameters
-		// Put here code to add control on parameters values
+		if (! $this->date_fin > 0)
+		{
+			$this->error='BadValueForEndDate';
+			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
+			return -1;
+		}
 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."opensurvey_sondage(";

htdocs/opensurvey/wizard/choix_date.php

@@ -30,10 +30,9 @@ require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php");
 // Security check
 if (!$user->rights->opensurvey->write) accessforbidden();
 
-//le format du sondage est DATE
+// Survey type is DATE
 $_SESSION["formatsondage"] = "D";
 
-//traitement de l'entrée des heures dans les cases texte
 $erreur = false;
 
 /*
@@ -44,15 +43,16 @@ $erreur = false;
 if (GETPOST('confirmation'))
 {
 
-	//On sauvegarde les heures deja entrées
+	// We save hours entered
 	if (issetAndNoEmpty('totalchoixjour', $_SESSION) === true && issetAndNoEmpty('nbrecaseshoraires', $_SESSION) === true)
 	{
 		$nbofchoice=count($_SESSION["totalchoixjour"]);
 
-		for ($i = 0; $i < $nbofchoice; $i++) {
+		for ($i = 0; $i < $nbofchoice; $i++)
-			//affichage des 5 cases horaires
+		{
-			for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) {
+			// Show hours choices
-				
+			for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++)
+			{
 				$_SESSION["horaires$i"][$j] = $_POST["horaires$i"][$j];
 
 				$case = $j + 1;
@@ -166,16 +166,21 @@ if (GETPOST('confirmation'))
 		$erreur=true;
 	}
 
-	if (!$erreur) {
+	// Add survey into database
+	if (!$erreur)
+	{
 		$_SESSION["toutchoix"]=substr("$choixdate",1);
+
 		ajouter_sondage();
 	}
 }
 
 // Reset days
-if (GETPOST('reset')) {
+if (GETPOST('reset'))
+{
 	$nbofchoice=count($_SESSION["totalchoixjour"]);
-	for ($i = 0; $i < $nbofchoice; $i++) {
+	for ($i = 0; $i < $nbofchoice; $i++)
+	{
 		for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) {
 			unset($_SESSION["horaires$i"][$j]);
 		}

htdocs/opensurvey/wizard/create_survey.php

@@ -79,10 +79,10 @@ if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre"))
 	$testdate = false;
 	$champdatefin = dol_mktime(0,0,0,GETPOST('champdatefinmonth'),GETPOST('champdatefinday'),GETPOST('champdatefinyear'));
 
-	if (GETPOST('champdatefin') && $champdatefin)	// A date was provided
+	if (GETPOST('champdatefin') && ($champdatefin > 0))	// A date was provided
 	{
 		// Expire date is not before today
-		if ($champdatefin - dol_now() > 0)
+		if ($champdatefin >= dol_now())
 		{
 			$testdate = true;
 			$_SESSION['champdatefin'] = dol_print_date($champdatefin,'dayrfc');
@@ -90,6 +90,8 @@ if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre"))
 		else
 		{
 			$testdate = true;
+			//$testdate = false;
+			//$_SESSION['champdatefin'] = dol_print_date($champdatefin,'dayrfc');
 			//setEventMessage($langs->trans('ExpiredDate'),'errors');
 		}
 	}

htdocs/product/class/product.class.php

@@ -3181,15 +3181,15 @@ class Product extends CommonObject
     							// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
     							if ($photo_vignette && preg_match('/(\.bmp|\.gif|\.jpg|\.jpeg|\.png)$/i', $photo) && ($product->imgWidth > $maxWidth || $product->imgHeight > $maxHeight))
     							{
-    								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$_GET["id"].'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'),'refresh').'&nbsp;&nbsp;</a>';
+    								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'),'refresh').'&nbsp;&nbsp;</a>';
     							}
     							if ($user->rights->produit->creer || $user->rights->service->creer)
     							{
     								// Link to resize
-    			               		$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$_GET["id"].'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','',1).'</a> &nbsp; ';
+    			               		$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','',1).'</a> &nbsp; ';
 
     			               		// Link to delete
-    								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$_GET["id"].'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
+    								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
     								$return.= img_delete().'</a>';
     							}
     						}
@@ -3212,10 +3212,10 @@ class Product extends CommonObject
     							if ($user->rights->produit->creer || $user->rights->service->creer)
     							{
     								// Link to resize
-    			               		$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$_GET["id"].'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','',1).'</a> &nbsp; ';
+    			               		$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','',1).'</a> &nbsp; ';
 
     			               		// Link to delete
-    			               		$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$_GET["id"].'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
+    			               		$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
     								$return.= img_delete().'</a>';
     							}
     						}

htdocs/theme/amarok/style.css.php

@@ -469,6 +469,7 @@ form#login img  {width:auto; height:auto; opacity:.7;}
 form#login img#img_logo {
 	width:190px;
 	max-width:190px;
+	max-height:100px;
 	height:auto;
 	border-radius:6px;
 	padding:6px;

htdocs/theme/auguria/style.css.php

@@ -557,6 +557,7 @@ form#login {
 }
 #img_logo {
 	max-width: 200px;
+	max-height: 100px;
 }
 
 div.login_block {

htdocs/theme/bureau2crea/style.css.php

@@ -583,6 +583,7 @@ form#login {
 }
 #img_logo {
 	max-width: 200px;
+	max-height: 100px;
 }
 
 div.login_block {

htdocs/theme/cameleo/style.css.php

@@ -656,6 +656,7 @@ form#login {
 }
 #img_logo {
 	max-width: 200px;
+	max-height: 100px;
 }
 
 div.login_block {

htdocs/theme/eldy/style.css.php

@@ -862,6 +862,7 @@ table.login_table tr td table.none tr td {
 }
 #img_logo {
 	max-width: 200px;
+	max-height: 100px;
 }
 
 div.login_block {