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

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

Browse Source 
Conflicts:
	htdocs/langs/en_US/blockedlog.lang
	htdocs/stripe/config.php
This commit is contained in:
Laurent Destailleur 2018-09-01 14:13:01 +02:00
commit 26cff9e11f
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/card.php
View File

@ -209,7 +209,7 @@ if (empty($reshook))
} }
else else
{ {
setEventMessages($object->errors, $object->error, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} }

2
htdocs/adherents/ldap.php
View File

@ -75,7 +75,7 @@ if ($action == 'dolibarr2ldap')
setEventMessages($langs->trans("MemberSynchronized"), null, 'mesgs'); setEventMessages($langs->trans("MemberSynchronized"), null, 'mesgs');
} }
else { else {
setEventMessages($ldap->errors, $ldap->error, 'errors'); setEventMessages($ldap->error, $ldap->errors, 'errors');
} }
} }

4
htdocs/core/modules/modSociete.class.php
View File

@ -314,7 +314,7 @@ class modSociete extends DolibarrModules
$this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' '; $this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' ';
if (! empty($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS)) { if (! empty($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS)) {
$subordinatesids = $user->getAllChildIds(); $subordinatesids = $user->getAllChildIds();
$this->export_sql_end[$r] .=count($subronidatesids)>0 ? ' OR (sc.fk_user IN ('.implode(',',$subronidatesids).')' : ''; $this->export_sql_end[$r] .=count($subordinatesids)>0 ? ' OR (sc.fk_user IN ('.implode(',',$subordinatesids).')' : '';
} }
$this->export_sql_end[$r] .=')'; $this->export_sql_end[$r] .=')';
} }
@ -365,7 +365,7 @@ class modSociete extends DolibarrModules
$this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' '; $this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' ';
if (! empty($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS)) { if (! empty($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS)) {
$subordinatesids = $user->getAllChildIds(); $subordinatesids = $user->getAllChildIds();
$this->export_sql_end[$r] .=count($subronidatesids)>0 ? ' OR (sc.fk_user IN ('.implode(',',$subronidatesids).')' : ''; $this->export_sql_end[$r] .=count($subordinatesids)>0 ? ' OR (sc.fk_user IN ('.implode(',',$subordinatesids).')' : '';
} }
$this->export_sql_end[$r] .=')'; $this->export_sql_end[$r] .=')';
} }

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

@ -4405,8 +4405,6 @@ class Product extends CommonObject
$langs->load('products'); $langs->load('products');
//$this->db->begin();
$label_type = 'label'; $label_type = 'label';
if ($type == 'short') if ($type == 'short')

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

@ -1367,7 +1367,7 @@ class Societe extends CommonObject
// Generation requete recherche // Generation requete recherche
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
$sql.= " WHERE entity IN (".getEntity('category').")"; $sql.= " WHERE entity IN (".getEntity('societe').")";
if (! empty($type)) if (! empty($type))
{ {
if ($type == 1 || $type == 2) if ($type == 1 || $type == 2)