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

Conflicts:
	ChangeLog
	htdocs/fourn/class/fournisseur.commande.class.php

build/debian/dolibarr.postinst

@@ -129,7 +129,7 @@ case "$1" in
 		then
 			# Create an empty conf.php with permission to web server
 			setup_empty_conf
-		else
+		#else
 			# File already exist. We add params not found.
 			#echo Add new params to overwrite path to use shared libraries/fonts
 			#grep -q -c "dolibarr_lib_ADODB_PATH" $config    || [ ! -d "/usr/share/php/adodb" ]  || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config

build/exe/doliwamp/doliwamp.iss

@@ -32,7 +32,7 @@ AppPublisherURL=http://www.nltechno.com
 AppSupportURL=http://www.dolibarr.org
 AppUpdatesURL=http://www.dolibarr.org
 AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares.
-AppCopyright=Copyright (C) 2008-2013 Laurent Destailleur, NLTechno
+AppCopyright=Copyright (C) 2008-2014 Laurent Destailleur, NLTechno
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr
 ;LicenseFile=COPYING

htdocs/cashdesk/affContenu.php

@@ -55,6 +55,8 @@ print '</div>';
 print '<div class="principal">';
 
 $page=GETPOST('menu','alpha');
+if (empty($page)) $page='facturation';
+
 if (in_array(
 		$page,
 		array(

htdocs/fourn/class/fournisseur.commande.class.php

@@ -1347,6 +1347,7 @@ class CommandeFournisseur extends CommonOrder
      */
     function deleteline($idline, $notrigger=0)
     {
+        global $user,$langs,$conf;
         if ($this->statut == 0)
         {
         	$this->db->begin();

htdocs/includes/ckeditor/contents.css

@@ -15,7 +15,7 @@ body
 	/* Remove the background color to make it transparent */
 	background-color: #fff;
 
-	margin: 20px;
+	margin: 8px;
 }
 
 .cke_editable

htdocs/install/mysql/migration/3.5.0-3.6.0.sql

@@ -297,6 +297,9 @@ create table llx_c_type_resource
   active  	    tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
 
+-- Fix llx_c_type_resource when you update from a 3.6-beta
+ALTER TABLE llx_c_type_resource CHANGE libelle label VARCHAR(64) NOT NULL;
+
 ALTER TABLE llx_c_type_resource ADD UNIQUE INDEX uk_c_type_resource_id (label, code);
 
 -- Fix :: account_parent must be an int, not an account number

htdocs/langs/en_US/products.lang

@@ -80,11 +80,12 @@ ContractStatusClosed=Closed
 ContractStatusRunning=Running
 ContractStatusExpired=expired
 ContractStatusOnHold=Not running
-ContractStatusToRun=A mettre en service
+ContractStatusToRun=To get running
 ContractNotRunning=This contract is not running
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product

htdocs/product/class/product.class.php

@@ -1205,7 +1205,7 @@ class Product extends CommonObject
 		if ($newvat == '') $newvat=$this->tva_tx;
 		if (! empty($newminprice) && ($newminprice > $newprice))
 		{
-			$this->error='ErrorPricCanBeLowerThanMinPrice';
+			$this->error='ErrorPriceCantBeLowerThanMinPrice';
 			return -1;
 		}
 

htdocs/product/document.php

@@ -141,7 +141,7 @@ if ($object->id)
     print '</div>';
 
     $modulepart = 'produit';
-    $permission = $user->rights->produit->creer;
+    $permission = (($object->type == 0 && $user->rights->produit->creer) || ($object->type == 1 && $user->rights->service->creer));
     $param = '&id=' . $object->id;
     include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 }

htdocs/theme/eldy/style.css.php

@@ -244,6 +244,10 @@ a:hover { text-decoration: underline; color: #000000;}
 input:focus, textarea:focus, button:focus, select:focus {
     box-shadow: 0 0 4px #8091BF;
 }
+textarea.cke_source:focus
+{
+	box-shadow: none;
+}
 
 input, input.flat, textarea, textarea.flat, form.flat select, select.flat {
     font-size: <?php print $fontsize ?>px;
@@ -2555,6 +2559,10 @@ A.none, A.none:active, A.none:visited, A.none:hover {
 /*  CKEditor                                                                      */
 /* ============================================================================== */
 
+.cke_editable 
+{
+	margin: 5px !important;
+}
 .cke_editor table, .cke_editor tr, .cke_editor td
 {
     border: 0px solid #FF0000 !important;