';
- print ''.$langs->trans("LastSalaries", ($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllSalaries").' '.$num.' ';
print '';
- print ''.$langs->trans("LastHolidays", ($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllHolidays").' '.$num.' ';
print '';
- print ''.$langs->trans("LastExpenseReports", ($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllExpenseReports").' '.$num.' '.$langs->trans("Skype").' ';
- print '';
- if (! empty($ldap_skype))
- {
- print ' '.$langs->trans($value['label']).' ';
+ print '';
+ if (! empty($ldap_social[$key])) {
+ print ' '.$langs->trans("Skype").' ';
+ // print '';
+ // if (! empty($ldap_skype))
+ // {
+ // print ' '.$langs->trans("Twitter").' ';
- print '';
- if (! empty($ldap_twitter))
- {
- print ' '.$langs->trans("Twitter").' ';
+ // print '';
+ // if (! empty($ldap_twitter))
+ // {
+ // print ' '.$langs->trans("Facebook").' ';
- print '';
- if (! empty($ldap_facebook))
- {
- print ' '.$langs->trans("Facebook").' ';
+ // print '';
+ // if (! empty($ldap_facebook))
+ // {
+ // print ' '.$langs->trans("LinkedIn").' ';
- print '';
- if (! empty($ldap_linkedin))
- {
- print ' '.$langs->trans("LinkedIn").' ';
+ // print '';
+ // if (! empty($ldap_linkedin))
+ // {
+ // print ' '.$langs->trans("Skype").' ';
- print '';
- if ($caneditfield && empty($object->ldap_sid))
- {
- print ' '.$langs->trans($value['label']).' ';
+ print '';
+ if ($caneditfield && empty($object->ldap_sid)) {
+ print ' '.$langs->trans("Twitter").' ';
- print '';
- if ($caneditfield && empty($object->ldap_sid))
- {
- print ' '.$langs->trans("Skype").' ';
+ // print '';
+ // if ($caneditfield && empty($object->ldap_sid))
+ // {
+ // print ' '.$langs->trans("Facebook").' ';
- print '';
- if ($caneditfield && empty($object->ldap_sid))
- {
- print ' '.$langs->trans("Twitter").' ';
+ // print '';
+ // if ($caneditfield && empty($object->ldap_sid))
+ // {
+ // print ' '.$langs->trans("LinkedIn").' ';
- print '';
- if ($caneditfield && empty($object->ldap_sid))
- {
- print ' '.$langs->trans("Facebook").' ';
+ // print '';
+ // if ($caneditfield && empty($object->ldap_sid))
+ // {
+ // print ' '.$langs->trans("LinkedIn").' ';
+ // print '';
+ // if ($caneditfield && empty($object->ldap_sid))
+ // {
+ // print '
+
trans('Ref') ?>
trans('Label') ?>
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index e0e3378bf26..cd32fc97e18 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3280,7 +3280,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm')
print ''."\n";
print '';
- if ($action == 'replacesiteconfirm')
+ if ($action == 'replacesiteconfirm' && $conf->global->MAIN_FEATURES_LEVEL >= 2)
{
print '
';
print '
';
diff --git a/htdocs/website/lib/websiteaccount.lib.php b/htdocs/website/lib/websiteaccount.lib.php
index 3190c081a43..4c2048798a5 100644
--- a/htdocs/website/lib/websiteaccount.lib.php
+++ b/htdocs/website/lib/websiteaccount.lib.php
@@ -46,7 +46,7 @@ function websiteaccountPrepareHead($object)
if(!empty($object->fields['note_public'])) $nbNote++;
$head[$h][0] = dol_buildpath('/monmodule/websiteaccount_note.php', 1).'?id='.$object->id;
$head[$h][1] = $langs->trans('Notes');
- if ($nbNote > 0) $head[$h][1].= '
'.$nbNote.' ';
+ if ($nbNote > 0) $head[$h][1].= '
'.$nbNote.' ';
$head[$h][2] = 'note';
$h++;
}*/
@@ -59,7 +59,7 @@ function websiteaccountPrepareHead($object)
$nbLinks=Link::count($db, $object->element, $object->id);
$head[$h][0] = dol_buildpath("/monmodule/websiteaccount_document.php", 1).'?id='.$object->id;
$head[$h][1] = $langs->trans('Documents');
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '
'.($nbFiles+$nbLinks).' ';
+ if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '
'.($nbFiles+$nbLinks).' ';
$head[$h][2] = 'document';
$h++;
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index db8c5b632f6..be7c773ed25 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -67,8 +67,7 @@ if (empty($action) && empty($id) && empty($ref)) $action='view';
$permissionnote=$user->rights->websiteaccount->write; // Used by the include of actions_setnotes.inc.php
$permissiondellink=$user->rights->websiteaccount->write; // Used by the include of actions_dellink.inc.php
-$permissionedit=$user->rights->websiteaccount->write; // Used by the include of actions_lineupdown.inc.php
-$permissiontoadd=$user->rights->websiteaccount->write; // Used by the include of actions_addupdatedelete.inc.php
+$permissiontoadd=$user->rights->websiteaccount->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
// Load object
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 5c79d68aefe..fdc7aba2bc9 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -633,39 +633,22 @@ class Hook extends CommonObject
public function LibStatut($status, $mode = 0)
{
// phpcs:enable
- if (empty($this->labelStatus)) {
- global $langs;
- //$langs->load("zapier@zapier");
- $this->labelStatus[1] = $langs->trans('Enabled');
- $this->labelStatus[0] = $langs->trans('Disabled');
- }
+ global $langs;
- if ($mode == 0) {
- return $this->labelStatus[$status];
- } elseif ($mode == 1) {
- return $this->labelStatus[$status];
- } elseif ($mode == 2) {
- if ($status == 1) {
- return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
- } elseif ($status == 0) {
- return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
- }
- } elseif ($mode == 3) {
- if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
- elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
- } elseif ($mode == 4) {
- if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
- elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
- } elseif ($mode == 5) {
- if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
- elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
- } elseif ($mode == 6) {
- if ($status == 1) {
- return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
- } elseif ($status == 0) {
- return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
- }
- }
+ if (empty($this->labelStatus) || empty($this->labelStatusShort))
+ {
+ global $langs;
+ //$langs->load("mymodule");
+ $this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
+ $this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+ $this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Disabled');
+ $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+ }
+
+ $statusType = 'status5';
+ if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+
+ return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
}
/**
diff --git a/htdocs/zapier/hook_list.php b/htdocs/zapier/hook_list.php
index e622ce8bcff..21e9c991d07 100644
--- a/htdocs/zapier/hook_list.php
+++ b/htdocs/zapier/hook_list.php
@@ -191,8 +191,8 @@ if (empty($reshook)) {
// Mass actions
$objectclass='Hook';
$objectlabel='Hook';
- $permtoread = $user->rights->mymodule->read;
- $permtodelete = $user->rights->mymodule->delete;
+ $permissiontoread = $user->rights->mymodule->read;
+ $permissiontodelete = $user->rights->mymodule->delete;
$uploaddir = $conf->mymodule->dir_output;
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
}
@@ -570,27 +570,8 @@ while ($i < min($num, $limit)) {
}
// Show total line
-if (isset($totalarray['pos'])) {
- print '
';
- $i=0;
- while ($i < $totalarray['nbfield']) {
- $i++;
- if (! empty($totalarray['pos'][$i])) {
- print ''.price($totalarray['val'][$totalarray['pos'][$i]]).' ';
- } else {
- if ($i == 1) {
- if ($num < $limit) {
- print ''.$langs->trans("Total").' ';
- } else {
- print ''.$langs->trans("Totalforthispage").' ';
- }
- } else {
- print ' ';
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
// If no record found
if ($num == 0) {
diff --git a/htdocs/zapier/lib/zapier_hook.lib.php b/htdocs/zapier/lib/zapier_hook.lib.php
index e1af0259062..98c10786c32 100644
--- a/htdocs/zapier/lib/zapier_hook.lib.php
+++ b/htdocs/zapier/lib/zapier_hook.lib.php
@@ -48,7 +48,7 @@ function myobjectPrepareHead($object)
if (!empty($object->note_public)) $nbNote++;
$head[$h][0] = dol_buildpath('/mymodule/myobject_note.php', 1).'?id='.$object->id;
$head[$h][1] = $langs->trans('Notes');
- if ($nbNote > 0) $head[$h][1].= '
'.$nbNote.' ';
+ if ($nbNote > 0) $head[$h][1].= '
'.$nbNote.' ';
$head[$h][2] = 'note';
$h++;
}
@@ -60,7 +60,7 @@ function myobjectPrepareHead($object)
$nbLinks=Link::count($db, $object->element, $object->id);
$head[$h][0] = dol_buildpath("/mymodule/myobject_document.php", 1).'?id='.$object->id;
$head[$h][1] = $langs->trans('Documents');
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '
'.($nbFiles+$nbLinks).' ';
+ if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '
'.($nbFiles+$nbLinks).' ';
$head[$h][2] = 'document';
$h++;
diff --git a/htdocs/zapier/zapierindex.php b/htdocs/zapier/zapierindex.php
index 9bec765c35e..f70f9e8c95d 100644
--- a/htdocs/zapier/zapierindex.php
+++ b/htdocs/zapier/zapierindex.php
@@ -106,7 +106,7 @@ if (! empty($conf->zapierfordolibarr->enabled) && $user->rights->zapierfordoliba
print '
';
print '';
- print ''.$langs->trans("DraftOrders").($num?' '.$num.' ':'').' ';
+ print ''.$langs->trans("DraftOrders").($num?''.$num.' ':'').' ';
$var = true;
if ($num > 0)
diff --git a/test/phpunit/ContactTest.php b/test/phpunit/ContactTest.php
index f4b5fc71616..8fdaea0cbe7 100755
--- a/test/phpunit/ContactTest.php
+++ b/test/phpunit/ContactTest.php
@@ -207,7 +207,7 @@ class ContactTest extends PHPUnit\Framework\TestCase
$localobject->phone_mobile='New tel mobile';
$localobject->fax='New fax';
$localobject->email='newemail@newemail.com';
- $localobject->jabberid='New im id';
+ $localobject->socialnetworks['jabber']='New im id';
$localobject->default_lang='es_ES';
$result=$localobject->update($localobject->id, $user);
@@ -257,8 +257,8 @@ class ContactTest extends PHPUnit\Framework\TestCase
$this->assertEquals($localobject->fax, $newobject->fax);
print __METHOD__." old=".$localobject->email." new=".$newobject->email."\n";
$this->assertEquals($localobject->email, $newobject->email);
- print __METHOD__." old=".$localobject->jabberid." new=".$newobject->jabberid."\n";
- $this->assertEquals($localobject->jabberid, $newobject->jabberid);
+ print __METHOD__." old=".$localobject->socialnetworks['jabber']." new=".$newobject->socialnetworks['jabber']."\n";
+ $this->assertEquals($localobject->socialnetworks['jabber'], $newobject->socialnetworks['jabber']);
print __METHOD__." old=".$localobject->default_lang." new=".$newobject->default_lang."\n";
$this->assertEquals($localobject->default_lang, $newobject->default_lang);
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index e46d1ac084a..3c89bd52d06 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -192,7 +192,7 @@ class UserTest extends PHPUnit\Framework\TestCase
$newlocalobject=new User($this->savdb);
$newlocalobject->initAsSpecimen();
$this->changeProperties($newlocalobject);
- $this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','socid','societe_id','ref','pass','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array()); // Actual, Expected
+ $this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','socid','societe_id','note','ref','pass','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array()); // Actual, Expected
return $localobject;
}
@@ -304,12 +304,12 @@ class UserTest extends PHPUnit\Framework\TestCase
/**
* Edit an object to test updates
*
- * @param mixed $localobject Object Facture
+ * @param mixed $localobject Object User
* @return void
*/
public function changeProperties(&$localobject)
{
- $localobject->note='New note after update';
+ $localobject->note_private='New note after update';
}
/**