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

Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fixinventory

Browse Source
This commit is contained in:
florian HENRY 2018-03-09 23:41:32 +01:00
commit c62904d632
7 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/blockedlog/class/blockedlog.class.php
View File

@ -103,6 +103,7 @@ class BlockedLog
public $ref_object = '';
public $object_data = null;
public $user_fullname='';
/**
* Array of tracked event codes

1
htdocs/commande/class/commande.class.php
View File

@ -1405,7 +1405,6 @@ class Commande extends CommonOrder
$this->line->total_localtax1=$total_localtax1;
$this->line->total_localtax2=$total_localtax2;
$this->line->total_ttc=$total_ttc;
$this->line->product_type=$type;
$this->line->special_code=$special_code;
$this->line->origin=$origin;
$this->line->origin_id=$origin_id;

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

@ -5835,7 +5835,7 @@ abstract class CommonObject
jQuery(document).ready(function() {
function showOptions(child_list, parent_list)
{
var val = $("select[name=\"options_"+parent_list+"\"]").val();
var val = $("select[name="+parent_list+"]").val();
var parentVal = parent_list + ":" + val;
if(val > 0) {
$("select[name=\""+child_list+"\"] option[parent]").hide();

6
htdocs/core/modules/modFournisseur.class.php
View File

@ -531,7 +531,11 @@ class modFournisseur extends DolibarrModules
case 'sellist':
$tmp='';
$tmpparam=unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options']));
if ($tmpparam['options'] && is_array($tmpparam['options'])) {
$tmpparam_param_key=array_keys($tmpparam['options']);
$tmp=array_shift($tmpparam_param_key);
}
if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
break;
}

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

@ -151,7 +151,7 @@ if (empty($reshook) && ! empty($extrafields->attributes[$object->table_element][
jQuery(document).ready(function() {
function showOptions(child_list, parent_list)
{
var val = $("select[name=\"options_"+parent_list+"\"]").val();
var val = $("select[name="+parent_list+"]").val();
var parentVal = parent_list + ":" + val;
if(val > 0) {
$("select[name=\""+child_list+"\"] option[parent]").hide();

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

@ -321,8 +321,6 @@ class CommandeFournisseur extends CommonOrder
if ($this->statut == 0) $this->brouillon = 1;
$this->fetchObjectLinked();
//$result=$this->fetch_lines();
$this->lines=array();

5
htdocs/holiday/define_holiday.php
View File

@ -216,8 +216,9 @@ if (empty($user->rights->holiday->read_all))
$userchilds=$user->getAllChildIds(1);
$filters.=' AND u.rowid IN ('.join(', ',$userchilds).')';
}
$filters.=natural_search(array('u.firstname','u.lastname'), $search_name);
if (!empty($search_name)) {
$filters.=natural_search(array('u.firstname','u.lastname'), $search_name);
}
if ($search_supervisor > 0) $filters.=natural_search(array('u.fk_user'), $search_supervisor, 2);
$listUsers = $holiday->fetchUsers(false, true, $filters);