';
// Charge tableau des categories
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 36ed1bd4ded..3cdb5d516f1 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -36,7 +36,7 @@ $ref=GETPOST('ref');
$type=GETPOST('type');
$action=GETPOST('action');
$confirm=GETPOST('confirm');
-$removeelem = GETPOST('removeelem','int');
+$removeelem = GETPOST('removeelem','int');
if ($id == "")
{
@@ -62,39 +62,39 @@ $type=$object->type;
* Actions
*/
-// Remove element from category
-if ($id > 0 && $removeelem > 0)
-{
- if ($type==0 && ($user->rights->produit->creer || $user->rights->service->creer))
- {
- require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
- $tmpobject = new Product($db);
- $result = $tmpobject->fetch($removeelem);
- $elementtype = 'product';
- }
- if ($type==1 && $user->rights->societe->creer)
- {
- $tmpobject = new Societe($db);
- $result = $tmpobject->fetch($removeelem);
- $elementtype = 'fournisseur';
- }
- if ($type==2 && $user->rights->societe->creer)
- {
- $tmpobject = new Societe($db);
- $result = $tmpobject->fetch($removeelem);
- $elementtype = 'societe';
- }
- if ($type == 3 && $user->rights->adherent->creer)
+// Remove element from category
+if ($id > 0 && $removeelem > 0)
+{
+ if ($type==0 && ($user->rights->produit->creer || $user->rights->service->creer))
{
- require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
- $tmpobject = new Adherent($db);
- $result = $tmpobject->fetch($removeelem);
+ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+ $tmpobject = new Product($db);
+ $result = $tmpobject->fetch($removeelem);
+ $elementtype = 'product';
+ }
+ if ($type==1 && $user->rights->societe->creer)
+ {
+ $tmpobject = new Societe($db);
+ $result = $tmpobject->fetch($removeelem);
+ $elementtype = 'fournisseur';
+ }
+ if ($type==2 && $user->rights->societe->creer)
+ {
+ $tmpobject = new Societe($db);
+ $result = $tmpobject->fetch($removeelem);
+ $elementtype = 'societe';
+ }
+ if ($type == 3 && $user->rights->adherent->creer)
+ {
+ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+ $tmpobject = new Adherent($db);
+ $result = $tmpobject->fetch($removeelem);
$elementtype = 'member';
- }
-
+ }
+
$result=$object->del_type($tmpobject,$elementtype);
- if ($result < 0) dol_print_error('',$object->error);
-}
+ if ($result < 0) dol_print_error('',$object->error);
+}
if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confirm == 'yes')
{
@@ -312,21 +312,21 @@ if ($object->type == 1)
print '
';
print "\n";
}
@@ -364,20 +364,20 @@ if($object->type == 2)
print '
';
print "\n";
}
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index bb30efe8ef9..f4bb4542843 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -334,7 +334,7 @@ class ActionComm extends CommonObject
$this->priority = $obj->priority;
$this->fulldayevent = $obj->fulldayevent;
$this->location = $obj->location;
- $this->transparency = $obj->transparency;
+ $this->transparency = $obj->transparency;
$this->socid = $obj->fk_soc; // To have fetch_thirdparty method working
$this->societe->id = $obj->fk_soc;
@@ -476,7 +476,7 @@ class ActionComm extends CommonObject
$sql.= ", priority = '".$this->priority."'";
$sql.= ", fulldayevent = '".$this->fulldayevent."'";
$sql.= ", location = ".($this->location ? "'".$this->db->escape($this->location)."'":"null");
- $sql.= ", transparency = '".$this->transparency."'";
+ $sql.= ", transparency = '".$this->transparency."'";
$sql.= ", fk_user_mod = '".$user->id."'";
$sql.= ", fk_user_action=".($this->usertodo->id > 0 ? "'".$this->usertodo->id."'":"null");
$sql.= ", fk_user_done=".($this->userdone->id > 0 ? "'".$this->userdone->id."'":"null");
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 3fe597d5c66..a813a34135a 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -527,8 +527,8 @@ if ($action == 'create')
// Busy
print '
';
+ print '';
// Realised by
if ($conf->global->AGENDA_ENABLE_DONEBY)
@@ -768,13 +768,13 @@ if ($id > 0)
print '';
// Busy
- print '
';
-
+ print '';
+
// Realised by
- if ($conf->global->AGENDA_ENABLE_DONEBY)
- {
+ if ($conf->global->AGENDA_ENABLE_DONEBY)
+ {
print '
';
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 705c7d6ff1c..e52615f6e59 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -76,7 +76,7 @@ $pid=GETPOST("projectid","int",3);
$status=GETPOST("status");
$type=GETPOST("type");
$maxprint=(isset($_GET["maxprint"])?GETPOST("maxprint"):$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
-$actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=="0"?'':(empty($conf->global->AGENDA_USE_EVENT_TYPE)?'AC_OTH':''));
+$actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=="0"?'':(empty($conf->global->AGENDA_USE_EVENT_TYPE)?'AC_OTH':''));
if (GETPOST('viewcal')) {
$action='show_month'; $day='';
@@ -965,7 +965,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print '
";
print '| '.$langs->trans("DatePayment").' | ';
print dol_print_date($vatpayment->datep,'day');
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 749e2fa08ce..036b99f9ae3 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -1010,13 +1010,13 @@ class Contact extends CommonObject
$this->country = 'France';
$this->email = 'specimen@specimen.com';
- $this->phone_pro = '0909090901';
- $this->phone_perso = '0909090902';
- $this->phone_mobile = '0909090903';
- $this->fax = '0909090909';
+ $this->phone_pro = '0909090901';
+ $this->phone_perso = '0909090902';
+ $this->phone_mobile = '0909090903';
+ $this->fax = '0909090909';
- $this->note_public='This is a comment (public)';
- $this->note_private='This is a comment (private)';
+ $this->note_public='This is a comment (public)';
+ $this->note_private='This is a comment (private)';
$socid = rand(1, $num_socs);
$this->socid = $socids[$socid];
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index ad0da9451e9..d0b59b67dd7 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -42,21 +42,21 @@ class box_activity extends ModeleBoxes
var $info_box_contents = array();
- /**
- * Constructor
- *
- * @param DoliDB $db Database handler
- * @param string $param More parameters
- */
- function __construct($db,$param)
- {
- global $conf;
-
- $this->db=$db;
+ /**
+ * Constructor
+ *
+ * @param DoliDB $db Database handler
+ * @param string $param More parameters
+ */
+ function __construct($db,$param)
+ {
+ global $conf;
+
+ $this->db=$db;
// FIXME: Use a cache to save data because this slow down too much main home page. This box slow down too seriously software.
// FIXME: Removed number_format (not compatible with all languages)
// FIXME: Pb into some status
- $this->enabled=$conf->global->MAIN_FEATURES_LEVEL; // Not enabled by default due to bugs (see previous FIXME)
+ $this->enabled=$conf->global->MAIN_FEATURES_LEVEL; // Not enabled by default due to bugs (see previous FIXME)
}
/**
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 3ec5add8a05..5bce26306f3 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -39,18 +39,18 @@ class box_graph_invoices_permonth extends ModeleBoxes
var $info_box_contents = array();
- /**
- * Constructor
- *
- * @param DoliDB $db Database handler
- * @param string $param More parameters
- */
- function __construct($db,$param)
+ /**
+ * Constructor
+ *
+ * @param DoliDB $db Database handler
+ * @param string $param More parameters
+ */
+ function __construct($db,$param)
{
global $conf;
-
- $this->db=$db;
- $this->enabled=$conf->global->MAIN_FEATURES_LEVEL;
+
+ $this->db=$db;
+ $this->enabled=$conf->global->MAIN_FEATURES_LEVEL;
}
/**
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 75183c2448a..d8b3e923781 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -82,24 +82,24 @@ abstract class CommonObject
return dol_trunc($ret,$maxlen);
}
- /**
- * Return full address of contact
- *
- * @param int $withcountry 1=Add country into address string
- * @param string $sep Separator to use to build string
- * @return string Full address string
- */
- function getFullAddress($withcountry=0,$sep="\n")
- {
- if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country)))
- {
- require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';
- $tmparray=getCountry($this->country_id,'all');
- $this->country_code=$tmparray['code'];
- $this->country =$tmparray['label'];
- }
+ /**
+ * Return full address of contact
+ *
+ * @param int $withcountry 1=Add country into address string
+ * @param string $sep Separator to use to build string
+ * @return string Full address string
+ */
+ function getFullAddress($withcountry=0,$sep="\n")
+ {
+ if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country)))
+ {
+ require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';
+ $tmparray=getCountry($this->country_id,'all');
+ $this->country_code=$tmparray['code'];
+ $this->country =$tmparray['label'];
+ }
- return dol_format_address($this, $withcountry, $sep);
+ return dol_format_address($this, $withcountry, $sep);
}
/**
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index a7a8fe04903..4ce1bbf8c3d 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -63,11 +63,11 @@ class Conf
//! Used to store list of entities to use for each element
public $entities = array();
- public $dol_hide_topmenu; // Set if we force param dol_hide_topmenu into login url
- public $dol_hide_leftmenu; // Set if we force param dol_hide_leftmenu into login url
- public $dol_optimize_smallscreen; // Set if we force param dol_optimize_smallscreen into login url or if browser is smartphone
- public $dol_no_mouse_hover; // Set if we force param dol_no_mouse_hover into login url or if browser is smartphone
- public $dol_use_jmobile; // Set if we force param dol_use_jmobile into login url
+ public $dol_hide_topmenu; // Set if we force param dol_hide_topmenu into login url
+ public $dol_hide_leftmenu; // Set if we force param dol_hide_leftmenu into login url
+ public $dol_optimize_smallscreen; // Set if we force param dol_optimize_smallscreen into login url or if browser is smartphone
+ public $dol_no_mouse_hover; // Set if we force param dol_no_mouse_hover into login url or if browser is smartphone
+ public $dol_use_jmobile; // Set if we force param dol_use_jmobile into login url
/**
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index ea1734353d3..529b420f961 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -907,7 +907,7 @@ class DolGraph
if ($direction == 'width') return ($conf->dol_optimize_smallscreen?(empty($_SESSION['dol_screen_width'])?'280':$_SESSION['dol_screen_width']-40):($defaultsize?$defaultsize:'500'));
if ($direction == 'height') return ($conf->dol_optimize_smallscreen?'160':($defaultsize?$defaultsize:'200'));
- return 0;
+ return 0;
}
}
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index bfd8f63d9a4..2642fc7e165 100755
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -143,7 +143,7 @@ class HookManager
{
foreach($modules as $module => $actionclassinstance)
{
- //print "Before hook ".get_class($actionclassinstance)." method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction."
\n";
+ //print "Before hook ".get_class($actionclassinstance)." method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction."
\n";
//print 'class='.get_class($actionclassinstance).' method='.$method.' action='.$action;
// jump to next class if method does not exists
@@ -168,8 +168,8 @@ class HookManager
}
}
- if (is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
- if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
+ if (is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
+ if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
}
// Generic hooks that return a string or array (printSearchForm, printLeftBlock, printTopRightMenu, formAddObjectLine, formBuilddocOptions, ...)
else
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index b7477c203f5..ef8422a7dbc 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -230,7 +230,7 @@ class FormActions
//asort($arraylist);
if ($selected == 'manual') $selected='AC_OTH';
- if ($selected == 'auto') $selected='AC_OTH_AUTO';
+ if ($selected == 'auto') $selected='AC_OTH_AUTO';
print $form->selectarray($htmlname, $arraylist, $selected);
if ($user->admin && empty($onlyautoornot)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 24707425cf4..b79b3ef22c6 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -383,18 +383,18 @@ class FormFile
$buttonlabeltoshow=$buttonlabel;
if (empty($buttonlabel)) $buttonlabel=$langs->trans('Generate');
-
-// Keep this. Used for test with jmobile
-/*print '
-
-';*/
+
+// Keep this. Used for test with jmobile
+/*print '
+
+';*/
if (empty($noform)) $out.= ' |