lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6

Browse Source 
Conflicts:
	htdocs/install/mysql/tables/llx_c_type_resource.key.sql
This commit is contained in:
Laurent Destailleur 2014-08-28 11:56:19 +02:00
commit 3064aa2177
10 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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.

2
htdocs/core/menus/standard/eldy.lib.php
View File

@ -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";

2
htdocs/core/tpl/document_actions_pre_headers.tpl.php
View File

@ -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;
}
}

9
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -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;

3
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
View File

@ -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

2
htdocs/install/mysql/tables/llx_c_type_resource.key.sql
View File

@ -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);

2
htdocs/install/mysql/tables/llx_c_type_resource.sql
View File

@ -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;

3
htdocs/langs/en_US/products.lang
View File

@ -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

2
htdocs/product/class/product.class.php
View File

@ -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;
}

2
htdocs/product/document.php
View File

@ -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';
}