diff --git a/ChangeLog b/ChangeLog
index d6ba26267a6650b88e07bf12aa9f4c074b954990..f92c959db5063bf57376ffd1bfc64e019d1544a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
English Dolibarr ChangeLog
--------------------------------------------------------------
+***** ChangeLog for 3.6.1 compared to 3.6.* *****
+For users:
+- Fix: Can upload files on services.
+- Fix: sql errors on updat fichinter
+- Fix: debian script syntax error
+- Fix: error "menu param is not inside list" into pos module.
+
***** ChangeLog for 3.6 compared to 3.5.* *****
For users:
- New: Update ckeditor to version 4.
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 2667e328e58ebf86d80f44ca1b908a16d2cf284a..ed255b5785f8773da921f3cbe0c8bc6ed77f084f 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1206,7 +1206,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,(empty($user->societe_id)?0:1),'eldy',$tabMenu);
// We update newmenu for special dynamic menus
- if ($user->rights->banque->lire && $mainmenu == 'bank') // Entry for each bank account
+ if (!empty($user->rights->banque->lire) && $mainmenu == 'bank') // Entry for each bank account
{
$sql = "SELECT rowid, label, courant, rappro, courant";
$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
diff --git a/htdocs/core/tpl/document_actions_pre_headers.tpl.php b/htdocs/core/tpl/document_actions_pre_headers.tpl.php
index ca6929331eccc8898ad35daa0cb019abca7560b2..b386391cec220feb83381b715c6d137f2d1bc967 100644
--- a/htdocs/core/tpl/document_actions_pre_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_pre_headers.tpl.php
@@ -74,7 +74,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
setEventMessage($langs->trans("ErrorFailedToDeleteLink", $link->label), 'errors');
}
}
- header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id.($withproject?'&withproject=1':''));
+ header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id.(!empty($withproject)?'&withproject=1':''));
exit;
}
}
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index f083318948e33527de0549286fd15deb1c279eea..dcd19b080b51893e6c23bfddc06460ac65612601 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -4,7 +4,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
* Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
- * Copyright (C) 2010-2013 Philippe Grand <philippe.grand@atoo-net.com>
+ * Copyright (C) 2010-2014 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
@@ -191,6 +191,13 @@ class CommandeFournisseur extends CommonOrder
$this->extraparams = (array) json_decode($obj->extraparams, true);
$this->db->free($resql);
+
+ // Retreive all extrafield
+ // fetch optionals attributes and labels
+ require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
+ $extrafields=new ExtraFields($this->db);
+ $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
+ $this->fetch_optionals($this->id,$extralabels);
if ($this->statut == 0) $this->brouillon = 1;
diff --git a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
index 919fbee7d4dc16efb366b9567aea23d823916695..0e7a226d0bd5757ca1b688f94a98597a8410eadf 100644
--- a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
+++ b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
@@ -293,6 +293,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
diff --git a/htdocs/install/mysql/tables/llx_c_type_resource.key.sql b/htdocs/install/mysql/tables/llx_c_type_resource.key.sql
index 68f5b74a42ab9ae42a89377e2aee94de75dcf9ed..dc5c5ee150a50c87b32c74e84cde87dda099f703 100644
--- a/htdocs/install/mysql/tables/llx_c_type_resource.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_resource.key.sql
@@ -17,5 +17,5 @@
-- ========================================================================
-ALTER TABLE llx_c_type_resource ADD UNIQUE INDEX uk_c_type_resource_id (libelle, code);
+ALTER TABLE llx_c_type_resource ADD UNIQUE INDEX uk_c_type_resource_id (label, code);
diff --git a/htdocs/install/mysql/tables/llx_c_type_resource.sql b/htdocs/install/mysql/tables/llx_c_type_resource.sql
index efb505ba57493fff604e96515fa968cd5a2d3328..8ba088c075e17861aa249cb08fd9e17db5b03b8f 100644
--- a/htdocs/install/mysql/tables/llx_c_type_resource.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_resource.sql
@@ -29,6 +29,6 @@ create table llx_c_type_resource
(
rowid integer PRIMARY KEY,
code varchar(32) NOT NULL,
- libelle varchar(64) NOT NULL,
+ label varchar(64) NOT NULL,
active tinyint DEFAULT 1 NOT NULL
)ENGINE=innodb;
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 684ee5ef20aad9cdfd8b2ac86be72b71a09acfe3..1e3027acd25398e404e23c8ec094e40094c91551 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/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
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index a32a8aa912701f289f94aa16e80a529444717f79..c3b337c4a16ae366f12f65a266a113a04acf5322 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1213,7 +1213,7 @@ class Product extends CommonObject
if ($newvat == '') $newvat=$this->tva_tx;
if (! empty($newminprice) && ($newminprice > $newprice))
{
- $this->error='ErrorPricCanBeLowerThanMinPrice';
+ $this->error='ErrorPriceCantBeLowerThanMinPrice';
return -1;
}
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 3e5417ae9e8e464b31915d022cb57a2d3addeb72..1e8c7b7cd9a3934995578fd18be33a43426ebf0d 100644
--- a/htdocs/product/document.php
+++ b/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';
}