Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php

ChangeLog

@@ -92,7 +92,9 @@ WARNING: If you used external modules, some of them may need to be upgraded due
 
 
 ***** ChangeLog for 3.3.3 compared to 3.3.2 *****
-  - Fix: [ bug #903 ] Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php
+- 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
 
 ***** ChangeLog for 3.3.2 compared to 3.3.1 *****
 - Fix: Dutch (nl_NL) translation

build/perl/virtualmin/dolibarr.pl

@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "3.4.0", "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" );
+return ( "3.4.0", "3.3.3", "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" );
 }
 
 sub script_dolibarr_category

htdocs/admin/index.php

@@ -68,7 +68,7 @@ print '<br>';
 print '<br>';
 //print '<hr style="color: #DDDDDD;">';
 print img_picto('','puce').' '.$langs->trans("SetupDescription4",DOL_URL_ROOT.'/admin/modules.php?mainmenu=home');
-if (count($conf->modules) <= 1)	// If only user module enabled
+if (count($conf->modules) <= (empty($conf->global->MAIN_MINNB_MODULE)?1:$conf->global->MAIN_MINNB_MODULE))	// If only user module enabled
 {
 	$langs->load("errors");
 	$warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete"));

htdocs/comm/propal.php

@@ -645,7 +645,8 @@ else if ($action == "addline" && $user->rights->propal->creer)
 		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")), 'errors');
 		$error++;
 	}
-	if ((empty($idprod) || GETPOST('usenewaddlineform')) && (!($price_ht != 0) || $price_ht == ''))	// Unit price can be 0 but not ''. Also price can be negative for proposal.
+
+	if ((empty($idprod) || GETPOST('usenewaddlineform')) && $price_ht == '')	// Unit price can be 0 but not ''. Also price can be negative for proposal.
 	{
 		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("UnitPriceHT")), 'errors');
 		$error++;

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

@@ -501,7 +501,6 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$newmenu->add('/admin/system/phpinfo.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoPHP'), 1);
 					//if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1);
 					$newmenu->add('/admin/system/database.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoDatabase'), 1);
-
 					$newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home&leftmenu=admintools", $langs->trans("Backup"),1);
 					$newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&leftmenu=admintools", $langs->trans("Restore"),1);
 					$newmenu->add("/admin/tools/update.php?mainmenu=home&leftmenu=admintools", $langs->trans("MenuUpgrade"),1);
@@ -512,6 +511,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$newmenu->add('/admin/system/about.php?mainmenu=home&leftmenu=admintools', $langs->trans('About'), 1);
 					$newmenu->add("/support/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("HelpCenter"),1,1,'targethelp');
 				}
+
 				// Modules system tools
 				if (! empty($conf->product->enabled) || ! empty($conf->service->enabled) || ! empty($conf->global->MAIN_MENU_ENABLE_MODULETOOLS))
 				{
@@ -1347,4 +1347,4 @@ function dol_eldy_showmenu($type_user, &$menuentry, &$listofmodulesforexternal)
 	return 1;
 }
 
-?>
+?>

htdocs/langs/es_ES/categories.lang

@@ -42,7 +42,7 @@ ErrCatAlreadyExists=Este nombre esta siendo utilizado
 AddProductToCat=¿Añadir este producto a una categoría?
 ImpossibleAddCat=Imposible añadir la categoría
 ImpossibleAssociateCategory=Imposible asociar la categoría
-WasAddedSuccessfully=se ha añadido con éxito.
+WasAddedSuccessfully=La categoría se ha añadido con éxito.
 ObjectAlreadyLinkedToCategory=El elemento ya está enlazado a esta categoría
 CategorySuccessfullyCreated=La categoría %s se insertado correctamente.
 ProductIsInCategories=Este producto/servicio se encuentra en las siguientes categorías
@@ -97,4 +97,4 @@ CatMemberList=Listado categorías de miembros
 CatSupLinks=Proveedores
 CatCusLinks=Clientes/Clientes potenciales
 CatProdLinks=Productos
-CatMemberLinks=Miembros
+CatMemberLinks=Miembros