';
/*
- * Last modified members
+ * Latest modified members
*/
$max=5;
@@ -342,7 +342,7 @@ if ($resql)
print '
';
print '';
$i++;
}
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index fafa69b8b3f..99326241485 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -37,9 +37,9 @@ $action = GETPOST('action', 'aZ09');
// Protection
$socid=0;
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
$object = new Adherent($db);
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index d954484c839..b2f302fea45 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -33,10 +33,10 @@ $mode=GETPOST('mode')?GETPOST('mode'):'';
// Security check
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
$result=restrictedArea($user, 'adherent', '', '', 'cotisation');
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index afc2e2b5218..3c469e658e5 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -34,10 +34,10 @@ $mode=GETPOST('mode')?GETPOST('mode'):'';
// Security check
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
$result=restrictedArea($user, 'adherent', '', '', 'cotisation');
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index 2f2c6f33920..d89a8a4a8c0 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -35,10 +35,10 @@ $userid=GETPOST('userid', 'int'); if ($userid < 0) $userid=0;
$socid=GETPOST('socid', 'int'); if ($socid < 0) $socid=0;
// Security check
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
$result=restrictedArea($user, 'adherent', '', '', 'cotisation');
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index ac9a269bf29..5a4f84868e1 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -41,7 +41,7 @@ $cancel=GETPOST('cancel', 'alpha');
// Security check
$fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
$fieldtype = (! empty($ref) ? 'ref' : 'rowid');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
// Security check
$result=restrictedArea($user, 'adherent', $id, 'adherent_type');
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 57031a9822f..a209a5f5590 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -208,7 +208,7 @@ print '
';
print "\n";
-$sql = "SELECT rowid, code as encoding, libelle, coder, example";
+$sql = "SELECT rowid, code as encoding, libelle as label, coder, example";
$sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
$sql.= " WHERE entity = ".$conf->entity;
$sql.= " ORDER BY code";
@@ -225,7 +225,7 @@ if ($resql)
$obj = $db->fetch_object($resql);
print '
';
- print $obj->libelle;
+ print $obj->label;
print " \n";
print $langs->trans('BarcodeDesc'.$obj->encoding);
//print "L'EAN se compose de 8 caracteres, 7 chiffres plus une cle de controle.\n";
+print "\n";
+print ''.$langs->trans("Name").' ';
+print ''.$langs->trans("Description").' ';
+print ''.$langs->trans("Status")." \n";
+print ''.$langs->trans("Default")." \n";
+print ''.$langs->trans("ShortInfo").' ';
+print ''.$langs->trans("Preview").' ';
+print " \n";
+
+clearstatcache();
+
+foreach ($dirmodels as $reldir)
+{
+ foreach (array('','/doc') as $valdir)
{
- $i = 0;
- $num_rows=$db->num_rows($resql);
- while ($i < $num_rows)
- {
- $array = $db->fetch_array($resql);
- array_push($def, $array[0]);
- $i++;
- }
- }
- else
- {
- dol_print_error($db);
- }
+ $dir = dol_buildpath($reldir."core/modules/bom".$valdir);
-
- print "\n";
- print "\n";
- print ''.$langs->trans("Name").' ';
- print ''.$langs->trans("Description").' ';
- print ''.$langs->trans("Status")." \n";
- print ''.$langs->trans("Default")." \n";
- print ''.$langs->trans("ShortInfo").' ';
- print ''.$langs->trans("Preview").' ';
- print " \n";
-
- clearstatcache();
-
- foreach ($dirmodels as $reldir)
- {
- foreach (array('','/doc') as $valdir)
+ if (is_dir($dir))
{
- $dir = dol_buildpath($reldir."core/modules/bom".$valdir);
-
- if (is_dir($dir))
+ $handle=opendir($dir);
+ if (is_resource($handle))
{
- $handle=opendir($dir);
- if (is_resource($handle))
+ while (($file = readdir($handle))!==false)
{
- while (($file = readdir($handle))!==false)
+ $filelist[]=$file;
+ }
+ closedir($handle);
+ arsort($filelist);
+
+ foreach($filelist as $file)
+ {
+ if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
{
- $filelist[]=$file;
- }
- closedir($handle);
- arsort($filelist);
+ if (file_exists($dir.'/'.$file))
+ {
+ $name = substr($file, 4, dol_strlen($file) -16);
+ $classname = substr($file, 0, dol_strlen($file) -12);
- foreach($filelist as $file)
- {
- if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
- {
- if (file_exists($dir.'/'.$file))
- {
- $name = substr($file, 4, dol_strlen($file) -16);
- $classname = substr($file, 0, dol_strlen($file) -12);
+ require_once $dir.'/'.$file;
+ $module = new $classname($db);
- require_once $dir.'/'.$file;
- $module = new $classname($db);
+ $modulequalified=1;
+ if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+ if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
- $modulequalified=1;
- if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
- if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+ if ($modulequalified)
+ {
+ $var = !$var;
+ print '';
+ print (empty($module->name)?$name:$module->name);
+ print " \n";
+ if (method_exists($module, 'info')) print $module->info($langs);
+ else print $module->description;
+ print ' ';
- if ($modulequalified)
- {
- $var = !$var;
- print '';
- print (empty($module->name)?$name:$module->name);
- print " \n";
- if (method_exists($module, 'info')) print $module->info($langs);
- else print $module->description;
- print ' ';
+ // Active
+ if (in_array($name, $def))
+ {
+ print ''."\n";
+ print '';
+ print img_picto($langs->trans("Enabled"), 'switch_on');
+ print ' ';
+ print ' ';
+ }
+ else
+ {
+ print ''."\n";
+ print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print " ";
+ }
- // Active
- if (in_array($name, $def))
- {
- print ''."\n";
- print '';
- print img_picto($langs->trans("Enabled"), 'switch_on');
- print ' ';
- print ' ';
- }
- else
- {
- print ''."\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
- print " ";
- }
+ // Default
+ print '';
+ if ($conf->global->BOM_ADDON_PDF == $name)
+ {
+ print img_picto($langs->trans("Default"), 'on');
+ }
+ else
+ {
+ print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
+ }
+ print ' ';
- // Default
- print '';
- if ($conf->global->BOM_ADDON_PDF == $name)
- {
- print img_picto($langs->trans("Default"), 'on');
- }
- else
- {
- print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
- }
- print ' ';
-
- // Info
- $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
- $htmltooltip.=''.$langs->trans("FeaturesSupported").': ';
- $htmltooltip.=''.$langs->trans("FeaturesSupported").': ';
+ $htmltooltip.='';
- print $form->textwithpicto('', $htmltooltip, 1, 0);
- print ' ';
+ print '';
+ print $form->textwithpicto('', $htmltooltip, 1, 0);
+ print ' ';
- // Preview
- print '';
- if ($module->type == 'pdf')
- {
- print ''.img_object($langs->trans("Preview"), 'bill').' ';
- }
- else
- {
- print img_object($langs->trans("PreviewNotAvailable"), 'generic');
- }
- print ' ';
+ // Preview
+ print '';
+ if ($module->type == 'pdf')
+ {
+ print ''.img_object($langs->trans("Preview"), 'bill').' ';
+ }
+ else
+ {
+ print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+ }
+ print ' ';
- print "
';
- print "';
- print '';
- print ''.$langs->trans("Parameter").' ';
- print ''.$langs->trans("Value").' ';
- print " \n";
- print " \n";
-
- $substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
- $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
- $htmltext = ''.$langs->trans("AvailableVariables").': ';
-
- print '';
-
- //Use draft Watermark
-
- print "';
-
- print '
';
- print '
';
+print "';
print '';
print ''.$langs->trans("Parameter").' ';
-print ' ';
+print ''.$langs->trans("Value").' ';
+print " \n";
print " \n";
+$substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = ''.$langs->trans("AvailableVariables").': ';
+
+print '';
+
+//Use draft Watermark
+
+print "';
print '
';
-*/
+print ''."\n";
+ print ''."\n";
//unset($fields[]);
@@ -296,7 +296,7 @@ if (($id || $ref) && $action == 'edit')
dol_fiche_head();
- print '' . "\n";
+ print '' . "\n";
// Common attributes
include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_edit.tpl.php';
@@ -448,7 +448,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '';
print '
';
print '
';
- print '
'."\n";
+ print ''."\n";
// Common attributes
//$keyforbreak='fieldkeytoswithonsecondcolumn';
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index 09ba5f7224f..e8b2e280a7f 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -78,9 +78,9 @@ if (! $sortorder) $sortorder="ASC";
// Security check
$socid=0;
-if ($user->societe_id > 0) // Protection if external user
+if ($user->socid > 0) // Protection if external user
{
- //$socid = $user->societe_id;
+ //$socid = $user->socid;
accessforbidden();
}
//$result = restrictedArea($user, 'emailcollector', $id, '');
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 58f107dfdf5..eb432b0dc72 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -71,9 +71,9 @@ if (! $sortorder) $sortorder="ASC";
// Protection if external user
$socid=0;
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
- //$socid = $user->societe_id;
+ //$socid = $user->socid;
accessforbidden();
}
@@ -393,7 +393,7 @@ print ''."\n";
// Detect if we need a fetch on each output line
$needToFetchEachLine=0;
-foreach ($extrafields->attribute_computed as $key => $val)
+foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val)
{
if (preg_match('/\$object/', $val)) $needToFetchEachLine++; // There is at least one compute field that use $object
}
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index c39cc385313..531e53ac459 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -129,7 +129,7 @@ foreach ($modulesdir as $dir)
if (preg_match('/deprecated/', $objMod->version) && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL >= 0))) $modulequalified=0;
// We discard modules according to property disabled
- if (! empty($objMod->hidden)) $modulequalified=0;
+ //if (! empty($objMod->hidden)) $modulequalified=0;
if ($modulequalified > 0)
{
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
new file mode 100644
index 00000000000..06c59338e58
--- /dev/null
+++ b/htdocs/admin/mrp.php
@@ -0,0 +1,522 @@
+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see '.$langs->trans("BackToModuleList").' ';
+print load_fiche_titre($langs->trans("MrpSetupPage"), $linkback, 'title_setup');
+
+$head = mrpAdminPrepareHead();
+
+dol_fiche_head($head, 'settings', $langs->trans("MOs"), -1, 'mrp');
+
+/*
+ * MOs Numbering model
+ */
+
+print load_fiche_titre($langs->trans("MOsNumberingModules"), '', '');
+
+print '';
+print '';
+print ''.$langs->trans("Name").' ';
+print ''.$langs->trans("Description").' ';
+print ''.$langs->trans("Example").' ';
+print ''.$langs->trans("Status").' ';
+print ''.$langs->trans("ShortInfo").' ';
+print ' '."\n";
+
+clearstatcache();
+
+foreach ($dirmodels as $reldir)
+{
+ $dir = dol_buildpath($reldir."core/modules/mrp/");
+
+ if (is_dir($dir))
+ {
+ $handle = opendir($dir);
+ if (is_resource($handle))
+ {
+ while (($file = readdir($handle))!==false)
+ {
+ if (substr($file, 0, 7) == 'mod_mo_' && substr($file, dol_strlen($file)-3, 3) == 'php')
+ {
+ $file = substr($file, 0, dol_strlen($file)-4);
+
+ require_once $dir.$file.'.php';
+
+ $module = new $file($db);
+
+ // Show modules according to features level
+ if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+ if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+
+ if ($module->isEnabled())
+ {
+ print ''.$module->name." \n";
+ print $module->info();
+ print ' ';
+
+ // Show example of numbering model
+ print '';
+ $tmp=$module->getExample();
+ if (preg_match('/^Error/', $tmp)) print ''.$langs->trans($tmp).'
';
+ elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
+ else print $tmp;
+ print ' '."\n";
+
+ print '';
+ if ($conf->global->MRP_MO_ADDON == $file)
+ {
+ print img_picto($langs->trans("Activated"), 'switch_on');
+ }
+ else
+ {
+ print '';
+ print img_picto($langs->trans("Disabled"), 'switch_off');
+ print ' ';
+ }
+ print ' ';
+
+ $mrp=new MO($db);
+ $mrp->initAsSpecimen();
+
+ // Info
+ $htmltooltip='';
+ $htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().' ';
+ print $form->textwithpicto('', $htmltooltip, 1, 0);
+ print ' ';
+
+ print "
\n";
+print "\n";
+print ''.$langs->trans("Name").' ';
+print ''.$langs->trans("Description").' ';
+print ''.$langs->trans("Status")." \n";
+print ''.$langs->trans("Default")." \n";
+print ''.$langs->trans("ShortInfo").' ';
+print ''.$langs->trans("Preview").' ';
+print " \n";
+
+clearstatcache();
+
+foreach ($dirmodels as $reldir)
+{
+ foreach (array('','/doc') as $valdir)
+ {
+ $dir = dol_buildpath($reldir."core/modules/mrp".$valdir);
+
+ if (is_dir($dir))
+ {
+ $handle=opendir($dir);
+ if (is_resource($handle))
+ {
+ while (($file = readdir($handle))!==false)
+ {
+ $filelist[]=$file;
+ }
+ closedir($handle);
+ arsort($filelist);
+
+ foreach($filelist as $file)
+ {
+ if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+ {
+ if (file_exists($dir.'/'.$file))
+ {
+ $name = substr($file, 4, dol_strlen($file) -16);
+ $classname = substr($file, 0, dol_strlen($file) -12);
+
+ require_once $dir.'/'.$file;
+ $module = new $classname($db);
+
+ $modulequalified=1;
+ if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+ if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+
+ if ($modulequalified)
+ {
+ $var = !$var;
+ print '';
+ print (empty($module->name)?$name:$module->name);
+ print " \n";
+ if (method_exists($module, 'info')) print $module->info($langs);
+ else print $module->description;
+ print ' ';
+
+ // Active
+ if (in_array($name, $def))
+ {
+ print ''."\n";
+ print '';
+ print img_picto($langs->trans("Enabled"), 'switch_on');
+ print ' ';
+ print ' ';
+ }
+ else
+ {
+ print ''."\n";
+ print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print " ";
+ }
+
+ // Default
+ print '';
+ if ($conf->global->MRP_MO_ADDON_PDF == $name)
+ {
+ print img_picto($langs->trans("Default"), 'on');
+ }
+ else
+ {
+ print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
+ }
+ print ' ';
+
+ // Info
+ $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+ $htmltooltip.=''.$langs->trans("FeaturesSupported").': ';
+ $htmltooltip.='';
+ print $form->textwithpicto('', $htmltooltip, 1, 0);
+ print ' ';
+
+ // Preview
+ print '';
+ if ($module->type == 'pdf')
+ {
+ print ''.img_object($langs->trans("Preview"), 'bill').' ';
+ }
+ else
+ {
+ print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+ }
+ print ' ';
+
+ print "
';
+print "';
+print '';
+print ''.$langs->trans("Parameter").' ';
+print ''.$langs->trans("Value").' ';
+print " \n";
+print " \n";
+
+$substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = ''.$langs->trans("AvailableVariables").': ';
+
+print '';
+
+//Use draft Watermark
+
+print "';
+
+print '
';
+print '';
print '
';
print '';
- print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder).'';
+ print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
print_liste_field_titre("CurrentTranslationString", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
//if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index 0343fecf69d..5ea6ee66dd9 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -421,7 +421,7 @@ $h++;
dol_fiche_head($head, 'website', '', -1);
-print $langs->trans("WebsiteSetupDesc").''.$langs->trans("WebsiteSetupDesc").' '."\n";
// Detect if we need a fetch on each output line
$needToFetchEachLine=0;
-foreach ($extrafields->attribute_computed as $key => $val)
+foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val)
{
if (preg_match('/\$object/', $val)) $needToFetchEachLine++; // There is at least one compute field that use $object
}
diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php
index 0c03619d31c..dce1daaa3ca 100644
--- a/htdocs/asset/note.php
+++ b/htdocs/asset/note.php
@@ -46,8 +46,8 @@ $hookmanager->initHooks(array('assetnote')); // Note that conf->hooks_module
$extrafields->fetch_name_optionals_label($object->table_element);
// Security check - Protection if external user
-//if ($user->societe_id > 0) access_forbidden();
-//if ($user->societe_id > 0) $socid = $user->societe_id;
+//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) $socid = $user->socid;
//$result = restrictedArea($user, 'asset', $id);
// Load object
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 906040a6bd9..4981c05afd7 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -100,7 +100,12 @@ class BlockedLog
*/
public $fk_user = 0;
+ /**
+ * @var integer|string date_creation
+ */
public $date_creation;
+
+
public $date_modification;
public $date_object = 0;
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index 87fb55a6541..c38d0a82a69 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -53,8 +53,8 @@ else
$search_agenda_label=GETPOST('search_agenda_label');
// Security check - Protection if external user
-//if ($user->societe_id > 0) access_forbidden();
-//if ($user->societe_id > 0) $socid = $user->societe_id;
+//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) $socid = $user->socid;
//$result = restrictedArea($user, 'bom', $id);
$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 6186e809543..231679f7b3a 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -70,8 +70,8 @@ if (empty($action) && empty($id) && empty($ref)) $action='view';
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
// Security check - Protection if external user
-//if ($user->societe_id > 0) access_forbidden();
-//if ($user->societe_id > 0) $socid = $user->societe_id;
+//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) $socid = $user->socid;
//$isdraft = (($object->statut == BillOfMaterials::STATUS_DRAFT) ? 1 : 0);
//$result = restrictedArea($user, 'bom', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
@@ -662,14 +662,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print ''.$langs->trans("DateActionStart").' ';
if (GETPOST("afaire") == 1) {
- print $form->selectDate($datep, 'ap', 1, 1, 0, "action", 1, 1, 0, 'fulldayend');
+ print $form->selectDate($datep, 'ap', 1, 1, 0, "action", 1, 2, 0, 'fulldayend');
} elseif (GETPOST("afaire") == 2) {
- print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldayend');
+ print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldayend');
} else {
- print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart');
+ print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldaystart');
}
print ' ';
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 8432ba786a1..a07e4ceba1a 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -45,43 +45,67 @@ class ActionComm extends CommonObject
*/
public $table_element = 'actioncomm';
+ /**
+ * @var string Name of id column
+ */
public $table_rowid = 'id';
/**
- * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+ * @var string Name of icon for actioncomm object. Filename of icon is object_action.png
*/
public $picto = 'action';
/**
- * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
- * @var int
+ * @var int 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
*/
public $ismultientitymanaged = 1;
/**
- * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user, 2=Same than 1 but accept record if fksoc is empty
- * @var integer
+ * @var integer 0=Default
+ * 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
+ * 2=Same than 1 but accept record if fksoc is empty
*/
public $restrictiononfksoc = 2;
/**
- * Id of the event
- * @var int
+ * @var int Id of the event
*/
public $id;
/**
- * Id of the event. Use $id as possible
- * @var int
+ * @var int Id of the event. Use $id as possible
*/
public $ref;
- public $type_id; // Id into parent table llx_c_actioncomm (used only if option to use type is set)
- public $type_code; // Code into parent table llx_c_actioncomm (used only if option to use type is set). With default setup, should be AC_OTH_AUTO or AC_OTH.
+ /**
+ * @var int Id into parent table llx_c_actioncomm (used only if option to use type is set)
+ */
+ public $type_id;
+
+ /**
+ * @var string Code into parent table llx_c_actioncomm (used only if option to use type is set). With default setup, should be AC_OTH_AUTO or AC_OTH.
+ */
+ public $type_code;
+
+ /**
+ * @var string Type label
+ */
public $type_label;
- public $type; // Label into parent table llx_c_actioncomm (used only if option to use type is set)
- public $type_color; // Color into parent table llx_c_actioncomm (used only if option to use type is set)
- public $code; // Free code to identify action. Ie: Agenda trigger add here AC_TRIGGERNAME ('AC_COMPANY_CREATE', 'AC_PROPAL_VALIDATE', ...)
+
+ /**
+ * @var string Label into parent table llx_c_actioncomm (used only if option to use type is set)
+ */
+ public $type;
+
+ /**
+ * @var string Color into parent table llx_c_actioncomm (used only if option to use type is set)
+ */
+ public $type_color;
+
+ /**
+ * @var string Free code to identify action. Ie: Agenda trigger add here AC_TRIGGERNAME ('AC_COMPANY_CREATE', 'AC_PROPAL_VALIDATE', ...)
+ */
+ public $code;
/**
* @var string Agenda event label
@@ -89,72 +113,56 @@ class ActionComm extends CommonObject
public $label;
/**
- * Date creation record (datec)
- *
- * @var integer
+ * @var integer Date creation record (datec)
*/
public $datec;
/**
- * Date end record (datef)
- *
- * @var integer
+ * @var integer Date end record (datef)
*/
public $datef;
/**
- * Duration (duree)
- *
- * @var integer
+ * @var integer Duration (duree)
*/
public $duree;
/**
- * Date modification record (tms)
- *
- * @var integer
+ * @var integer Date modification record (tms)
*/
public $datem;
/**
- * Object user that create action
- * @var User
+ * @var User Object user that create action
* @deprecated
* @see $authorid
*/
public $author;
/**
- * Object user that modified action
- * @var User
+ * @var User Object user that modified action
* @deprecated
* @see $usermodid
*/
public $usermod;
/**
- * Id user that create action
- * @var int
+ * @var int Id user that create action
*/
public $authorid;
/**
- * Id user that modified action
- * @var int
+ * @var int Id user that modified action
*/
public $usermodid;
/**
- * Date action start (datep)
- *
- * @var integer
+ * @var integer Date action start (datep)
*/
public $datep;
/**
- * Date action end (datep2)
- *
- * @var integer
+ * @var integer Date action end (datep2)
*/
public $datep2;
@@ -163,90 +171,178 @@ class ActionComm extends CommonObject
* @deprecated
*/
public $durationp = -1;
- public $fulldayevent = 0; // 1=Event on full day
/**
- * Milestone
- * @var int
+ * @var int 1=Event on full day
+ */
+ public $fulldayevent = 0;
+
+ /**
+ * @var int Milestone
* @deprecated Milestone is already event with end date = start date
*/
public $punctual = 1;
- public $percentage; // Percentage
- public $location; // Location
- public $transparency; // Transparency (ical standard). Used to say if people assigned to event are busy or not by event. 0=available, 1=busy, 2=busy (refused events)
- public $priority; // Small int (0 By default)
+ /**
+ * @var integer Percentage
+ */
+ public $percentage;
- public $userassigned = array(); // Array of user ids
- public $userownerid; // Id of user owner = fk_user_action into table
- public $userdoneid; // Id of user done (deprecated)
+ /**
+ * @var string Location
+ */
+ public $location;
- public $socpeopleassigned = array(); // Array of contact ids
+ /**
+ * @var int Transparency (ical standard). Used to say if people assigned to event are busy or not by event. 0=available, 1=busy, 2=busy (refused events)
+ */
+ public $transparency;
- public $otherassigned = array(); // Array of other contact emails (not user, not contact)
+ /**
+ * @var int (0 By default)
+ */
+ public $priority;
+
+ /**
+ * @var int[] Array of user ids
+ */
+ public $userassigned = array();
+
+ /**
+ * @var int Id of user owner = fk_user_action into table
+ */
+ public $userownerid;
+
+ /**
+ * @var int Id of user done (deprecated)
+ * @deprecated
+ */
+ public $userdoneid;
+
+ /**
+ * @var int[] Array of contact ids
+ */
+ public $socpeopleassigned = array();
+
+ /**
+ * @var int[] Array of other contact emails (not user, not contact)
+ */
+ public $otherassigned = array();
- /**
- * Object user of owner
- * @var User
+ /**
+ * @var User Object user of owner
* @deprecated
* @see userownerid
*/
public $usertodo;
/**
- * Object user that did action
- * @var User
+ * @var User Object user that did action
* @deprecated
* @see userdoneid
*/
public $userdone;
+ /**
+ * @var int thirdparty id linked to action
+ */
public $socid;
+
+ /**
+ * @var int socpeople id linked to action
+ */
public $contactid;
/**
- * Company linked to action (optional)
- * @var Societe|null
+ * @var Societe|null Company linked to action (optional)
* @deprecated
* @see socid
*/
public $societe;
/**
- * Contact linked to action (optional)
- * @var Contact|null
+ * @var Contact|null Contact linked to action (optional)
* @deprecated
* @see contactid
*/
public $contact;
// Properties for links to other objects
+ /**
+ * @var int Id of linked object
+ */
public $fk_element; // Id of record
- public $elementid; // Id of record alternative for API
- public $elementtype; // Type of record. This if property ->element of object linked to.
- // Ical
+ /**
+ * @var int Id of record alternative for API
+ */
+ public $elementid;
+
+ /**
+ * @var string Type of record. This if property ->element of object linked to.
+ */
+ public $elementtype;
+
+ /**
+ * @var string Ical name
+ */
public $icalname;
+
+ /**
+ * @var string Ical color
+ */
public $icalcolor;
+ /**
+ * @var array Actions
+ */
public $actions=array();
- // Fields for emails
+ /**
+ * @var string Email msgid
+ */
public $email_msgid;
+
+ /**
+ * @var string Email from
+ */
public $email_from;
+
+ /**
+ * @var string Email sender
+ */
public $email_sender;
+
+ /**
+ * @var string Email to
+ */
public $email_to;
+
+ /**
+ * @var string Email tocc
+ */
public $email_tocc;
+ /**
+ * @var string Email tobcc
+ */
public $email_tobcc;
+
+ /**
+ * @var string Email subject
+ */
public $email_subject;
+
+ /**
+ * @var string Email errors to
+ */
public $errors_to;
/**
* Constructor
*
- * @param DoliDB $db Database handler
+ * @param DoliDB $db Database handler
*/
public function __construct(DoliDB $db)
{
@@ -1067,13 +1163,13 @@ class ActionComm extends CommonObject
$sql = "SELECT count(a.id) as nb";
}
$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
- if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+ if (! $user->rights->societe->client->voir && ! $user->socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
$sql.= " WHERE 1 = 1";
if(empty($load_state_board)) $sql.= " AND a.percent >= 0 AND a.percent < 100";
$sql.= " AND a.entity IN (".getEntity('agenda').")";
- if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
- if ($user->societe_id) $sql.=" AND a.fk_soc = ".$user->societe_id;
+ if (! $user->rights->societe->client->voir && ! $user->socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
+ if ($user->socid) $sql.=" AND a.fk_soc = ".$user->socid;
if (! $user->rights->agenda->allactions->read) $sql.= " AND (a.fk_user_author = ".$user->id . " OR a.fk_user_action = ".$user->id . " OR a.fk_user_done = ".$user->id . ")";
$resql=$this->db->query($sql);
@@ -1344,7 +1440,6 @@ class ActionComm extends CommonObject
$linkstart = '';
$linkend = '';
}
- //print 'rrr'.$this->libelle.'rrr'.$this->label.'rrr'.$withpicto;
if ($withpicto == 2)
{
@@ -1463,7 +1558,7 @@ class ActionComm extends CommonObject
$sql.= " a.priority, a.fulldayevent, a.location, a.punctual, a.transparency,";
$sql.= " u.firstname, u.lastname, u.email,";
$sql.= " s.nom as socname,";
- $sql.= " c.id as type_id, c.code as type_code, c.libelle";
+ $sql.= " c.id as type_id, c.code as type_code, c.libelle as type_label";
$sql.= " FROM (".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."actioncomm as a)";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_author"; // Link to get author of event for export
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = a.fk_soc";
@@ -1568,7 +1663,7 @@ class ActionComm extends CommonObject
$event['location']=$obj->location;
$event['transparency']=(($obj->transparency > 0)?'OPAQUE':'TRANSPARENT'); // OPAQUE (busy) or TRANSPARENT (not busy)
$event['punctual']=$obj->punctual;
- $event['category']=$obj->libelle; // libelle type action
+ $event['category']=$obj->type_label;
$event['email']=$obj->email;
// Define $urlwithroot
$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -1579,6 +1674,22 @@ class ActionComm extends CommonObject
$event['created']=$this->db->jdate($obj->datec)-(empty($conf->global->AGENDA_EXPORT_FIX_TZ)?0:($conf->global->AGENDA_EXPORT_FIX_TZ*3600));
$event['modified']=$this->db->jdate($obj->datem)-(empty($conf->global->AGENDA_EXPORT_FIX_TZ)?0:($conf->global->AGENDA_EXPORT_FIX_TZ*3600));
+ // TODO: find a way to call "$this->fetch_userassigned();" without override "$this" properties
+ $this->id = $obj->id;
+ $this->fetch_userassigned();
+
+ $assignedUserArray = array();
+
+ foreach($this->userassigned as $key => $value)
+ {
+ $assignedUser = new User($this->db);
+ $assignedUser->fetch($value['id']);
+
+ $assignedUserArray[$key]=$assignedUser;
+ }
+
+ $event['assignedUsers']=$assignedUserArray;
+
if ($qualified && $datestart)
{
$eventarray[]=$event;
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 652e0d80966..f3fa2cd47c1 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -338,6 +338,7 @@ class AgendaEvents extends DolibarrApi
// phpcs:enable
$object = parent::_cleanObjectDatas($object);
+ unset($object->note); // alreaydy into note_private
unset($object->usermod);
unset($object->libelle);
unset($object->context);
@@ -350,6 +351,11 @@ class AgendaEvents extends DolibarrApi
unset($object->origin_id);
unset($object->ref_ext);
unset($object->statut);
+ unset($object->state_code);
+ unset($object->state_id);
+ unset($object->state);
+ unset($object->region);
+ unset($object->region_code);
unset($object->country);
unset($object->country_id);
unset($object->country_code);
@@ -378,6 +384,9 @@ class AgendaEvents extends DolibarrApi
unset($object->contact);
unset($object->societe);
+ unset($object->actions);
+ unset($object->lines);
+
return $object;
}
}
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 6f0875be879..f01f49921e7 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -45,8 +45,8 @@ $confirm = GETPOST('confirm', 'alpha');
// Security check
$socid = GETPOST('socid', 'int');
-if ($user->societe_id) $socid=$user->societe_id;
-if ($user->societe_id > 0)
+if ($user->socid) $socid=$user->socid;
+if ($user->socid > 0)
{
unset($_GET["action"]);
$action='';
@@ -159,7 +159,7 @@ if ($object->id > 0)
}
$morehtmlref.='
';
- dol_banner_tab($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', $morehtmlref);
+ dol_banner_tab($object, 'id', $linkback, ($user->socid?0:1), 'id', 'ref', $morehtmlref);
print '';
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 9ad3ef80dde..031918b194b 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -67,7 +67,7 @@ if (! $sortfield) $sortfield="a.datec";
// Security check
$socid = GETPOST("search_socid", "int")?GETPOST("search_socid", "int"):GETPOST("socid", "int");
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'agenda', 0, '', 'myactions');
if ($socid < 0) $socid='';
@@ -614,7 +614,7 @@ if ($resql)
$event->type_label=$obj->type_label;
$event->type_color=$obj->type_color;
- $event->libelle=$obj->label;
+ $event->libelle=$obj->label; // deprecated
$event->label=$obj->label;
$event->percentage=$obj->percent;
$event->authorid=$obj->fk_user_author; // user id of creator
@@ -720,7 +720,7 @@ if ($showbirthday)
$event->datep=dol_mktime(0, 0, 0, $datearray['mon'], $datearray['mday'], $year, true); // For full day events, date are also GMT but they wont but converted during output
$event->datef=$event->datep;
$event->type_code='BIRTHDAY';
- $event->libelle=$langs->trans("Birthday").' '.dolGetFirstLastname($obj->firstname, $obj->lastname);
+ $event->label=$langs->trans("Birthday").' '.dolGetFirstLastname($obj->firstname, $obj->lastname);
$event->percentage=100;
$event->fulldayevent=1;
@@ -949,9 +949,9 @@ if (count($listofextcals))
$event->datef=$dateend+$usertime;
$event->type_code="ICALEVENT";
- if($icalevent['SUMMARY']) $event->libelle=$icalevent['SUMMARY'];
- elseif($icalevent['DESCRIPTION']) $event->libelle=dol_nl2br($icalevent['DESCRIPTION'], 1);
- else $event->libelle = $langs->trans("ExtSiteNoLabel");
+ if($icalevent['SUMMARY']) $event->label=$icalevent['SUMMARY'];
+ elseif($icalevent['DESCRIPTION']) $event->label=dol_nl2br($icalevent['DESCRIPTION'], 1);
+ else $event->label = $langs->trans("ExtSiteNoLabel");
$event->date_start_in_calendar=$event->datep;
@@ -1554,7 +1554,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
// Show title
$titletoshow = $daterange;
- $titletoshow.=($titletoshow?' ':'').$event->libelle;
+ $titletoshow.=($titletoshow?' ':'').($event->label?$event->label:$event->libelle);
if ($event->type_code == 'ICALEVENT') print $titletoshow;
else
@@ -1735,7 +1735,7 @@ function sort_events_by_date($a, $b)
}
// If both events have the same start time, longest first
-
+
if(! is_numeric($b->datef))
{
// when event B have no end timestamp, event B should sort be before event A (All day events on top)
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index 02277fc30e8..a88ff67fd91 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -39,10 +39,10 @@ $langs->load("commercial");
$id = GETPOST('id', 'int');
// Security check
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
$result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
@@ -102,7 +102,7 @@ if (! empty($conf->projet->enabled))
}
$morehtmlref.='
';
-dol_banner_tab($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', $morehtmlref);
+dol_banner_tab($object, 'id', $linkback, ($user->socid?0:1), 'id', 'ref', $morehtmlref);
print '
';
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 1b33e5da9b8..65852d053b4 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -110,7 +110,7 @@ if (! $sortfield)
// Security check
$socid = GETPOST("search_socid", 'int')?GETPOST("search_socid", 'int'):GETPOST("socid", 'int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'agenda', 0, '', 'myactions');
if ($socid < 0) $socid='';
@@ -488,7 +488,7 @@ if ($resql)
if (! empty($arrayfields['a.tms']['checked'])) print '';
- print $formactions->form_select_status_action('formaction', $status, 1, 'status', 1, 2);
+ $formactions->form_select_status_action('formaction', $status, 1, 'status', 1, 2);
print ajax_combobox('selectstatus');
print ' ';
}
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 286863c7dc6..134e239b66f 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -65,7 +65,7 @@ if (! $sortfield) $sortfield="a.datec";
// Security check
$socid = GETPOST("socid", "int");
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'agenda', 0, '', 'myactions');
if ($socid < 0) $socid='';
@@ -616,12 +616,12 @@ $typeofevents=array();
// Load array of colors by type
$colorsbytype=array();
$labelbytype=array();
-$sql="SELECT code, color, libelle FROM ".MAIN_DB_PREFIX."c_actioncomm";
+$sql="SELECT code, color, libelle as label FROM ".MAIN_DB_PREFIX."c_actioncomm ORDER BY position";
$resql=$db->query($sql);
while ($obj = $db->fetch_object($resql))
{
$colorsbytype[$obj->code]=$obj->color;
- $labelbytype[$obj->code]=$obj->libelle;
+ $labelbytype[$obj->code]=$obj->label;
}
// Loop on each user to show calendar
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index ce577de78bd..3280ddc7af4 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -65,7 +65,7 @@ if (! $sortfield) $sortfield="a.datec";
// Security check
$socid = GETPOST("search_socid", "int")?GETPOST("search_socid", "int"):GETPOST("socid", "int");
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'agenda', 0, '', 'myactions');
if ($socid < 0) $socid='';
@@ -752,12 +752,12 @@ while($currentdaytoshow<$lastdaytoshow) {
// Load array of colors by type
$colorsbytype=array();
$labelbytype=array();
- $sql="SELECT code, color, libelle FROM ".MAIN_DB_PREFIX."c_actioncomm ORDER BY position";
+ $sql="SELECT code, color, libelle as label FROM ".MAIN_DB_PREFIX."c_actioncomm ORDER BY position";
$resql=$db->query($sql);
while ($obj = $db->fetch_object($resql))
{
$colorsbytype[$obj->code]=$obj->color;
- $labelbytype[$obj->code]=$obj->libelle;
+ $labelbytype[$obj->code]=$obj->label;
}
// Loop on each user to show calendar
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 8cc1774cba2..c6549c5c39a 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -49,7 +49,7 @@ if (! $sortfield) $sortfield="a.datep";
// Security check
$socid = GETPOST('socid', 'int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'agenda', $socid, '', 'myactions');
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 57239c355b4..a0263065dee 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -59,7 +59,7 @@ if (! empty($conf->notification->enabled)) $langs->load("mails");
// Security check
$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
-if ($user->societe_id > 0) $id=$user->societe_id;
+if ($user->socid > 0) $id=$user->socid;
$result = restrictedArea($user, 'societe', $id, '&societe');
$action = GETPOST('action', 'aZ09');
@@ -240,7 +240,7 @@ if ($object->id > 0)
$linkback = ''.$langs->trans("BackToList").' ';
- dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+ dol_banner_tab($object, 'socid', $linkback, ($user->socid?0:1), 'rowid', 'nom');
print '';
@@ -387,7 +387,7 @@ if ($object->id > 0)
print '
';
print $langs->trans("CustomerRelativeDiscountShort");
print ' ';
- if ($user->rights->societe->creer && !$user->societe_id > 0)
+ if ($user->rights->societe->creer && !$user->socid > 0)
{
print ''.img_edit($langs->trans("Modify")).' ';
}
@@ -401,7 +401,7 @@ if ($object->id > 0)
print ' ';
print $langs->trans("CustomerAbsoluteDiscountShort");
print ' ';
- if ($user->rights->societe->creer && !$user->societe_id > 0)
+ if ($user->rights->societe->creer && !$user->socid > 0)
{
print ''.img_edit($langs->trans("Modify")).' ';
}
@@ -1274,7 +1274,7 @@ if ($object->id > 0)
}
// Add invoice
- if ($user->societe_id == 0)
+ if ($user->socid == 0)
{
if (! empty($conf->deplacement->enabled) && $object->status==1)
{
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 10314b597e7..6c0aea2f935 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -47,7 +47,7 @@ $begin=GETPOST('begin', 'alpha');
// Security check
$socid = GETPOST('socid', 'int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'societe', $socid, '');
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 43af4f8f1c0..245d3874d92 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -51,10 +51,10 @@ $bid=GETPOST('bid', 'int');
// Securite acces client
$socid=GETPOST('socid', 'int');
-if (isset($user->societe_id) && $user->societe_id > 0)
+if (isset($user->socid) && $user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
$max=3;
@@ -120,6 +120,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele
{
print '';
print ' ';
print '';
print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "mc.email", $param, "", "", $sortfield, $sortorder);
print_liste_field_titre("Lastname", $_SERVER["PHP_SELF"], "mc.lastname", $param, "", "", $sortfield, $sortorder);
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 41f74846125..32637096910 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -67,7 +67,12 @@ class Mailing extends CommonObject
public $user_creat;
public $user_valid;
+ /**
+ * @var integer|string date_creation
+ */
public $date_creat;
+
+
public $date_valid;
public $extraparams=array();
@@ -618,48 +623,24 @@ class Mailing extends CommonObject
/**
* Renvoi le libelle d'un statut donne
*
- * @param int $statut Id statut
+ * @param int $status Id status
* @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
* @return string Label
*/
- public function LibStatut($statut, $mode = 0)
+ public function LibStatut($status, $mode = 0)
{
// phpcs:enable
global $langs;
- $langs->load('mails');
+ $langs->load("mailing");
- if ($mode == 0 || $mode == 1)
- {
- return $langs->trans($this->statuts[$statut]);
- }
- elseif ($mode == 2)
- {
- if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]), 'statut0').' '.$langs->trans($this->statuts[$statut]);
- elseif ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]), 'statut1').' '.$langs->trans($this->statuts[$statut]);
- elseif ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]), 'statut3').' '.$langs->trans($this->statuts[$statut]);
- elseif ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]), 'statut6').' '.$langs->trans($this->statuts[$statut]);
- }
- elseif ($mode == 3)
- {
- if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]), 'statut0');
- elseif ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]), 'statut1');
- elseif ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]), 'statut3');
- elseif ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]), 'statut6');
- }
- elseif ($mode == 4)
- {
- if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]), 'statut0').' '.$langs->trans($this->statuts[$statut]);
- elseif ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]), 'statut1').' '.$langs->trans($this->statuts[$statut]);
- elseif ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]), 'statut3').' '.$langs->trans($this->statuts[$statut]);
- elseif ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]), 'statut6').' '.$langs->trans($this->statuts[$statut]);
- }
- elseif ($mode == 5)
- {
- if ($statut == 0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]), 'statut0');
- elseif ($statut == 1) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]), 'statut1');
- elseif ($statut == 2) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]), 'statut3');
- elseif ($statut == 3) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]), 'statut6');
- }
+ $labelStatus = $langs->trans($this->statuts[$status]);
+ $labelStatusShort = $langs->trans($this->statuts[$status]);
+
+ $statusType = 'status'.$status;
+ if ($status == 2) $statusType = 'status3';
+ if ($status == 3) $statusType = 'status6';
+
+ return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
}
@@ -667,58 +648,37 @@ class Mailing extends CommonObject
* Renvoi le libelle d'un statut donne
* TODO Add class mailin_target.class.php
*
- * @param int $statut Id statut
+ * @param int $status Id status
* @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
* @param string $desc Desc error
* @return string Label
*/
- public static function libStatutDest($statut, $mode = 0, $desc = '')
+ public static function libStatutDest($status, $mode = 0, $desc = '')
{
global $langs;
- $langs->load('mails');
+ $langs->load("mails");
- if ($mode == 0)
- {
- return $langs->trans('MailingStatusError');
- }
- elseif ($mode == 1)
- {
- return $langs->trans('MailingStatusSent');
- }
- elseif ($mode == 2)
- {
- if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
- elseif ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"), 'statut6');
- elseif ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"), 'statut4');
- elseif ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"), 'statut3');
- }
- elseif ($mode == 3)
- {
- if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
- elseif ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"), 'statut6');
- elseif ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"), 'statut4');
- elseif ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"), 'statut3');
- }
- elseif ($mode == 4)
- {
- if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
- elseif ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"), 'statut6');
- elseif ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"), 'statut4');
- elseif ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"), 'statut3');
- }
- elseif ($mode == 5)
- {
- if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
- elseif ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"), 'statut6');
- elseif ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"), 'statut4');
- elseif ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"), 'statut3');
- }
- elseif ($mode == 6)
- {
- if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
- elseif ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"), 'statut6');
- elseif ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"), 'statut4');
- elseif ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"), 'statut3');
+ $labelStatus = array();
+ $labelStatusShort = array();
+
+ $labelStatus[-1] = $langs->trans('MailingStatusError');
+ $labelStatus[1] = $langs->trans('MailingStatusSent');
+ $labelStatus[2] = $langs->trans('MailingStatusRead');
+ $labelStatus[3] = $langs->trans('MailingStatusNotContact');
+ $labelStatusShort[-1] = $langs->trans('MailingStatusError');
+ $labelStatusShort[1] = $langs->trans('MailingStatusSent');
+ $labelStatusShort[2] = $langs->trans('MailingStatusRead');
+ $labelStatusShort[3] = $langs->trans('MailingStatusNotContact');
+
+ $statusType = 'status'.$status;
+ if ($status == -1) $statusType = 'status8';
+ if ($status == 1) $statusType = 'status6';
+ if ($status == 2) $statusType = 'status4';
+
+ $param = array();
+ if ($status == - 1) {
+ $param = array('badgeParams'=>array('attr'=>array('title'=>$desc)));
}
+ return dolGetStatus($labelStatus[$status], $labelStatusShort[$status], '', $statusType, $mode, '', $param);
}
}
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index e5d096dea26..701dd2d4716 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -60,6 +60,7 @@ print '';
// Recherche emails
print '
\n";
//}
@@ -160,6 +161,7 @@ $sql.= " ORDER BY m.date_creat DESC";
$sql.= " LIMIT ".$limit;
$result=$db->query($sql);
if ($result) {
+ print '
';
print '
';
print '';
print ''.$langs->trans("LastMailings", $limit).' ';
@@ -193,7 +195,7 @@ if ($result) {
{
print ' '.$langs->trans("None").'
";
+ print "
'.$langs->trans("BackToList").' ';
$morehtmlright='';
- if ($object->statut == 2) $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
+ $nbtry = $nbok = 0;
+ if ($object->statut == 2 || $object->statut == 3)
+ {
+ $nbtry = $object->countNbOfTargets('alreadysent');
+ $nbko = $object->countNbOfTargets('alreadysentko');
+
+ $morehtmlright.=' ('.$nbtry.'/'.$object->nbemail;
+ if ($nbko) $morehtmlright.=' - '.$nbko.' '.$langs->trans("Error");
+ $morehtmlright.=') ';
+ }
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index 429e7f3dacf..c99048a8955 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -33,9 +33,9 @@ $langs->loadLangs(array('orders', 'companies'));
$id = GETPOST('id', 'int');
$_socid = GETPOST("id", 'int');
// Security check
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
- $_socid = $user->societe_id;
+ $_socid = $user->socid;
}
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 113d3baf503..8f28a65473c 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -86,7 +86,7 @@ $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (! empty($co
$NBLINES = 4;
// Security check
-if (! empty($user->societe_id)) $socid = $user->societe_id;
+if (! empty($user->socid)) $socid = $user->socid;
$result = restrictedArea($user, 'propal', $id);
$object = new Propal($db);
@@ -1717,7 +1717,7 @@ if ($action == 'create')
print $doleditor->Create(1);
// Private note
- if (empty($user->societe_id))
+ if (empty($user->socid))
{
print '';
print '' . $langs->trans('NotePrivate') . ' ';
@@ -2202,11 +2202,11 @@ if ($action == 'create')
print '';
print '';
- if ($object->statut == Propal::STATUS_DRAFT && $action == 'editmulticurrencycode' && $usercancreate) {
+ if ($object->statut == $object::STATUS_DRAFT && $action == 'editmulticurrencycode' && $usercancreate) {
$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'multicurrency_code');
} else {
$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'none');
@@ -2214,29 +2214,33 @@ if ($action == 'create')
print ' ';
// Multicurrency rate
- print '';
- print '';
- print '';
- print ' ';
- if ($object->statut == Propal::STATUS_DRAFT && ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') && $usercancreate) {
- if($action == 'actualizemulticurrencyrate') {
- list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
- }
- $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx', $object->multicurrency_code);
- } else {
- $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
- if ($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
- print '';
+ if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)
+ {
+ print ' ';
+ print '';
+ print '';
+ print ' ';
+ if ($object->statut ==$object::STATUS_DRAFT && ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') && $usercancreate) {
+ if($action == 'actualizemulticurrencyrate') {
+ list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
+ }
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx', $object->multicurrency_code);
+ } else {
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
+ if ($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
+ print '';
+ }
}
+ print ' ';
}
- print '';
}
if ($soc->outstanding_limit)
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index a2b89dedb11..0df1af873a8 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -13,7 +13,7 @@
* Copyright (C) 2013 Florian Henry
* Copyright (C) 2014-2015 Marcos García
* Copyright (C) 2018 Nicolas ZABOURI
- * Copyright (C) 2018 Frédéric France
+ * Copyright (C) 2018-2019 Frédéric France
* Copyright (C) 2018 Ferran Marcet
*
* This program is free software; you can redistribute it and/or modify
@@ -95,8 +95,17 @@ class Propal extends CommonObject
*/
public $socid;
+ /**
+ * ID of the contact
+ * @var int
+ */
public $contactid;
public $author;
+
+ /**
+ * Ref from thirdparty
+ * @var string
+ */
public $ref_client;
/**
@@ -192,8 +201,8 @@ class Propal extends CommonObject
public $lines = array();
public $line;
- public $labelstatut=array();
- public $labelstatut_short=array();
+ public $labelStatus=array();
+ public $labelStatusShort=array();
public $specimen;
@@ -240,7 +249,7 @@ class Propal extends CommonObject
* @param int $socid Id third party
* @param int $propalid Id proposal
*/
- public function __construct($db, $socid = "", $propalid = 0)
+ public function __construct($db, $socid = 0, $propalid = 0)
{
global $conf,$langs;
@@ -1686,13 +1695,13 @@ class Propal extends CommonObject
$line->fk_product = $objp->fk_product;
- $line->ref = $objp->product_ref; // TODO deprecated
+ $line->ref = $objp->product_ref; // deprecated
$line->product_ref = $objp->product_ref;
- $line->libelle = $objp->product_label; // TODO deprecated
+ $line->libelle = $objp->product_label; // deprecated
$line->product_label = $objp->product_label;
$line->product_desc = $objp->product_desc; // Description produit
$line->product_tobatch = $objp->product_tobatch;
- $line->fk_product_type = $objp->fk_product_type; // TODO deprecated
+ $line->fk_product_type = $objp->fk_product_type; // deprecated
$line->fk_unit = $objp->fk_unit;
$line->weight = $objp->weight;
$line->weight_units = $objp->weight_units;
@@ -3200,40 +3209,40 @@ class Propal extends CommonObject
/**
* Return label of a status (draft, validated, ...)
*
- * @param int $statut id statut
+ * @param int $status Id status
* @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
* @return string Label
*/
- public function LibStatut($statut, $mode = 1)
+ public function LibStatut($status, $mode = 1)
{
// phpcs:enable
global $conf;
// Init/load array of translation of status
- if (empty($this->labelstatut) || empty($this->labelstatut_short))
+ if (empty($this->labelStatus) || empty($this->labelStatusShort))
{
global $langs;
$langs->load("propal");
- $this->labelstatut[0]=$langs->trans("PropalStatusDraft");
- $this->labelstatut[1]=$langs->trans("PropalStatusValidated");
- $this->labelstatut[2]=$langs->trans("PropalStatusSigned");
- $this->labelstatut[3]=$langs->trans("PropalStatusNotSigned");
- $this->labelstatut[4]=$langs->trans("PropalStatusBilled");
- $this->labelstatut_short[0]=$langs->trans("PropalStatusDraftShort");
- $this->labelstatut_short[1]=$langs->trans("PropalStatusValidatedShort");
- $this->labelstatut_short[2]=$langs->trans("PropalStatusSignedShort");
- $this->labelstatut_short[3]=$langs->trans("PropalStatusNotSignedShort");
- $this->labelstatut_short[4]=$langs->trans("PropalStatusBilledShort");
+ $this->labelStatus[0]=$langs->trans("PropalStatusDraft");
+ $this->labelStatus[1]=$langs->trans("PropalStatusValidated");
+ $this->labelStatus[2]=$langs->trans("PropalStatusSigned");
+ $this->labelStatus[3]=$langs->trans("PropalStatusNotSigned");
+ $this->labelStatus[4]=$langs->trans("PropalStatusBilled");
+ $this->labelStatusShort[0]=$langs->trans("PropalStatusDraftShort");
+ $this->labelStatusShort[1]=$langs->trans("PropalStatusValidatedShort");
+ $this->labelStatusShort[2]=$langs->trans("PropalStatusSignedShort");
+ $this->labelStatusShort[3]=$langs->trans("PropalStatusNotSignedShort");
+ $this->labelStatusShort[4]=$langs->trans("PropalStatusBilledShort");
}
$statusType='';
- if ($statut==self::STATUS_DRAFT) $statusType='status0';
- elseif ($statut==self::STATUS_VALIDATED) $statusType='status1';
- elseif ($statut==self::STATUS_SIGNED) $statusType='status3';
- elseif ($statut==self::STATUS_NOTSIGNED) $statusType='status5';
- elseif ($statut==self::STATUS_BILLED) $statusType='status6';
+ if ($status==self::STATUS_DRAFT) $statusType='status0';
+ elseif ($status==self::STATUS_VALIDATED) $statusType='status1';
+ elseif ($status==self::STATUS_SIGNED) $statusType='status3';
+ elseif ($status==self::STATUS_NOTSIGNED) $statusType='status5';
+ elseif ($status==self::STATUS_BILLED) $statusType='status6';
- return dolGetStatus($this->labelstatut[$statut], $this->labelstatut_short[$statut], '', $statusType, $mode);
+ return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
}
@@ -3254,7 +3263,7 @@ class Propal extends CommonObject
$sql = "SELECT p.rowid, p.ref, p.datec as datec, p.fin_validite as datefin, p.total_ht";
$sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
- if (!$user->rights->societe->client->voir && !$user->societe_id)
+ if (!$user->rights->societe->client->voir && !$user->socid)
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
$sql.= " WHERE sc.fk_user = " .$user->id;
@@ -3263,7 +3272,7 @@ class Propal extends CommonObject
$sql.= $clause." p.entity IN (".getEntity('propal').")";
if ($mode == 'opened') $sql.= " AND p.fk_statut = ".self::STATUS_VALIDATED;
if ($mode == 'signed') $sql.= " AND p.fk_statut = ".self::STATUS_SIGNED;
- if ($user->societe_id) $sql.= " AND p.fk_soc = ".$user->societe_id;
+ if ($user->socid) $sql.= " AND p.fk_soc = ".$user->socid;
$resql=$this->db->query($sql);
if ($resql)
@@ -3272,17 +3281,17 @@ class Propal extends CommonObject
$now=dol_now();
$delay_warning = 0;
- $statut = 0;
+ $status = 0;
$label = $labelShort = '';
if ($mode == 'opened') {
$delay_warning=$conf->propal->cloture->warning_delay;
- $statut = self::STATUS_VALIDATED;
+ $status = self::STATUS_VALIDATED;
$label = $langs->trans("PropalsToClose");
$labelShort = $langs->trans("ToAcceptRefuse");
}
if ($mode == 'signed') {
$delay_warning=$conf->propal->facturation->warning_delay;
- $statut = self::STATUS_SIGNED;
+ $status = self::STATUS_SIGNED;
$label = $langs->trans("PropalsToBill"); // We set here bill but may be billed or ordered
$labelShort = $langs->trans("ToBill");
}
@@ -3291,8 +3300,8 @@ class Propal extends CommonObject
$response->warning_delay = $delay_warning/60/60/24;
$response->label = $label;
$response->labelShort = $labelShort;
- $response->url = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals';
- $response->url_late = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals&sortfield=p.datep&sortorder=asc';
+ $response->url = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$status.'&mainmenu=commercial&leftmenu=propals';
+ $response->url_late = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$status.'&mainmenu=commercial&leftmenu=propals&sortfield=p.datep&sortorder=asc';
$response->img = img_object('', "propal");
// This assignment in condition is not a bug. It allows walking the results.
@@ -3433,7 +3442,7 @@ class Propal extends CommonObject
$sql = "SELECT count(p.rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
- if (!$user->rights->societe->client->voir && !$user->societe_id)
+ if (!$user->rights->societe->client->voir && !$user->socid)
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
$sql.= " WHERE sc.fk_user = " .$user->id;
diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
index bd0f57bc801..0859bdb7974 100644
--- a/htdocs/comm/propal/class/propalestats.class.php
+++ b/htdocs/comm/propal/class/propalestats.class.php
@@ -112,7 +112,7 @@ class PropaleStats extends Stats
$sql = "SELECT date_format(".$this->field_date.",'%m') as dm, COUNT(*) as nb";
$sql.= " FROM ".$this->from;
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE ".$this->field_date." BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
$sql.= " AND ".$this->where;
$sql.= " GROUP BY dm";
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index cb798e2fdd6..14f5913c4ce 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -41,7 +41,7 @@ $lineid=GETPOST('lineid', 'int');
$action=GETPOST('action', 'alpha');
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'propal', $id);
$object = new Propal($db);
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index c1719ddbe45..55a21445be2 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -46,9 +46,9 @@ $ref = GETPOST('ref', 'alpha');
// Security check
$socid='';
-if (! empty($user->societe_id))
+if (! empty($user->socid))
{
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
$result = restrictedArea($user, 'propal', $id);
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index a1104682904..d802548ac6b 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -38,10 +38,10 @@ $langs->loadLangs(array('propal', 'companies'));
// Security check
$socid=GETPOST('socid', 'int');
-if (isset($user->societe_id) && $user->societe_id > 0)
+if (isset($user->socid) && $user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
$result = restrictedArea($user, 'propal');
@@ -87,7 +87,7 @@ $sql.= ", ".MAIN_DB_PREFIX."propal as p";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE p.fk_soc = s.rowid";
$sql.= " AND p.entity IN (".getEntity('propal').")";
-if ($user->societe_id) $sql.=' AND p.fk_soc = '.$user->societe_id;
+if ($user->socid) $sql.=' AND p.fk_soc = '.$user->socid;
if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql.= " AND p.fk_statut IN (0,1,2,3,4)";
$sql.= " GROUP BY p.fk_statut";
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index 848d707f22f..1e27f187488 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -40,7 +40,7 @@ $ref=GETPOST('ref', 'alpha');
$socid=GETPOST('socid', 'int');
// Security check
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->socid)) $socid=$user->socid;
$result = restrictedArea($user, 'propal', $id);
$object = new Propal($db);
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 01d4c264667..a83d7ee5161 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -112,7 +112,7 @@ if (! $sortorder) $sortorder='DESC';
$module='propal';
$dbtable='';
$objectid='';
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->socid)) $socid=$user->socid;
if (! empty($socid))
{
$objectid=$socid;
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 7c3d58f64d5..ee9d9bd9c4f 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -41,7 +41,7 @@ $ref=GETPOST('ref', 'alpha');
$action=GETPOST('action', 'alpha');
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'propale', $id, 'propal');
$object = new Propal($db);
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 1d81b553f7a..a37006d60fb 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -42,10 +42,10 @@ $object_status=GETPOST('object_status');
$userid=GETPOST('userid', 'int');
$socid=GETPOST('socid', 'int');
// Security check
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
$nowyear=strftime("%Y", dol_now());
@@ -94,7 +94,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
// $data = array(array('Lib',val1,val2,val3),...)
-if (!$user->rights->societe->client->voir || $user->societe_id)
+if (!$user->rights->societe->client->voir || $user->socid)
{
$filenamenb = $dir.'/proposalsnbinyear-'.$user->id.'-'.$year.'.png';
$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$user->id.'-'.$year.'.png';
@@ -134,7 +134,7 @@ if (! $mesg)
$data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, 0);
// $data = array(array('Lib',val1,val2,val3),...)
-if (!$user->rights->societe->client->voir || $user->societe_id)
+if (!$user->rights->societe->client->voir || $user->socid)
{
$filenameamount = $dir.'/proposalsamountinyear-'.$user->id.'-'.$year.'.png';
$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$user->id.'-'.$year.'.png';
@@ -173,7 +173,7 @@ if (! $mesg)
$data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
$fileurl_avg='';
-if (!$user->rights->societe->client->voir || $user->societe_id)
+if (!$user->rights->societe->client->voir || $user->socid)
{
$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index cdd94c9cf6c..485771939c4 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -30,9 +30,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
$langs->load("propal");
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php
index 192aaccbddf..07741635bcc 100644
--- a/htdocs/comm/prospect/recap-prospect.php
+++ b/htdocs/comm/prospect/recap-prospect.php
@@ -32,10 +32,10 @@ if (! empty($conf->facture->enabled)) $langs->load("bills");
// Security check
$socid = $_GET["socid"];
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php
index 0759c47c06c..9605281d6ca 100644
--- a/htdocs/comm/recap-client.php
+++ b/htdocs/comm/recap-client.php
@@ -32,10 +32,10 @@ if (! empty($conf->facture->enabled)) $langs->load("bills");
// Security check
$socid = $_GET["socid"];
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index a704a4be173..32c6869d576 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -33,9 +33,9 @@ $id=GETPOST("id", 'int');
$socid = GETPOST('id', 'int')?GETPOST('id', 'int'):GETPOST('socid', 'int');
// Security check
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
$backtopage = GETPOST('backtopage', 'alpha');
@@ -116,7 +116,7 @@ if ($socid > 0)
dol_fiche_head($head, 'relativediscount', $langs->trans("ThirdParty"), -1, 'company');
- dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom');
+ dol_banner_tab($object, 'socid', '', ($user->socid?0:1), 'rowid', 'nom');
print '';
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 002eb7288e2..523c6ebc7b1 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -40,9 +40,9 @@ $backtopage=GETPOST('backtopage', 'alpha');
// Security check
$socid = GETPOST('id', 'int')?GETPOST('id', 'int'):GETPOST('socid', 'int');
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
@@ -252,7 +252,7 @@ if ($socid > 0)
dol_fiche_head($head, 'absolutediscount', $langs->trans("ThirdParty"), 0, 'company');
- dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom');
+ dol_banner_tab($object, 'socid', '', ($user->socid?0:1), 'rowid', 'nom');
print '
';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index e645bf3cee6..a6427dbd045 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -82,8 +82,8 @@ $hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (! empty(
$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
// Security check
-if (! empty($user->societe_id))
- $socid = $user->societe_id;
+if (! empty($user->socid))
+ $socid = $user->socid;
$result = restrictedArea($user, 'commande', $id);
$object = new Commande($db);
@@ -1803,7 +1803,7 @@ if ($action == 'create' && $usercancreate)
print '';
// Note private
- if (empty($user->societe_id)) {
+ if (empty($user->socid)) {
print '
';
print '' . $langs->trans('NotePrivate') . ' ';
print '';
@@ -2057,12 +2057,8 @@ if ($action == 'create' && $usercancreate)
if ($action == 'clone') {
// Create an array for form
$formquestion = array(
- // 'text' => $langs->trans("ConfirmClone"),
- // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' =>
- // 1),
- // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value'
- // => 1),
- array('type' => 'other','name' => 'socid','label' => $langs->trans("SelectThirdParty"),'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=3)')));
+ array('type' => 'other','name' => 'socid','label' => $langs->trans("SelectThirdParty"),'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=3)'))
+ );
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneOrder', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
}
@@ -2291,25 +2287,28 @@ if ($action == 'create' && $usercancreate)
print ' ';
// Multicurrency rate
- print '
';
- print '';
- $editenable = $usercancreate && $object->multicurrency_code && $object->multicurrency_code != $conf->currency && $object->statut == Commande::STATUS_DRAFT;
- print $form->editfieldkey("CurrencyRate", 'multicurrencyrate', '', $object, $editenable);
- print ' ';
- if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
- if($action == 'actualizemulticurrencyrate') {
- list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
- }
- $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx', $object->multicurrency_code);
- } else {
- $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
- if($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
- print '';
+ if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)
+ {
+ print ' ';
+ print '';
+ $editenable = $usercancreate && $object->multicurrency_code && $object->multicurrency_code != $conf->currency && $object->statut == $object::STATUS_DRAFT;
+ print $form->editfieldkey("CurrencyRate", 'multicurrencyrate', '', $object, $editenable);
+ print ' ';
+ if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
+ if($action == 'actualizemulticurrencyrate') {
+ list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
+ }
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx', $object->multicurrency_code);
+ } else {
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
+ if($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
+ print '';
+ }
}
+ print ' ';
}
- print '';
}
// Delivery delay
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 4cc922a8cbf..6e01ba2f5e2 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -53,19 +53,22 @@ class Commande extends CommonOrder
public $table_element='commande';
/**
- * @var int Name of subtable line
+ * @var string Name of subtable line
*/
public $table_element_line = 'commandedet';
+ /**
+ * @var string Name of class line
+ */
public $class_element_line = 'OrderLine';
/**
- * @var int Field with ID of parent key if this field has a parent
+ * @var string Field name with ID of parent key if this field has a parent
*/
public $fk_element = 'fk_commande';
/**
- * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+ * @var string String with name of icon for commande class. Here is object_order.png
*/
public $picto = 'order';
@@ -87,13 +90,23 @@ class Commande extends CommonOrder
protected $table_ref_field = 'ref';
/**
- * Client ID
- * @var int
+ * @var int Thirparty ID
*/
public $socid;
+ /**
+ * @var string Thirparty ref of order
+ */
public $ref_client;
+
+ /**
+ * @var string Internal ref for order
+ */
public $ref_int;
+
+ /**
+ * @var int Contact ID
+ */
public $contactid;
/**
@@ -103,10 +116,9 @@ class Commande extends CommonOrder
public $statut;
/**
- * Billed
- * @var int
+ * @var int Status Billed or not
*/
- public $billed; // billed or not
+ public $billed;
/**
* @var int Draft Status of the order
@@ -115,25 +127,22 @@ class Commande extends CommonOrder
public $cond_reglement_code;
/**
- * @var int ID
+ * @var int bank account ID
*/
public $fk_account;
/**
- * It holds the label of the payment mode. Use it in case translation cannot be found.
- * @var string
+ * @var string It holds the label of the payment mode. Use it in case translation cannot be found.
*/
public $mode_reglement;
/**
- * Payment mode id
- * @var int
+ * @var int Payment mode id
*/
public $mode_reglement_id;
/**
- * Payment mode code
- * @var string
+ * @var string Payment mode code
*/
public $mode_reglement_code;
@@ -157,9 +166,13 @@ class Commande extends CommonOrder
public $demand_reason_id; // Source reason. Why we receive order (after a phone campaign, ...)
public $demand_reason_code;
- public $date; // Date commande
+ /**
+ * @var int Date of order
+ */
+ public $date;
/**
+ * @var int Date of order
* @deprecated
* @see $date
*/
@@ -182,7 +195,14 @@ class Commande extends CommonOrder
public $linked_objects=array();
+ /**
+ * @var int User author ID
+ */
public $user_author_id;
+
+ /**
+ * @var int User validator ID
+ */
public $user_valid;
/**
@@ -192,7 +212,7 @@ class Commande extends CommonOrder
// Multicurrency
/**
- * @var int ID
+ * @var int Currency ID
*/
public $fk_multicurrency;
@@ -202,6 +222,9 @@ class Commande extends CommonOrder
public $multicurrency_total_tva;
public $multicurrency_total_ttc;
+ /**
+ * @var Commande clone of order object
+ */
public $oldcopy;
//! key of module source when order generated from a dedicated module ('cashdesk', 'takepos', ...)
@@ -3393,7 +3416,7 @@ class Commande extends CommonOrder
$sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.date_livraison as delivery_date, c.fk_statut, c.total_ht";
$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
- if (!$user->rights->societe->client->voir && !$user->societe_id)
+ if (!$user->rights->societe->client->voir && !$user->socid)
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
$sql.= " WHERE sc.fk_user = " .$user->id;
@@ -3402,7 +3425,7 @@ class Commande extends CommonOrder
$sql.= $clause." c.entity IN (".getEntity('commande').")";
//$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0";
$sql.= " AND ((c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_SHIPMENTONPROCESS.")) OR (c.fk_statut = ".self::STATUS_CLOSED." AND c.facture = 0))"; // If status is 2 and facture=1, it must be selected
- if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
+ if ($user->socid) $sql.=" AND c.fk_soc = ".$user->socid;
$resql=$this->db->query($sql);
if ($resql)
@@ -3469,13 +3492,13 @@ class Commande extends CommonOrder
/**
* Return label of status
*
- * @param int $statut Id statut
+ * @param int $status Id status
* @param int $billed If invoiced
* @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
* @param int $donotshowbilled Do not show billed status after order status
* @return string Label of status
*/
- public function LibStatut($statut, $billed, $mode, $donotshowbilled = 0)
+ public function LibStatut($status, $billed, $mode, $donotshowbilled = 0)
{
// phpcs:enable
global $langs, $conf;
@@ -3483,49 +3506,49 @@ class Commande extends CommonOrder
$billedtext = '';
if (empty($donotshowbilled)) $billedtext .= ($billed?' - '.$langs->trans("Billed"):'');
- if ($statut==self::STATUS_CANCELED){
- $labelstatut = $langs->trans('StatusOrderCanceled');
- $labelstatutShort = $langs->trans('StatusOrderCanceledShort');
+ if ($status==self::STATUS_CANCELED){
+ $labelStatus = $langs->trans('StatusOrderCanceled');
+ $labelStatusShort = $langs->trans('StatusOrderCanceledShort');
$statusType='status5';
}
- elseif ($statut==self::STATUS_DRAFT){
- $labelstatut = $langs->trans('StatusOrderDraft');
- $labelstatutShort = $langs->trans('StatusOrderDraftShort');
+ elseif ($status==self::STATUS_DRAFT){
+ $labelStatus = $langs->trans('StatusOrderDraft');
+ $labelStatusShort = $langs->trans('StatusOrderDraftShort');
$statusType='status0';
}
- elseif ($statut==self::STATUS_VALIDATED){
- $labelstatut = $langs->trans('StatusOrderValidated').$billedtext;
- $labelstatutShort = $langs->trans('StatusOrderValidatedShort').$billedtext;
+ elseif ($status==self::STATUS_VALIDATED){
+ $labelStatus = $langs->trans('StatusOrderValidated').$billedtext;
+ $labelStatusShort = $langs->trans('StatusOrderValidatedShort').$billedtext;
$statusType='status1';
}
- elseif ($statut==self::STATUS_SHIPMENTONPROCESS){
- $labelstatut = $langs->trans('StatusOrderSentShort').$billedtext;
- $labelstatutShort = $langs->trans('StatusOrderSentShort').$billedtext;
+ elseif ($status==self::STATUS_SHIPMENTONPROCESS){
+ $labelStatus = $langs->trans('StatusOrderSentShort').$billedtext;
+ $labelStatusShort = $langs->trans('StatusOrderSentShort').$billedtext;
$statusType='status3';
}
- elseif ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))){
- $labelstatut = $langs->trans('StatusOrderToBill');
- $labelstatutShort = $langs->trans('StatusOrderToBillShort');
+ elseif ($status==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))){
+ $labelStatus = $langs->trans('StatusOrderToBill');
+ $labelStatusShort = $langs->trans('StatusOrderToBillShort');
$statusType='status4';
}
- elseif ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))){
- $labelstatut = $langs->trans('StatusOrderProcessed').$billedtext;
- $labelstatutShort = $langs->trans('StatusOrderProcessed').$billedtext;
+ elseif ($status==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))){
+ $labelStatus = $langs->trans('StatusOrderProcessed').$billedtext;
+ $labelStatusShort = $langs->trans('StatusOrderProcessed').$billedtext;
$statusType='status6';
}
- elseif ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))){
- $labelstatut = $langs->trans('StatusOrderDelivered');
- $labelstatutShort = $langs->trans('StatusOrderDelivered');
+ elseif ($status==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))){
+ $labelStatus = $langs->trans('StatusOrderDelivered');
+ $labelStatusShort = $langs->trans('StatusOrderDelivered');
$statusType='status6';
}
else{
- $labelstatut = $langs->trans('Unknown');
- $labelstatutShort = '';
+ $labelStatus = $langs->trans('Unknown');
+ $labelStatusShort = '';
$statusType='';
$mode = 0;
}
- return dolGetStatus($labelstatut, $labelstatutShort, '', $statusType, $mode);
+ return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
}
@@ -3774,7 +3797,7 @@ class Commande extends CommonOrder
$sql = "SELECT count(co.rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."commande as co";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
- if (!$user->rights->societe->client->voir && !$user->societe_id)
+ if (!$user->rights->societe->client->voir && !$user->socid)
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
$sql.= " WHERE sc.fk_user = " .$user->id;
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index 10276e34c0e..0311f4c49ed 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -212,7 +212,7 @@ class CommandeStats extends Stats
$sql = "SELECT product.ref, COUNT(product.ref) as nb, SUM(tl.".$this->field_line.") as total, AVG(tl.".$this->field_line.") as avg";
$sql.= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE ".$this->where;
$sql.= " AND c.rowid = tl.fk_commande AND tl.fk_product = product.rowid";
$sql.= " AND c.date_commande BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index 57e37f9f903..97890c9d2ef 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -40,7 +40,7 @@ $ref=GETPOST('ref', 'alpha');
$action=GETPOST('action', 'alpha');
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'commande', $id, '');
$object = new Commande($db);
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 2f275adadb9..bcb445c546c 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -33,10 +33,10 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
$action=GETPOST('action', 'aZ09');
// Secrutiy check
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
if (! $user->rights->facture->creer)
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index fa825086c4a..565583e1fae 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -45,9 +45,9 @@ $id = GETPOST('id', 'int');
$ref = GETPOST('ref');
// Security check
-if ($user->societe_id)
+if ($user->socid)
{
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
$result=restrictedArea($user, 'commande', $id, '');
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 2149c48121b..da1a4fc55df 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -42,10 +42,10 @@ $langs->loadLangs(array('orders', 'bills'));
// Security check
$socid=GETPOST('socid', 'int');
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
@@ -92,7 +92,7 @@ $sql.= ", ".MAIN_DB_PREFIX."commande as c";
if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE c.fk_soc = s.rowid";
$sql.= " AND c.entity IN (".getEntity('societe').")";
-if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
+if ($user->socid) $sql.=' AND c.fk_soc = '.$user->socid;
if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql.= " GROUP BY c.fk_statut";
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 7d8e319c5ae..4ca81f77771 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -42,7 +42,7 @@ $id = GETPOST("id", 'int');
$ref=GETPOST('ref', 'alpha');
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result=restrictedArea($user, 'commande', $comid, '');
$object = new Commande($db);
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 37dd5a8d570..5f9906b58dc 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -88,7 +88,7 @@ $search_project=GETPOST('search_project', 'alpha');
// Security check
$id = (GETPOST('orderid')?GETPOST('orderid', 'int'):GETPOST('id', 'int'));
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'commande', $id, '');
$diroutputmassaction=$conf->commande->multidir_output[$conf->entity] . '/temp/massgeneration/'.$user->id;
@@ -268,7 +268,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typ
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
if (! empty($search_categ_cus)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
$sql.= ', '.MAIN_DB_PREFIX.'commande as c';
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande_extrafields as ef on (c.rowid = ef.fk_object)";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande_extrafields as ef on (c.rowid = ef.fk_object)";
if ($sall || $search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'commandedet as pd ON c.rowid=pd.fk_commande';
if ($search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = c.fk_projet";
@@ -769,6 +769,7 @@ if ($resql)
$total=0;
$subtotal=0;
$productstat_cache=array();
+ $getNomUrl_cache=array();
$generic_commande = new Commande($db);
$generic_product = new Product($db);
@@ -785,11 +786,14 @@ if ($resql)
$text_warning='';
$nbprod=0;
- $companystatic->id=$obj->socid;
+ $companystatic->id = $obj->socid;
$companystatic->code_client = $obj->code_client;
- $companystatic->name=$obj->name;
- $companystatic->client=$obj->client;
- $companystatic->email=$obj->email;
+ $companystatic->name = $obj->name;
+ $companystatic->client = $obj->client;
+ $companystatic->email = $obj->email;
+ if (!isset($getNomUrl_cache[$obj->socid])) {
+ $getNomUrl_cache[$obj->socid] = $companystatic->getNomUrl(1, 'customer');
+ }
$generic_commande->id=$obj->rowid;
$generic_commande->ref=$obj->ref;
@@ -974,7 +978,7 @@ if ($resql)
if (! empty($arrayfields['s.nom']['checked']))
{
print '
';
- print $companystatic->getNomUrl(1, 'customer');
+ print $getNomUrl_cache[$obj->socid];
// If module invoices enabled and user with invoice creation permissions
if (! empty($conf->facture->enabled) && ! empty($conf->global->ORDER_BILLING_ALL_CUSTOMER))
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 2cb69bd698b..5b8fe052b06 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -42,7 +42,7 @@ $action=GETPOST('action', 'alpha');
// Security check
$socid=0;
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result=restrictedArea($user, 'commande', $id, '');
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index fae23fa8bcd..35756a56487 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -139,7 +139,7 @@ if (($action == 'create' || $action == 'add') && !$error)
// Security check
$fieldid = GETPOST('ref', 'alpha')?'ref':'rowid';
- if ($user->societe_id) $socid=$user->societe_id;
+ if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid);
$usehm=$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE;
@@ -503,7 +503,7 @@ if ($action == 'create' && !$error)
print ' ';
// Private note
- if (empty($user->societe_id))
+ if (empty($user->socid))
{
print '
';
print ''.$langs->trans('NotePrivate').' ';
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 696823f4e41..bdf277bc375 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -43,10 +43,10 @@ $object_status=GETPOST('object_status');
$userid=GETPOST('userid', 'int');
$socid=GETPOST('socid', 'int');
// Security check
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
$nowyear=strftime("%Y", dol_now());
@@ -101,7 +101,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
// $data = array(array('Lib',val1,val2,val3),...)
-if (!$user->rights->societe->client->voir || $user->societe_id)
+if (!$user->rights->societe->client->voir || $user->socid)
{
$filenamenb = $dir.'/ordersnbinyear-'.$user->id.'-'.$year.'.png';
if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
@@ -144,7 +144,7 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear);
//var_dump($data);
// $data = array(array('Lib',val1,val2,val3),...)
-if (!$user->rights->societe->client->voir || $user->societe_id)
+if (!$user->rights->societe->client->voir || $user->socid)
{
$filenameamount = $dir.'/ordersamountinyear-'.$user->id.'-'.$year.'.png';
if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
@@ -185,7 +185,7 @@ if (! $mesg)
$data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
-if (!$user->rights->societe->client->voir || $user->societe_id)
+if (!$user->rights->societe->client->voir || $user->socid)
{
$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index cbecd9cbc05..f9d7e44794c 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -73,7 +73,7 @@ $arrayfields=array(
if (empty($conf->comptabilite->enabled) && empty($conf->accounting->enabled)) {
accessforbidden();
}
-if ($user->societe_id > 0) {
+if ($user->socid > 0) {
accessforbidden();
}
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index 7f96d9e28e7..b5839db2200 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -41,7 +41,7 @@ $ref=GETPOST('ref');
// Security check
$fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref :''));
$fieldtype = (! empty($ref) ? 'ref' :'rowid');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result=restrictedArea($user, 'banque', $fieldvalue, 'bank_account&bank_account', '', '', $fieldtype);
$year_start=GETPOST('year_start');
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 457e311d01c..773ee1e9255 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -66,12 +66,12 @@ $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref :''));
$fieldtype = (! empty($ref) ? 'ref' :'rowid');
if ($fielvalue)
{
- if ($user->societe_id) $socid=$user->societe_id;
+ if ($user->socid) $socid=$user->socid;
$result=restrictedArea($user, 'banque', $fieldvalue, 'bank_account&bank_account', '', '', $fieldtype);
}
else
{
- if ($user->societe_id) $socid=$user->societe_id;
+ if ($user->socid) $socid=$user->socid;
$result=restrictedArea($user, 'banque');
}
@@ -1065,9 +1065,10 @@ if ($resql)
}
}
// Extra fields
- if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+ $element = 'banktransaction';
+ if (is_array($extrafields->attributes[$element]['label']) && count($extrafields->attributes[$element]['label']))
{
- foreach($extrafields->attribute_label as $key => $val)
+ foreach($extrafields->attributes[$element]['label'] as $key => $val)
{
if (! empty($arrayfields["ef.".$key]['checked']))
{
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index 41275ec2a40..c9c5a0f77fe 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$langs->loadLangs(array('banks', 'categories'));
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result=restrictedArea($user, 'banque');
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 53fa268b750..57cff121010 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1188,7 +1188,7 @@ class Account extends CommonObject
// phpcs:enable
global $conf, $langs;
- if ($user->societe_id) return -1; // protection pour eviter appel par utilisateur externe
+ if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
$sql = "SELECT b.rowid, b.datev as datefin";
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b,";
@@ -1244,7 +1244,7 @@ class Account extends CommonObject
// phpcs:enable
global $user;
- if ($user->societe_id) return -1; // protection pour eviter appel par utilisateur externe
+ if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
$sql = "SELECT count(b.rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b,";
@@ -1283,7 +1283,7 @@ class Account extends CommonObject
global $db, $conf, $user;
//Protection against external users
- if ($user->societe_id) {
+ if ($user->socid) {
return 0;
}
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index ed94c8e4700..ca3acd59e42 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -523,46 +523,46 @@ class PaymentVarious extends CommonObject
/**
* Renvoi le libelle d'un statut donne
*
- * @param int $statut Id status
+ * @param int $status Id status
* @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
* @return string Libelle
*/
- public function LibStatut($statut, $mode = 0)
+ public function LibStatut($status, $mode = 0)
{
// phpcs:enable
global $langs;
if ($mode == 0)
{
- return $langs->trans($this->statuts[$statut]);
+ return $langs->trans($this->statuts[$status]);
}
elseif ($mode == 1)
{
- return $langs->trans($this->statuts_short[$statut]);
+ return $langs->trans($this->statuts_short[$status]);
}
elseif ($mode == 2)
{
- if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0').' '.$langs->trans($this->statuts_short[$statut]);
- elseif ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4').' '.$langs->trans($this->statuts_short[$statut]);
- elseif ($statut==2) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6').' '.$langs->trans($this->statuts_short[$statut]);
+ if ($status==0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
+ elseif ($status==1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
+ elseif ($status==2) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
}
elseif ($mode == 3)
{
- if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0');
- elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4');
- elseif ($statut==2 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
+ if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
+ elseif ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
+ elseif ($status==2 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
}
elseif ($mode == 4)
{
- if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0').' '.$langs->trans($this->statuts[$statut]);
- elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4').' '.$langs->trans($this->statuts[$statut]);
- elseif ($statut==2 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6').' '.$langs->trans($this->statuts[$statut]);
+ if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
+ elseif ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
+ elseif ($status==2 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
}
elseif ($mode == 5)
{
- if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut0');
- elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut4');
- elseif ($statut==2 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
+ if ($status==0 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
+ elseif ($status==1 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
+ elseif ($status==2 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
}
}
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index 67a38e03cc6..1a250a83b10 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -46,12 +46,12 @@ if (isset($_SESSION['DolMessage'])) {
}
// Security check
-if ($user->societe_id) {
+if ($user->socid) {
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
-if ($user->societe_id)
- $socid = $user->societe_id;
+if ($user->socid)
+ $socid = $user->socid;
// Get parameters
$sortfield = GETPOST("sortfield", 'alpha');
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 4ad0fe0e261..15f6a1236d5 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -40,7 +40,7 @@ if (isset($_GET["account"]) || isset($_GET["ref"]))
$id = isset($_GET["account"])?$_GET["account"]:(isset($_GET["ref"])?$_GET["ref"]:'');
}
$fieldid = isset($_GET["ref"])?'ref':'rowid';
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result=restrictedArea($user, 'banque', $id, 'bank_account&bank_account', '', '', $fieldid);
$account=GETPOST("account");
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 389cde747af..7e96ddf31be 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -53,7 +53,7 @@ $cancel=GETPOST('cancel', 'alpha');
// Security check
$fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref :''));
$fieldtype = (! empty($ref) ? 'ref' :'rowid');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result=restrictedArea($user, 'banque', $fieldvalue, 'bank_account', '', '', $fieldtype);
if (! $user->rights->banque->lire && ! $user->rights->banque->consolidate) accessforbidden();
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 1b06a0e222b..524e3f44cbc 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -50,7 +50,7 @@ $search_status=GETPOST('search_status')?GETPOST('search_status', 'alpha'):'opene
$optioncss = GETPOST('optioncss', 'alpha');
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
if (! empty($user->rights->accounting->chartofaccount)) $allowed=1; // Dictionary with list of banks accounting account allowed to manager of chart account
if (! $allowed) $result=restrictedArea($user, 'banque');
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index ae01b761b1b..cb029902372 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -57,7 +57,7 @@ $newbankreceipt=GETPOST('newbankreceipt', 'alpha');
// Security check
$fieldid = (! empty($ref)?$ref:$id);
$fieldname = isset($ref)?'ref':'rowid';
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result=restrictedArea($user, 'banque', $fieldid, 'bank_account', '', '', $fieldname);
if ($user->rights->banque->consolidate && $action == 'dvnext' && ! empty($dvid))
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index cec68cf2c3a..7ca62b67ab8 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -42,7 +42,7 @@ if (isset($_GET["account"]) || isset($_GET["ref"]))
$id = isset($_GET["account"])?$_GET["account"]:(isset($_GET["ref"])?$_GET["ref"]:'');
}
$fieldid = isset($_GET["ref"])?'ref':'rowid';
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result=restrictedArea($user, 'banque', $id, 'bank_account&bank_account', '', '', $fieldid);
@@ -258,7 +258,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
{
$socialcontribstatic->ref=$obj->ref;
$socialcontribstatic->id=$obj->objid;
- $socialcontribstatic->lib=$obj->type;
+ $socialcontribstatic->label=$obj->type;
$ref = $socialcontribstatic->getNomUrl(1, 24);
$totalpayment = -1*$socialcontribstatic->getSommePaiement(); // Payment already done
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 5cb9d3c9558..30472729d92 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -57,7 +57,7 @@ $category_transaction = GETPOST("category_transaction", 'alpha');
// Security check
$socid = GETPOST("socid", "int");
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'banque', '', '', '');
$object = new PaymentVarious($db);
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 21598990aba..7070946e2c7 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -39,7 +39,7 @@ $confirm = GETPOST('confirm', 'alpha');
// Security check
$socid = GETPOST("socid", "int");
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'banque', '', '', '');
// Get parameters
diff --git a/htdocs/compta/bank/various_payment/info.php b/htdocs/compta/bank/various_payment/info.php
index 7d55703802e..7498872881d 100644
--- a/htdocs/compta/bank/various_payment/info.php
+++ b/htdocs/compta/bank/various_payment/info.php
@@ -35,7 +35,7 @@ $action=GETPOST('action', 'aZ09');
// Security check
$socid = GETPOST("socid", "int");
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'banque', '', '', '');
/*
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 6c15c40ecaa..cad88367aa0 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -35,7 +35,7 @@ $langs->loadLangs(array("compta","banks","bills","accountancy"));
// Security check
$socid = GETPOST("socid", "int");
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'banque', '', '', '');
$optioncss = GETPOST('optioncss', 'alpha');
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 6b767bc3949..e0461d35368 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -90,9 +90,9 @@ if (! $sortorder) $sortorder="ASC";
// Security check
$socid=0;
-if ($user->societe_id > 0) // Protection if external user
+if ($user->socid > 0) // Protection if external user
{
- //$socid = $user->societe_id;
+ //$socid = $user->socid;
accessforbidden();
}
//$result = restrictedArea($user, 'monmodule', $id, '');
@@ -322,7 +322,7 @@ $arrayofmassactions = array(
//'presend'=>$langs->trans("SendByMail"),
//'builddoc'=>$langs->trans("PDFMerge"),
);
-if ($user->rights->monmodule->delete) $arrayofmassactions['predelete']=''.$langs->trans('New').' ';
-$newcardbutton.= '';
foreach($object->fields as $key => $val)
{
- $cssforfield='';
- if (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
- if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
- if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price'))) $cssforfield.=($cssforfield?' ':'').'right';
- if ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
- if (! empty($arrayfields['t.'.$key]['checked'])) print '';
+ if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+ else print ' ';
+ }
}
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -416,15 +418,15 @@ print ''."\n";
print '';
foreach($object->fields as $key => $val)
{
- $cssforfield='';
- if (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
- if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
- if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price'))) $cssforfield.=($cssforfield?' ':'').'right';
- if ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
- if (! empty($arrayfields['t.'.$key]['checked']))
- {
- print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield?'class="'.$cssforfield.'"':''), $sortfield, $sortorder, ($cssforfield?$cssforfield.' ':''))."\n";
- }
+ $cssforfield=(empty($val['css'])?'':$val['css']);
+ if ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
+ elseif (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
+ elseif (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
+ elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield.=($cssforfield?' ':'').'right';
+ if (! empty($arrayfields['t.'.$key]['checked']))
+ {
+ print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield?'class="'.$cssforfield.'"':''), $sortfield, $sortorder, ($cssforfield?$cssforfield.' ':''))."\n";
+ }
}
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -467,25 +469,21 @@ while ($i < min($num, $limit))
print ' ';
foreach($object->fields as $key => $val)
{
- $cssforfield='';
- if (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
- elseif ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
+ $cssforfield=(empty($val['css'])?'':$val['css']);
+ if (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
+ elseif ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
- if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
- elseif ($key == 'ref') $cssforfield.=($cssforfield?' ':'').'nowrap';
+ if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
+ elseif ($key == 'ref') $cssforfield.=($cssforfield?' ':'').'nowrap';
- if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price'))) $cssforfield.=($cssforfield?' ':'').'right';
+ if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield.=($cssforfield?' ':'').'right';
if (! empty($arrayfields['t.'.$key]['checked']))
{
- print '';
- print $object->showOutputField($val, $key, $obj->$key, '');
+ print '';
+ if ($key == 'status') print $object->getLibStatut(5);
+ elseif (in_array($val['type'], array('date','datetime','timestamp'))) print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
+ else print $object->showOutputField($val, $key, $obj->$key, '');
print '';
if (! $i) $totalarray['nbfield']++;
if (! empty($val['isameasure']))
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 87db81bf98d..00d77987d08 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -87,7 +87,13 @@ class CashControl extends CommonObject
public $cheque;
public $card;
public $date_valid;
+
+ /**
+ * @var integer|string date_creation
+ */
public $date_creation;
+
+
public $date_modification;
const STATUS_DRAFT = 0;
@@ -311,47 +317,20 @@ class CashControl extends CommonObject
public function LibStatut($status, $mode = 0)
{
// phpcs:enable
- if (empty($this->labelstatus))
+ if (empty($this->labelStatus) || empty($this->labelStatusShort))
{
global $langs;
//$langs->load("mymodule");
- $this->labelstatus[0] = $langs->trans('Draft');
- $this->labelstatus[1] = $langs->trans('Closed');
+ $this->labelStatus[0] = $langs->trans('Draft');
+ $this->labelStatus[1] = $langs->trans('Closed');
+ $this->labelStatusShort[0] = $langs->trans('Draft');
+ $this->labelStatusShort[1] = $langs->trans('Closed');
}
- 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], 'statut6', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
- elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut0', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
- }
- elseif ($mode == 3)
- {
- if ($status == 1) return img_picto($this->labelstatus[$status], 'statut6', '', false, 0, 0, '', 'valignmiddle');
- elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut0', '', false, 0, 0, '', 'valignmiddle');
- }
- elseif ($mode == 4)
- {
- if ($status == 1) return img_picto($this->labelstatus[$status], 'statut6', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
- elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut0', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
- }
- elseif ($mode == 5)
- {
- if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut6', '', false, 0, 0, '', 'valignmiddle');
- elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut0', '', false, 0, 0, '', 'valignmiddle');
- }
- elseif ($mode == 6)
- {
- if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut6', '', false, 0, 0, '', 'valignmiddle');
- elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut0', '', false, 0, 0, '', 'valignmiddle');
- }
+ $statusType = 'status0';
+ if ($status == self::STATUS_VALIDATED) $statusType = 'status6';
+
+ return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
}
/**
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 01cda8871b5..5fe9853ec54 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -45,7 +45,7 @@ $hookmanager->initHooks(array('specialexpensesindex'));
$langs->loadLangs(array('compta', 'bills'));
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'tax|salaries', '', '', 'charges|');
$mode=GETPOST("mode", 'alpha');
@@ -138,7 +138,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pc.amount", "", $param, 'class="right"', $sortfield, $sortorder);
print " \n";
- $sql = "SELECT c.id, c.libelle as lib,";
+ $sql = "SELECT c.id, c.libelle as label,";
$sql.= " cs.rowid, cs.libelle, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total,";
$sql.= " pc.rowid as pid, pc.datep, pc.amount as totalpaye, pc.num_paiement as num_payment, pc.fk_bank,";
$sql.= " pct.code as payment_code,";
@@ -185,12 +185,12 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
// Label
print '';
$socialcontrib->id=$obj->rowid;
- $socialcontrib->ref=$obj->libelle;
- $socialcontrib->lib=$obj->libelle;
+ $socialcontrib->ref=$obj->label;
+ $socialcontrib->label=$obj->label;
print $socialcontrib->getNomUrl(1, '20');
print ' ';
// Type
- print ''.$obj->lib.' '.$obj->label.' '.price($obj->total).' ';
// Ref payment
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index b7652587826..15f3504268b 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -30,10 +30,10 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
$action=GETPOST('action', 'aZ09');
// Secrutiy check
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
if (! $user->rights->facture->lire)
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 6a320970396..dd56e611545 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -40,7 +40,7 @@ $langs->load("trips");
// Security check
$id = GETPOST('id', 'int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'deplacement', $id, '');
$action = GETPOST('action', 'alpha');
@@ -287,7 +287,7 @@ if ($action == 'create')
print '';
// Private note
- if (empty($user->societe_id))
+ if (empty($user->socid))
{
print '';
print ''.$langs->trans('NotePrivate').' ';
@@ -385,7 +385,7 @@ elseif ($id)
print " ";
// Private note
- if (empty($user->societe_id))
+ if (empty($user->socid))
{
print ''.$langs->trans("NotePrivate").' ';
print '';
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 1b70641a6bc..0601c62fd80 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -336,46 +336,46 @@ class Deplacement extends CommonObject
/**
* Renvoi le libelle d'un statut donne
*
- * @param int $statut Id status
+ * @param int $status Id status
* @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
* @return string Libelle
*/
- public function LibStatut($statut, $mode = 0)
+ public function LibStatut($status, $mode = 0)
{
// phpcs:enable
global $langs;
if ($mode == 0)
{
- return $langs->trans($this->statuts[$statut]);
+ return $langs->trans($this->statuts[$status]);
}
elseif ($mode == 1)
{
- return $langs->trans($this->statuts_short[$statut]);
+ return $langs->trans($this->statuts_short[$status]);
}
elseif ($mode == 2)
{
- if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0').' '.$langs->trans($this->statuts_short[$statut]);
- elseif ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4').' '.$langs->trans($this->statuts_short[$statut]);
- elseif ($statut==2) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6').' '.$langs->trans($this->statuts_short[$statut]);
+ if ($status==0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
+ elseif ($status==1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
+ elseif ($status==2) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
}
elseif ($mode == 3)
{
- if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0');
- elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4');
- elseif ($statut==2 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
+ if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
+ elseif ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
+ elseif ($status==2 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
}
elseif ($mode == 4)
{
- if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0').' '.$langs->trans($this->statuts[$statut]);
- elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4').' '.$langs->trans($this->statuts[$statut]);
- elseif ($statut==2 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6').' '.$langs->trans($this->statuts[$statut]);
+ if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
+ elseif ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
+ elseif ($status==2 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
}
elseif ($mode == 5)
{
- if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut0');
- elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut4');
- elseif ($statut==2 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
+ if ($status==0 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
+ elseif ($status==1 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
+ elseif ($status==2 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
}
}
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 3f2faa267ea..96c8013c18c 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -43,7 +43,7 @@ $action = GETPOST('action', 'alpha');
$confirm = GETPOST('confirm', 'alpha');
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'deplacement', $id, '');
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 0208f9da89f..659744a2ba0 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -32,7 +32,7 @@ $langs->loadLangs(array('companies', 'users', 'trips'));
// Security check
$socid = GETPOST('socid', 'int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'deplacement', '', '');
$sortfield = GETPOST("sortfield", 'alpha');
@@ -143,11 +143,11 @@ $langs->load("boxes");
$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, d.rowid, d.dated as date, d.tms as dm, d.km, d.fk_statut";
$sql.= " FROM ".MAIN_DB_PREFIX."deplacement as d, ".MAIN_DB_PREFIX."user as u";
-if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE u.rowid = d.fk_user";
$sql.= " AND d.entity = ".$conf->entity;
if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',', $childids).')';
-if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
if ($socid) $sql.= " AND d.fk_soc = ".$socid;
$sql.= $db->order("d.tms", "DESC");
$sql.= $db->plimit($max, 0);
diff --git a/htdocs/compta/deplacement/info.php b/htdocs/compta/deplacement/info.php
index 510675265a0..28d1d8e68da 100644
--- a/htdocs/compta/deplacement/info.php
+++ b/htdocs/compta/deplacement/info.php
@@ -32,7 +32,7 @@ $langs->load("trips");
// Security check
$id = GETPOST('id', 'int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'deplacement', $id, '');
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 9b5b2b7d9c9..6d5d952d104 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array('companies', 'users', 'trips'));
// Security check
$socid = GETPOST('socid', 'int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'deplacement', '', '');
$search_ref=GETPOST('search_ref', 'int');
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index 54e1cd1524e..ccb2ecb60fe 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -38,12 +38,12 @@ $socid=GETPOST('socid', 'int'); if ($socid < 0) $socid=0;
$id = GETPOST('id', 'int');
// Security check
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'deplacement', $id, '');
// Other security check
@@ -162,7 +162,7 @@ if (! $mesg)
$data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
-if (!$user->rights->societe->client->voir || $user->societe_id)
+if (!$user->rights->societe->client->voir || $user->socid)
{
$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/card-rec.php
similarity index 94%
rename from htdocs/compta/facture/fiche-rec.php
rename to htdocs/compta/facture/card-rec.php
index 79780402108..10eb2ac03c8 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -25,7 +25,7 @@
*/
/**
- * \file htdocs/compta/facture/fiche-rec.php
+ * \file htdocs/compta/facture/card-rec.php
* \ingroup facture
* \brief Page to show predefined invoice
*/
@@ -58,7 +58,7 @@ $contextpage= GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'invoice
$id=(GETPOST('facid', 'int')?GETPOST('facid', 'int'):GETPOST('id', 'int'));
$lineid=GETPOST('lineid', 'int');
$ref=GETPOST('ref', 'alpha');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$objecttype = 'facture_rec';
if ($action == "create" || $action == "add") $objecttype = '';
$result = restrictedArea($user, 'facture', $id, $objecttype);
@@ -387,6 +387,15 @@ if (empty($reshook))
setEventMessages($object->error, $object->errors, 'errors');
}
}
+ // Multicurrency Code
+ elseif ($action == 'setmulticurrencycode' && $usercancreate) {
+ $result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
+ }
+
+ // Multicurrency rate
+ elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
+ $result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
+ }
// Delete line
if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->facture->creer)
@@ -1039,7 +1048,7 @@ if ($action == 'create')
print $doleditor->Create(1);
// Private note
- if (empty($user->societe_id))
+ if (empty($user->socid))
{
print ' ';
print '';
@@ -1346,6 +1355,52 @@ else
}
print ' ';
+ // Multicurrency
+ if (! empty($conf->multicurrency->enabled))
+ {
+ // Multicurrency code
+ print '';
+ print '';
+ print '';
+ print ' ';
+ $htmlname = (($usercancreate && $action == 'editmulticurrencycode')?'multicurrency_code':'none');
+ $form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, $htmlname);
+ print ' ';
+
+ // Multicurrency rate
+ if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)
+ {
+ print '';
+ print '';
+ print '';
+ print ' ';
+ if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
+ if($action == 'actualizemulticurrencyrate') {
+ list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
+ }
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, ($usercancreate?'multicurrency_tx':'none'), $object->multicurrency_code);
+ } else {
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
+ if($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
+ print '';
+ }
+ }
+ print ' ';
+ }
+ }
+
// Help of substitution key
$dateexample=dol_now();
if (! empty($object->frequency) && ! empty($object->date_when)) $dateexample=$object->date_when;
@@ -1701,11 +1756,11 @@ else
{
if (empty($object->suspended))
{
- print '';
+ print '';
}
else
{
- print '';
+ print '';
}
}
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 08fbb019fd2..fce1fb7cb25 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -130,7 +130,7 @@ $permissiontoadd = $usercancreate; // Used by the include of actions_addupdatede
// Security check
$fieldid = (! empty($ref) ? 'ref' : 'rowid');
-if ($user->societe_id) $socid = $user->societe_id;
+if ($user->socid) $socid = $user->socid;
$isdraft = (($object->statut == Facture::STATUS_DRAFT) ? 1 : 0);
$result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid, $isdraft);
@@ -2579,7 +2579,6 @@ $title = $langs->trans('InvoiceCustomer') . " - " . $langs->trans('Card');
$helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
llxHeader('', $title, $helpurl);
-
// Mode creation
if ($action == 'create')
@@ -2600,18 +2599,19 @@ if ($action == 'create')
{
// Parse element/subelement (ex: project_task)
$element = $subelement = $origin;
+ $regs = array();
if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
- $element = $regs [1];
- $subelement = $regs [2];
+ $element = $reg[1];
+ $subelement = $regs[2];
}
if ($element == 'project') {
$projectid = $originid;
- if (!$cond_reglement_id) {
+ if (empty($cond_reglement_id)) {
$cond_reglement_id = $soc->cond_reglement_id;
}
- if (!$mode_reglement_id) {
+ if (empty($mode_reglement_id)) {
$mode_reglement_id = $soc->mode_reglement_id;
}
if (!$remise_percent) {
@@ -2754,7 +2754,7 @@ if ($action == 'create')
// Thirdparty
print '' . $langs->trans('Customer') . ' ';
- if ($soc->id > 0 && ! GETPOST('fac_rec', 'alpha'))
+ if ($soc->id > 0 && ! GETPOST('fac_rec', 'int'))
{
print '';
print $soc->getNomUrl(1);
@@ -2797,7 +2797,7 @@ if ($action == 'create')
$exampletemplateinvoice=new FactureRec($db);
- // Overwrite value if creation of invoice is from a predefined invoice
+ // Overwrite some values if creation of invoice is from a predefined invoice
if (empty($origin) && empty($originid) && GETPOST('fac_rec', 'int') > 0)
{
$invoice_predefined = new FactureRec($db);
@@ -2811,6 +2811,9 @@ if ($action == 'create')
$note_public = $invoice_predefined->note_public;
$note_private = $invoice_predefined->note_private;
+ if (! empty($invoice_predefined->multicurrency_code)) $currency_code = $invoice_predefined->multicurrency_code;
+ if (! empty($invoice_predefined->multicurrency_tx)) $currency_tx = $invoice_predefined->multicurrency_tx;
+
$sql = 'SELECT r.rowid, r.titre as title, r.total_ttc';
$sql .= ' FROM ' . MAIN_DB_PREFIX . 'facture_rec as r';
$sql .= ' WHERE r.fk_soc = ' . $invoice_predefined->socid;
@@ -2833,7 +2836,7 @@ if ($action == 'create')
if (GETPOST('fac_rec') == $objp->rowid)
{
print ' selected';
- $exampletemplateinvoice->fetch(GETPOST('fac_rec'));
+ $exampletemplateinvoice->fetch(GETPOST('fac_rec', 'int'));
}
print '>' . $objp->title . ' (' . price($objp->total_ttc) . ' ' . $langs->trans("TTC") . ')';
$i ++;
@@ -2921,12 +2924,17 @@ if ($action == 'create')
// Next situation invoice
$opt = $form->selectSituationInvoices(GETPOST('originid'), $socid);
+
print '';
$tmp='
' . $langs->trans('NoSituations') . '') || (GETPOST('origin') && GETPOST('origin') != 'facture' && GETPOST('origin') != 'commande')) $tmp.=' disabled';
+ if ($opt == ('
' . $langs->trans('NoSituations') . ' ') || (GETPOST('origin') && GETPOST('origin') != 'facture' && GETPOST('origin') != 'commande'))
+ $tmp.=' disabled';
$tmp.= '> ';
$text = '
'.$tmp.$langs->trans("InvoiceSituationAsk") . ' ';
- $text .= '
';
+ $text .= '' . $langs->trans('NoSituations') . '') || (GETPOST('origin') && GETPOST('origin') != 'facture' && GETPOST('origin') != 'commande'))
+ $text .= ' disabled';
+ $text .='>';
$text .= $opt;
$text .= ' ';
$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceSituationDesc"), 1, 'help', '', 0, 3);
@@ -3334,7 +3342,7 @@ if ($action == 'create')
print $doleditor->Create(1);
// Private note
- if (empty($user->societe_id))
+ if (empty($user->socid))
{
print '';
print '';
@@ -3460,7 +3468,7 @@ elseif ($id > 0 || ! empty($ref))
// fetch optionals attributes and labels
$extrafields->fetch_name_optionals_label($object->table_element);
- if ($user->societe_id > 0 && $user->societe_id != $object->socid)
+ if ($user->socid > 0 && $user->socid != $object->socid)
{
accessforbidden('', 0, 1);
}
@@ -4030,29 +4038,33 @@ elseif ($id > 0 || ! empty($ref))
$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, $htmlname);
print ' ';
- print '';
- print '';
- print '';
- print ' ';
- if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
- if($action == 'actualizemulticurrencyrate') {
- list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
- }
- $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, ($usercancreate?'multicurrency_tx':'none'), $object->multicurrency_code);
- } else {
- $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
- if($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
- print '';
+ // Multicurrency rate
+ if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)
+ {
+ print ' ';
+ print '';
+ print '';
+ print ' ';
+ if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
+ if($action == 'actualizemulticurrencyrate') {
+ list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
+ }
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, ($usercancreate?'multicurrency_tx':'none'), $object->multicurrency_code);
+ } else {
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
+ if($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
+ print '';
+ }
}
+ print ' ';
}
- print ' ';
}
// Bank Account
@@ -4099,7 +4111,7 @@ elseif ($id > 0 || ! empty($ref))
}
$displayWarranty = false;
- if( ( $object->type == Facture::TYPE_SITUATION && (!empty($object->retained_warranty) || !empty($conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY)) ) )
+ if (($object->type == Facture::TYPE_SITUATION && (!empty($object->retained_warranty) || !empty($conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY))))
{
// Check if this situation invoice is 100% for real
if(!empty($object->situation_final) && !empty($object->lines)){
@@ -4179,9 +4191,7 @@ elseif ($id > 0 || ! empty($ref))
print '';
-
-
- if($displayWarranty)
+ if ($displayWarranty)
{
// Retained Warranty payment date limit
print '';
@@ -4547,7 +4557,7 @@ elseif ($id > 0 || ! empty($ref))
}
print ' ' . price($sign * $objp->amount) . ' ';
print '';
- if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $user->societe_id == 0)
+ if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
{
print 'rowid.'">';
print img_delete();
@@ -5024,7 +5034,7 @@ elseif ($id > 0 || ! empty($ref))
{
if (! $objectidnext && count($object->lines) > 0)
{
- print ' ' . $langs->trans("ChangeIntoRepeatableInvoice") . ' ';
+ print '' . $langs->trans("ChangeIntoRepeatableInvoice") . ' ';
}
}
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 25d92fad92a..da5ad40002b 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -565,7 +565,7 @@ class Invoices extends DolibarrApi
throw new RestException(500);
}
- return array(
+ return array(
'success' => array(
'code' => 200,
'message' => 'Invoice deleted'
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 9ff90b7b025..408ce2c1303 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -896,7 +896,7 @@ class FactureRec extends CommonInvoice
* @param int $date_start_fill 1=Flag to fill start date when generating invoice
* @param int $date_end_fill 1=Flag to fill end date when generating invoice
* @param int $fk_fournprice Id of origin supplier price
- * @param int $pa_ht Price (without tax) of product when it was bought
+ * @param int $pa_ht Price (without tax) of product for margin calculation
* @return int <0 if KO, Id of line if OK
*/
public function updateline($rowid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $info_bits = 0, $fk_remise_except = '', $pu_ttc = 0, $type = 0, $rang = -1, $special_code = 0, $label = '', $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0, $date_start_fill = 0, $date_end_fill = 0, $fk_fournprice = null, $pa_ht = 0)
@@ -920,8 +920,9 @@ class FactureRec extends CommonInvoice
$remise_percent=price2num($remise_percent);
$qty=price2num($qty);
if (empty($info_bits)) $info_bits=0;
- $pu_ht=price2num($pu_ht);
- $pu_ttc=price2num($pu_ttc);
+ $pu_ht = price2num($pu_ht);
+ $pu_ttc = price2num($pu_ttc);
+ $pu_ht_devise = price2num($pu_ht_devise);
$txtva=price2num($txtva);
$txlocaltax1 = price2num($txlocaltax1);
$txlocaltax2 = price2num($txlocaltax2);
@@ -1258,7 +1259,7 @@ class FactureRec extends CommonInvoice
}
}
- $url = DOL_URL_ROOT.'/compta/facture/fiche-rec.php?facid='.$this->id;
+ $url = DOL_URL_ROOT.'/compta/facture/card-rec.php?facid='.$this->id;
if ($short) return $url;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 8859578e94b..ac39b84e428 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1127,7 +1127,7 @@ class Facture extends CommonInvoice
{
$line = new FactureLigne($this->db);
- $line->libelle = $object->lines[$i]->libelle;
+ $line->libelle = $object->lines[$i]->libelle; // deprecated
$line->label = $object->lines[$i]->label;
$line->desc = $object->lines[$i]->desc;
$line->subprice = $object->lines[$i]->subprice;
@@ -1551,7 +1551,7 @@ class Facture extends CommonInvoice
$line->product_type = $objp->product_type; // Type of line
$line->ref = $objp->product_ref; // Ref product
$line->product_ref = $objp->product_ref; // Ref product
- $line->libelle = $objp->product_label; // TODO deprecated
+ $line->libelle = $objp->product_label; // deprecated
$line->product_label = $objp->product_label; // Label product
$line->product_desc = $objp->product_desc; // Description product
$line->fk_product_type = $objp->fk_product_type; // Type of product
@@ -3961,7 +3961,7 @@ class Facture extends CommonInvoice
$sql = "SELECT f.rowid, f.date_lim_reglement as datefin,f.fk_statut, f.total";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
- if (!$user->rights->societe->client->voir && !$user->societe_id)
+ if (!$user->rights->societe->client->voir && !$user->socid)
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON f.fk_soc = sc.fk_soc";
$sql.= " WHERE sc.fk_user = " .$user->id;
@@ -3970,7 +3970,7 @@ class Facture extends CommonInvoice
$sql.= $clause." f.paye=0";
$sql.= " AND f.entity IN (".getEntity('invoice').")";
$sql.= " AND f.fk_statut = ".self::STATUS_VALIDATED;
- if ($user->societe_id) $sql.= " AND f.fk_soc = ".$user->societe_id;
+ if ($user->socid) $sql.= " AND f.fk_soc = ".$user->socid;
$resql=$this->db->query($sql);
if ($resql)
@@ -4211,7 +4211,7 @@ class Facture extends CommonInvoice
$sql = "SELECT count(f.rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
- if (!$user->rights->societe->client->voir && !$user->societe_id)
+ if (!$user->rights->societe->client->voir && !$user->socid)
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
$sql.= " WHERE sc.fk_user = " .$user->id;
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 62960b71346..72bb79545e5 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -45,7 +45,7 @@ $socid = GETPOST('socid', 'int');
$action = GETPOST('action', 'alpha');
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'facture', $id);
$object = new Facture($db);
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 9527f66b79e..36f768991f8 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -49,9 +49,9 @@ $action=GETPOST('action', 'alpha');
$confirm=GETPOST('confirm', 'alpha');
// Security check
-if ($user->societe_id)
+if ($user->socid)
{
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
$result=restrictedArea($user, 'facture', $id, '');
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index f714d51cf6e..09873f5ee61 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -58,7 +58,7 @@ $contextpage= GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'invoice
$id=(GETPOST('facid', 'int')?GETPOST('facid', 'int'):GETPOST('id', 'int'));
$lineid=GETPOST('lineid', 'int');
$ref=GETPOST('ref', 'alpha');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$objecttype = 'facture_rec';
if ($action == "create" || $action == "add") $objecttype = '';
$result = restrictedArea($user, 'facture', $id, $objecttype);
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 5f1ce9e44c3..74c27c1e467 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -128,7 +128,7 @@ $pagenext = $page + 1;
// Security check
$fieldid = (! empty($ref)?'ref':'rowid');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->socid)) $socid=$user->socid;
$result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid);
$diroutputmassaction=$conf->facture->dir_output . '/temp/massgeneration/'.$user->id;
@@ -512,9 +512,8 @@ if (! $sall)
$sql.= " p.rowid, p.ref, p.title";
if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
// Add fields from extrafields
- foreach ($extrafields->attribute_label as $key => $val) //prevent error with sql_mode=only_full_group_by
- {
- $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
+ if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+ foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
}
}
else
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index beeb5f730ab..ff71b1ff9af 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -43,7 +43,7 @@ $action=GETPOST('action', 'alpha');
// Security check
$socid=0;
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result=restrictedArea($user, 'facture', $id, '');
$object = new Facture($db);
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index cf59af89cf6..485401d340e 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -47,7 +47,7 @@ $socid=GETPOST('socid', 'int');
$action=GETPOST('action', 'alpha');
$fieldid = (! empty($ref)?'ref':'rowid');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid);
$object = new Facture($db);
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index dadbb27b30d..5f81d34a092 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -41,10 +41,10 @@ $object_status=GETPOST('object_status');
$userid=GETPOST('userid', 'int');
$socid=GETPOST('socid', 'int');
// Security check
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
$nowyear=strftime("%Y", dol_now());
@@ -159,7 +159,7 @@ if (! $mesg)
$data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
-if (!$user->rights->societe->client->voir || $user->societe_id)
+if (!$user->rights->societe->client->voir || $user->socid)
{
$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 1453491fd11..8531249afdb 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -56,10 +56,10 @@ $bid=GETPOST('bid', 'int');
// Security check
$socid='';
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
$max=3;
@@ -624,12 +624,12 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
$chargestatic=new ChargeSociales($db);
$sql = "SELECT c.rowid, c.amount, c.date_ech, c.paye,";
- $sql.= " cc.libelle,";
+ $sql.= " cc.libelle as label,";
$sql.= " SUM(pc.amount) as sumpaid";
$sql.= " FROM (".MAIN_DB_PREFIX."c_chargesociales as cc, ".MAIN_DB_PREFIX."chargesociales as c)";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = c.rowid";
$sql.= " WHERE c.fk_type = cc.id";
- $sql.= " AND c.entity = ".$conf->entity;
+ $sql.= " AND c.entity IN (".getEntity('tax').')';
$sql.= " AND c.paye = 0";
// Add where from hooks
$parameters=array();
@@ -661,8 +661,8 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
$obj = $db->fetch_object($resql);
$chargestatic->id=$obj->rowid;
- $chargestatic->ref=$obj->libelle;
- $chargestatic->lib=$obj->libelle;
+ $chargestatic->ref=$obj->rowid;
+ $chargestatic->label=$obj->label;
$chargestatic->paye=$obj->paye;
print ' ';
@@ -672,6 +672,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print ''.price($obj->sumpaid).' ';
print ''.$chargestatic->getLibStatut(3).' ';
print ' ';
+
$tot_ttc+=$obj->amount;
$i++;
}
@@ -957,7 +958,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
{
$facstatic=new FactureFournisseur($db);
- $sql = "SELECT ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.total_tva, ff.total_ttc, ff.paye";
+ $sql = "SELECT ff.rowid, ff.ref, ff.fk_statut, ff.libelle as label, ff.total_ht, ff.total_tva, ff.total_ttc, ff.paye";
$sql.= ", ff.date_lim_reglement";
$sql.= ", s.nom as name";
$sql.= ", s.rowid as socid, s.email";
@@ -1074,9 +1075,8 @@ if ($resql)
{
$obj = $db->fetch_object($resql);
-
print ''.dol_print_date($db->jdate($obj->da), "day").' ';
- print ''.$obj->libelle.' '.$obj->label.' '.$obj->label.' '.$langs->trans('PaymentMode').' '.$labeltype;
print $object->num_paiement?' - '.$object->num_paiement:'';
print ' ';
if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
{
- if ($user->societe_id == 0 && $object->statut == 0 && $_GET['action'] == '')
+ if ($user->socid == 0 && $object->statut == 0 && $_GET['action'] == '')
{
if ($user->rights->facture->paiement)
{
@@ -438,7 +438,7 @@ if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
}
}
-if ($user->societe_id == 0 && $action == '')
+if ($user->socid == 0 && $action == '')
{
if ($user->rights->facture->paiement)
{
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 3afce69e94b..f91ac35f678 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -43,7 +43,7 @@ $confirm=GETPOST('confirm', 'alpha');
// Security check
$fieldname = (! empty($ref)?'ref':'rowid');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'cheque', $id, 'bordereau_cheque', '', 'fk_user_author', $fieldname);
$sortfield=GETPOST('sortfield', 'alpha');
@@ -770,12 +770,12 @@ else
print '
';
-if ($user->societe_id == 0 && ! empty($object->id) && $object->statut == 0 && $user->rights->banque->cheque)
+if ($user->socid == 0 && ! empty($object->id) && $object->statut == 0 && $user->rights->banque->cheque)
{
print '
'.$langs->trans('Validate').' ';
}
-if ($user->societe_id == 0 && ! empty($object->id) && $user->rights->banque->cheque)
+if ($user->socid == 0 && ! empty($object->id) && $user->rights->banque->cheque)
{
print '
'.$langs->trans('Delete').' ';
}
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 940013df44e..6f0438644a6 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -506,7 +506,7 @@ class RemiseCheque extends CommonObject
// phpcs:enable
global $conf, $langs;
- if ($user->societe_id) return -1; // protection pour eviter appel par utilisateur externe
+ if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
$sql = "SELECT b.rowid, b.datev as datefin";
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -561,7 +561,7 @@ class RemiseCheque extends CommonObject
// phpcs:enable
global $user;
- if ($user->societe_id) return -1; // protection pour eviter appel par utilisateur externe
+ if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
$sql = "SELECT count(b.rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index cdbc56896cb..bbec9e1fba7 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$langs->loadLangs(array('banks', 'categories', 'compta', 'bills'));
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'banque', '', '');
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 396432545d9..2201412f3f8 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
$langs->loadLangs(array('banks', 'categories', 'bills'));
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'banque', '', '');
$search_ref = GETPOST('search_ref', 'alpha');
diff --git a/htdocs/compta/paiement/class/cpaiement.class.php b/htdocs/compta/paiement/class/cpaiement.class.php
index 37614f7e36e..4363f39216f 100644
--- a/htdocs/compta/paiement/class/cpaiement.class.php
+++ b/htdocs/compta/paiement/class/cpaiement.class.php
@@ -41,7 +41,14 @@ class Cpaiement
public $table_element = 'c_paiement';
public $code;
+
+ /**
+ * @deprecated
+ * @see $label
+ */
public $libelle;
+ public $label;
+
public $type;
public $active;
public $accountancy_code;
@@ -80,6 +87,9 @@ class Cpaiement
if (isset($this->libelle)) {
$this->libelle = trim($this->libelle);
}
+ if (isset($this->label)) {
+ $this->label = trim($this->label);
+ }
if (isset($this->type)) {
$this->type = trim($this->type);
}
@@ -100,7 +110,6 @@ class Cpaiement
// Insert request
$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
-
$sql.= 'entity,';
$sql.= 'code,';
$sql.= 'libelle,';
@@ -108,10 +117,7 @@ class Cpaiement
$sql.= 'active,';
$sql.= 'accountancy_code,';
$sql.= 'module';
-
-
$sql .= ') VALUES (';
-
$sql .= ' '.(! isset($this->entity)?getEntity('c_paiement'):$this->entity).',';
$sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
$sql .= ' '.(! isset($this->libelle)?'NULL':"'".$this->db->escape($this->libelle)."'").',';
@@ -119,8 +125,6 @@ class Cpaiement
$sql .= ' '.(! isset($this->active)?'NULL':$this->active).',';
$sql .= ' '.(! isset($this->accountancy_code)?'NULL':"'".$this->db->escape($this->accountancy_code)."'").',';
$sql .= ' '.(! isset($this->module)?'NULL':"'".$this->db->escape($this->module)."'");
-
-
$sql .= ')';
$this->db->begin();
@@ -173,7 +177,7 @@ class Cpaiement
$sql = 'SELECT';
$sql .= ' t.id,';
$sql .= " t.code,";
- $sql .= " t.libelle,";
+ $sql .= " t.libelle as label,";
$sql .= " t.type,";
$sql .= " t.active,";
$sql .= " t.accountancy_code,";
@@ -195,7 +199,8 @@ class Cpaiement
$this->id = $obj->id;
$this->code = $obj->code;
- $this->libelle = $obj->libelle;
+ $this->libelle = $obj->label;
+ $this->label = $obj->label;
$this->type = $obj->type;
$this->active = $obj->active;
$this->accountancy_code = $obj->accountancy_code;
@@ -238,6 +243,9 @@ class Cpaiement
if (isset($this->libelle)) {
$this->libelle = trim($this->libelle);
}
+ if (isset($this->label)) {
+ $this->label = trim($this->label);
+ }
if (isset($this->type)) {
$this->type = trim($this->type);
}
@@ -361,6 +369,7 @@ class Cpaiement
$this->code = '';
$this->libelle = '';
+ $this->label = '';
$this->type = '';
$this->active = '';
$this->accountancy_code = '';
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index e6d2a27087c..e4a4a275029 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -78,7 +78,7 @@ class Paiement extends CommonObject
/**
* @var string type libelle
*/
- public $type_libelle;
+ public $type_label;
/**
* @var string type code
@@ -160,7 +160,7 @@ class Paiement extends CommonObject
public function fetch($id, $ref = '', $fk_bank = '')
{
$sql = 'SELECT p.rowid, p.ref, p.datep as dp, p.amount, p.statut, p.ext_payment_id, p.ext_payment_site, p.fk_bank,';
- $sql.= ' c.code as type_code, c.libelle as type_libelle,';
+ $sql.= ' c.code as type_code, c.libelle as type_label,';
$sql.= ' p.num_paiement as num_payment, p.note,';
$sql.= ' b.fk_account';
$sql.= ' FROM '.MAIN_DB_PREFIX.'paiement as p LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
@@ -188,7 +188,7 @@ class Paiement extends CommonObject
$this->montant = $obj->amount; // deprecated
$this->amount = $obj->amount;
$this->note = $obj->note;
- $this->type_libelle = $obj->type_libelle;
+ $this->type_label = $obj->type_label;
$this->type_code = $obj->type_code;
$this->statut = $obj->statut;
$this->ext_payment_id = $obj->ext_payment_id;
diff --git a/htdocs/compta/paiement/index.php b/htdocs/compta/paiement/index.php
index fa47915f216..89136ec5712 100644
--- a/htdocs/compta/paiement/index.php
+++ b/htdocs/compta/paiement/index.php
@@ -19,7 +19,7 @@
require '../../main.inc.php';
// Security check
-if (!$user->admin && $user->societe_id > 0)
+if (!$user->admin && $user->socid > 0)
accessforbidden();
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 090cc7c83fb..7faa2727ae4 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -51,7 +51,7 @@ $month = GETPOST('month', 'int');
$year = GETPOST('year', 'int');
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'facture', $facid, '');
$paymentstatic=new Paiement($db);
@@ -117,8 +117,6 @@ if (GETPOST("orphelins", "alpha"))
$sql = "SELECT p.rowid, p.ref, p.datep as dp, p.amount,";
$sql.= " p.statut, p.num_paiement,";
$sql.= " c.code as paiement_code";
- // Add fields for extrafields
- foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
// Add fields from hooks
$parameters=array();
$reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
@@ -139,8 +137,6 @@ else
$sql.= " c.code as paiement_code,";
$sql.= " ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.fk_accountancy_journal as accountancy_journal,";
$sql.= " s.rowid as socid, s.nom as name, s.email";
- // Add fields for extrafields
- foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
// Add fields from hooks
$parameters=array();
$reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 35325dce4cb..0140031431f 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -34,10 +34,10 @@ if (! $user->rights->facture->lire) accessforbidden();
$action=GETPOST('action', 'aZ09');
$socid=0;
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
$dir = $conf->facture->dir_output.'/payments';
diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php
index 120e326d6a2..e3c23041ec8 100644
--- a/htdocs/compta/paiement/tovalidate.php
+++ b/htdocs/compta/paiement/tovalidate.php
@@ -32,10 +32,10 @@ if (! $user->rights->facture->lire)
accessforbidden();
$socid=0;
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
$action = '';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index def454f2ca5..238ac01fd1a 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -36,9 +36,9 @@ $amounts = array();
// Security check
$socid=0;
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
@@ -202,9 +202,9 @@ if ($action == 'create')
print '
';
print ''.$langs->trans("Ref").' '.$chid.' '.$langs->trans("Type")." ".$charge->type_libelle." '.$langs->trans("Type")." ".$charge->type_label." '.$langs->trans("Period")." ".dol_print_date($charge->periode, 'day')." '.$langs->trans("Label").' '.$charge->lib." '.$langs->trans("Label").' '.$charge->label." '.$langs->trans("DateDue")." ".dol_print_date($charge->date_ech,'day')." '.$langs->trans("Amount")." ".price($charge->amount,0,$outputlangs,1,-1,-1,$conf->currency).' ';
- print $socialcontrib->type_libelle;
+ print $socialcontrib->type_label;
/*print $socialcontrib->type;*/
print " \n";
// Label
- print ''.$objp->libelle.' ';
+ print ''.$objp->label.' ';
// Expected to pay
print ''.price($objp->sc_amount).' ';
// Status
@@ -299,7 +299,7 @@ print '';
/*
if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
{
- if ($user->societe_id == 0 && $object->statut == 0 && $_GET['action'] == '')
+ if ($user->socid == 0 && $object->statut == 0 && $_GET['action'] == '')
{
if ($user->rights->facture->paiement)
{
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index ecea96b7a09..eb18618ab62 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -33,7 +33,7 @@ $langs->loadLangs(array('banks', 'categories', 'widthdrawals'));
// Security check
$socid = GETPOST('socid', 'int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'prelevement', '', '', 'bons');
$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 1282226623c..6c60cdaa059 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -37,7 +37,7 @@ if (!$user->rights->prelevement->bons->lire)
accessforbidden();
// Security check
-if ($user->societe_id > 0) accessforbidden();
+if ($user->socid > 0) accessforbidden();
// Get supervariables
$action = GETPOST('action', 'alpha');
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 4016ebdc813..f1c3f70c53a 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -69,7 +69,7 @@ class BonPrelevement extends CommonObject
public $total;
public $fetched;
public $statut; // 0-Wait, 1-Trans, 2-Done
- public $labelstatut=array();
+ public $labelStatus=array();
public $invoice_in_error=array();
public $thirdparty_in_error=array();
@@ -1995,55 +1995,55 @@ class BonPrelevement extends CommonObject
/**
* Return status label for a status
*
- * @param int $statut id statut
+ * @param int $status Id status
* @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
* @return string Label
*/
- public function LibStatut($statut, $mode = 0)
+ public function LibStatut($status, $mode = 0)
{
// phpcs:enable
- if (empty($this->labelstatut))
+ if (empty($this->labelStatus))
{
global $langs;
$langs->load("withdrawals");
- $this->labelstatut[0]=$langs->trans("StatusWaiting");
- $this->labelstatut[1]=$langs->trans("StatusTrans");
- $this->labelstatut[2]=$langs->trans("StatusCredited");
+ $this->labelStatus[0]=$langs->trans("StatusWaiting");
+ $this->labelStatus[1]=$langs->trans("StatusTrans");
+ $this->labelStatus[2]=$langs->trans("StatusCredited");
}
if ($mode == 0 || $mode == 1)
{
- return $this->labelstatut[$statut];
+ return $this->labelStatus[$status];
}
elseif ($mode == 2)
{
- if ($statut==0) return img_picto($this->labelstatut[$statut], 'statut1').' '.$this->labelstatut[$statut];
- elseif ($statut==1) return img_picto($this->labelstatut[$statut], 'statut3').' '.$this->labelstatut[$statut];
- elseif ($statut==2) return img_picto($this->labelstatut[$statut], 'statut6').' '.$this->labelstatut[$statut];
+ if ($status==0) return img_picto($this->labelStatus[$status], 'statut1').' '.$this->labelStatus[$status];
+ elseif ($status==1) return img_picto($this->labelStatus[$status], 'statut3').' '.$this->labelStatus[$status];
+ elseif ($status==2) return img_picto($this->labelStatus[$status], 'statut6').' '.$this->labelStatus[$status];
}
elseif ($mode == 3)
{
- if ($statut==0) return img_picto($this->labelstatut[$statut], 'statut1');
- elseif ($statut==1) return img_picto($this->labelstatut[$statut], 'statut3');
- elseif ($statut==2) return img_picto($this->labelstatut[$statut], 'statut6');
+ if ($status==0) return img_picto($this->labelStatus[$status], 'statut1');
+ elseif ($status==1) return img_picto($this->labelStatus[$status], 'statut3');
+ elseif ($status==2) return img_picto($this->labelStatus[$status], 'statut6');
}
elseif ($mode == 4)
{
- if ($statut==0) return img_picto($this->labelstatut[$statut], 'statut1').' '.$this->labelstatut[$statut];
- elseif ($statut==1) return img_picto($this->labelstatut[$statut], 'statut3').' '.$this->labelstatut[$statut];
- elseif ($statut==2) return img_picto($this->labelstatut[$statut], 'statut6').' '.$this->labelstatut[$statut];
+ if ($status==0) return img_picto($this->labelStatus[$status], 'statut1').' '.$this->labelStatus[$status];
+ elseif ($status==1) return img_picto($this->labelStatus[$status], 'statut3').' '.$this->labelStatus[$status];
+ elseif ($status==2) return img_picto($this->labelStatus[$status], 'statut6').' '.$this->labelStatus[$status];
}
elseif ($mode == 5)
{
- if ($statut==0) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut1');
- elseif ($statut==1) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut3');
- elseif ($statut==2) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut6');
+ if ($status==0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut1');
+ elseif ($status==1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut3');
+ elseif ($status==2) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut6');
}
elseif ($mode == 6)
{
- if ($statut==0) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut1');
- elseif ($statut==1) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut3');
- elseif ($statut==2) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut6');
+ if ($status==0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut1');
+ elseif ($status==1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut3');
+ elseif ($status==2) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut6');
}
}
}
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index 3b0f61b17a0..467351e3110 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -132,36 +132,36 @@ class LignePrelevement
/**
* Return status label for a status
*
- * @param int $statut id statut
+ * @param int $status Id status
* @param int $mode 0=Label, 1=Picto + label, 2=Picto, 3=Label + Picto
* @return string Label
*/
- public function LibStatut($statut, $mode = 0)
+ public function LibStatut($status, $mode = 0)
{
// phpcs:enable
global $langs;
if ($mode == 0)
{
- return $langs->trans($this->statuts[$statut]);
+ return $langs->trans($this->statuts[$status]);
}
elseif ($mode == 1)
{
- if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]), 'statut1').' '.$langs->trans($this->statuts[$statut]); // Waiting
- elseif ($statut==2) return img_picto($langs->trans($this->statuts[$statut]), 'statut6').' '.$langs->trans($this->statuts[$statut]); // Credited
- elseif ($statut==3) return img_picto($langs->trans($this->statuts[$statut]), 'statut8').' '.$langs->trans($this->statuts[$statut]); // Refused
+ if ($status==0) return img_picto($langs->trans($this->statuts[$status]), 'statut1').' '.$langs->trans($this->statuts[$status]); // Waiting
+ elseif ($status==2) return img_picto($langs->trans($this->statuts[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]); // Credited
+ elseif ($status==3) return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]); // Refused
}
elseif ($mode == 2)
{
- if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]), 'statut1');
- elseif ($statut==2) return img_picto($langs->trans($this->statuts[$statut]), 'statut6');
- elseif ($statut==3) return img_picto($langs->trans($this->statuts[$statut]), 'statut8');
+ if ($status==0) return img_picto($langs->trans($this->statuts[$status]), 'statut1');
+ elseif ($status==2) return img_picto($langs->trans($this->statuts[$status]), 'statut6');
+ elseif ($status==3) return img_picto($langs->trans($this->statuts[$status]), 'statut8');
}
elseif ($mode == 3)
{
- if ($statut==0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]), 'statut1');
- elseif ($statut==2) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]), 'statut6');
- elseif ($statut==3) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]), 'statut8');
+ if ($status==0) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut1');
+ elseif ($status==2) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut6');
+ elseif ($status==3) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut8');
}
}
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 3aaad5662a3..c4cad05d1f6 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies', 'bills'));
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'prelevement', '', '', 'bons');
// Get supervariables
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 4ea74e83b4f..52b312e6b4c 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies'));
// Security check
$socid = GETPOST('socid', 'int');
$status = GETPOST('status', 'int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'prelevement', '', '', 'bons');
$contextpage= GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'myobjectlist'; // To manage different context of search
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index fbc36418222..334e36c5a68 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$langs->loadLangs(array('banks', 'categories', 'companies', 'withdrawals', 'bills'));
// Securite acces client
-if ($user->societe_id > 0) accessforbidden();
+if ($user->socid > 0) accessforbidden();
// Get supervariables
$prev_id = GETPOST('id', 'int');
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 3dbfec69461..17e8dcebe98 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$langs->loadLangs(array("banks","categories",'withdrawals','bills'));
// Securite acces client
-if ($user->societe_id > 0) accessforbidden();
+if ($user->socid > 0) accessforbidden();
// Get supervariables
$prev_id = GETPOST('id', 'int');
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index c8914b41f26..01fde1b2450 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$langs->loadLangs(array("banks","categories",'withdrawals','bills'));
// Security check
-if ($user->societe_id > 0) accessforbidden();
+if ($user->socid > 0) accessforbidden();
// Get supervariables
$prev_id = GETPOST('id', 'int');
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 80d7abb4f0a..3af40c84dcb 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals'));
// Security check
$socid = GETPOST('socid', 'int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'prelevement', '', '');
@@ -71,7 +71,7 @@ $thirdpartystatic=new Societe($db);
$invoicestatic=new Facture($db);
$bprev = new BonPrelevement($db);
-
+print '
';
print '
';
print ''.$langs->trans("Statistics").' '.$langs->trans("AmountToWithdraw").' ';
print '';
print price($bprev->SommeAPrelever(), '', '', 1, -1, -1, 'auto');
-print '
';
+print '
';
@@ -116,6 +116,7 @@ if ($resql)
$num = $db->num_rows($resql);
$i = 0;
+ print '
';
print '
';
print '';
print ''.$langs->trans("InvoiceWaitingWithdraw").' ('.$num.') ';
@@ -162,7 +163,7 @@ if ($resql)
{
print ''.$langs->trans("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders")).'
";
+ print "
';
print '
';
print ''.$langs->trans("LastWithdrawalReceipt", $limit).' ';
print ''.$langs->trans("Date").' ';
@@ -216,7 +218,7 @@ if ($result)
print "
";
+ print "
';
// Ref customer
- $morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+ $morehtmlref.=$form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
+ $morehtmlref.=$form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
// Project
if (! empty($conf->projet->enabled))
{
@@ -495,7 +514,7 @@ if ($id > 0)
print '
';
// Type
- print ''.$langs->trans("Type")." ".$object->type_libelle." ";
+ print ''.$langs->trans("Type")." ".$object->type_label." ";
print "'.$langs->trans("ShowSocialContribution").' ';
if (! empty($this->ref))
$label .= ''.$langs->trans('Ref') . ': ' . $this->ref;
- if (! empty($this->lib))
- $label .= ''.$langs->trans('Label') . ': ' . $this->lib;
- if (! empty($this->type_libelle))
- $label .= ''.$langs->trans('Type') . ': ' . $this->type_libelle;
+ if (! empty($this->label))
+ $label .= ''.$langs->trans('Label') . ': ' . $this->label;
+ if (! empty($this->type_label))
+ $label .= ''.$langs->trans('Type') . ': ' . $this->type_label;
$linkclose='';
if (empty($notooltip) && $user->rights->facture->lire)
@@ -677,12 +689,12 @@ class ChargeSociales extends CommonObject
$this->ref = 'SPECIMEN';
$this->specimen=1;
$this->paye = 0;
- $this->date = time();
+ $this->date = dol_now();
$this->date_ech=$this->date+3600*24*30;
$this->periode=$this->date+3600*24*30;
$this->amount=100;
- $this->lib = 0;
+ $this->label = 'Social contribution label';
$this->type = 1;
- $this->type_libelle = 'Social contribution label';
+ $this->type_label = 'Type of social contribution';
}
}
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index e13738fd5f4..4fb2f27b53f 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -236,7 +236,7 @@ class PaymentSocialContribution extends CommonObject
$sql.= " t.fk_bank,";
$sql.= " t.fk_user_creat,";
$sql.= " t.fk_user_modif,";
- $sql.= " pt.code as type_code, pt.libelle as type_libelle,";
+ $sql.= " pt.code as type_code, pt.libelle as type_label,";
$sql.= ' b.fk_account';
$sql.= " FROM ".MAIN_DB_PREFIX."paiementcharge as t LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pt ON t.fk_typepaiement = pt.id";
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
@@ -267,7 +267,7 @@ class PaymentSocialContribution extends CommonObject
$this->fk_user_modif = $obj->fk_user_modif;
$this->type_code = $obj->type_code;
- $this->type_libelle = $obj->type_libelle;
+ $this->type_label = $obj->type_label;
$this->bank_account = $obj->fk_account;
$this->bank_line = $obj->fk_bank;
@@ -592,7 +592,7 @@ class PaymentSocialContribution extends CommonObject
{
$socialcontrib = new ChargeSociales($this->db);
$socialcontrib->fetch($key);
- $result=$acc->add_url_line($bank_line_id, $socialcontrib->id, DOL_URL_ROOT.'/compta/charges.php?id=', $socialcontrib->type_libelle.(($socialcontrib->lib && $socialcontrib->lib!=$socialcontrib->type_libelle)?' ('.$socialcontrib->lib.')':''), 'sc');
+ $result=$acc->add_url_line($bank_line_id, $socialcontrib->id, DOL_URL_ROOT.'/compta/charges.php?id=', $socialcontrib->type_label.(($socialcontrib->lib && $socialcontrib->lib!=$socialcontrib->type_label)?' ('.$socialcontrib->lib.')':''), 'sc');
if ($result <= 0) dol_print_error($this->db);
}
}
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index b3fb1cf697b..4a714df8bae 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -47,7 +47,7 @@ $action = GETPOST('action', 'aZ09');
$confirm = GETPOST('confirm', 'alpha');
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'tax', $id, 'chargesociales', 'charges');
@@ -108,8 +108,8 @@ if ($object->id)
$morehtmlref='';
// Label of social contribution
- $morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+ $morehtmlref.=$form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
+ $morehtmlref.=$form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
// Project
if (! empty($conf->projet->enabled))
{
diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php
index 3d59e2b229c..e449f907bc8 100644
--- a/htdocs/compta/sociales/info.php
+++ b/htdocs/compta/sociales/info.php
@@ -39,7 +39,7 @@ $action=GETPOST('action', 'aZ09');
// Security check
$socid = GETPOST('socid', 'int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'tax', $id, 'chargesociales', 'charges');
$object = new ChargeSociales($db);
@@ -79,8 +79,8 @@ dol_fiche_head($head, 'info', $langs->trans("SocialContribution"), -1, 'bill');
$morehtmlref='
';
// Label of social contribution
-$morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
-$morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+$morehtmlref.=$form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
+$morehtmlref.=$form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
// Project
if (! empty($conf->projet->enabled))
{
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 56493f3bf7c..6fbf174abc5 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -42,7 +42,7 @@ $contextpage=GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'sclist';
// Security check
$socid = isset($_GET["socid"])?$_GET["socid"]:'';
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'tax', '', '', 'charges');
$search_ref = GETPOST('search_ref', 'int');
@@ -110,8 +110,8 @@ $chargesociale_static=new ChargeSociales($db);
llxHeader('', $langs->trans("SocialContributions"));
$sql = "SELECT cs.rowid as id, cs.fk_type as type, ";
-$sql.= " cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode,";
-$sql.= " c.libelle as type_lib,";
+$sql.= " cs.amount, cs.date_ech, cs.libelle as label, cs.paye, cs.periode,";
+$sql.= " c.libelle as type_label,";
$sql.= " SUM(pc.amount) as alreadypayed";
$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
$sql.= " ".MAIN_DB_PREFIX."chargesociales as cs";
@@ -261,8 +261,8 @@ if ($resql)
$chargesociale_static->id=$obj->id;
$chargesociale_static->ref=$obj->id;
- $chargesociale_static->lib=$obj->libelle;
- $chargesociale_static->type_libelle=$obj->type_lib;
+ $chargesociale_static->label=$obj->label;
+ $chargesociale_static->type_label=$obj->type_label;
print '
';
@@ -272,10 +272,10 @@ if ($resql)
print '';
// Label
- print ''.dol_trunc($obj->libelle, 42).' ';
+ print ''.dol_trunc($obj->label, 42).' ';
// Type
- print ''.$obj->type_lib.' ';
+ print ''.$obj->type_label.' ';
// Date end period
print '';
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index caf11a6ea3b..d22bd80722a 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
$langs->loadLangs(array('compta', 'bills'));
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'tax|salaries', '', '', 'charges|');
$mode=GETPOST("mode", 'alpha');
@@ -126,8 +126,8 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pc.amount", "", $param, 'class="right"', $sortfield, $sortorder);
print " \n";
- $sql = "SELECT c.id, c.libelle as lib,";
- $sql.= " cs.rowid, cs.libelle, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total,";
+ $sql = "SELECT c.id, c.libelle as type_label,";
+ $sql.= " cs.rowid, cs.libelle as label, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total,";
$sql.= " pc.rowid as pid, pc.datep, pc.amount as totalpaye, pc.num_paiement as num_payment,";
$sql.= " pct.code as payment_code";
$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
@@ -162,10 +162,12 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
while ($i < min($num, $limit))
{
$obj = $db->fetch_object($resql);
- print '
';
- // Ref payment
+
$payment_sc_static->id=$obj->pid;
$payment_sc_static->ref=$obj->pid;
+
+ print ' ';
+ // Ref payment
print ''.$payment_sc_static->getNomUrl(1)." \n";
// Date payment
print ''.dol_print_date($db->jdate($obj->datep), 'day').' ';
@@ -176,12 +178,12 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
// Label
print '';
$socialcontrib->id=$obj->rowid;
- $socialcontrib->ref=$obj->libelle;
- $socialcontrib->lib=$obj->libelle;
+ $socialcontrib->ref=$obj->rowid;
+ $socialcontrib->label=$obj->label;
print $socialcontrib->getNomUrl(1, '20');
print ' ';
// Type
- print ''.$obj->lib.' '.$obj->type_label.' ';
if ($user->rights->societe->contact->creer) {
print '
'.$langs->trans('Modify').' ';
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 08b2e8e1d41..9642cdfa84c 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -76,7 +76,7 @@ if (! empty($canvas))
}
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -181,7 +181,7 @@ if (empty($reshook))
$object->socid = GETPOST("socid", 'int');
$object->lastname = GETPOST("lastname", 'alpha');
$object->firstname = GETPOST("firstname", 'alpha');
- $object->civility_id = GETPOST("civility_id", 'alpha');
+ $object->civility_code = GETPOST("civility_code", 'alpha');
$object->poste = GETPOST("poste", 'alpha');
$object->address = GETPOST("address", 'alpha');
$object->zip = GETPOST("zipcode", 'alpha');
@@ -377,7 +377,7 @@ if (empty($reshook))
$object->socid = GETPOST("socid", 'int');
$object->lastname = GETPOST("lastname", 'alpha');
$object->firstname = GETPOST("firstname", 'alpha');
- $object->civility_id = GETPOST("civility_id", 'alpha');
+ $object->civility_code = GETPOST("civility_code", 'alpha');
$object->poste = GETPOST("poste", 'alpha');
$object->address = GETPOST("address", 'alpha');
@@ -638,8 +638,8 @@ else
}
// Civility
- print '
'.$langs->trans("UserTitle").' ';
- print $formcompany->select_civility(GETPOST("civility", 'alpha')?GETPOST("civility", 'alpha'):$object->civility_code);
+ print ' '.$langs->trans("UserTitle").' ';
+ print $formcompany->select_civility(GETPOSTISSET("civility_code")?GETPOST("civility_code", 'alpha'):$object->civility_code, 'civility_code');
print ' ';
print '
'.$langs->trans("PostOrFunction").' '.$langs->trans("UserTitle").' ';
- print $formcompany->select_civility(isset($_POST["civility"])?GETPOST("civility"):$object->civility_code);
+ print ' '.$langs->trans("UserTitle").' ';
+ print $formcompany->select_civility(GETPOSTISSET("civility_code")?GETPOST("civility", "aZ09"):$object->civility_code, 'civility_code');
print ' ';
print '
'.$langs->trans("PostOrFunction").' ';
@@ -170,7 +170,7 @@ if ($type_element == 'fichinter')
{ // Customer : show products from invoices
require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
$documentstatic=new Fichinter($db);
- $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, tc.libelle, ';
+ $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, tc.libelle as type_contact_label, ';
$tables_from = MAIN_DB_PREFIX.'fichinterdet d';
$tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinter as f ON d.fk_fichinter=f.rowid';
$tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
@@ -183,7 +183,7 @@ elseif ($type_element == 'invoice')
{ // Customer : show products from invoices
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
$documentstatic=new Facture($db);
- $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, tc.libelle, ';
+ $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, tc.libelle as type_contact_label, ';
$tables_from = MAIN_DB_PREFIX.'facturedet d';
$tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture as f ON d.fk_facture=f.rowid';
$tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
@@ -198,7 +198,7 @@ elseif ($type_element == 'propal')
{
require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
$documentstatic=new Propal($db);
- $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.datep as dateprint, c.fk_statut as status, tc.libelle, ';
+ $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.datep as dateprint, c.fk_statut as status, tc.libelle as type_contact_label, ';
$tables_from = MAIN_DB_PREFIX.'propaldet d';
$tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'propal as c ON d.fk_propal=c.rowid';
$tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
@@ -213,7 +213,7 @@ elseif ($type_element == 'order')
{
require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
$documentstatic=new Commande($db);
- $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_commande as dateprint, c.fk_statut as status, tc.libelle, ';
+ $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_commande as dateprint, c.fk_statut as status, tc.libelle as type_contact_label, ';
$tables_from = MAIN_DB_PREFIX.'commandedet d';
$tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande as c ON d.fk_commande=c.rowid';
$tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
@@ -228,7 +228,7 @@ elseif ($type_element == 'supplier_invoice')
{ // Supplier : Show products from invoices.
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
$documentstatic=new FactureFournisseur($db);
- $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, tc.libelle, ';
+ $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, tc.libelle as type_contact_label, ';
$tables_from = MAIN_DB_PREFIX.'facture_fourn_det d';
$tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn as f ON d.fk_facture_fourn=f.rowid';
$tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
@@ -256,7 +256,7 @@ elseif ($type_element == 'supplier_order')
{ // Supplier : Show products from orders.
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
$documentstatic=new CommandeFournisseur($db);
- $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, tc.libelle, ';
+ $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, tc.libelle as type_contact_label, ';
$tables_from = MAIN_DB_PREFIX.'commande_fournisseurdet d';
$tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseur as c ON d.fk_commande=c.rowid';
$tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
@@ -272,7 +272,7 @@ elseif ($type_element == 'contract')
require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
$documentstatic=new Contrat($db);
$documentstaticline=new ContratLigne($db);
- $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_contrat as dateprint, d.statut as status, tc.libelle, ';
+ $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_contrat as dateprint, d.statut as status, tc.libelle as type_contact_label, ';
$tables_from = MAIN_DB_PREFIX.'contratdet d';
$tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'contrat as c ON d.fk_contrat=c.rowid';
$tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
@@ -344,14 +344,14 @@ if ($sql_select)
$num = $db->num_rows($resql);
- $param="&socid=".$socid."&type_element=".$type_element;
- if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
- if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+ $param="&socid=".urlencode($socid)."&type_element=".urlencode($type_element);
+ if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+ if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
if ($sprod_fulldescr) $param.= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
if ($sref) $param.= "&sref=".urlencode($sref);
- if ($month) $param.= "&month=".$month;
- if ($year) $param.= "&year=".$year;
- if ($optioncss != '') $param.='&optioncss='.$optioncss;
+ if ($month) $param.= "&month=".urlencode($month);
+ if ($year) $param.= "&year=".urlencode($year);
+ if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit);
@@ -408,6 +408,7 @@ if ($sql_select)
$documentstatic->statut=$objp->status;
$documentstatic->status=$objp->status;
$documentstatic->paye=$objp->paid;
+ $documentstatic->paid=$objp->paid;
if (is_object($documentstaticline)) $documentstaticline->statut=$objp->status;
@@ -573,8 +574,7 @@ if ($sql_select)
*/
print '';
- //print '
'.$prodreftxt.' ';
- print '
'.$objp->libelle.' ';
+ print '
'.$objp->type_contact_label.' '; // Type of contact label
print '
'.$objp->prod_qty.' ';
$total_qty+=$objp->prod_qty;
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 1dbc22d1a51..8533cb13feb 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -51,7 +51,7 @@ if (! empty($canvas))
}
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission
// Get parameters
diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php
index 3cb46276d43..2546f5d19e4 100644
--- a/htdocs/contact/info.php
+++ b/htdocs/contact/info.php
@@ -34,7 +34,7 @@ $langs->load("companies");
// Security check
$id = GETPOST("id", 'int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
$object = new Contact($db);
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index 826b5d3db39..cf2bf91bf99 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -36,7 +36,7 @@ $action=GETPOST('action', 'aZ09');
// Security check
$id = GETPOST('id', 'int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
$object = new Contact($db);
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 60232a052af..6694c363977 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -54,7 +54,7 @@ $contextpage=GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'contactl
$id = GETPOST('id', 'int');
$contactid = GETPOST('id', 'int');
$ref = ''; // There is no ref for contacts
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'contact', $contactid, '');
$sall=trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index 72ee557c085..230211cca5e 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -36,7 +36,7 @@ $langs->load("companies");
// Security check
$id = GETPOST('id', 'int');
-if ($user->societe_id) $id=$user->societe_id;
+if ($user->socid) $id=$user->socid;
$result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
$object = new Contact($db);
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 3a09f294849..093245025cd 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -35,7 +35,7 @@ $id = GETPOST('id', 'int');
$action = GETPOST('action', 'alpha');
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
$object = new Contact($db);
@@ -319,7 +319,7 @@ else
if ($action != 'edit')
{
// Barre d'actions
- if ($user->societe_id == 0)
+ if ($user->socid == 0)
{
print '
';
diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index df1629b46a6..4eb794a3054 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -52,7 +52,7 @@ $id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'contrat', $id, '');
$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 3a8e4f99a65..4e0226d4cae 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -62,7 +62,7 @@ $datecontrat='';
$usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:0);
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result=restrictedArea($user, 'contrat', $id);
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -1256,7 +1256,7 @@ if ($action == 'create')
print $doleditor->Create(1);
print '
';
- if (empty($user->societe_id))
+ if (empty($user->socid))
{
print '
'.$langs->trans("NotePrivate").' ';
$doleditor=new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
@@ -1890,7 +1890,7 @@ else
print ' ';
print ''.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).' ';
print '';
- if ($user->societe_id == 0)
+ if ($user->socid == 0)
{
if ($object->statut > 0 && $action != 'activateline' && $action != 'unactivateline')
{
@@ -2098,7 +2098,7 @@ else
* Buttons
*/
- if ($user->societe_id == 0)
+ if ($user->socid == 0)
{
print '';
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index a6ccd9f7cf1..0b9c6768eda 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -189,6 +189,12 @@ class Contrat extends CommonObject
protected $lines_id_index_mapper=array();
+ const STATUS_DRAFT = 0;
+ const STATUS_VALIDATED = 1;
+ const STATUS_CLOSED = 2;
+
+
+
/**
* Constructor
*
@@ -1881,40 +1887,31 @@ class Contrat extends CommonObject
/**
* Renvoi label of a given contrat status
*
- * @param int $statut Status id
+ * @param int $status Id status
* @param int $mode 0=Long label, 1=Short label, 2=Picto + Libelle court, 3=Picto, 4=Picto + Long label of all services, 5=Libelle court + Picto, 6=Picto of all services, 7=Same than 6 with fixed length
* @return string Label
*/
- public function LibStatut($statut, $mode)
+ public function LibStatut($status, $mode)
{
// phpcs:enable
- global $langs;
- $langs->load("contracts");
- if ($mode == 0)
+
+ if (empty($this->labelStatus) || empty($this->labelStatusShort))
{
- if ($statut == 0) { return $langs->trans("ContractStatusDraft"); }
- elseif ($statut == 1) { return $langs->trans("ContractStatusValidated"); }
- elseif ($statut == 2) { return $langs->trans("ContractStatusClosed"); }
+ global $langs;
+ $langs->load("contracts");
+ $this->labelStatus[self::STATUS_DRAFT] = $langs->trans('ContractStatusDraft');
+ $this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('ContractStatusValidated');
+ $this->labelStatus[self::STATUS_CLOSED] = $langs->trans('ContractStatusClosed');
+ $this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('ContractStatusDraft');
+ $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('ContractStatusValidated');
+ $this->labelStatusShort[self::STATUS_CLOSED] = $langs->trans('ContractStatusClosed');
}
- elseif ($mode == 1)
- {
- if ($statut == 0) { return $langs->trans("ContractStatusDraft"); }
- elseif ($statut == 1) { return $langs->trans("ContractStatusValidated"); }
- elseif ($statut == 2) { return $langs->trans("ContractStatusClosed"); }
- }
- elseif ($mode == 2)
- {
- if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'), 'statut0').' '.$langs->trans("ContractStatusDraft"); }
- elseif ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'), 'statut4').' '.$langs->trans("ContractStatusValidated"); }
- elseif ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'), 'statut6').' '.$langs->trans("ContractStatusClosed"); }
- }
- elseif ($mode == 3)
- {
- if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'), 'statut0'); }
- elseif ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'), 'statut4'); }
- elseif ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'), 'statut6'); }
- }
- elseif ($mode == 4 || $mode == 6 || $mode == 7)
+
+ $statusType = 'status'.$status;
+ if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+ if ($status == self::STATUS_VALIDATED) $statusType = 'status6';
+
+ if ($mode == 4 || $mode == 6 || $mode == 7)
{
$text='';
if ($mode == 4) {
@@ -1924,22 +1921,20 @@ class Contrat extends CommonObject
$text.=': ';
$text.='';
}
- $text.=($mode == 7?'
':'');
- $text.=($mode != 7 || $this->nbofserviceswait > 0) ? ($this->nbofserviceswait.ContratLigne::LibStatut(0, 3, -1, 'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesopened || $this->nbofservicesexpired || $this->nbofservicesclosed)?' ':'') : '';
- $text.=($mode == 7?'
':'');
- $text.=($mode != 7 || $this->nbofservicesopened > 0) ? ($this->nbofservicesopened.ContratLigne::LibStatut(4, 3, 0, 'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesexpired || $this->nbofservicesclosed)?' ':'') : '';
- $text.=($mode == 7?'
':'');
- $text.=($mode != 7 || $this->nbofservicesexpired > 0) ? ($this->nbofservicesexpired.ContratLigne::LibStatut(4, 3, 1, 'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesclosed)?' ':'') : '';
- $text.=($mode == 7?'
':'');
- $text.=($mode != 7 || $this->nbofservicesclosed > 0) ? ($this->nbofservicesclosed.ContratLigne::LibStatut(5, 3, -1, 'class="paddingleft2 inline-block valigntextbottom"')) : '';
- $text.=($mode == 7?'
':'');
+ $text.=($mode == 7?'
':'');
+ $text.=($mode != 7 || $this->nbofserviceswait > 0) ? ($this->nbofserviceswait.ContratLigne::LibStatut(0, 3, -1, 'class="marginleft2"')).(($mode != 7 || $this->nbofservicesopened || $this->nbofservicesexpired || $this->nbofservicesclosed)?' ':'') : '';
+ $text.=($mode == 7?' ':'');
+ $text.=($mode != 7 || $this->nbofservicesopened > 0) ? ($this->nbofservicesopened.ContratLigne::LibStatut(4, 3, 0, 'class="marginleft2"')).(($mode != 7 || $this->nbofservicesexpired || $this->nbofservicesclosed)?' ':'') : '';
+ $text.=($mode == 7?' ':'');
+ $text.=($mode != 7 || $this->nbofservicesexpired > 0) ? ($this->nbofservicesexpired.ContratLigne::LibStatut(4, 3, 1, 'class="marginleft2"')).(($mode != 7 || $this->nbofservicesclosed)?' ':'') : '';
+ $text.=($mode == 7?' ':'');
+ $text.=($mode != 7 || $this->nbofservicesclosed > 0) ? ($this->nbofservicesclosed.ContratLigne::LibStatut(5, 3, -1, 'class="marginleft2"')) : '';
+ $text.=($mode == 7?' ':'');
return $text;
}
- elseif ($mode == 5)
+ else
{
- if ($statut == 0) { return $langs->trans("ContractStatusDraft").' '.img_picto($langs->trans('ContractStatusDraft'), 'statut0'); }
- elseif ($statut == 1) { return $langs->trans("ContractStatusValidated").' '.img_picto($langs->trans('ContractStatusValidated'), 'statut4'); }
- elseif ($statut == 2) { return $langs->trans("ContractStatusClosed").' '.img_picto($langs->trans('ContractStatusClosed'), 'statut6'); }
+ return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
}
}
@@ -2073,10 +2068,10 @@ class Contrat extends CommonObject
/**
* Return list of line rowid
*
- * @param int $statut Status of lines to get
+ * @param int $status Status of lines to get
* @return array|int Array of line's rowid or <0 if error
*/
- public function array_detail($statut = -1)
+ public function array_detail($status = -1)
{
// phpcs:enable
$tab=array();
@@ -2084,7 +2079,7 @@ class Contrat extends CommonObject
$sql = "SELECT cd.rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
$sql.= " WHERE fk_contrat =".$this->id;
- if ($statut >= 0) $sql.= " AND statut = '$statut'";
+ if ($status >= 0) $sql.= " AND statut = ".$status;
dol_syslog(get_class($this)."::array_detail()", LOG_DEBUG);
$resql=$this->db->query($sql);
@@ -2162,7 +2157,7 @@ class Contrat extends CommonObject
$this->from = " FROM ".MAIN_DB_PREFIX."contrat as c";
$this->from.= ", ".MAIN_DB_PREFIX."contratdet as cd";
$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $this->from.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $this->from.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
if ($mode == 'inactive')
{
@@ -2193,8 +2188,8 @@ class Contrat extends CommonObject
}
$sql.= " AND c.fk_soc = s.rowid";
$sql.= " AND c.entity = ".$conf->entity;
- if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($user->socid) $sql.=" AND c.fk_soc = ".$user->socid;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
$resql=$this->db->query($sql);
if ($resql)
@@ -2265,7 +2260,7 @@ class Contrat extends CommonObject
$sql = "SELECT count(c.rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
- if (!$user->rights->societe->client->voir && !$user->societe_id)
+ if (!$user->rights->societe->client->voir && !$user->socid)
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
$sql.= " WHERE sc.fk_user = " .$user->id;
@@ -2728,65 +2723,34 @@ class ContratLigne extends CommonObjectLine
/**
* Return label of a contract line status
*
- * @param int $statut Id statut
+ * @param int $status Id status
* @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
* @param int $expired 0=Not expired, 1=Expired, -1=Both or unknown
* @param string $moreatt More attribute
* @return string Libelle
*/
- public static function LibStatut($statut, $mode, $expired = -1, $moreatt = '')
+ public static function LibStatut($status, $mode, $expired = -1, $moreatt = '')
{
// phpcs:enable
global $langs;
$langs->load("contracts");
- if ($mode == 0)
+
+ if ($status == self::STATUS_INITIAL) { $labelStatus = $langs->trans("ServiceStatusInitial"); $labelStatusShort = $langs->trans("ServiceStatusInitial"); }
+ elseif ($status == self::STATUS_OPEN && $expired == -1) { $labelStatus = $langs->trans("ServiceStatusRunning"); $labelStatusShort = $langs->trans("ServiceStatusRunning"); }
+ elseif ($status == self::STATUS_OPEN && $expired == 0) { $labelStatus = $langs->trans("ServiceStatusNotLate"); $labelStatusShort = $langs->trans("ServiceStatusNotLateShort"); }
+ elseif ($status == self::STATUS_OPEN && $expired == 1) { $labelStatus = $langs->trans("ServiceStatusLate"); $labelStatusShort = $langs->trans("ServiceStatusLateShort"); }
+ elseif ($status == self::STATUS_CLOSED) { $labelStatus = $langs->trans("ServiceStatusClosed"); $labelStatusShort = $langs->trans("ServiceStatusClosed"); }
+
+ $statusType = 'status'.$status;
+ if ($status == self::STATUS_OPEN && $expired == 1) $statusType = 'status3';
+ if ($status == self::STATUS_CLOSED) $statusType = 'status6';
+
+ $params = array(); $reg = array();
+ if (preg_match('/class="(.*)"/', $moreatt, $reg))
{
- if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial"); }
- elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning"); }
- elseif ($statut == self::STATUS_OPEN && $expired == 0) { return $langs->trans("ServiceStatusNotLate"); }
- elseif ($statut == self::STATUS_OPEN && $expired == 1) { return $langs->trans("ServiceStatusLate"); }
- elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed"); }
- }
- elseif ($mode == 1)
- {
- if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial"); }
- elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning"); }
- elseif ($statut == self::STATUS_OPEN && $expired == 0) { return $langs->trans("ServiceStatusNotLateShort"); }
- elseif ($statut == self::STATUS_OPEN && $expired == 1) { return $langs->trans("ServiceStatusLateShort"); }
- elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed"); }
- }
- elseif ($mode == 2)
- {
- if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'), 'statut0').' '.$langs->trans("ServiceStatusInitial"); }
- elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'), 'statut4').' '.$langs->trans("ServiceStatusRunning"); }
- elseif ($statut == self::STATUS_OPEN && $expired == 0) { return img_picto($langs->trans('ServiceStatusNotLate'), 'statut4').' '.$langs->trans("ServiceStatusNotLateShort"); }
- elseif ($statut == self::STATUS_OPEN && $expired == 1) { return img_picto($langs->trans('ServiceStatusLate'), 'statut3').' '.$langs->trans("ServiceStatusLateShort"); }
- elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'), 'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
- }
- elseif ($mode == 3)
- {
- if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'), 'statut0', $moreatt); }
- elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'), 'statut4', $moreatt); }
- elseif ($statut == self::STATUS_OPEN && $expired == 0) { return img_picto($langs->trans('ServiceStatusNotLate'), 'statut4', $moreatt); }
- elseif ($statut == self::STATUS_OPEN && $expired == 1) { return img_picto($langs->trans('ServiceStatusLate'), 'statut3', $moreatt); }
- elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'), 'statut6', $moreatt); }
- }
- elseif ($mode == 4)
- {
- if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'), 'statut0').' '.$langs->trans("ServiceStatusInitial"); }
- elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'), 'statut4').' '.$langs->trans("ServiceStatusRunning"); }
- elseif ($statut == self::STATUS_OPEN && $expired == 0) { return img_picto($langs->trans('ServiceStatusNotLate'), 'statut4').' '.$langs->trans("ServiceStatusNotLate"); }
- elseif ($statut == self::STATUS_OPEN && $expired == 1) { return img_picto($langs->trans('ServiceStatusLate'), 'statut3').' '.$langs->trans("ServiceStatusLate"); }
- elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'), 'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
- }
- elseif ($mode == 5)
- {
- if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial").' '.img_picto($langs->trans('ServiceStatusInitial'), 'statut0'); }
- elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning").' '.img_picto($langs->trans('ServiceStatusRunning'), 'statut4'); }
- elseif ($statut == self::STATUS_OPEN && $expired == 0) { return $langs->trans("ServiceStatusNotLateShort").' '.img_picto($langs->trans('ServiceStatusNotLateShort'), 'statut4'); }
- elseif ($statut == self::STATUS_OPEN && $expired == 1) { return $langs->trans("ServiceStatusLateShort").' '.img_picto($langs->trans('ServiceStatusLate'), 'statut3'); }
- elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed").' '.img_picto($langs->trans('ServiceStatusClosed'), 'statut6'); }
+ $params = array('badgeParams'=>array('css' => $reg[1]));
}
+ return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode, '', $params);
}
/**
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 85247327dda..56a0c198db3 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -43,7 +43,7 @@ $id = GETPOST('id', 'int');
$ref=GETPOST('ref', 'alpha');
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result=restrictedArea($user, 'contrat', $id);
$object = new Contrat($db);
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 7fbc291839d..fceba285f47 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -46,11 +46,11 @@ $id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
// Security check
-if ($user->societe_id > 0)
+if ($user->socid > 0)
{
unset($_GET["action"]);
$action='';
- $socid = $user->societe_id;
+ $socid = $user->socid;
}
$result = restrictedArea($user, 'contrat', $id);
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 8fd54a4f8e4..9d96ca7be5e 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -46,7 +46,7 @@ $statut=GETPOST('statut')?GETPOST('statut'):1;
// Security check
$socid=0;
$id = GETPOST('id', 'int');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->socid)) $socid=$user->socid;
$result = restrictedArea($user, 'contrat', $id);
$staticcompany=new Societe($db);
@@ -114,7 +114,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX
$sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
$sql.= " AND (cd.statut != 4 OR (cd.statut = 4 AND (cd.date_fin_validite is null or cd.date_fin_validite >= '".$db->idate($now)."')))";
$sql.= " AND c.entity IN (".getEntity('contract', 0).")";
-if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
+if ($user->socid) $sql.=' AND c.fk_soc = '.$user->socid;
if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql.= " GROUP BY cd.statut";
$resql = $db->query($sql);
@@ -151,7 +151,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX
$sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
$sql.= " AND (cd.statut = 4 AND cd.date_fin_validite < '".$db->idate($now)."')";
$sql.= " AND c.entity IN (".getEntity('contract', 0).")";
-if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
+if ($user->socid) $sql.=' AND c.fk_soc = '.$user->socid;
if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql.= " GROUP BY cd.statut";
$resql = $db->query($sql);
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 0fd27d29826..3df193d53d2 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -84,7 +84,7 @@ if (! $sortorder) $sortorder='DESC';
// Security check
$id=GETPOST('id', 'int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result = restrictedArea($user, 'contrat', $id);
$diroutputmassaction=$conf->contrat->dir_output . '/temp/massgeneration/'.$user->id;
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 25772c08193..e4cceff10e0 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -41,7 +41,7 @@ $id=GETPOST('id', 'int');
$ref=GETPOST('ref', 'alpha');
// Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->socid) $socid=$user->socid;
$result=restrictedArea($user, 'contrat', $id);
$object = new Contrat($db);
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 81c0b13449b..a7656289fdd 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -90,7 +90,7 @@ $search_array_options=$extrafields->getOptionalsFromPost($object->table_element,
// Security check
$contratid = GETPOST('id', 'int');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->socid)) $socid=$user->socid;
$result = restrictedArea($user, 'contrat', $contratid);
if ($search_status != '')
diff --git a/htdocs/core/actions_comments.inc.php b/htdocs/core/actions_comments.inc.php
index a84edb0150a..1c679c88825 100644
--- a/htdocs/core/actions_comments.inc.php
+++ b/htdocs/core/actions_comments.inc.php
@@ -57,6 +57,24 @@ if ($action == 'addcomment')
}
}
}
+if ($action === 'updatecomment')
+{
+ if ($comment->fetch($idcomment) >= 0)
+ {
+ $comment->description = GETPOST('comment_description', 'none');
+ if ($comment->update($user) > 0)
+ {
+ setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
+ header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1#comment':''));
+ exit;
+ }
+ else
+ {
+ setEventMessages($comment->error, $comment->errors, 'errors');
+ $action='';
+ }
+ }
+}
if ($action == 'deletecomment')
{
if ($comment->fetch($idcomment) >= 0)
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index d6a2ba77f05..b369550dda2 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -104,7 +104,7 @@ if (empty($url))
$langs->loadLangs(array("ecm","companies","other"));
// Security check
-if ($user->societe_id > 0) $socid = $user->societe_id;
+if ($user->socid > 0) $socid = $user->socid;
//print 'xxx'.$upload_dir;
diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index e812e8b9a3c..0d662b6a0bd 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -39,8 +39,8 @@ $element=GETPOST('element', 'alpha');
$object = new GenericObject($db);
// Security check
-if (! empty($user->societe_id))
- $socid = $user->societe_id;
+if (! empty($user->socid))
+ $socid = $user->socid;
diff --git a/htdocs/core/ajax/pingresult.php b/htdocs/core/ajax/pingresult.php
index 9de6e53a0f5..eec1c9f0aca 100644
--- a/htdocs/core/ajax/pingresult.php
+++ b/htdocs/core/ajax/pingresult.php
@@ -36,8 +36,8 @@ $hash_algo=GETPOST('hash_algo', 'alpha');
// Security check
-if (! empty($user->societe_id))
- $socid = $user->societe_id;
+if (! empty($user->socid))
+ $socid = $user->socid;
$now = dol_now();
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index af86e73ce2c..c104384434d 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -90,13 +90,13 @@ class box_actions extends ModeleBoxes
$sql.= ", s.rowid as socid";
$sql.= ", s.code_client";
$sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm AS ta, ".MAIN_DB_PREFIX."actioncomm AS a";
- if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+ if (! $user->rights->societe->client->voir && ! $user->socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
$sql.= " WHERE a.fk_action = ta.id";
$sql.= " AND a.entity = ".$conf->entity;
$sql.= " AND a.percent >= 0 AND a.percent < 100";
- if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
- if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+ if (! $user->rights->societe->client->voir && ! $user->socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
+ if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
if (! $user->rights->agenda->allactions->read) $sql.= " AND (a.fk_user_author = ".$user->id . " OR a.fk_user_action = ".$user->id . " OR a.fk_user_done = ".$user->id . ")";
$sql.= " ORDER BY a.datec DESC";
$sql.= $this->db->plimit($max, 0);
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index c18bf2f3bf3..9609f596618 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -84,7 +84,7 @@ class box_activity extends ModeleBoxes
$totalnb = 0;
$line = 0;
$cachetime = 3600;
- $fileid = '-e'.$conf->entity.'-u'.$user->id.'-s'.$user->societe_id.'-r'.($user->rights->societe->client->voir?'1':'0').'.cache';
+ $fileid = '-e'.$conf->entity.'-u'.$user->id.'-s'.$user->socid.'-r'.($user->rights->societe->client->voir?'1':'0').'.cache';
$now = dol_now();
$nbofperiod=3;
@@ -113,12 +113,12 @@ class box_activity extends ModeleBoxes
{
$sql = "SELECT p.fk_statut, SUM(p.total) as Mnttot, COUNT(*) as nb";
$sql.= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= ")";
$sql.= " WHERE p.entity IN (".getEntity('propal').")";
$sql.= " AND p.fk_soc = s.rowid";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
$sql.= " AND p.datep >= '".$this->db->idate($tmpdate)."'";
$sql.= " AND p.date_cloture IS NULL"; // just unclosed
$sql.= " GROUP BY p.fk_statut";
@@ -202,12 +202,12 @@ class box_activity extends ModeleBoxes
if ($refresh) {
$sql = "SELECT c.fk_statut, sum(c.total_ttc) as Mnttot, count(*) as nb";
$sql.= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= ")";
$sql.= " WHERE c.entity = ".$conf->entity;
$sql.= " AND c.fk_soc = s.rowid";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
$sql.= " AND c.date_commande >= '".$this->db->idate($tmpdate)."'";
$sql.= " GROUP BY c.fk_statut";
$sql.= " ORDER BY c.fk_statut DESC";
@@ -286,11 +286,11 @@ class box_activity extends ModeleBoxes
{
$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= ")";
$sql.= " WHERE f.entity IN (".getEntity('invoice').')';
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
$sql.= " AND f.fk_soc = s.rowid";
$sql.= " AND f.datef >= '".$this->db->idate($tmpdate)."' AND f.paye=1";
$sql.= " GROUP BY f.fk_statut";
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 185f581b5c5..feb7564cdaf 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -97,11 +97,11 @@ class box_clients extends ModeleBoxes
$sql.= ", s.email";
$sql.= ", s.datec, s.tms, s.status";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.client IN (1, 3)";
$sql.= " AND s.entity IN (".getEntity('societe').")";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($user->societe_id) $sql.= " AND s.rowid = $user->societe_id";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($user->socid) $sql.= " AND s.rowid = $user->socid";
$sql.= " ORDER BY s.tms DESC";
$sql.= $this->db->plimit($max, 0);
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 327f06fc0c9..40d809fd6e7 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -102,12 +102,12 @@ class box_commandes extends ModeleBoxes
$sql.= ", c.total_ttc";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."commande as c";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE c.fk_soc = s.rowid";
$sql.= " AND c.entity = ".$conf->entity;
if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) $sql.=" AND c.fk_statut = 1";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
$sql.= $this->db->plimit($max, 0);
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index 02ed249d3b6..c4259b6252a 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -64,7 +64,7 @@ class box_comptes extends ModeleBoxes
// disable module for such cases
$listofmodulesforexternal=explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
- if (! in_array('banque', $listofmodulesforexternal) && ! empty($user->societe_id)) $this->enabled=0; // disabled for external users
+ if (! in_array('banque', $listofmodulesforexternal) && ! empty($user->socid)) $this->enabled=0; // disabled for external users
$this->hidden = ! ($user->rights->banque->lire);
}
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 09e33c5f6a8..5bdb17ba0b9 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -90,10 +90,10 @@ class box_contacts extends ModeleBoxes
$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON sp.fk_pays = co.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
- if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (! $user->rights->societe->client->voir && ! $user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
- if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND sp.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($user->societe_id) $sql.= " AND sp.fk_soc = ".$user->societe_id;
+ if (! $user->rights->societe->client->voir && ! $user->socid) $sql.= " AND sp.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($user->socid) $sql.= " AND sp.fk_soc = ".$user->socid;
$sql.= " ORDER BY sp.tms DESC";
$sql.= $this->db->plimit($max, 0);
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 0d155f158e9..37fdf45f118 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -87,11 +87,11 @@ class box_contracts extends ModeleBoxes
$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
$sql.= ", c.ref_customer, c.ref_supplier";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE c.fk_soc = s.rowid";
$sql.= " AND c.entity = ".$conf->entity;
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_contrat DESC, c.ref DESC ";
else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
$sql.= $this->db->plimit($max, 0);
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 09841f4a4a8..65724f5fa4b 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -97,12 +97,12 @@ class box_factures extends ModeleBoxes
$sql.= ", s.rowid as socid, s.nom as name, s.code_client, s.email, s.tva_intra, s.code_compta, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
$sql.= ", f.date_lim_reglement as datelimite";
$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= ")";
$sql.= " WHERE f.fk_soc = s.rowid";
$sql.= " AND f.entity IN (".getEntity('invoice').")";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.ref DESC ";
else $sql.= " ORDER BY f.tms DESC, f.ref DESC ";
$sql.= $this->db->plimit($max, 0);
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 46e2da3ab62..9eb836fe1e2 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -99,11 +99,11 @@ class box_factures_fourn extends ModeleBoxes
$sql.= ' f.date_lim_reglement as datelimite, f.tms, f.type';
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE f.fk_soc = s.rowid";
$sql.= " AND f.entity = ".$conf->entity;
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.ref DESC ";
else $sql.= " ORDER BY f.tms DESC, f.ref DESC ";
$sql.= $this->db->plimit($max, 0);
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index 0a6c7e904a3..3c0fc6444a2 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -91,13 +91,13 @@ class box_factures_fourn_imp extends ModeleBoxes
$sql.= " f.paye, f.fk_statut, f.type";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ",".MAIN_DB_PREFIX."facture_fourn as f";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE f.fk_soc = s.rowid";
$sql.= " AND f.entity = ".$conf->entity;
$sql.= " AND f.paye=0";
$sql.= " AND fk_statut = 1";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
$sql.= " ORDER BY datelimite DESC, f.ref_supplier DESC ";
$sql.= $this->db->plimit($max, 0);
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 3c4ba1c9736..992e1333390 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -100,15 +100,15 @@ class box_factures_imp extends ModeleBoxes
$sql.= " f.paye, f.fk_statut, f.rowid as facid";
$sql.= ", sum(pf.amount) as am";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= ", ".MAIN_DB_PREFIX."facture as f";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
$sql.= " WHERE f.fk_soc = s.rowid";
$sql.= " AND f.entity IN (".getEntity('invoice').")";
$sql.= " AND f.paye = 0";
$sql.= " AND fk_statut = 1";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
$sql.= " GROUP BY s.nom, s.rowid, s.code_client, s.logo, f.ref, f.date_lim_reglement,";
$sql.= " f.type, f.amount, f.datef, f.total, f.tva, f.total_ttc, f.paye, f.fk_statut, f.rowid";
//$sql.= " ORDER BY f.datef DESC, f.ref DESC ";
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index a646d6556ba..b0851ed28c0 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -92,8 +92,8 @@ class box_ficheinter extends ModeleBoxes
$sql.= ", ".MAIN_DB_PREFIX."fichinter as f";
$sql.= " WHERE f.fk_soc = s.rowid ";
$sql.= " AND f.entity = ".$conf->entity;
- if (! $user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+ if (! $user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
$sql.= " ORDER BY f.tms DESC";
$sql.= $this->db->plimit($max, 0);
@@ -138,7 +138,7 @@ class box_ficheinter extends ModeleBoxes
$this->info_box_contents[$i][] = array(
'td' => 'class="nowrap right"',
- 'text' => $ficheinterstatic->getLibStatut(6),
+ 'text' => $ficheinterstatic->getLibStatut(3),
'asis' => 1,
);
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 6369b25987a..5f26351affe 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -88,11 +88,11 @@ class box_fournisseurs extends ModeleBoxes
$sql.= " s.code_fournisseur, s.email as semail,";
$sql.= " s.logo";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.fournisseur = 1";
$sql.= " AND s.entity IN (".getEntity('societe').")";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
$sql.= " ORDER BY s.tms DESC ";
$sql.= $this->db->plimit($max, 0);
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index ba0e24ddaab..91ec36fd500 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -92,7 +92,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
$dir=''; // We don't need a path because image file will not be saved into disk
$prefix='';
$socid=0;
- if ($user->societe_id) $socid=$user->societe_id;
+ if ($user->socid) $socid=$user->socid;
if (! $user->rights->societe->client->voir || $socid) $prefix.='private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
if ($user->rights->facture->lire)
@@ -135,7 +135,8 @@ class box_graph_invoices_permonth extends ModeleBoxes
$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
$filenamenb = $dir."/".$prefix."invoicesnbinyear-".$endyear.".png";
- if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$endyear.'.png';
+ // default value for customer mode
+ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$endyear.'.png';
if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessuppliernbinyear-'.$endyear.'.png';
$px1 = new DolGraph();
@@ -180,7 +181,8 @@ class box_graph_invoices_permonth extends ModeleBoxes
$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
$filenamenb = $dir."/".$prefix."invoicesamountinyear-".$endyear.".png";
- if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesamountinyear-'.$endyear.'.png';
+ // default value for customer mode
+ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesamountinyear-'.$endyear.'.png';
if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessupplieramountinyear-'.$endyear.'.png';
$px2 = new DolGraph();
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 4393e9db790..9be3a986fa9 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -91,7 +91,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
$dir=''; // We don't need a path because image file will not be saved into disk
$prefix='';
$socid=0;
- if ($user->societe_id) $socid=$user->societe_id;
+ if ($user->socid) $socid=$user->socid;
if (! $user->rights->societe->client->voir || $socid) $prefix.='private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
if ($user->rights->fournisseur->facture->lire)
@@ -132,7 +132,8 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
$filenamenb = $dir."/".$prefix."invoicessuppliernbinyear-".$year.".png";
- if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$year.'.png';
+ // default value for customer mode
+ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$year.'.png';
if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessuppliernbinyear-'.$year.'.png';
$px1 = new DolGraph();
@@ -143,7 +144,8 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
$px1->SetData($data1);
unset($data1);
- $i=$startyear;$legend=array();
+ $i=$startyear;
+ $legend=array();
while ($i <= $endyear)
{
if ($startmonth != 1)
@@ -177,7 +179,8 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
$filenamenb = $dir."/".$prefix."invoicessupplieramountinyear-".$year.".png";
- if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesamountinyear-'.$year.'.png';
+ // default value for customer mode
+ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesamountinyear-'.$year.'.png';
if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessupplieramountinyear-'.$year.'.png';
$px2 = new DolGraph();
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 6e5bf253832..5ea1bb9f764 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -92,7 +92,7 @@ class box_graph_orders_permonth extends ModeleBoxes
$dir=''; // We don't need a path because image file will not be saved into disk
$prefix='';
$socid=0;
- if ($user->societe_id) $socid=$user->societe_id;
+ if ($user->socid) $socid=$user->socid;
if (! $user->rights->societe->client->voir || $socid) $prefix.='private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
if ($user->rights->commande->lire)
@@ -135,7 +135,8 @@ class box_graph_orders_permonth extends ModeleBoxes
$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
$filenamenb = $dir."/".$prefix."ordersnbinyear-".$endyear.".png";
- if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$endyear.'.png';
+ // default value for customer mode
+ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$endyear.'.png';
if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$endyear.'.png';
$px1 = new DolGraph();
@@ -144,7 +145,8 @@ class box_graph_orders_permonth extends ModeleBoxes
{
$px1->SetData($data1);
unset($data1);
- $i=$startyear;$legend=array();
+ $i=$startyear;
+ $legend=array();
while ($i <= $endyear)
{
if ($startmonth != 1)
@@ -178,7 +180,8 @@ class box_graph_orders_permonth extends ModeleBoxes
$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
$filenamenb = $dir."/".$prefix."ordersamountinyear-".$endyear.".png";
- if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$endyear.'.png';
+ // default value for customer mode
+ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$endyear.'.png';
if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$endyear.'.png';
$px2 = new DolGraph();
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 443f374346d..fba42b42eba 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -91,7 +91,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
$dir=''; // We don't need a path because image file will not be saved into disk
$prefix='';
$socid=0;
- if ($user->societe_id) $socid=$user->societe_id;
+ if ($user->socid) $socid=$user->socid;
if (! $user->rights->societe->client->voir || $socid) $prefix.='private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
if ($user->rights->fournisseur->commande->lire)
@@ -134,7 +134,8 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
$filenamenb = $dir."/".$prefix."orderssuppliernbinyear-".$endyear.".png";
- if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$endyear.'.png';
+ // default value for customer mode
+ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$endyear.'.png';
if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=orderssuppliernbinyear-'.$endyear.'.png';
$px1 = new DolGraph();
@@ -143,7 +144,8 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
{
$px1->SetData($data1);
unset($data1);
- $i=$startyear;$legend=array();
+ $i=$startyear;
+ $legend=array();
while ($i <= $endyear)
{
if ($startmonth != 1)
@@ -177,7 +179,8 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
$filenamenb = $dir."/".$prefix."orderssupplieramountinyear-".$endyear.".png";
- if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$endyear.'.png';
+ // default value for customer mode
+ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$endyear.'.png';
if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=orderssupplieramountinyear-'.$endyear.'.png';
$px2 = new DolGraph();
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 332f92b7ace..7bcc85aa47f 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -128,7 +128,7 @@ class box_graph_product_distribution extends ModeleBoxes
);
- $socid=empty($user->societe_id)?0:$user->societe_id;
+ $socid=empty($user->socid)?0:$user->socid;
$userid=0; // No filter on user creation
$WIDTH=($nbofgraph >= 2 || ! empty($conf->dol_optimize_smallscreen))?'160':'320';
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index a06c5d8ff83..150e9517c8a 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -94,7 +94,7 @@ class box_graph_propales_permonth extends ModeleBoxes
$dir=''; // We don't need a path because image file will not be saved into disk
$prefix='';
$socid=0;
- if ($user->societe_id) $socid=$user->societe_id;
+ if ($user->socid) $socid=$user->socid;
if (! $user->rights->societe->client->voir || $socid) $prefix.='private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
if ($user->rights->propale->lire)
diff --git a/htdocs/core/boxes/box_last_modified_ticket.php b/htdocs/core/boxes/box_last_modified_ticket.php
index 56299c60429..de2bbd79181 100644
--- a/htdocs/core/boxes/box_last_modified_ticket.php
+++ b/htdocs/core/boxes/box_last_modified_ticket.php
@@ -96,9 +96,9 @@ class box_last_modified_ticket extends ModeleBoxes
$sql.= " WHERE t.entity = ".$conf->entity;
// $sql.= " AND e.rowid = er.fk_event";
- //if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($user->societe_id) {
- $sql.= " AND t.fk_soc= ".$user->societe_id;
+ //if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($user->socid) {
+ $sql.= " AND t.fk_soc= ".$user->socid;
}
$sql.= " ORDER BY t.tms DESC, t.rowid DESC ";
diff --git a/htdocs/core/boxes/box_last_ticket.php b/htdocs/core/boxes/box_last_ticket.php
index cf4b7f305f7..4c66c647477 100644
--- a/htdocs/core/boxes/box_last_ticket.php
+++ b/htdocs/core/boxes/box_last_ticket.php
@@ -96,9 +96,9 @@ class box_last_ticket extends ModeleBoxes
$sql .= " WHERE t.entity = " . $conf->entity;
// $sql.= " AND e.rowid = er.fk_event";
- //if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($user->societe_id) {
- $sql .= " AND t.fk_soc= " . $user->societe_id;
+ //if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($user->socid) {
+ $sql .= " AND t.fk_soc= " . $user->socid;
}
//$sql.= " AND t.fk_statut > 9";
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index 1e4588f05cf..29f37751ce9 100644
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -63,7 +63,7 @@ class box_members extends ModeleBoxes
// disable module for such cases
$listofmodulesforexternal=explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
- if (! in_array('adherent', $listofmodulesforexternal) && ! empty($user->societe_id)) $this->enabled=0; // disabled for external users
+ if (! in_array('adherent', $listofmodulesforexternal) && ! empty($user->socid)) $this->enabled=0; // disabled for external users
$this->hidden = ! ($user->rights->adherent->lire);
}
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 23c4cc368cf..5cccd24ad6a 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -63,7 +63,7 @@ class box_produits extends ModeleBoxes
$listofmodulesforexternal=explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
$tmpentry=array('enabled'=>(! empty($conf->product->enabled) || ! empty($conf->service->enabled)), 'perms'=>(! empty($user->rights->produit->lire) || ! empty($user->rights->service->lire)), 'module'=>'product|service');
- $showmode=isVisibleToUserType(($user->societe_id > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
+ $showmode=isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
$this->hidden = ($showmode != 1);
}
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 22509a6c9a2..3c674cd32c0 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -65,7 +65,7 @@ class box_produits_alerte_stock extends ModeleBoxes
$listofmodulesforexternal=explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
$tmpentry=array('enabled'=>((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && ! empty($conf->stock->enabled)), 'perms'=>($user->rights->stock->lire), 'module'=>'product|service|stock');
- $showmode=isVisibleToUserType(($user->societe_id > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
+ $showmode=isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
$this->hidden = ($showmode != 1);
}
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index 9053e5f2ab3..48a6d260e2c 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -89,7 +89,7 @@ class box_project extends ModeleBoxes
$projectstatic = new Project($this->db);
$socid=0;
- //if ($user->societe_id > 0) $socid = $user->societe_id; // For external user, no check is done on company because readability is managed by public status of project and assignement.
+ //if ($user->socid > 0) $socid = $user->socid; // For external user, no check is done on company because readability is managed by public status of project and assignement.
// Get list of project id allowed to user (in a string list separated by coma)
$projectsListId='';
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index 0ba1b1565f8..1fe8c2a0ed8 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -88,11 +88,11 @@ class box_propales extends ModeleBoxes
$sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.tms";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."propal as p";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE p.fk_soc = s.rowid";
$sql.= " AND p.entity = ".$conf->entity;
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY p.datep DESC, p.ref DESC ";
else $sql.= " ORDER BY p.tms DESC, p.ref DESC ";
$sql.= $this->db->plimit($max, 0);
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index b489247e0b1..9d6a10b6225 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -94,11 +94,11 @@ class box_prospect extends ModeleBoxes
$sql.= ", s.logo";
$sql.= ", s.fk_stcomm, s.datec, s.tms, s.status";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.client IN (2, 3)";
$sql.= " AND s.entity IN (".getEntity('societe').")";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
$sql.= " ORDER BY s.tms DESC";
$sql.= $this->db->plimit($max, 0);
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index f080403aba3..dbb26408b6f 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -96,10 +96,10 @@ class box_services_contracts extends ModeleBoxes
$sql.= " INNER JOIN ".MAIN_DB_PREFIX."contrat as c ON s.rowid = c.fk_soc";
$sql.= " INNER JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql.= ")";
$sql.= " WHERE c.entity = ".$conf->entity;
- if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+ if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
$sql.= $this->db->order("c.tms", "DESC");
$sql.= $this->db->plimit($max, 0);
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index b56674adaa0..9ddfa229e55 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -87,12 +87,12 @@ class box_services_expired extends ModeleBoxes
$sql.= " s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
$sql.= " MIN(cd.date_fin_validite) as date_line, COUNT(cd.rowid) as nb_services";
$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE cd.statut = 4 AND cd.date_fin_validite <= '".$this->db->idate($now)."'";
$sql.= " AND c.entity = ".$conf->entity;
$sql.= " AND c.fk_soc=s.rowid AND cd.fk_contrat=c.rowid AND c.statut > 0";
- if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($user->socid) $sql.=' AND c.fk_soc = '.$user->socid;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql.= " GROUP BY c.rowid, c.ref, c.statut, c.date_contrat, c.ref_customer, c.ref_supplier, s.nom, s.rowid";
$sql.= " ORDER BY date_line ASC";
$sql.= $this->db->plimit($max, 0);
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 42c1b7464b9..a95c008688b 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -93,11 +93,11 @@ class box_supplier_orders extends ModeleBoxes
$sql.= " c.fk_statut";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE c.fk_soc = s.rowid";
$sql.= " AND c.entity = ".$conf->entity;
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
$sql.= $this->db->plimit($max, 0);
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index e285cc34289..1039ea74385 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -119,25 +119,25 @@ class box_task extends ModeleBoxes
// list the summary of the orders
if ($user->rights->projet->lire) {
$boxcontent.= '
'."\n";
- $boxcontent.= '
'."\n";
+ $boxcontent.= '
'."\n";
$boxcontent.= ''."\n";
$boxcontent.= '
'."\n";
$boxcontent.= '';
// set cookie by js
$boxcontent.='';
$this->info_box_contents[0][] = array(
- 'tr'=>'class="nohover"',
+ 'tr'=>'class="nohover showiffilter'.$this->boxcode.' hideobject"',
'td' => 'class="nohover"',
'textnoformat' => $boxcontent,
);
@@ -188,7 +188,7 @@ class box_task extends ModeleBoxes
$label = $projectstatic->getNomUrl(1).' '.$taskstatic->getNomUrl(1).' '.dol_htmlentities($taskstatic->label);
- $boxcontent = getTaskProgressView($taskstatic, $label, true, false, true);
+ $boxcontent = getTaskProgressView($taskstatic, $label, true, false, false);
$this->info_box_contents[$i][] = array(
'td' => '',
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 8cc8de94295..f5399cd9eea 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -216,7 +216,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
$cachetime = 900; // 900 : 15mn
$cachedir = DOL_DATA_ROOT.'/boxes/temp';
- $fileid = get_class($this).'id-'.$this->box_id.'-e'.$conf->entity.'-u'.$user->id.'-s'.$user->societe_id.'.cache';
+ $fileid = get_class($this).'id-'.$this->box_id.'-e'.$conf->entity.'-u'.$user->id.'-s'.$user->socid.'.cache';
$filename = '/box-'.$fileid;
$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
$out = '';
diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php
index 3f4b486f547..18c20b0b07c 100644
--- a/htdocs/core/class/comment.class.php
+++ b/htdocs/core/class/comment.class.php
@@ -62,6 +62,11 @@ class Comment extends CommonObject
*/
public $fk_user_author;
+ /**
+ * @var int ID
+ */
+ public $fk_user_modif;
+
/**
* @var int Entity
*/
@@ -94,17 +99,18 @@ class Comment extends CommonObject
*/
public function create($user, $notrigger = 0)
{
- global $conf, $langs;
+ global $user;
$error=0;
// Insert request
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."comment (";
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
$sql.= "description";
$sql.= ", datec";
$sql.= ", fk_element";
$sql.= ", element_type";
$sql.= ", fk_user_author";
+ $sql.= ", fk_user_modif";
$sql.= ", entity";
$sql.= ", import_key";
$sql.= ") VALUES (";
@@ -113,6 +119,7 @@ class Comment extends CommonObject
$sql.= ", '".(isset($this->fk_element)?$this->fk_element:"null")."'";
$sql.= ", '".$this->db->escape($this->element_type)."'";
$sql.= ", '".(isset($this->fk_user_author)?$this->fk_user_author:"null")."'";
+ $sql.= ", ".$user->id."";
$sql.= ", ".(!empty($this->entity)?$this->entity:'1');
$sql.= ", ".(!empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
$sql.= ")";
@@ -128,7 +135,7 @@ class Comment extends CommonObject
if (! $error)
{
- $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_comment");
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
if (! $notrigger)
{
@@ -177,9 +184,10 @@ class Comment extends CommonObject
$sql.= " c.fk_element,";
$sql.= " c.element_type,";
$sql.= " c.fk_user_author,";
+ $sql.= " c.fk_user_modif,";
$sql.= " c.entity,";
$sql.= " c.import_key";
- $sql.= " FROM ".MAIN_DB_PREFIX."comment as c";
+ $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as c";
$sql.= " WHERE c.rowid = ".$id;
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -196,8 +204,9 @@ class Comment extends CommonObject
$this->description = $obj->description;
$this->element_type = $obj->element_type;
$this->datec = $this->db->jdate($obj->datec);
- $this->tms = $obj->tms;
+ $this->tms = $this->db->jdate($obj->tms);
$this->fk_user_author = $obj->fk_user_author;
+ $this->fk_user_modif = $obj->fk_user_modif;
$this->fk_element = $obj->fk_element;
$this->entity = $obj->entity;
$this->import_key = $obj->import_key;
@@ -225,22 +234,21 @@ class Comment extends CommonObject
*/
public function update(User $user, $notrigger = 0)
{
- global $conf, $langs;
+ global $user;
$error=0;
// Clean parameters
if (isset($this->fk_element)) $this->fk_project=(int) trim($this->fk_element);
- if (isset($this->fk_user_author)) $this->fk_user_author=(int) trim($this->fk_user_author);
if (isset($this->description)) $this->description=trim($this->description);
// Update request
- $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_comment SET";
+ $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
$sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").",";
$sql.= " datec=".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null').",";
$sql.= " fk_element=".(isset($this->fk_element)?$this->fk_element:"null").",";
$sql.= " element_type='".$this->db->escape($this->element_type)."',";
- $sql.= " fk_user_author=".(isset($this->fk_user_author)?$this->fk_user_author:"null").",";
+ $sql.= " fk_user_modif=".$user->id.",";
$sql.= " entity=".(!empty($this->entity)?$this->entity:'1').",";
$sql.= " import_key=".(!empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
$sql.= " WHERE rowid=".$this->id;
@@ -297,7 +305,7 @@ class Comment extends CommonObject
$this->db->begin();
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."comment";
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
$sql.= " WHERE rowid=".$this->id;
$resql = $this->db->query($sql);
@@ -345,7 +353,7 @@ class Comment extends CommonObject
if(!empty($element_type) && !empty($fk_element)) {
$sql = "SELECT";
$sql.= " c.rowid";
- $sql.= " FROM ".MAIN_DB_PREFIX."comment as c";
+ $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as c";
$sql.= " WHERE c.fk_element = ".$fk_element;
$sql.= " AND c.element_type = '".$db->escape($element_type)."'";
$sql.= " AND c.entity = ".$conf->entity;
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 20889e1a742..6a9bc0c9f29 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -585,7 +585,7 @@ abstract class CommonDocGenerator
{
$resarray['line_unit']=$outputlangs->trans($line->getLabelOfUnit('long'));
$resarray['line_unit_short']=$outputlangs->trans($line->getLabelOfUnit('short'));
- }
+ }
// Retrieve extrafields
$extrafieldkey=$line->element;
@@ -595,7 +595,30 @@ abstract class CommonDocGenerator
$extrafields->fetch_name_optionals_label($extrafieldkey, true);
$line->fetch_optionals();
- $resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
+ $resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
+
+ // Check if the current line belongs to a supplier order
+ if (get_class($line) == 'CommandeFournisseurLigne')
+ {
+ // Add the product supplier extrafields to the substitutions
+ $extrafields->fetch_name_optionals_label("product_fournisseur_price");
+ $extralabels=$extrafields->attributes["product_fournisseur_price"]['label'];
+ $columns = "";
+ foreach ($extralabels as $key => $value)
+ $columns .= "$key, ";
+
+ if ($columns != "")
+ {
+ $columns = substr($columns, 0, strlen($columns) - 2);
+ $resql = $this->db->query("SELECT $columns FROM " . MAIN_DB_PREFIX . "product_fournisseur_price_extrafields AS ex INNER JOIN " . MAIN_DB_PREFIX . "product_fournisseur_price AS f ON ex.fk_object = f.rowid WHERE f.ref_fourn = '" . $line->ref_supplier . "'");
+ if ($this->db->num_rows($resql) > 0) {
+ $resql = $this->db->fetch_object($resql);
+
+ foreach ($extralabels as $key => $value)
+ $resarray['line_product_supplier_'.$key] = $resql->{$key};
+ }
+ }
+ }
// Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
if (isset($line->fk_product) && $line->fk_product > 0)
@@ -820,7 +843,7 @@ abstract class CommonDocGenerator
$id = $object->array_options['options_'.$key];
if ($id != "")
{
- $param = $extrafields->attribute_param[$key];
+ $param = $extrafields->attributes[$object->table_element]['param'][$key];
$param_list=array_keys($param['options']); // $param_list='ObjectName:classPath'
$InfoFieldList = explode(":", $param_list[0]);
$classname=$InfoFieldList[0];
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index ec27b83e0a0..b6381ccc7ca 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -496,27 +496,27 @@ abstract class CommonInvoice extends CommonObject
$prefix='Short';
if (! $paye){
if ($status == 0) {
- $labelstatut = $langs->trans('BillStatusDraft');
- $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusDraft');
+ $labelStatus = $langs->trans('BillStatusDraft');
+ $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusDraft');
}
elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
- $labelstatut = $langs->trans('BillStatusClosedUnpaid');
- $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
+ $labelStatus = $langs->trans('BillStatusClosedUnpaid');
+ $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
$statusType='status5';
}
elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
- $labelstatut = $langs->trans('BillStatusClosedPaidPartially');
- $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+ $labelStatus = $langs->trans('BillStatusClosedPaidPartially');
+ $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
$statusType='status9';
}
elseif ($alreadypaid <= 0) {
- $labelstatut = $langs->trans('BillStatusNotPaid');
- $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusNotPaid');
+ $labelStatus = $langs->trans('BillStatusNotPaid');
+ $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusNotPaid');
$statusType='status1';
}
else {
- $labelstatut = $langs->trans('BillStatusStarted');
- $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusStarted');
+ $labelStatus = $langs->trans('BillStatusStarted');
+ $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusStarted');
$statusType='status3';
}
}
@@ -525,20 +525,20 @@ abstract class CommonInvoice extends CommonObject
$statusType='status6';
if ($type == self::TYPE_CREDIT_NOTE){
- $labelstatut = $langs->trans('BillStatusPaidBackOrConverted'); // credit note
- $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted'); // credit note
+ $labelStatus = $langs->trans('BillStatusPaidBackOrConverted'); // credit note
+ $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted'); // credit note
}
elseif ($type == self::TYPE_DEPOSIT){
- $labelstatut = $langs->trans('BillStatusConverted'); // deposit invoice
- $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusConverted'); // deposit invoice
+ $labelStatus = $langs->trans('BillStatusConverted'); // deposit invoice
+ $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusConverted'); // deposit invoice
}
else{
- $labelstatut = $langs->trans('BillStatusPaid');
- $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusPaid');
+ $labelStatus = $langs->trans('BillStatusPaid');
+ $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusPaid');
}
}
- return dolGetStatus($labelstatut, $labelstatutShort, '', $statusType, $mode);
+ return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 6adbba4366a..0cfe1958f03 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -421,7 +421,12 @@ abstract class CommonObject
public $civility_id;
// Dates
- public $date_creation; // Date creation
+ /**
+ * @var integer|string date_creation
+ */
+ public $date_creation;
+
+
public $date_validation; // Date validation
public $date_modification; // Date last change (tms field)
@@ -1064,13 +1069,13 @@ abstract class CommonObject
/**
* Get array of all contacts for an object
*
- * @param int $statut Status of links to get (-1=all)
+ * @param int $status Status of links to get (-1=all)
* @param string $source Source of contact: external or thirdparty (llx_socpeople) or internal (llx_user)
* @param int $list 0:Return array contains all properties, 1:Return array contains just id
* @param string $code Filter on this code of contact type ('SHIPPING', 'BILLING', ...)
* @return array|int Array of contacts, -1 if error
*/
- public function liste_contact($statut = -1, $source = 'external', $list = 0, $code = '')
+ public function liste_contact($status = -1, $source = 'external', $list = 0, $code = '')
{
// phpcs:enable
global $langs;
@@ -1093,7 +1098,7 @@ abstract class CommonObject
if ($source == 'internal') $sql.= " AND tc.source = 'internal'";
if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";
$sql.= " AND tc.active=1";
- if ($statut >= 0) $sql.= " AND ec.statut = '".$statut."'";
+ if ($status >= 0) $sql.= " AND ec.statut = ".$status;
$sql.=" ORDER BY t.lastname ASC";
dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);
@@ -1748,7 +1753,7 @@ abstract class CommonObject
// Security on socid
$socid = 0;
- if ($user->societe_id > 0) $socid = $user->societe_id;
+ if ($user->socid > 0) $socid = $user->socid;
// this->ismultientitymanaged contains
// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
@@ -5631,7 +5636,7 @@ abstract class CommonObject
{
$morecss = 'minwidth100imp';
}
- elseif ($type == 'datetime')
+ elseif ($type == 'datetime' || $type == 'link')
{
$morecss = 'minwidth200imp';
}
@@ -6100,7 +6105,7 @@ abstract class CommonObject
$param_list_array = explode(':', $param_list[0]);
$showempty=(($required && $default != '')?0:1);
- $out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', '', '', 0, empty($val['disabled'])?0:1);
+ $out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, '', 0, empty($val['disabled'])?0:1);
if (! empty($param_list_array[2])) // If we set to add a create button
{
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 61f02e0fa83..ef529f39d9a 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -1,6 +1,5 @@
+/* Copyright (C) 2015-2018 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 155050c6997..c4af5773885 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -105,7 +105,13 @@ class EmailSenderProfile extends CommonObject
public $label;
public $email;
+
+ /**
+ * @var integer|string date_creation
+ */
public $date_creation;
+
+
public $tms;
//public $fk_user_creat;
//public $fk_user_modif;
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 6807e75ba80..83734acd36e 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1029,7 +1029,7 @@ class ExtraFields
{
$morecss = 'minwidth100imp';
}
- elseif ($type == 'datetime')
+ elseif ($type == 'datetime' || $type == 'link')
{
$morecss = 'minwidth200imp';
}
@@ -1586,7 +1586,7 @@ class ExtraFields
* @param string $key Key of attribute
* @param string $value Value to show
* @param string $moreparam To add more parameters on html input tag (only checkbox use html input for output rendering)
- * @param string $extrafieldsobjectkey If defined (for example $object->table_element), use the new method to get extrafields data
+ * @param string $extrafieldsobjectkey If defined (for example $object->table_element), function uses the new method to get extrafields data
* @return string Formated value
*/
public function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '')
@@ -1611,6 +1611,7 @@ class ExtraFields
}
else // Old usage
{
+ //dol_syslog("Warning: parameter 'extrafieldsobjectkey' is missing", LOG_WARNING);
$label=$this->attribute_label[$key];
$type=$this->attribute_type[$key];
$size=$this->attribute_size[$key];
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index f944ccdc0c0..0eed1a56580 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -290,42 +290,42 @@ class Fiscalyear extends CommonObject
/**
* Give a label from a status
*
- * @param int $statut Id status
+ * @param int $status Id status
* @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
* @return string Label
*/
- public function LibStatut($statut, $mode = 0)
+ public function LibStatut($status, $mode = 0)
{
// phpcs:enable
global $langs;
if ($mode == 0)
{
- return $langs->trans($this->statuts[$statut]);
+ return $langs->trans($this->statuts[$status]);
}
elseif ($mode == 1)
{
- return $langs->trans($this->statuts_short[$statut]);
+ return $langs->trans($this->statuts_short[$status]);
}
elseif ($mode == 2)
{
- if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4').' '.$langs->trans($this->statuts_short[$statut]);
- elseif ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut8').' '.$langs->trans($this->statuts_short[$statut]);
+ if ($status==0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
+ elseif ($status==1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8').' '.$langs->trans($this->statuts_short[$status]);
}
elseif ($mode == 3)
{
- if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4');
- elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut8');
+ if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
+ elseif ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8');
}
elseif ($mode == 4)
{
- if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4').' '.$langs->trans($this->statuts[$statut]);
- elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut8').' '.$langs->trans($this->statuts[$statut]);
+ if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
+ elseif ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]);
}
elseif ($mode == 5)
{
- if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut4');
- elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
+ if ($status==0 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
+ elseif ($status==1 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
}
}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7f1c2cbee50..0aca6a94213 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1651,7 +1651,7 @@ class Form
$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
}
}
- if (! empty($user->societe_id)) $sql.= " AND u.fk_soc = ".$user->societe_id;
+ if (! empty($user->socid)) $sql.= " AND u.fk_soc = ".$user->socid;
if (is_array($exclude) && $excludeUsers) $sql.= " AND u.rowid NOT IN (".$excludeUsers.")";
if ($includeUsers) $sql.= " AND u.rowid IN (".$includeUsers.")";
if (! empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $noactive) $sql.= " AND u.statut <> 0";
@@ -3765,7 +3765,7 @@ class Form
*
* @param string $selected Id account pre-selected
* @param string $htmlname Name of select zone
- * @param int $statut Status of searched accounts (0=open, 1=closed, 2=both)
+ * @param int $status Status of searched accounts (0=open, 1=closed, 2=both)
* @param string $filtre To filter list
* @param int $useempty 1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
* @param string $moreattrib To add more attribute on select
@@ -3773,7 +3773,7 @@ class Form
* @param string $morecss More CSS
* @return int <0 if error, Num of bank account found if OK (0, 1, 2, ...)
*/
- public function select_comptes($selected = '', $htmlname = 'accountid', $statut = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '')
+ public function select_comptes($selected = '', $htmlname = 'accountid', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '')
{
// phpcs:enable
global $langs, $conf;
@@ -3784,7 +3784,7 @@ class Form
$sql = "SELECT rowid, label, bank, clos as status, currency_code";
$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
$sql.= " WHERE entity IN (".getEntity('bank_account').")";
- if ($statut != 2) $sql.= " AND clos = '".$statut."'";
+ if ($status != 2) $sql.= " AND clos = ".(int) $status;
if ($filtre) $sql.=" AND ".$filtre;
$sql.= " ORDER BY label";
@@ -3815,7 +3815,7 @@ class Form
}
print trim($obj->label);
if ($showcurrency) print ' ('.$obj->currency_code.')';
- if ($statut == 2 && $obj->status == 1) print ' ('.$langs->trans("Closed").')';
+ if ($status == 2 && $obj->status == 1) print ' ('.$langs->trans("Closed").')';
print '';
$i++;
}
@@ -3823,7 +3823,7 @@ class Form
}
else
{
- if ($statut == 0) print ''.$langs->trans("NoActiveBankAccountDefined").' ';
+ if ($status == 0) print ''.$langs->trans("NoActiveBankAccountDefined").' ';
else print ''.$langs->trans("NoBankAccountFound").' ';
}
}
@@ -3839,13 +3839,13 @@ class Form
*
* @param string $selected Id establishment pre-selected
* @param string $htmlname Name of select zone
- * @param int $statut Status of searched establishment (0=open, 1=closed, 2=both)
+ * @param int $status Status of searched establishment (0=open, 1=closed, 2=both)
* @param string $filtre To filter list
* @param int $useempty 1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
* @param string $moreattrib To add more attribute on select
* @return int <0 if error, Num of establishment found if OK (0, 1, 2, ...)
*/
- public function selectEstablishments($selected = '', $htmlname = 'entity', $statut = 0, $filtre = '', $useempty = 0, $moreattrib = '')
+ public function selectEstablishments($selected = '', $htmlname = 'entity', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '')
{
// phpcs:enable
global $langs, $conf;
@@ -3856,7 +3856,7 @@ class Form
$sql = "SELECT rowid, name, fk_country, status, entity";
$sql.= " FROM ".MAIN_DB_PREFIX."establishment";
$sql.= " WHERE 1=1";
- if ($statut != 2) $sql.= " AND status = '".$statut."'";
+ if ($status != 2) $sql.= " AND status = ".(int) $status;
if ($filtre) $sql.=" AND ".$filtre;
$sql.= " ORDER BY name";
@@ -3886,7 +3886,7 @@ class Form
print '';
}
print trim($obj->name);
- if ($statut == 2 && $obj->status == 1) print ' ('.$langs->trans("Closed").')';
+ if ($status == 2 && $obj->status == 1) print ' ('.$langs->trans("Closed").')';
print ' ';
$i++;
}
@@ -3894,7 +3894,7 @@ class Form
}
else
{
- if ($statut == 0) print ''.$langs->trans("NoActiveEstablishmentDefined").' ';
+ if ($status == 0) print ''.$langs->trans("NoActiveEstablishmentDefined").' ';
else print ''.$langs->trans("NoEstablishmentFound").' ';
}
}
@@ -4070,13 +4070,13 @@ class Form
* @param array $formquestion An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , ))
* type can be 'hidden', 'text', 'password', 'checkbox', 'radio', 'date', 'morecss', ...
* @param string $selectedchoice '' or 'no', or 'yes' or '1' or '0'
- * @param int $useajax 0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
- * @param int $height Force height of box
+ * @param int|string $useajax 0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
+ * @param int $height Force height of box (0 = auto)
* @param int $width Force width of box ('999' or '90%'). Ignored and forced to 90% on smartphones.
* @param int $disableformtag 1=Disable form tag. Can be used if we are already inside a '."\n";
}
// JQUI method dialog is broken with jmobile, we use standard HTML.
@@ -5336,13 +5344,14 @@ class Form
* @param int $disabled Disable input fields
* @param int $fullday When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59
* @param string $addplusone Add a link "+1 hour". Value must be name of another selectDate field.
- * @param datetime $adddateof Add a link "Date of invoice" using the following date.
- * @param string $openinghours Specify hour strat and hour end for the select ex 8,20
+ * @param datetime $adddateof Add a link "Date of invoice" using the following date. See also $labeladddateof for the label used.
+ * @param string $openinghours Specify hour start and hour end for the select ex 8,20
* @param int $stepminutes Specify step for minutes between 1 and 30
+ * @param string $labeladddateof Label to use for the $adddateof parameter.
* @return string Html for selectDate
* @see form_date(), select_month(), select_year(), select_dayofweek()
*/
- public function selectDate($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '', $openinghours = '', $stepminutes = 1)
+ public function selectDate($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '', $openinghours = '', $stepminutes = 1, $labeladddateof = '')
{
global $conf,$langs;
@@ -5729,7 +5738,8 @@ class Form
if ($conf->use_javascript_ajax && $adddateof)
{
$tmparray=dol_getdate($adddateof);
- $retstring.=' -
'.$langs->trans("DateInvoice").'';
+ if (empty($labeladddateof)) $labeladddateof = $langs->trans("DateInvoice");
+ $retstring.=' - '.$labeladddateof.'';
}
return $retstring;
@@ -5857,7 +5867,12 @@ class Form
if ($classname && class_exists($classname))
{
$objecttmp = new $classname($this->db);
- $objecttmp->filter = $filter;
+ // Make some replacement
+ $sharedentities = getEntity(strtolower($classname));
+ $objecttmp->filter = str_replace(
+ array('__ENTITY__', '__SHARED_ENTITIES__', '__USER_ID__'),
+ array($conf->entity, $sharedentities, $user->id),
+ $filter);
}
}
if (! is_object($objecttmp))
@@ -5866,6 +5881,7 @@ class Form
return 'Error bad setup of type for field '.join(',', $InfoFieldList);
}
+ //var_dump($objecttmp->filter);
$prefixforautocompletemode=$objecttmp->element;
if ($prefixforautocompletemode == 'societe') $prefixforautocompletemode='company';
$confkeyforautocompletemode=strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index d231dacab87..22acff7763d 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -688,7 +688,7 @@ class FormFile
}
else
{
- dol_print_error($this->db, 'Bad value for modulepart');
+ dol_print_error($this->db, "Bad value for modulepart '".$modulepart."' in showdocuments");
return -1;
}
}
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index 25a46090b1d..613992bdd2a 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -195,7 +195,7 @@ class FormMargin
{
global $langs, $conf, $user;
- if (! empty($user->societe_id)) return;
+ if (! empty($user->socid)) return;
if (! $user->rights->margins->liretous) return;
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index 6fc00605d77..12ec3e7f5ad 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -47,7 +47,7 @@ class FormWebsite
/**
- * Return HTML select list of export models
+ * Return HTML select list of websites
*
* @param string $selected Id modele pre-selectionne
* @param string $htmlname Name of HTML select
@@ -99,7 +99,7 @@ class FormWebsite
/**
- * Return a HTML select list of a dictionary
+ * Return a HTML select list of type of containers from the dictionary
*
* @param string $htmlname Name of select zone
* @param string $selected Selected value
@@ -162,7 +162,7 @@ class FormWebsite
/**
- * Return a HTML select list of type of containers
+ * Return a HTML select list of samples of containers content
*
* @param string $htmlname Name of select zone
* @param string $selected Selected value
@@ -217,4 +217,72 @@ class FormWebsite
return $out;
}
+
+
+ /**
+ * Return a HTML select list of containers of a website.
+ * Note: $website->lines must have been loaded.
+ *
+ * @param Website $website Object Website
+ * @param string $htmlname Name of select zone
+ * @param int $pageid Preselected container ID
+ * @param int $showempty Show empty record
+ * @param string $action Action on page that use this select list
+ * @return string HTML select component with list of type of containers
+ */
+ public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '')
+ {
+ global $langs;
+
+ $atleastonepage = (is_array($website->lines) && count($website->lines) > 0);
+
+ $out='';
+ if ($atleastonepage && $action != 'editsource')
+ {
+ $out.='';
+ }
+ else
+ {
+ $out.='';
+ }
+
+ if ($showempty || ! $atleastonepage) $out.=' ';
+
+ if ($atleastonepage)
+ {
+ if (empty($pageid) && $action != 'createcontainer') // Page id is not defined, we try to take one
+ {
+ $firstpageid=0;$homepageid=0;
+ foreach($website->lines as $key => $valpage)
+ {
+ if (empty($firstpageid)) $firstpageid=$valpage->id;
+ if ($website->fk_default_home && $key == $website->fk_default_home) $homepageid=$valpage->id;
+ }
+ $pageid=$homepageid?$homepageid:$firstpageid; // We choose home page and if not defined yet, we take first page
+ }
+
+ foreach($website->lines as $key => $valpage)
+ {
+ $out.=' 0 && $pageid == $key) $out.=' selected'; // To preselect a value
+ $out.='>';
+ $out.='['.$valpage->type_container.' '.sprintf("%03d", $valpage->id).'] ';
+ $out.=$valpage->pageurl.' - '.$valpage->title;
+ if ($website->fk_default_home && $key == $website->fk_default_home) $out.=' ('.$langs->trans("HomePage").')';
+ $out.=' ';
+ }
+ }
+ $out.=' ';
+
+ if ($atleastonepage && $action != 'editsource')
+ {
+ $out.=ajax_combobox($htmlname);
+ }
+ else
+ {
+ $out.=''."\n";
-
- if ($morehtmlright) $out.='
'.$morehtmlright.'
'; // Output right area first so when space is missing, text is in front of tabs and not under.
-
// Show title
$showtitle=1;
if (! empty($conf->dol_optimize_smallscreen)) $showtitle=0;
+
+ $out = "\n".'';
+
+ if ((! empty($title) && $showtitle) || $morehtmlright || ! empty($links)) {
+ $out.= '
'."\n";
+ }
+
+ // Show right part
+ if ($morehtmlright) $out.='
'.$morehtmlright.'
'; // Output right area first so when space is missing, text is in front of tabs and not under.
+
+ // Show title
if (! empty($title) && $showtitle)
{
$limittitle=30;
@@ -1138,6 +1145,8 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
$out.='';
}
+ // Show tabs
+
// Define max of key (max may be higher than sizeof because of hole due to module disabling some tabs).
$maxkey=-1;
if (is_array($links) && ! empty($links))
@@ -1149,16 +1158,15 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
if (! empty($conf->dol_optimize_smallscreen)) $conf->global->MAIN_MAXTABS_IN_CARD=2;
// Show tabs
- $bactive=false;
// if =0 we don't use the feature
$limittoshow=(empty($conf->global->MAIN_MAXTABS_IN_CARD)?99:$conf->global->MAIN_MAXTABS_IN_CARD);
$displaytab=0;
$nbintab=0;
- $popuptab=0; $outmore='';
+ $popuptab=0;
+ $outmore='';
for ($i = 0 ; $i <= $maxkey ; $i++)
{
- if ((is_numeric($active) && $i == $active) || (! empty($links[$i][2]) && ! is_numeric($active) && $active == $links[$i][2]))
- {
+ if ((is_numeric($active) && $i == $active) || (! empty($links[$i][2]) && ! is_numeric($active) && $active == $links[$i][2])) {
// If active tab is already present
if ($i >= $limittoshow) $limittoshow--;
}
@@ -1166,13 +1174,10 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
for ($i = 0 ; $i <= $maxkey ; $i++)
{
- if ((is_numeric($active) && $i == $active) || (! empty($links[$i][2]) && ! is_numeric($active) && $active == $links[$i][2]))
- {
+ if ((is_numeric($active) && $i == $active) || (! empty($links[$i][2]) && ! is_numeric($active) && $active == $links[$i][2])) {
$isactive=true;
- $bactive=true;
}
- else
- {
+ else {
$isactive=false;
}
@@ -1258,7 +1263,9 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
$out.="";
}
- $out.="
\n";
+ if ((! empty($title) && $showtitle) || $morehtmlright || ! empty($links)) {
+ $out.="
'."\n";
@@ -1984,56 +1991,48 @@ function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = false, $
if ($second< 0 || $second > 60) return '';
}
- if (method_exists('DateTime', 'getTimestamp'))
+ if (empty($gm) || $gm === 'server')
{
- if (empty($gm) || $gm === 'server')
- {
- $default_timezone=@date_default_timezone_get(); // Example 'Europe/Berlin'
+ $default_timezone=@date_default_timezone_get(); // Example 'Europe/Berlin'
+ $localtz = new DateTimeZone($default_timezone);
+ }
+ elseif ($gm === 'user')
+ {
+ // We use dol_tz_string first because it is more reliable.
+ $default_timezone=(empty($_SESSION["dol_tz_string"])?@date_default_timezone_get():$_SESSION["dol_tz_string"]); // Example 'Europe/Berlin'
+ try {
$localtz = new DateTimeZone($default_timezone);
}
- elseif ($gm === 'user')
+ catch(Exception $e)
{
- // We use dol_tz_string first because it is more reliable.
- $default_timezone=(empty($_SESSION["dol_tz_string"])?@date_default_timezone_get():$_SESSION["dol_tz_string"]); // Example 'Europe/Berlin'
- try {
- $localtz = new DateTimeZone($default_timezone);
- }
- catch(Exception $e)
- {
- dol_syslog("Warning dol_tz_string contains an invalid value ".$_SESSION["dol_tz_string"], LOG_WARNING);
- $default_timezone=@date_default_timezone_get();
- }
+ dol_syslog("Warning dol_tz_string contains an invalid value ".$_SESSION["dol_tz_string"], LOG_WARNING);
+ $default_timezone=@date_default_timezone_get();
}
- elseif (strrpos($gm, "tz,") !== false)
- {
- $timezone=str_replace("tz,", "", $gm); // Example 'tz,Europe/Berlin'
- try
- {
- $localtz = new DateTimeZone($timezone);
- }
- catch(Exception $e)
- {
- dol_syslog("Warning passed timezone contains an invalid value ".$timezone, LOG_WARNING);
- }
- }
-
- if (empty($localtz)) {
- $localtz = new DateTimeZone('UTC');
- }
- //var_dump($localtz);
- //var_dump($year.'-'.$month.'-'.$day.'-'.$hour.'-'.$minute);
- $dt = new DateTime(null, $localtz);
- $dt->setDate((int) $year, (int) $month, (int) $day);
- $dt->setTime((int) $hour, (int) $minute, (int) $second);
- $date=$dt->getTimestamp(); // should include daylight saving time
- //var_dump($date);
- return $date;
}
- else
+ elseif (strrpos($gm, "tz,") !== false)
{
- dol_print_error('', 'PHP version must be 5.4+');
- return '';
+ $timezone=str_replace("tz,", "", $gm); // Example 'tz,Europe/Berlin'
+ try
+ {
+ $localtz = new DateTimeZone($timezone);
+ }
+ catch(Exception $e)
+ {
+ dol_syslog("Warning passed timezone contains an invalid value ".$timezone, LOG_WARNING);
+ }
}
+
+ if (empty($localtz)) {
+ $localtz = new DateTimeZone('UTC');
+ }
+ //var_dump($localtz);
+ //var_dump($year.'-'.$month.'-'.$day.'-'.$hour.'-'.$minute);
+ $dt = new DateTime(null, $localtz);
+ $dt->setDate((int) $year, (int) $month, (int) $day);
+ $dt->setTime((int) $hour, (int) $minute, (int) $second);
+ $date=$dt->getTimestamp(); // should include daylight saving time
+ //var_dump($date);
+ return $date;
}
@@ -3024,7 +3023,7 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
* @param int $notitle 1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
* @param string $alt Force alt for bind people
* @param string $morecss Add more class css on img tag (For example 'myclascss'). Work only if $moreatt is empty.
- * @param string $marginleftonlyshort 1 = Add a short left margin on picto, 2 = Add a larger left maring on picto, 0 = No margin left. Works for fontawesome picto only.
+ * @param string $marginleftonlyshort 1 = Add a short left margin on picto, 2 = Add a larger left margin on picto, 0 = No margin left. Works for fontawesome picto only.
* @return string Return img tag
* @see img_object(), img_picto_common()
*/
@@ -3055,7 +3054,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
//if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
if (empty($srconly) && in_array($pictowithouttext, array(
'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
- 'address', 'bank', 'building', 'cash-register', 'close_title', 'cubes', 'delete', 'dolly', 'edit', 'ellipsis-h', 'bookmark', 'filter', 'grip', 'grip_title', 'list', 'listlight', 'note',
+ 'address', 'bank', 'bookmark', 'building', 'cash-register', 'close_title', 'cubes', 'delete', 'dolly', 'edit', 'ellipsis-h',
+ 'filter', 'file-code', 'grip', 'grip_title', 'list', 'listlight', 'note',
'object_list','object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
'off', 'on', 'play', 'playdisabled', 'printer', 'resize', 'stats',
'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench', 'globe',
@@ -3086,12 +3086,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$morecss .= ($morecss ? ' ' : '').('picto'.$pictowithouttext);
} elseif ($pictowithouttext == 'switch_off') {
$facolor = '#999';
- $fasize = '2em';
$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
}
elseif ($pictowithouttext == 'switch_on') {
$facolor = '#227722';
- $fasize = '2em';
$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
}
elseif ($pictowithouttext == 'off') {
@@ -8116,25 +8114,24 @@ function roundUpToNextMultiple($n, $x = 5)
* @param string $type type of badge : Primary Secondary Success Danger Warning Info Light Dark status0 status1 status2 status3 status4 status5 status6 status7 status8 status9
* @param string $mode default '' , pill, dot
* @param string $url the url for link
- * @param array $params various params for future : recommended rather than adding more fuction arguments
+ * @param array $params various params for future : recommended rather than adding more fuction arguments. array('attr'=>array('title'=>'abc'))
* @return string Html badge
*/
function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '', $params = array())
{
$attr=array(
- 'class'=>'badge badge-status'.(!empty($mode)?' badge-'.$mode:'').(!empty($type)?' badge-'.$type:'')
+ 'class'=>'badge badge-status'.(!empty($mode)?' badge-'.$mode:'').(!empty($type)?' badge-'.$type:'').(empty($params['css'])?'':' '.$params['css'])
);
- if(empty($html)){
+ if (empty($html)) {
$html = $label;
}
- if(!empty($url)){
+ if (!empty($url)) {
$attr['href'] = $url;
}
- if($mode==='dot')
- {
+ if ($mode==='dot') {
$attr['class'].= ' classfortooltip';
$attr['title'] = $html;
$attr['aria-label'] = $label;
@@ -8142,8 +8139,8 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '
}
// Override attr
- if(!empty($params['attr']) && is_array($params['attr'])){
- foreach($params['attr']as $key => $value){
+ if (!empty($params['attr']) && is_array($params['attr'])) {
+ foreach($params['attr']as $key => $value) {
$attr[$key] = $value;
}
}
@@ -8154,7 +8151,7 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '
$attr = array_map('dol_escape_htmltag', $attr);
$TCompiledAttr = array();
- foreach($attr as $key => $value){
+ foreach($attr as $key => $value) {
$TCompiledAttr[] = $key.'="'.$value.'"';
}
@@ -8197,13 +8194,13 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
elseif ($displayMode == 1) {
$return = !empty($html)?$html:(!empty($statusLabelShort)?$statusLabelShort:$statusLabel);
}
- // use status with images
- elseif (empty($conf->global->MAIN_STATUS_USES_CSS)) {
+ // Use status with images (for backward compatibility)
+ elseif (! empty($conf->global->MAIN_STATUS_USES_IMAGES)) {
$return = '';
$htmlLabel = (in_array($displayMode, array(1,2,5))?'
':'').(!empty($html)?$html:$statusLabel).(in_array($displayMode, array(1,2,5))?' ':'');
$htmlLabelShort = (in_array($displayMode, array(1,2,5))?'
':'').(!empty($html)?$html:(!empty($statusLabelShort)?$statusLabelShort:$statusLabel)).(in_array($displayMode, array(1,2,5))?' ':'');
- // For small screen, we use the short label instead of long label.
+ // For small screen, we always use the short label instead of long label.
if (! empty($conf->dol_optimize_smallscreen))
{
if ($displayMode == 0) $displayMode = 1;
@@ -8211,7 +8208,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
elseif ($displayMode == 6) $displayMode = 5;
}
- // image's filename are still in French, so we use this array to convert
+ // For backward compatibility. Image's filename are still in French, so we use this array to convert
$statusImg=array(
'status0' => 'statut0'
,'status1' => 'statut1'
@@ -8248,7 +8245,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
}
}
// Use new badge
- elseif (!empty($conf->global->MAIN_STATUS_USES_CSS) && !empty($displayMode)) {
+ elseif (empty($conf->global->MAIN_STATUS_USES_IMAGES) && !empty($displayMode)) {
$statusLabelShort = !empty($statusLabelShort)?$statusLabelShort:$statusLabel;
if ($displayMode == 3) {
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 30eba9867b8..07f058f2fe2 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1617,7 +1617,7 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
$found=0;
$dirtoscan='';
- $sql = "SELECT nom as id, nom as lib, libelle as label, description as description";
+ $sql = "SELECT nom as id, nom as doc_template_name, libelle as label, description as description";
$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
$sql.= " WHERE type = '".$type."'";
$sql.= " AND entity IN (0,".$conf->entity.")";
@@ -1677,18 +1677,18 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
}
else
{
- if ($type == 'member' && $obj->lib == 'standard') // Special case, if member template, we add variant per format
+ if ($type == 'member' && $obj->doc_template_name == 'standard') // Special case, if member template, we add variant per format
{
global $_Avery_Labels;
include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
foreach($_Avery_Labels as $key => $val)
{
- $liste[$obj->id.':'.$key]=($obj->label?$obj->label:$obj->lib).' '.$val['name'];
+ $liste[$obj->id.':'.$key]=($obj->label?$obj->label:$obj->doc_template_name).' '.$val['name'];
}
}
else // Common usage
{
- $liste[$obj->id]=$obj->label?$obj->label:$obj->lib;
+ $liste[$obj->id]=$obj->label?$obj->label:$obj->doc_template_name;
}
}
$i++;
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 004f355a27a..7dfee37666a 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -189,7 +189,7 @@ function invoice_rec_prepare_head($object)
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT.'/compta/facture/fiche-rec.php?id='.$object->id;
+ $head[$h][0] = DOL_URL_ROOT.'/compta/facture/card-rec.php?id='.$object->id;
$head[$h][1] = $langs->trans("CardBill");
$head[$h][2] = 'card';
$h++;
diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index e6f36b25d47..4e5cbb92c02 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -128,17 +128,19 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
$i++;
$texttoinsert.= "\t\t'".$key."' => array('type'=>'".$val['type']."', 'label'=>'".$val['label']."',";
$texttoinsert.= " 'enabled'=>".($val['enabled']!=''?$val['enabled']:1).",";
- $texttoinsert.= " 'visible'=>".($val['visible']!=''?$val['visible']:-1).",";
$texttoinsert.= " 'position'=>".($val['position']!=''?$val['position']:50).",";
- $texttoinsert.= " 'notnull'=>".($val['notnull']!=''?$val['notnull']:-1).",";
+ $texttoinsert.= " 'notnull'=>".(empty($val['notnull'])?0:$val['notnull']).",";
+ $texttoinsert.= " 'visible'=>".($val['visible']!=''?$val['visible']:-1).",";
+ if ($val['noteditable']) $texttoinsert.= " 'noteditable'=>'".$val['noteditable']."',";
if ($val['default']) $texttoinsert.= " 'default'=>'".$val['default']."',";
if ($val['index']) $texttoinsert.= " 'index'=>".$val['index'].",";
+ if ($val['foreignkey']) $texttoinsert.= " 'foreignkey'=>'".$val['foreignkey']."',";
if ($val['searchall']) $texttoinsert.= " 'searchall'=>".$val['searchall'].",";
if ($val['isameasure']) $texttoinsert.= " 'isameasure'=>'".$val['isameasure']."',";
- if ($val['foreignkey']) $texttoinsert.= " 'foreignkey'=>'".$val['foreignkey']."',";
+ if ($val['css']) $texttoinsert.= " 'css'=>'".$val['css']."',";
if ($val['help']) $texttoinsert.= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";
- if ($val['comment']) $texttoinsert.= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\",";
if ($val['showoncombobox']) $texttoinsert.= " 'showoncombobox'=>'".$val['showoncombobox']."',";
+ if ($val['disabled']) $texttoinsert.= " 'disabled'=>'".$val['disabled']."',";
if ($val['arrayofkeyval'])
{
$texttoinsert.= " 'arrayofkeyval'=>array(";
@@ -149,8 +151,10 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
$texttoinsert.="'".$key2."'=>'".$val2."'";
$i++;
}
- $texttoinsert.= ")";
+ $texttoinsert.= "),";
}
+ if ($val['comment']) $texttoinsert.= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\"";
+
$texttoinsert.= "),\n";
}
}
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 544ca40fcf6..11c5d50592a 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -291,6 +291,11 @@ function product_admin_prepare_head()
$head[$h][2] = 'attributes';
$h++;
+ $head[$h][0] = DOL_URL_ROOT.'/product/admin/product_supplier_extrafields.php';
+ $head[$h][1] = $langs->trans("ProductSupplierExtraFields");
+ $head[$h][2] = 'supplierAttributes';
+ $h++;
+
complete_head_from_modules($conf, $langs, null, $head, $h, 'product_admin', 'remove');
return $head;
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 0c80b05c9cd..825142d1385 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -670,8 +670,9 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
if ($total_projectlinesa_planned) {
$totalAverageDeclaredProgress = round(100 * $total_projectlinesa_declared_if_planned / $total_projectlinesa_planned, 2);
$totalCalculatedProgress = round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 2);
- // this conf is actually hidden, by default we use 1% for "be carefull or warning"
- $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.01;
+
+ // this conf is actually hidden, by default we use 10% for "be carefull or warning"
+ $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
// define progress color according to time spend vs workload
$progressBarClass = 'progress-bar-info';
@@ -1748,12 +1749,12 @@ function searchTaskInChild(&$inc, $parent, &$lines, &$taskrole)
* @param int $socid Id thirdparty
* @param int $projectsListId Id of project I have permission on
* @param int $mytasks Limited to task I am contact to
- * @param int $statut -1=No filter on statut, 0 or 1 = Filter on status
+ * @param int $status -1=No filter on statut, 0 or 1 = Filter on status
* @param array $listofoppstatus List of opportunity status
* @param array $hiddenfields List of info to not show ('projectlabel', 'declaredprogress', '...', )
* @return void
*/
-function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks = 0, $statut = -1, $listofoppstatus = array(), $hiddenfields = array())
+function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks = 0, $status = -1, $listofoppstatus = array(), $hiddenfields = array())
{
global $langs,$conf,$user,$bc;
@@ -1767,7 +1768,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
$project_year_filter=0;
$title=$langs->trans("Projects");
- if (strcmp($statut, '') && $statut >= 0) $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
+ if (strcmp($status, '') && $status >= 0) $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$status]);
$arrayidtypeofcontact=array();
@@ -1796,9 +1797,9 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
$sql.= " AND ec.fk_c_type_contact = ctc.rowid"; // Replace the 2 lines with ec.fk_c_type_contact in $arrayidtypeofcontact
$sql.= " AND ctc.element = 'project_task'";
}
- if ($statut >= 0)
+ if ($status >= 0)
{
- $sql.= " AND p.fk_statut = ".$statut;
+ $sql.= " AND p.fk_statut = ".(int) $status;
}
if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))
{
@@ -1995,6 +1996,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
* @param hideOnProgressNull $hideOnProgressNull bool hide if progress is null
* @param spaced $spaced bool used to add space at bottom (made by css)
* @return string
+ * @see getTaskProgressBadge()
*/
function getTaskProgressView($task, $label = true, $progressNumber = true, $hideOnProgressNull = false, $spaced = false)
{
@@ -2020,26 +2022,27 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
if ($task->planned_workload){
$progressCalculated = round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
- // this conf is actually hidden, by default we use 1% for "be carefull or warning"
- $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.01;
+ // this conf is actually hidden, by default we use 10% for "be carefull or warning"
+ $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
- $diffTitle = '
'.$langs->trans('ProgressDeclared').' : '.$task->progress.'%';
- $diffTitle.= '
'.$langs->trans('ProgressCalculated').' : '.$progressCalculated.'%';
+ $diffTitle = '
'.$langs->trans('ProgressDeclared').' : '.$task->progress.($task->progress ? '%' : '');
+ $diffTitle.= '
'.$langs->trans('ProgressCalculated').' : '.$progressCalculated.($progressCalculated ? '%' : '');
- if($progressCalculated > doubleval($task->progress)){
+ //var_dump($progressCalculated.' '.$warningRatio.' '.$task->progress.' '.doubleval($task->progress * $warningRatio));
+ if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
$progressBarClass = 'progress-bar-danger';
- $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress-$progressCalculated).'%');
- $diff = '
';
+ $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress-$progressCalculated).' '.$langs->trans("point"));
+ $diff = '
';
}
- elseif($progressCalculated * $warningRatio >= doubleval($task->progress)){ // warning if close at 1%
+ elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
$progressBarClass = 'progress-bar-warning';
- $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress-$progressCalculated).'%');
- $diff = '
';
+ $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress-$progressCalculated).' '.$langs->trans("point"));
+ $diff = '
';
}
else{
$progressBarClass = 'progress-bar-success';
- $title = $langs->trans('TheReportedProgressIsMoreThanTheCalculatedProgressionByX', ($task->progress-$progressCalculated).'%');
- $diff = '
';
+ $title = $langs->trans('TheReportedProgressIsMoreThanTheCalculatedProgressionByX', ($task->progress-$progressCalculated).' '.$langs->trans("point"));
+ $diff = '
';
}
}
@@ -2062,7 +2065,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
if($progressNumber !== false)
{
$out.= '
';
- if($progressNumber!==true){
+ if ($progressNumber!==true) {
$out.= $progressNumber; // replace label by param
}
else{
@@ -2087,8 +2090,21 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
$out.= ' ';
- $out.= '
';
- $out.= '
';
+ $out.= '
';
+ $diffval = doubleval($task->progress) - doubleval($progressCalculated);
+ if ($diffval >= 0) {
+ // good
+ $out.= '
';
+ $out.= '
';
+ $out.= '
';
+ }
+ else
+ {
+ // bad
+ $out.= '
';
+ $out.= '
';
+ $out.= '
';
+ }
$out.= '
';
$out.= '
';
@@ -2101,6 +2117,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
* @param label $label string empty = auto (progress), string = replace output
* @param tooltip $tooltip string empty = auto , string = replace output
* @return string
+ * @see getTaskProgressView()
*/
function getTaskProgressBadge($task, $label = '', $tooltip = '')
{
@@ -2117,13 +2134,13 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
if ($task->planned_workload){
$progressCalculated = round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
- // this conf is actually hidden, by default we use 1% for "be carefull or warning"
- $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.01;
+ // this conf is actually hidden, by default we use 10% for "be carefull or warning"
+ $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
- if($progressCalculated > doubleval($task->progress)){
+ if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
$badgeClass.= 'badge-danger';
}
- elseif($progressCalculated * $warningRatio >= doubleval($task->progress)){ // warning if close at 1%
+ elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
$badgeClass.= 'badge-warning';
}
else{
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index a4b96a6b650..d5226bb7e3d 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -217,7 +217,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
{
$featureforlistofmodule=$feature;
if ($featureforlistofmodule == 'produit') $featureforlistofmodule='product';
- if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule, $listofmodules)) // If limits on modules for external users, module must be into list of modules for external users
+ if (! empty($user->socid) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule, $listofmodules)) // If limits on modules for external users, module must be into list of modules for external users
{
$readok=0; $nbko++;
continue;
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 63e9a2fc9ff..e89e9a79194 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -819,6 +819,46 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
}
}
+ $documents = getTicketActionCommEcmList($actionstatic) ;
+ if(!empty($documents))
+ {
+ $footer.= '
';
+ foreach ($documents as $doc)
+ {
+ $footer.= '
id.'" ';
+ $footer.= ' data-path="'.$doc->filepath.'"';
+ $footer.= ' data-filename="'.dol_escape_htmltag($doc->filename).'" ';
+ $footer.= '>';
+
+ $filePath = DOL_DATA_ROOT . '/'. $doc->filepath . '/'. $doc->filename;
+ $mime = dol_mimetype($filePath);
+ $file = $actionstatic->id.'/'.$doc->filename;
+ $thumb = $actionstatic->id.'/thumbs/'.substr($doc->filename, 0, strrpos($doc->filename,'.')).'_mini'.substr($doc->filename, strrpos($doc->filename,'.'));
+ $doclink = dol_buildpath('document.php', 1).'?modulepart=actions&attachment=0&file='.urlencode($file).'&entity='.$conf->entity;
+ $viewlink = dol_buildpath('viewimage.php', 1).'?modulepart=actions&file='.urlencode($thumb).'&entity='.$conf->entity;
+
+ $mimeAttr = ' mime="'.$mime.'" ';
+ $class = '';
+ if(in_array($mime, array('image/png', 'image/jpeg', 'application/pdf'))){
+ $class.= ' documentpreview';
+ }
+
+ $footer.= '';
+ $footer.= img_mime($filePath).' '.$doc->filename;
+ $footer.= ' ';
+
+ $footer.= ' ';
+ }
+ $footer.= '
';
+ }
+
+
+
+
+
+
+
if(!empty($footer)){
$out.='';
}
@@ -838,3 +878,32 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
if ($noprint) return $out;
else print $out;
}
+
+
+/**
+ * @var $object ActionComm
+ * @return array
+ */
+function getTicketActionCommEcmList($object)
+{
+ global $conf, $db;
+
+ $documents = array();
+
+ $sql = 'SELECT ecm.rowid as id, ecm.src_object_type, ecm.src_object_id, ecm.filepath, ecm.filename';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'ecm_files ecm';
+ $sql.= ' WHERE ecm.filepath = \'agenda/'.$object->id.'\'';
+ //$sql.= ' ecm.src_object_type = \''.$object->element.'\' AND ecm.src_object_id = '.$object->id; // Actually upload file doesn't add type
+ $sql.= ' ORDER BY ecm.position ASC';
+
+ $resql= $db->query($sql);
+ if ($resql) {
+ if ($db->num_rows($resql)) {
+ while ($obj = $db->fetch_object($resql)) {
+ $documents[$obj->id] = $obj;
+ }
+ }
+ }
+
+ return $documents;
+}
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 7beadc9496b..a65d51d5f04 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -108,7 +108,7 @@ function user_prepare_head($object)
}
// Notifications
- if ($user->societe_id == 0 && ! empty($conf->notification->enabled))
+ if ($user->socid == 0 && ! empty($conf->notification->enabled))
{
$nbNote = 0;
$sql = "SELECT COUNT(n.rowid) as nb";
@@ -157,7 +157,7 @@ function user_prepare_head($object)
}
// Such info on users is visible only by internal user
- if (empty($user->societe_id))
+ if (empty($user->socid))
{
// Notes
$nbNote = 0;
diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
index b45eaa4b7a9..7e7cbd9672e 100644
--- a/htdocs/core/lib/xcal.lib.php
+++ b/htdocs/core/lib/xcal.lib.php
@@ -25,499 +25,573 @@
* Build a file from an array of events
* All input params and data must be encoded in $conf->charset_output
*
- * @param string $format 'vcal' or 'ical'
- * @param string $title Title of export
- * @param string $desc Description of export
- * @param array $events_array Array of events ('eid','startdate','duration','enddate','title','summary','category','email','url','desc','author')
- * @param string $outputfile Output file
- * @return int <0 if ko, Nb of events in file if ok
+ * @param string $format "vcal" or "ical"
+ * @param string $title Title of export
+ * @param string $desc Description of export
+ * @param array $events_array Array of events ("uid","startdate","duration","enddate","title","summary","category","email","url","desc","author")
+ * @param string $outputfile Output file
+ * @return int < 0 if ko, Nb of events in file if ok
*/
function build_calfile($format, $title, $desc, $events_array, $outputfile)
{
- global $conf,$langs;
+ global $conf, $langs;
- dol_syslog("xcal.lib.php::build_calfile Build cal file ".$outputfile." to format ".$format);
+ dol_syslog("xcal.lib.php::build_calfile Build cal file ".$outputfile." to format ".$format);
- if (empty($outputfile)) return -1;
+ if (empty($outputfile))
+ {
+ // -1 = error
+ return -1;
+ }
// Note: A cal file is an UTF8 encoded file
- $calfileh=fopen($outputfile, 'w');
- if ($calfileh)
- {
- include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
- $now=dol_now();
+ $calfileh = fopen($outputfile, "w");
- $encoding='';
- if ($format == 'vcal') $encoding='ENCODING=QUOTED-PRINTABLE:';
+ if ($calfileh)
+ {
+ include_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
- // Print header
- fwrite($calfileh, "BEGIN:VCALENDAR\n");
- fwrite($calfileh, "VERSION:2.0\n");
- fwrite($calfileh, "METHOD:PUBLISH\n");
- //fwrite($calfileh,"PRODID:-//DOLIBARR ".DOL_VERSION."//EN\n");
- fwrite($calfileh, "PRODID:-//DOLIBARR ".DOL_VERSION."\n");
- fwrite($calfileh, "CALSCALE:GREGORIAN\n");
- fwrite($calfileh, "X-WR-CALNAME:".$encoding.format_cal($format, $title)."\n");
- fwrite($calfileh, "X-WR-CALDESC:".$encoding.format_cal($format, $desc)."\n");
- //fwrite($calfileh,"X-WR-TIMEZONE:Europe/Paris\n");
- if (! empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)
- && $conf->global->MAIN_AGENDA_EXPORT_CACHE > 60){
- $hh=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, 'hour');
- $mm=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, 'min');
- $ss=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, 'sec');
- fwrite($calfileh, "X-PUBLISHED-TTL: P".$hh."H".$mm."M".$ss."S\n");
+ $now = dol_now();
+ $encoding = "";
+
+ if ($format === "vcal")
+ {
+ $encoding = "ENCODING=QUOTED-PRINTABLE:";
}
- foreach ($events_array as $key => $event)
- {
- $eventqualified=true;
- if ($eventqualified)
- {
- // See http://fr.wikipedia.org/wiki/ICalendar for format
- // See http://www.ietf.org/rfc/rfc2445.txt for RFC
- $uid = $event['uid'];
- $type = $event['type'];
- $startdate = $event['startdate'];
- $duration = $event['duration'];
- $enddate = $event['enddate'];
- $summary = $event['summary'];
- $category = $event['category'];
- $priority = $event['priority'];
- $fulldayevent = $event['fulldayevent'];
- $location = $event['location'];
- $email = $event['email'];
- $url = $event['url'];
- $transparency = $event['transparency']; // OPAQUE (busy) or TRANSPARENT (not busy)
- $description=preg_replace('/
/i', "\n", $event['desc']);
- $description=dol_string_nohtmltag($description, 0); // Remove html tags
- $created = $event['created'];
- $modified = $event['modified'];
+ // Print header
+ fwrite($calfileh, "BEGIN:VCALENDAR\n");
- // Uncomment for tests
- //$summary="Resume";
- //$description="Description";
- //$description="MemberValidatedInDolibarr gd gdf gd gdff\nNom: tgdf g dfgdf gfd r ter\nType: gdfgfdf dfg fd gfd gd gdf gdf gfd gdfg dfg ddf\nAuteur: AD01fg dgdgdfg df gdf gd";
+ // version is always "2.0"
+ fwrite($calfileh, "VERSION:2.0\n");
- // Format
- $summary=format_cal($format, $summary);
- $description=format_cal($format, $description);
- $category=format_cal($format, $category);
- $location=format_cal($format, $location);
+ fwrite($calfileh, "METHOD:PUBLISH\n");
+ fwrite($calfileh, "PRODID:-//DOLIBARR ".DOL_VERSION."\n");
+ fwrite($calfileh, "CALSCALE:GREGORIAN\n");
+ fwrite($calfileh, "X-WR-CALNAME:".$encoding.format_cal($format, $title)."\n");
+ fwrite($calfileh, "X-WR-CALDESC:".$encoding.format_cal($format, $desc)."\n");
+ //fwrite($calfileh,"X-WR-TIMEZONE:Europe/Paris\n");
- // Output the vCard/iCal VEVENT object
- /*
- Example from Google ical export for a 1 hour event:
- BEGIN:VEVENT
- DTSTART:20101103T120000Z
- DTEND:20101103T130000Z
- DTSTAMP:20101121T144902Z
- UID:4eilllcsq8r1p87ncg7vc8dbpk@google.com
- CREATED:20101121T144657Z
- DESCRIPTION:
- LAST-MODIFIED:20101121T144707Z
- LOCATION:
- SEQUENCE:0
- STATUS:CONFIRMED
- SUMMARY:Tâche 1 heure
- TRANSP:OPAQUE
- END:VEVENT
+ if (! empty($conf->global->MAIN_AGENDA_EXPORT_CACHE) && $conf->global->MAIN_AGENDA_EXPORT_CACHE > 60)
+ {
+ $hh = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "hour");
+ $mm = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "min");
+ $ss = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "sec");
- Example from Google ical export for a 1 day event:
- BEGIN:VEVENT
- DTSTART;VALUE=DATE:20101102
- DTEND;VALUE=DATE:20101103
- DTSTAMP:20101121T144902Z
- UID:d09t43kcf1qgapu9efsmmo1m6k@google.com
- CREATED:20101121T144607Z
- DESCRIPTION:
- LAST-MODIFIED:20101121T144607Z
- LOCATION:
- SEQUENCE:0
- STATUS:CONFIRMED
- SUMMARY:Tâche 1 jour
- TRANSP:TRANSPARENT
- END:VEVENT
- */
- if ($type == 'event')
- {
- fwrite($calfileh, "BEGIN:VEVENT\n");
- fwrite($calfileh, "UID:".$uid."\n");
- if (! empty($email))
- {
- fwrite($calfileh, "ORGANIZER:MAILTO:".$email."\n");
- fwrite($calfileh, "CONTACT:MAILTO:".$email."\n");
- }
- if (! empty($url))
- {
- fwrite($calfileh, "URL:".$url."\n");
- };
+ fwrite($calfileh, "X-PUBLISHED-TTL: P".$hh."H".$mm."M".$ss."S\n");
+ }
- if ($created) fwrite($calfileh, "CREATED:".dol_print_date($created, 'dayhourxcard', true)."\n");
- if ($modified) fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, 'dayhourxcard', true)."\n");
- fwrite($calfileh, "SUMMARY:".$encoding.$summary."\n");
- fwrite($calfileh, "DESCRIPTION:".$encoding.$description."\n");
+ foreach ($events_array as $key => $event)
+ {
+ // See http://fr.wikipedia.org/wiki/ICalendar for format
+ // See http://www.ietf.org/rfc/rfc2445.txt for RFC
- /* Other keys:
- // Status values for a "VEVENT"
- statvalue = "TENTATIVE" ;Indicates event is
- ;tentative.
- / "CONFIRMED" ;Indicates event is
- ;definite.
- / "CANCELLED" ;Indicates event was
- // Status values for "VTODO".
- statvalue =/ "NEEDS-ACTION" ;Indicates to-do needs action.
- / "COMPLETED" ;Indicates to-do completed.
- / "IN-PROCESS" ;Indicates to-do in process of
- / "CANCELLED" ;Indicates to-do was cancelled.
- // Status values for "VJOURNAL".
- statvalue =/ "DRAFT" ;Indicates journal is draft.
- / "FINAL" ;Indicates journal is final.
- / "CANCELLED" ;Indicates journal is removed.
- */
- //fwrite($calfileh,"CLASS:PUBLIC\n"); // PUBLIC, PRIVATE, CONFIDENTIAL
- //fwrite($calfileh,"X-MICROSOFT-CDO-BUSYSTATUS:1\n");
- //ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;CN=Laurent Destailleur;X-NUM-GUESTS=0:mailto:eldy10@gmail.com
+ // TODO: avoid use extra event array, use objects direct thahtwas created before
- if (! empty($location)) fwrite($calfileh, "LOCATION:".$encoding.$location."\n");
- if ($fulldayevent) fwrite($calfileh, "X-FUNAMBOL-ALLDAY:1\n");
+ $uid = $event["uid"];
+ $type = $event["type"];
+ $startdate = $event["startdate"];
+ $duration = $event["duration"];
+ $enddate = $event["enddate"];
+ $summary = $event["summary"];
+ $category = $event["category"];
+ $priority = $event["priority"];
+ $fulldayevent = $event["fulldayevent"];
+ $location = $event["location"];
+ $email = $event["email"];
+ $url = $event["url"];
+ $transparency = $event["transparency"];
+ $description = dol_string_nohtmltag(preg_replace("//i", "\n", $event["desc"]), 0);
+ $created = $event["created"];
+ $modified = $event["modified"];
+ $assignedUsers = $event["assignedUsers"];
- // see https://docs.microsoft.com/en-us/openspecs/exchange_server_protocols/ms-oxcical/0f262da6-c5fd-459e-9f18-145eba86b5d2
- if ($fulldayevent) fwrite($calfileh, "X-MICROSOFT-CDO-ALLDAYEVENT:TRUE\n");
+ // Format
+ $summary = format_cal($format, $summary);
+ $description = format_cal($format, $description);
+ $category = format_cal($format, $category);
+ $location = format_cal($format, $location);
- // Date must be GMT dates
- // Current date
- fwrite($calfileh, "DTSTAMP:".dol_print_date($now, 'dayhourxcard', true)."\n");
- // Start date
- $prefix='';
- $startdatef = dol_print_date($startdate, 'dayhourxcard', true);
- if ($fulldayevent)
- {
- $prefix=';VALUE=DATE';
- $startdatef = dol_print_date($startdate, 'dayxcard', false); // Local time
- }
- fwrite($calfileh, "DTSTART".$prefix.":".$startdatef."\n");
- // End date
- if ($fulldayevent)
- {
- if (empty($enddate)) $enddate=dol_time_plus_duree($startdate, 1, 'd');
- }
- else
- {
- if (empty($enddate)) $enddate=$startdate+$duration;
- }
- $prefix='';
- $enddatef = dol_print_date($enddate, 'dayhourxcard', true);
- if ($fulldayevent)
- {
- $prefix=';VALUE=DATE';
- $enddatef = dol_print_date($enddate+1, 'dayxcard', false);
- //$enddatef .= dol_print_date($enddate+1,'dayhourxcard',false); // Local time
- }
- fwrite($calfileh, "DTEND".$prefix.":".$enddatef."\n");
- fwrite($calfileh, 'STATUS:CONFIRMED'."\n");
- if (! empty($transparency)) fwrite($calfileh, "TRANSP:".$transparency."\n");
- if (! empty($category)) fwrite($calfileh, "CATEGORIES:".$encoding.$category."\n");
- fwrite($calfileh, "END:VEVENT\n");
- }
+ // Output the vCard/iCal VEVENT object
+ /*
+ Example from Google ical export for a 1 hour event:
+ BEGIN:VEVENT
+ DTSTART:20101103T120000Z
+ DTEND:20101103T130000Z
+ DTSTAMP:20101121T144902Z
+ UID:4eilllcsq8r1p87ncg7vc8dbpk@google.com
+ CREATED:20101121T144657Z
+ DESCRIPTION:
+ LAST-MODIFIED:20101121T144707Z
+ LOCATION:
+ SEQUENCE:0
+ STATUS:CONFIRMED
+ SUMMARY:Tâche 1 heure
+ TRANSP:OPAQUE
+ END:VEVENT
- // Output the vCard/iCal VTODO object
- // ...
- //PERCENT-COMPLETE:39
+ Example from Google ical export for a 1 day event:
+ BEGIN:VEVENT
+ DTSTART;VALUE=DATE:20101102
+ DTEND;VALUE=DATE:20101103
+ DTSTAMP:20101121T144902Z
+ UID:d09t43kcf1qgapu9efsmmo1m6k@google.com
+ CREATED:20101121T144607Z
+ DESCRIPTION:
+ LAST-MODIFIED:20101121T144607Z
+ LOCATION:
+ SEQUENCE:0
+ STATUS:CONFIRMED
+ SUMMARY:Tâche 1 jour
+ TRANSP:TRANSPARENT
+ END:VEVENT
+ */
- // Output the vCard/iCal VJOURNAL object
- if ($type == 'journal')
- {
- fwrite($calfileh, "BEGIN:VJOURNAL\n");
- fwrite($calfileh, "UID:".$uid."\n");
- if (! empty($email))
- {
- fwrite($calfileh, "ORGANIZER:MAILTO:".$email."\n");
- fwrite($calfileh, "CONTACT:MAILTO:".$email."\n");
- }
- if (! empty($url))
- {
- fwrite($calfileh, "URL:".$url."\n");
- };
+ if ($type === "event")
+ {
+ fwrite($calfileh, "BEGIN:VEVENT\n");
+ fwrite($calfileh, "UID:".$uid."\n");
- if ($created) fwrite($calfileh, "CREATED:".dol_print_date($created, 'dayhourxcard', true)."\n");
- if ($modified) fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, 'dayhourxcard', true)."\n");
- fwrite($calfileh, "SUMMARY:".$encoding.$summary."\n");
- fwrite($calfileh, "DESCRIPTION:".$encoding.$description."\n");
- fwrite($calfileh, 'STATUS:CONFIRMED'."\n");
- fwrite($calfileh, "CATEGORIES:".$category."\n");
- fwrite($calfileh, "LOCATION:".$location."\n");
- fwrite($calfileh, "TRANSP:OPAQUE\n");
- fwrite($calfileh, "CLASS:CONFIDENTIAL\n");
- fwrite($calfileh, "DTSTAMP:".dol_print_date($startdatef, 'dayhourxcard', true)."\n");
+ if (! empty($email))
+ {
+ fwrite($calfileh, "ORGANIZER:MAILTO:".$email."\n");
+ fwrite($calfileh, "CONTACT:MAILTO:".$email."\n");
+ }
- fwrite($calfileh, "END:VJOURNAL\n");
- }
+ if (! empty($url))
+ {
+ fwrite($calfileh, "URL:".$url."\n");
+ }
+ if (is_array($assignedUsers))
+ {
+ foreach($assignedUsers as $assignedUser)
+ {
+ if($assignedUser->email === $email)
+ {
+ continue;
+ }
- // Put other info in comment
- /*
- $comment=array();
- $comment ['eid'] = $eid;
- $comment ['url'] = $linktoevent;
- $comment ['date'] = dol_mktime($evttime,"Ymd");
- $comment ['duration'] = $duration;
- $comment ['startdate'] = $startdate;
- $comment ['enddate'] = $enddate;
- fwrite($calfileh,"COMMENT:" . serialize ($comment) . "\n");
- */
- }
- }
+ fwrite($calfileh, "ATTENDEE;RSVP=TRUE:mailto:".$assignedUser->email."\n");
+ }
+ }
- // Footer
- fwrite($calfileh, "END:VCALENDAR");
+ if ($created)
+ {
+ fwrite($calfileh, "CREATED:".dol_print_date($created, "dayhourxcard", true)."\n");
+ }
- fclose($calfileh);
- if (! empty($conf->global->MAIN_UMASK))
- @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
- }
- else
- {
- dol_syslog("xcal.lib.php::build_calfile Failed to open file ".$outputfile." for writing");
- return -2;
- }
+ if ($modified)
+ {
+ fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, "dayhourxcard", true)."\n");
+ }
+
+ fwrite($calfileh, "SUMMARY:".$encoding.$summary."\n");
+ fwrite($calfileh, "DESCRIPTION:".$encoding.$description."\n");
+
+ if (! empty($location))
+ {
+ fwrite($calfileh, "LOCATION:".$encoding.$location."\n");
+ }
+
+ if ($fulldayevent)
+ {
+ fwrite($calfileh, "X-FUNAMBOL-ALLDAY:1\n");
+ }
+
+ // see https://docs.microsoft.com/en-us/openspecs/exchange_server_protocols/ms-oxcical/0f262da6-c5fd-459e-9f18-145eba86b5d2
+ if ($fulldayevent)
+ {
+ fwrite($calfileh, "X-MICROSOFT-CDO-ALLDAYEVENT:TRUE\n");
+ }
+
+ // Date must be GMT dates
+ // Current date
+ fwrite($calfileh, "DTSTAMP:".dol_print_date($now, "dayhourxcard", true)."\n");
+
+ // Start date
+ $prefix = "";
+ $startdatef = dol_print_date($startdate, "dayhourxcard", true);
+
+ if ($fulldayevent)
+ {
+ // Local time
+ $prefix = ";VALUE=DATE";
+ $startdatef = dol_print_date($startdate, "dayxcard", false);
+ }
+
+ fwrite($calfileh, "DTSTART".$prefix.":".$startdatef."\n");
+
+ // End date
+ if ($fulldayevent)
+ {
+ if (empty($enddate))
+ {
+ $enddate = dol_time_plus_duree($startdate, 1, "d");
+ }
+ }
+ else
+ {
+ if (empty($enddate))
+ {
+ $enddate = $startdate+$duration;
+ }
+ }
+
+ $prefix = "";
+ $enddatef = dol_print_date($enddate, "dayhourxcard", true);
+
+ if ($fulldayevent)
+ {
+ $prefix = ";VALUE=DATE";
+ $enddatef = dol_print_date($enddate+1, "dayxcard", false);
+
+ // Local time
+ //$enddatef .= dol_print_date($enddate+1,"dayhourxcard",false);
+ }
+
+ fwrite($calfileh, "DTEND".$prefix.":".$enddatef."\n");
+ fwrite($calfileh, "STATUS:CONFIRMED"."\n");
+
+ if (! empty($transparency))
+ {
+ fwrite($calfileh, "TRANSP:".$transparency."\n");
+ }
+
+ if (! empty($category))
+ {
+ fwrite($calfileh, "CATEGORIES:".$encoding.$category."\n");
+ }
+
+ fwrite($calfileh, "END:VEVENT\n");
+ }
+
+ // Output the vCard/iCal VJOURNAL object
+ if ($type === "journal")
+ {
+ fwrite($calfileh, "BEGIN:VJOURNAL\n");
+ fwrite($calfileh, "UID:".$uid."\n");
+
+ if (! empty($email))
+ {
+ fwrite($calfileh, "ORGANIZER:MAILTO:".$email."\n");
+ fwrite($calfileh, "CONTACT:MAILTO:".$email."\n");
+ }
+
+ if (! empty($url))
+ {
+ fwrite($calfileh, "URL:".$url."\n");
+ }
+
+ if ($created)
+ {
+ fwrite($calfileh, "CREATED:".dol_print_date($created, "dayhourxcard", true)."\n");
+ }
+
+ if ($modified)
+ {
+ fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, "dayhourxcard", true)."\n");
+ }
+
+ fwrite($calfileh, "SUMMARY:".$encoding.$summary."\n");
+ fwrite($calfileh, "DESCRIPTION:".$encoding.$description."\n");
+ fwrite($calfileh, "STATUS:CONFIRMED"."\n");
+ fwrite($calfileh, "CATEGORIES:".$category."\n");
+ fwrite($calfileh, "LOCATION:".$location."\n");
+ fwrite($calfileh, "TRANSP:OPAQUE\n");
+ fwrite($calfileh, "CLASS:CONFIDENTIAL\n");
+ fwrite($calfileh, "DTSTAMP:".dol_print_date($startdatef, "dayhourxcard", true)."\n");
+
+ fwrite($calfileh, "END:VJOURNAL\n");
+ }
+ }
+
+ // Footer
+ fwrite($calfileh, "END:VCALENDAR");
+
+ fclose($calfileh);
+
+ if (! empty($conf->global->MAIN_UMASK))
+ {
+ @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+ }
+ }
+ else
+ {
+ dol_syslog("xcal.lib.php::build_calfile Failed to open file ".$outputfile." for writing");
+ return -2;
+ }
}
/**
- * Build a file from an array of events.
+ * Build a file from an array of events.
* All input data must be encoded in $conf->charset_output
*
- * @param string $format 'rss'
- * @param string $title Title of export
- * @param string $desc Description of export
- * @param array $events_array Array of events ('uid','startdate','summary','url','desc','author','category')
- * @param string $outputfile Output file
- * @param string $filter Filter
- * @return int <0 if ko, Nb of events in file if ok
+ * @param string $format "rss"
+ * @param string $title Title of export
+ * @param string $desc Description of export
+ * @param array $events_array Array of events ("uid","startdate","summary","url","desc","author","category")
+ * @param string $outputfile Output file
+ * @param string $filter (optional) Filter
+ * @return int < 0 if ko, Nb of events in file if ok
*/
-function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filter = '')
+function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filter = "")
{
- global $user,$conf,$langs;
- global $dolibarr_main_url_root;
+ global $user, $conf, $langs;
+ global $dolibarr_main_url_root;
- dol_syslog("xcal.lib.php::build_rssfile Build rss file ".$outputfile." to format ".$format);
+ dol_syslog("xcal.lib.php::build_rssfile Build rss file ".$outputfile." to format ".$format);
- if (empty($outputfile)) return -1;
+ if (empty($outputfile))
+ {
+ // -1 = error
+ return -1;
+ }
- $fichier=fopen($outputfile, 'w');
- if ($fichier)
- {
- $date=date("r");
+ $fichier = fopen($outputfile, "w");
- // Print header
- $form='charset_output.'"?>';
- fwrite($fichier, $form);
- fwrite($fichier, "\n");
- $form='';
- fwrite($fichier, $form);
- fwrite($fichier, "\n");
+ if ($fichier)
+ {
+ $date = date("r");
- $form="\n".$title." \n";
- fwrite($fichier, $form);
+ // Print header
+ fwrite($fichier, 'charset_output.""?>');
+ fwrite($fichier, "\n");
- $form='fr '."\n".
- 'Dolibarr '."\n".
- ''.$date.' '."\n".
- 'Dolibarr '."\n";
+ fwrite($fichier, '');
+ fwrite($fichier, "\n");
- // Define $urlwithroot
- $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
- $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
- //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current
- $url=$urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY);
- $form.='\n".$title." \n");
- //print $form;
- fwrite($fichier, $form);
+ $form = "fr "."\n".
+ "Dolibarr "."\n".
+ "".$date." "."\n".
+ "Dolibarr "."\n";
+ // Define $urlwithroot
+ $urlwithouturlroot = preg_replace("/".preg_quote(DOL_URL_ROOT, "/")."$/i", "", trim($dolibarr_main_url_root));
- foreach ($events_array as $key => $event)
- {
- $eventqualified=true;
- if ($filter)
- {
- // TODO Add a filter
+ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+ //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current
- $eventqualified=false;
- }
+ $url=$urlwithroot."/public/agenda/agendaexport.php?format=rss&exportkey=".urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY);
- if ($eventqualified)
- {
- $uid = $event['uid'];
- $startdate = $event['startdate'];
- $summary = $event['summary'];
- $url = $event['url'];
- $author = $event['author'];
- $category = $event['category'];
- /* No place inside a RSS
- $priority = $event['priority'];
- $fulldayevent = $event['fulldayevent'];
- $location = $event['location'];
- $email = $event['email'];
+ fwrite($fichier, "/i', "\n", $event['desc']);
- $description=dol_string_nohtmltag($description, 0); // Remove html tags
- fwrite($fichier, "- \n");
- fwrite($fichier, "
<![CDATA[".$summary."]]> \n");
- fwrite($fichier, "".date("r", $startdate)." \n");
- fwrite($fichier, " \n");
- }
- }
+ $description = dol_string_nohtmltag(preg_replace("//i", "\n", $event["desc"]), 0);
- fwrite($fichier, ' ');
- fwrite($fichier, "\n");
- fwrite($fichier, ' ');
+ fwrite($fichier, "- \n");
+ fwrite($fichier, "
<![CDATA[".$summary."]]> \n");
+ fwrite($fichier, "global->MAIN_UMASK))
- @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
- }
+ if ($description)
+ fwrite($fichier, $description);
+ // else
+ // fwrite($fichier, "NoDesc");
+
+ fwrite($fichier, "]]> \n");
+ fwrite($fichier, "".date("r", $startdate)." \n");
+ fwrite($fichier, " \n");
+ }
+ }
+
+ fwrite($fichier, " ");
+ fwrite($fichier, "\n");
+ fwrite($fichier, " ");
+
+ fclose($fichier);
+
+ if (! empty($conf->global->MAIN_UMASK))
+ {
+ @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+ }
+ }
}
-
/**
- * Encode for cal export
+ * Encode for cal export
*
- * @param string $format vcal or ical
- * @param string $string string to encode
- * @return string string encoded
+ * @param string $format "vcal" or "ical"
+ * @param string $string String to encode
+ * @return string String encoded
*/
function format_cal($format, $string)
{
- global $conf;
+ global $conf;
- $newstring=$string;
+ $newstring = $string;
- if ($format == 'vcal')
- {
- $newstring=quotedPrintEncode($newstring);
- }
- if ($format == 'ical')
- {
- // Replace new lines chars by '\n'
- $newstring=preg_replace('/'."\r\n".'/i', "\n", $newstring);
- $newstring=preg_replace('/'."\n\r".'/i', "\n", $newstring);
- $newstring=preg_replace('/'."\n".'/i', '\n', $newstring);
- // Must not exceed 75 char. Cut with "\r\n"+Space
- $newstring=calEncode($newstring);
- }
+ if ($format === "vcal")
+ {
+ $newstring = quotedPrintEncode($newstring);
+ }
- return $newstring;
+ if ($format === "ical")
+ {
+ // Replace new lines chars by "\n"
+ $newstring = preg_replace("/"."\r\n"."/i", "\\n", $newstring);
+ $newstring = preg_replace("/"."\n\r"."/i", "\\n", $newstring);
+ $newstring = preg_replace("/"."\n"."/i", "\\n", $newstring);
+
+ // Must not exceed 75 char. Cut with "\r\n"+Space
+ $newstring = calEncode($newstring);
+ }
+
+ return $newstring;
}
/**
- * Cut string after 75 chars. Add CRLF+Space.
- * line must be encoded in UTF-8
+ * Cut string after 75 chars. Add CRLF+Space.
+ * line must be encoded in UTF-8
*
- * @param string $line String to convert
- * @return string String converted
+ * @param string $line String to convert
+ * @return string String converted
*/
function calEncode($line)
{
- $out = '';
+ $out = "";
+ $newpara = "";
- $newpara = '';
+ // If mb_ functions exists, it"s better to use them
+ if (function_exists("mb_strlen"))
+ {
+ $strlength = mb_strlen($line, "UTF-8");
- // If mb_ functions exists, it's better to use them
- if (function_exists('mb_strlen'))
- {
- $strlength=mb_strlen($line, 'UTF-8');
- for ($j = 0; $j <= ($strlength - 1); $j++)
- {
- $char = mb_substr($line, $j, 1, 'UTF-8'); // Take char at position $j
+ for ($j = 0; $j < $strlength; $j++)
+ {
+ // Take char at position $j
+ $char = mb_substr($line, $j, 1, "UTF-8");
- if ((mb_strlen($newpara, 'UTF-8') + mb_strlen($char, 'UTF-8')) >= 75)
- {
- $out .= $newpara . "\r\n "; // CRLF + Space for cal
- $newpara = '';
- }
- $newpara .= $char;
- }
- $out .= $newpara;
- }
- else
- {
- $strlength=dol_strlen($line);
- for ($j = 0; $j <= ($strlength - 1); $j++)
- {
- $char = substr($line, $j, 1); // Take char at position $j
+ if ((mb_strlen($newpara, "UTF-8") + mb_strlen($char, "UTF-8")) >= 75)
+ {
+ // CRLF + Space for cal
+ $out .= $newpara . "\r\n ";
- if ((dol_strlen($newpara) + dol_strlen($char)) >= 75 )
- {
- $out .= $newpara . "\r\n "; // CRLF + Space for cal
- $newpara = '';
- }
- $newpara .= $char;
- }
- $out .= $newpara;
- }
+ $newpara = "";
+ }
- return trim($out);
+ $newpara .= $char;
+ }
+
+ $out .= $newpara;
+ }
+ else
+ {
+ $strlength = dol_strlen($line);
+
+ for ($j = 0; $j < $strlength; $j++)
+ {
+ // Take char at position $j
+ $char = substr($line, $j, 1);
+
+ if ((dol_strlen($newpara) + dol_strlen($char)) >= 75 )
+ {
+ // CRLF + Space for cal
+ $out .= $newpara . "\r\n ";
+
+ $newpara = "";
+ }
+
+ $newpara .= $char;
+ }
+
+ $out .= $newpara;
+ }
+
+ return trim($out);
}
/**
- * Encode into vcal format
+ * Encode into vcal format
*
- * @param string $str String to convert
- * @param int $forcal 1=For cal
- * @return string String converted
+ * @param string $str String to convert
+ * @param int $forcal (optional) 1 = For cal
+ * @return string String converted
*/
function quotedPrintEncode($str, $forcal = 0)
{
- $lines = preg_split("/\r\n/", $str);
- $out = '';
+ $lines = preg_split("/\r\n/", $str);
+ $out = "";
- foreach ($lines as $line)
- {
- $newpara = '';
+ foreach ($lines as $line)
+ {
+ $newpara = "";
- $strlength=strlen($line); // Do not use dol_strlen here, we need number of bytes
- for ($j = 0; $j <= ($strlength - 1); $j++)
- {
- $char = substr($line, $j, 1);
- $ascii = ord($char);
+ // Do not use dol_strlen here, we need number of bytes
+ $strlength = strlen($line);
- if ( $ascii < 32 || $ascii == 61 || $ascii > 126 )
- $char = '=' . strtoupper(sprintf("%02X", $ascii));
+ for ($j = 0; $j < $strlength; $j++)
+ {
+ $char = substr($line, $j, 1);
+ $ascii = ord($char);
- if ((strlen($newpara) + strlen($char)) >= 76 ) // Do not use dol_strlen here, we need number of bytes
- {
- $out .= $newpara . '=' . "\r\n"; // CRLF
- if ($forcal) $out .= " "; // + Space for cal
- $newpara = '';
- }
- $newpara .= $char;
- }
- $out .= $newpara;
- }
- return trim($out);
+ if ( $ascii < 32 || $ascii === 61 || $ascii > 126 )
+ {
+ $char = "=" . strtoupper(sprintf("%02X", $ascii));
+ }
+
+ // Do not use dol_strlen here, we need number of bytes
+ if ((strlen($newpara) + strlen($char)) >= 76 )
+ {
+ // New line with carray-return (CR) and line-feed (LF)
+ $out .= $newpara . "=" . "\r\n";
+
+ // extra space for cal
+ if ($forcal)
+ $out .= " ";
+
+ $newpara = "";
+ }
+
+ $newpara .= $char;
+ }
+
+ $out .= $newpara;
+ }
+ return trim($out);
}
/**
- * Decode vcal format
+ * Decode vcal format
*
- * @param string $str String to convert
- * @return string String converted
+ * @param string $str String to convert
+ * @return string String converted
*/
function quotedPrintDecode($str)
{
- $out = preg_replace('/=\r?\n/', '', $str);
- $out = quoted_printable_decode($out); // Available with PHP 4+
- return trim($out);
+ return trim(quoted_printable_decode(preg_replace("/=\r?\n/", "", $str)));
}
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 5f27a68d63a..6819ab864b3 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -316,7 +316,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
// We update newmenu with entries found into database
$menuArbo = new Menubase($db, 'auguria');
- $newmenu = $menuArbo->menuLeftCharger($newmenu, $mainmenu, $leftmenu, ($user->societe_id?1:0), 'auguria', $tabMenu);
+ $newmenu = $menuArbo->menuLeftCharger($newmenu, $mainmenu, $leftmenu, ($user->socid?1:0), 'auguria', $tabMenu);
// We update newmenu for special dynamic menus
if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank') // Entry for each bank account
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 380b6a22355..d9f0d663754 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1852,7 +1852,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
// Add personalized menus and modules menus
//var_dump($newmenu->liste); //
$menuArbo = new Menubase($db, 'eldy');
- $newmenu = $menuArbo->menuLeftCharger($newmenu, $mainmenu, $leftmenu, (empty($user->societe_id)?0:1), 'eldy', $tabMenu);
+ $newmenu = $menuArbo->menuLeftCharger($newmenu, $mainmenu, $leftmenu, (empty($user->socid)?0:1), 'eldy', $tabMenu);
//var_dump($newmenu->liste); //
// We update newmenu for special dynamic menus
diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index 8885348bb16..38358222282 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
/**
* Class to build documents using ODF templates generator
*/
-class doc_generic_bom_odt extends ModelePDFBOMs
+class doc_generic_bom_odt extends ModelePDFBoms
{
/**
* Issuer
@@ -85,14 +85,7 @@ class doc_generic_bom_odt extends ModelePDFBOMs
$this->marge_haute=0;
$this->marge_basse=0;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 0; // Gere option tva COMMANDE_TVAOPTION
- $this->option_modereg = 0; // Affiche mode reglement
- $this->option_condreg = 0; // Affiche conditions reglement
- $this->option_codeproduitservice = 0; // Affiche code produit-service
$this->option_multilang = 1; // Dispo en plusieurs langues
- $this->option_escompte = 0; // Affiche si il y a eu escompte
- $this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 0; // Support add of a watermark on drafts
@@ -486,7 +479,7 @@ class doc_generic_bom_odt extends ModelePDFBOMs
}
else {
try {
- $odfHandler->saveToDisk($file);
+ $odfHandler->saveToDisk($file);
} catch (Exception $e) {
$this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index 581fca03f8b..558744d87e8 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -31,6 +31,10 @@ class mailing_advthirdparties extends MailingTargets
public $require_admin=0;
public $require_module=array("none"); // This module should not be displayed as Selector in mailling
+
+ /**
+ * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+ */
public $picto='company';
/**
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index aa951426a12..b3687e4f603 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -37,6 +37,10 @@ class mailing_contacts1 extends MailingTargets
public $desc='Contacts of thirdparties (prospects, customers, suppliers...)';
public $require_module=array("societe"); // Module mailing actif si modules require_module actifs
public $require_admin=0; // Module mailing actif pour user admin ou non
+
+ /**
+ * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+ */
public $picto='contact';
/**
diff --git a/htdocs/core/modules/mailings/example.modules.php b/htdocs/core/modules/mailings/example.modules.php
index a96457c2625..88af802ecfe 100644
--- a/htdocs/core/modules/mailings/example.modules.php
+++ b/htdocs/core/modules/mailings/example.modules.php
@@ -36,6 +36,10 @@ class mailing_example extends MailingTargets
public $tooltip='MyTooltipLangKey';
public $require_module=array();
+
+ /**
+ * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+ */
public $picto='';
/**
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index 25ffcb717fd..ae0dff89b76 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -40,6 +40,10 @@ class mailing_fraise extends MailingTargets
public $require_admin=0;
public $require_module=array('adherent');
+
+ /**
+ * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+ */
public $picto='user';
/**
@@ -129,7 +133,7 @@ class mailing_fraise extends MailingTargets
$s.=' ';
$s.=$langs->trans("Type").': ';
$s.='';
- $sql = "SELECT rowid, libelle, statut";
+ $sql = "SELECT rowid, libelle as label, statut";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent_type";
$sql.= " WHERE entity IN (".getEntity('member_type').")";
$sql.= " ORDER BY rowid";
@@ -146,7 +150,7 @@ class mailing_fraise extends MailingTargets
{
$obj = $this->db->fetch_object($resql);
- $s.=''.dol_trunc($obj->libelle, 38, 'middle');
+ $s.=' '.dol_trunc($obj->label, 38, 'middle');
$s.=' ';
$i++;
}
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index 970339e4dbb..8d55bd86adc 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -35,6 +35,10 @@ class mailing_pomme extends MailingTargets
public $desc='Dolibarr users with emails'; // Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv�e
public $require_module=array(); // Module mailing actif si modules require_module actifs
public $require_admin=1; // Module mailing actif pour user admin ou non
+
+ /**
+ * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+ */
public $picto='user';
/**
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 68cb49e10d9..e0c148e4f9f 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -30,6 +30,10 @@ class mailing_thirdparties extends MailingTargets
public $require_admin=0;
public $require_module=array("societe"); // This module allows to select by categories must be also enabled if category module is not activated
+
+ /**
+ * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+ */
public $picto='company';
/**
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index 75dc4b9499b..7e3b468fc6d 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -28,6 +28,10 @@ class mailing_thirdparties_services_expired extends MailingTargets
public $require_admin=0;
public $require_module=array('contrat');
+
+ /**
+ * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+ */
public $picto='company';
/**
diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index 4987c9ebc17..a69800230b1 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -35,6 +35,10 @@ class mailing_xinputfile extends MailingTargets
public $desc='EMails from a file'; // Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv�e
public $require_module=array(); // Module mailing actif si modules require_module actifs
public $require_admin=0; // Module mailing actif pour user admin ou non
+
+ /**
+ * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+ */
public $picto='generic';
public $tooltip='UseFormatFileEmailToTarget';
diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php
index 8d4ecf0b72e..7014f5f894d 100644
--- a/htdocs/core/modules/mailings/xinputuser.modules.php
+++ b/htdocs/core/modules/mailings/xinputuser.modules.php
@@ -35,6 +35,10 @@ class mailing_xinputuser extends MailingTargets
public $desc='EMails input by user'; // Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv�e
public $require_module=array(); // Module mailing actif si modules require_module actifs
public $require_admin=0; // Module mailing actif pour user admin ou non
+
+ /**
+ * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+ */
public $picto='generic';
public $tooltip='UseFormatInputEmailToTarget';
diff --git a/htdocs/core/modules/modBom.class.php b/htdocs/core/modules/modBom.class.php
index 720721ac156..47daf430873 100644
--- a/htdocs/core/modules/modBom.class.php
+++ b/htdocs/core/modules/modBom.class.php
@@ -121,7 +121,7 @@ class modBom extends DolibarrModules
// 1=>array('BILLOFMATERIALS_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
// );
$this->const = array(
- 1=>array('BOM_ADDON_PDF', 'chaine', 'avalue', 'Name of PDF model of BOM', 0),
+ 1=>array('BOM_ADDON_PDF', 'chaine', 'alpha', 'Name of PDF model of BOM', 0),
2=>array('BOM_ADDON', 'chaine', 'mod_bom_standard', 'Name of numbering rules of BOM', 0),
3=>array('BOM_ADDON_PDF_ODT_PATH', 'chaine', 'DOL_DATA_ROOT/doctemplates/boms', '', 0)
);
@@ -189,7 +189,7 @@ class modBom extends DolibarrModules
// Boxes/Widgets
// Add here list of php file(s) stored in bom/core/boxes that contains class to show a widget.
$this->boxes = array(
- 0=>array('file'=>'box_boms.php','note'=>'','enabledbydefaulton'=>'Home')
+ 0=>array('file' => 'box_boms.php', 'note' => '', 'enabledbydefaulton' => 'Home')
);
@@ -203,7 +203,7 @@ class modBom extends DolibarrModules
// );
- // Permissions
+ // Permissions provided by this module
$this->rights = array(); // Permission array used by this module
$r=0;
@@ -228,7 +228,7 @@ class modBom extends DolibarrModules
$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->bom->level1->level2)
- // Main menu entries
+ // Main menu entries to add
$this->menu = array(); // List of menus to add
$r=0;
@@ -317,21 +317,49 @@ class modBom extends DolibarrModules
*/
public function init($options = '')
{
+ global $conf, $langs;
+
$result=$this->_load_tables('/bom/sql/');
if ($result < 0) return -1; // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
// Create extrafields
- include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
- $extrafields = new ExtraFields($this->db);
-
+ //include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+ //$extrafields = new ExtraFields($this->db);
//$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1, 3, 'thirdparty', 0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->bom->enabled');
//$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project', 0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->bom->enabled');
//$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->bom->enabled');
//$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select', 1, 3, 'thirdparty', 0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'mrp', '$conf->bom->enabled');
//$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text', 1, 10, 'user', 0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->bom->enabled');
+
+ // Permissions
+ $this->remove($options);
+
$sql = array();
+ // ODT template
+ $src=DOL_DOCUMENT_ROOT.'/install/doctemplates/boms/template_bom.odt';
+ $dirodt=DOL_DATA_ROOT.'/doctemplates/boms';
+ $dest=$dirodt.'/template_bom.odt';
+
+ if (file_exists($src) && ! file_exists($dest))
+ {
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+ dol_mkdir($dirodt);
+ $result=dol_copy($src, $dest, 0, 0);
+ if ($result < 0)
+ {
+ $langs->load("errors");
+ $this->error=$langs->trans('ErrorFailToCopyFile', $src, $dest);
+ return 0;
+ }
+ }
+
+ $sql = array(
+ "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('standard')."' AND type = 'bom' AND entity = ".$conf->entity,
+ "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('standard')."', 'bom', ".$conf->entity.")"
+ );
+
return $this->_init($sql, $options);
}
diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php
index 5ad2ba0d03a..aca3f4686e5 100644
--- a/htdocs/core/modules/modMargin.class.php
+++ b/htdocs/core/modules/modMargin.class.php
@@ -86,7 +86,7 @@ class modMargin extends DolibarrModules
// New pages on tabs
$this->tabs = array(
'product:+margin:Margins:margins:$user->rights->margins->liretous:/margin/tabs/productMargins.php?id=__ID__',
- 'thirdparty:+margin:Margins:margins:empty($user->societe_id) && $user->rights->margins->liretous && ($object->client > 0):/margin/tabs/thirdpartyMargins.php?socid=__ID__'
+ 'thirdparty:+margin:Margins:margins:empty($user->socid) && $user->rights->margins->liretous && ($object->client > 0):/margin/tabs/thirdpartyMargins.php?socid=__ID__'
);
diff --git a/htdocs/core/modules/modMrp.class.php b/htdocs/core/modules/modMrp.class.php
index 53f778d063f..bc85111ebd2 100644
--- a/htdocs/core/modules/modMrp.class.php
+++ b/htdocs/core/modules/modMrp.class.php
@@ -58,7 +58,7 @@ class modMrp extends DolibarrModules
// Module label (no space allowed), used if translation string 'ModuleMrpName' not found (Mrp is name of module).
$this->name = preg_replace('/^mod/i', '', get_class($this));
// Module description, used if translation string 'ModuleMrpDesc' not found (Mrp is name of module).
- $this->description = "MRPDescription";
+ $this->description = "Module to Manage Manufacturing Orders (MO)";
// Used only if file README.md and README-LL.md not found.
$this->descriptionlong = "Module to Manage Manufacturing Orders (MO)";
// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
@@ -113,7 +113,7 @@ class modMrp extends DolibarrModules
// Example: this->dirs = array("/mrp/temp","/mrp/subdir");
$this->dirs = array("/mrp/temp");
// Config pages. Put here list of php page, stored into mrp/admin directory, to use to setup module.
- $this->config_page_url = array("setup.php@mrp");
+ $this->config_page_url = array("mrp.php");
// Dependencies
// A condition to hide module
$this->hidden = false;
@@ -135,7 +135,9 @@ class modMrp extends DolibarrModules
// 2 => array('MRP_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
// );
$this->const = array(
- // 1 => array('MRP_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
+ 1=>array('MRP_MO_ADDON_PDF', 'chaine', 'alpha', 'Name of PDF model of MO', 0),
+ 2=>array('MRP_MO_ADDON', 'chaine', 'mod_mo_standard', 'Name of numbering rules of MO', 0),
+ 3=>array('MRP_MO_ADDON_PDF_ODT_PATH', 'chaine', 'DOL_DATA_ROOT/doctemplates/mrps', '', 0)
);
// Some keys to add into the overwriting translation tables
@@ -312,6 +314,8 @@ class modMrp extends DolibarrModules
*/
public function init($options = '')
{
+ global $conf, $langs;
+
$result=$this->_load_tables('/mrp/sql/');
if ($result < 0) return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
@@ -324,7 +328,34 @@ class modMrp extends DolibarrModules
//$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select', 1, 3, 'thirdparty', 0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
//$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text', 1, 10, 'user', 0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
+ // Permissions
+ $this->remove($options);
+
$sql = array();
+
+ // ODT template
+ $src=DOL_DOCUMENT_ROOT.'/install/doctemplates/mrps/template_mo.odt';
+ $dirodt=DOL_DATA_ROOT.'/doctemplates/mrps';
+ $dest=$dirodt.'/template_mo.odt';
+
+ if (file_exists($src) && ! file_exists($dest))
+ {
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+ dol_mkdir($dirodt);
+ $result=dol_copy($src, $dest, 0, 0);
+ if ($result < 0)
+ {
+ $langs->load("errors");
+ $this->error=$langs->trans('ErrorFailToCopyFile', $src, $dest);
+ return 0;
+ }
+ }
+
+ $sql = array(
+ "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('standard')."' AND type = 'mo' AND entity = ".$conf->entity,
+ "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('standard')."', 'mo', ".$conf->entity.")"
+ );
+
return $this->_init($sql, $options);
}
diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index 30d90b8a0c6..cfa45cb6a4b 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -150,7 +150,7 @@ class modStripe extends DolibarrModules
'target' => '',
'user' => 0
);
- $this->menu[$r] = array(
+ $this->menu[$r] = array(
'fk_menu' => 'fk_mainmenu=bank,fk_leftmenu=stripe',
'type' => 'left',
'titre' => 'StripePayoutList',
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index 6d85bfd3553..0447694465f 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -27,7 +27,7 @@
* \brief File of class to build ODT documents for MOs
*/
-require_once DOL_DOCUMENT_ROOT.'/core/modules/bom/modules_bom.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/mrp/modules_mrp.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
/**
* Class to build documents using ODF templates generator
*/
-class doc_generic_mo_odt extends ModelePDFMOs
+class doc_generic_mo_odt extends ModelePDFMos
{
/**
* Issuer
@@ -486,7 +486,7 @@ class doc_generic_mo_odt extends ModelePDFMOs
}
else {
try {
- $odfHandler->saveToDisk($file);
+ $odfHandler->saveToDisk($file);
} catch (Exception $e) {
$this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
diff --git a/htdocs/core/modules/mrp/mod_mrp_advanced.php b/htdocs/core/modules/mrp/mod_mo_advanced.php
similarity index 93%
rename from htdocs/core/modules/mrp/mod_mrp_advanced.php
rename to htdocs/core/modules/mrp/mod_mo_advanced.php
index 1c24b4010ba..42c506194f3 100644
--- a/htdocs/core/modules/mrp/mod_mrp_advanced.php
+++ b/htdocs/core/modules/mrp/mod_mo_advanced.php
@@ -21,7 +21,7 @@
*/
/**
- * \file htdocs/core/modules/mrp/mod_mrp_advanced.php
+ * \file htdocs/core/modules/mrp/mod_mo_advanced.php
* \ingroup mrp
* \brief File containing class for numbering model of MOs advanced
*/
@@ -30,9 +30,9 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/mrp/modules_mrp.php';
/**
- * Class to manage customer Bom numbering rules advanced
+ * Class to manage MO numbering rules advanced
*/
-class mod_mrp_advanced extends ModeleNumRefMos
+class mod_mo_advanced extends ModeleNumRefMos
{
/**
* Dolibarr version of the loaded document
@@ -68,7 +68,7 @@ class mod_mrp_advanced extends ModeleNumRefMos
$texte.= '