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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2014-09-11 17:47:58 +02:00
commit 744f370920
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -131,6 +131,7 @@ For users:
- Fix: Salaries payment - Field date value is now required and add control on it.
- Fix: Iban was used instead of Bic into SEPA file.
- Fix: Must unaccent strings into SEPA file.
- Fix: Extrafield feature select from table should try to translate multiple column when not needed
***** ChangeLog for 3.6 compared to 3.5.* *****
For users:

2
htdocs/core/class/extrafields.class.php
View File

@ -975,7 +975,7 @@ class ExtraFields
// Several field into label (eq table:code|libelle:rowid)
$fields_label = explode('|',$InfoFieldList[1]);
if(is_array($fields_label))
if(is_array($fields_label) && count($fields_label)>1)
{
foreach ($fields_label as $field_toshow)
{

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

@ -912,6 +912,7 @@ class Expedition extends CommonObject
$this->db->begin();
if ($conf->productbatch->enabled) {
require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
if ( ExpeditionLigneBatch::deletefromexp($this->db,$this->id)<0)
{$error++;$this->errors[]="Error ".$this->db->lasterror();}
}
@ -1088,6 +1089,7 @@ class Expedition extends CommonObject
$line = new ExpeditionLigne($this->db);
$obj = $this->db->fetch_object($resql);
$line->line_id = $obj->line_id;
$line->fk_origin_line = $obj->fk_origin_line;
$line->origin_line_id = $obj->fk_origin_line; // TODO deprecated
$line->entrepot_id = $obj->fk_entrepot;

4
htdocs/projet/class/project.class.php
View File

@ -971,7 +971,7 @@ class Project extends CommonObject
$error=0;
dol_syslog("createFromClone clone_contact=".$clone_contact." clone_task=".$clone_task." clone_file=".$clone_file." clone_note=".$clone_note);
dol_syslog("createFromClone clone_contact=".$clone_contact." clone_task=".$clone_task." clone_project_file=".$clone_project_file." clone_note=".$clone_note);
$now = dol_mktime(0,0,0,idate('m',dol_now()),idate('d',dol_now()),idate('Y',dol_now()));
@ -1130,6 +1130,8 @@ class Project extends CommonObject
//Duplicate task
if ($clone_task)
{
require_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php';
$taskstatic = new Task($this->db);
// Security check