),3).'?s='.$width.'&d='.urlencode(dol_buildpath($nophoto,2)).' "'.$email.' Gravatar avatar")
'; // gravatar need md5 hash
+ $ret.='),3).'?s='.$width.'&d='.urlencode(dol_buildpath($nophoto,3)).' "'.$email.' Gravatar avatar")
'; // gravatar need md5 hash
}
else
{
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index ab4e7a0095f..9563e11aaa2 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -135,10 +135,13 @@ class modDeplacement extends DolibarrModules
$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('deplacement',1).')';
if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR d.fk_soc IS NULL)';
- $childids = $user->getAllChildIds();
- $childids[]=$user->id;
-
- if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')';
+ if (! empty($user)) // Not defined during migration process
+ {
+ $childids = $user->getAllChildIds();
+ $childids[]=$user->id;
+
+ if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')';
+ }
}
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 9204d691dbd..a9d7c73ae1a 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -89,7 +89,7 @@ $(document).ready(function () {
|
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 0a6c76fa786..840fa709ddf 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -191,7 +191,7 @@ if (constant('DOL_DATA_ROOT') === null) {
}
if (@file_exists($lockfile))
{
- print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory). '; + print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr documents directory). '; if (! empty($dolibarr_main_url_root)) { print 'Click on following link. '; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index a4f396a43b8..475a67c060f 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -460,6 +460,7 @@ DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? Login=Login CurrentLogin=Current login +EnterLoginDetail=Enter login details January=January February=February March=March diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index a9057ca34ba..1b650a4e7bb 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -36,21 +36,21 @@ class Entrepot extends CommonObject public $element='stock'; public $table_element='entrepot'; public $picto='stock'; - + /** * Warehouse closed, inactive */ const STATUS_CLOSED = 0; - + /** * Warehouse open and operations for customer shipping, supplier dispatch, internal stock transfers/corrections allowed. */ const STATUS_OPEN_ALL = 1; - + /** * Warehouse open and operations for stock transfers/corrections allowed (not for customer shipping and supplier dispatch). */ - const STATUS_OPEN_INTERNAL = 2; + const STATUS_OPEN_INTERNAL = 2; var $libelle; var $description; @@ -61,10 +61,10 @@ class Entrepot extends CommonObject var $zip; var $town; var $fk_parent; - + // List of short language codes for status var $statuts = array(); - + /** * Constructor * @@ -85,7 +85,7 @@ class Entrepot extends CommonObject { $this->statuts[self::STATUS_OPEN_ALL] = 'Opened'; } - + } /** @@ -97,9 +97,9 @@ class Entrepot extends CommonObject function create($user) { global $conf; - + $this->libelle = trim($this->libelle); - + // Si libelle non defini, erreur if ($this->libelle == '') { @@ -112,7 +112,7 @@ class Entrepot extends CommonObject $this->db->begin(); $sql = "INSERT INTO ".MAIN_DB_PREFIX."entrepot (entity, datec, fk_user_author, label, fk_parent)"; - $sql .= " VALUES (".$conf->entity.",'".$this->db->idate($now)."',".$user->id.",'".$this->db->escape($this->libelle)."', ".($this->fk_parent > 0 ? $this->fk_parent : 'NULL').")"; + $sql .= " VALUES (".$conf->entity.",'".$this->db->idate($now)."',".$user->id.",'".$this->db->escape($this->libelle)."', ".($this->fk_parent > 0 ? $this->fk_parent : "NULL").")"; dol_syslog(get_class($this)."::create", LOG_DEBUG); $result=$this->db->query($sql); @@ -161,19 +161,19 @@ class Entrepot extends CommonObject function update($id, $user) { if (empty($id)) $id = $this->id; - + // Check if new parent is already a child of current warehouse - if(!empty($this->fk_parent)) + if(!empty($this->fk_parent)) { $TChildWarehouses = array($id); $TChildWarehouses = $this->get_children_warehouses($this->id, $TChildWarehouses); - if(in_array($this->fk_parent, $TChildWarehouses)) + if(in_array($this->fk_parent, $TChildWarehouses)) { $this->error = 'ErrorCannotAddThisParentWarehouse'; return -2; } } - + $this->libelle=trim($this->libelle); $this->description=trim($this->description); @@ -186,7 +186,7 @@ class Entrepot extends CommonObject $sql = "UPDATE ".MAIN_DB_PREFIX."entrepot "; $sql .= " SET label = '" . $this->db->escape($this->libelle) ."'"; - $sql .= ", fk_parent = " . (($this->fk_parent > 0) ? $this->fk_parent : 'NULL'); + $sql .= ", fk_parent = " . (($this->fk_parent > 0) ? $this->fk_parent : "NULL"); $sql .= ", description = '" . $this->db->escape($this->description) ."'"; $sql .= ", statut = " . $this->statut; $sql .= ", lieu = '" . $this->db->escape($this->lieu) ."'"; @@ -232,7 +232,7 @@ class Entrepot extends CommonObject if ($result < 0) { $error++; } // End call triggers } - + $elements = array('stock_mouvement','product_stock','product_warehouse_properties'); foreach($elements as $table) { @@ -516,12 +516,12 @@ class Entrepot extends CommonObject function LibStatut($statut,$mode=0) { global $langs; - + $langs->load('stocks'); - + $picto = 'statut5'; $label = $langs->trans($this->statuts[$statut]); - + if ($mode == 0) { @@ -569,10 +569,10 @@ class Entrepot extends CommonObject $langs->load("stocks"); if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips - + $result=''; $label = ''; - + $label = '' . $langs->trans("ShowWarehouse").''; $label.= ' ' . $langs->trans('Ref') . ': ' . (empty($this->label)?$this->libelle:$this->label); if (! empty($this->lieu)) @@ -591,11 +591,11 @@ class Entrepot extends CommonObject $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"'; $linkclose.=' class="classfortooltip"'; } - + $linkstart = ''; $linkend=''; - + if ($withpicto) $result.=($link.img_object(($notooltip?'':$label), 'stock', ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend.' '); $result.=$linkstart.($showfullpath ? $this->get_full_arbo() : (empty($this->label)?$this->libelle:$this->label)).$linkend; return $result; @@ -628,60 +628,60 @@ class Entrepot extends CommonObject $this->country_id=1; $this->country_code='FR'; } - + /** * Return full path to current warehouse * - * @return string String full path to current warehouse separated by " >> " + * @return string String full path to current warehouse separated by " >> " */ - function get_full_arbo() + function get_full_arbo() { global $user,$langs,$conf; - + $TArbo = array(empty($this->label)?$this->libelle:$this->label); - + $protection=100; // We limit depth of warehouses to 100 - + $warehousetmp = new Entrepot($this->db); - - $parentid = $this->fk_parent; // If parent_id not defined on current object, we do not start consecutive searches of parents + + $parentid = $this->fk_parent; // If parent_id not defined on current object, we do not start consecutive searches of parents $i=0; - while ($parentid > 0 && $i < $protection) + while ($parentid > 0 && $i < $protection) { $sql = 'SELECT fk_parent FROM '.MAIN_DB_PREFIX.'entrepot WHERE rowid = '.$parentid; $resql = $this->db->query($sql); - if ($resql) + if ($resql) { $objarbo = $this->db->fetch_object($resql); if ($objarbo) { $warehousetmp->fetch($parentid); $TArbo[] = $warehousetmp->label; - $parentid = $objarbo->fk_parent; + $parentid = $objarbo->fk_parent; } else break; } else dol_print_error($this->db); - + $i++; } - + return implode(' >> ', array_reverse($TArbo)); } - + /** * Return array of children warehouses ids from $id warehouse (recursive function) - * + * * @param int $id id parent warehouse * @param array() $TChildWarehouses array which will contain all children (param by reference) * @return array() $TChildWarehouses array which will contain all children */ function get_children_warehouses($id, &$TChildWarehouses) { - + $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'entrepot WHERE fk_parent = '.$id; - + $resql = $this->db->query($sql); if($resql) { while($res = $this->db->fetch_object($resql)) { @@ -689,9 +689,9 @@ class Entrepot extends CommonObject $this->get_children_warehouses($res->rowid, $TChildWarehouses); } } - + return $TChildWarehouses; - + } } diff --git a/htdocs/societe/class/api_deprecated_contact.class.php b/htdocs/societe/class/api_deprecated_contact.class.php index e229dc5f79b..b9c991c7fa5 100644 --- a/htdocs/societe/class/api_deprecated_contact.class.php +++ b/htdocs/societe/class/api_deprecated_contact.class.php @@ -17,7 +17,7 @@ use Luracast\Restler\RestException; -//require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php'; /** * API class for contact object diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 68749713788..e5d5eb5cc8f 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -64,9 +64,10 @@ class CompanyBankAccount extends Account * Create bank information record * * @param User $user User + * @param int $notrigger 1=Disable triggers * @return int <0 if KO, >= 0 if OK */ - function create(User $user = null) + function create(User $user = null, $notrigger=0) { $now=dol_now(); |