| '; print ''; print ' | '; } // Thirpdarty - if (! empty($arrayfields['s.nom']['checked'])) + if (!empty($arrayfields['s.nom']['checked'])) { print ''; } - if (! empty($arrayfields['f.total']['checked'])) + if (!empty($arrayfields['f.total']['checked'])) { // Amount net print ' | '; print ''; print ' | '; } - if (! empty($arrayfields['f.tva']['checked'])) + if (!empty($arrayfields['f.tva']['checked'])) { // Amount Vat print ''; print ''; print ' | '; } - if (! empty($arrayfields['f.total_ttc']['checked'])) + if (!empty($arrayfields['f.total_ttc']['checked'])) { // Amount print ''; print ''; print ' | '; } - if (! empty($arrayfields['f.fk_cond_reglement']['checked'])) + if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) { // Payment term print ''; $form->select_conditions_paiements($search_payment_term, 'search_payment_term', -1, 1, 1, 'maxwidth100'); print " | "; } - if (! empty($arrayfields['f.fk_mode_reglement']['checked'])) + if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) { // Payment mode print ''; $form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100'); print ' | '; } - if (! empty($arrayfields['recurring']['checked'])) + if (!empty($arrayfields['recurring']['checked'])) { // Recurring or not print ''; print $form->selectyesno('search_recurring', $search_recurring, 1, false, 1); print ' | '; } - if (! empty($arrayfields['f.frequency']['checked'])) + if (!empty($arrayfields['f.frequency']['checked'])) { // Recurring or not print ''; print ''; print ' | '; } - if (! empty($arrayfields['f.unit_frequency']['checked'])) + if (!empty($arrayfields['f.unit_frequency']['checked'])) { // Frequency unit print ''; print ''; print ' | '; } - if (! empty($arrayfields['f.nb_gen_done']['checked'])) + if (!empty($arrayfields['f.nb_gen_done']['checked'])) { // Nb generation print ''; print ' | '; } // Date invoice - if (! empty($arrayfields['f.date_last_gen']['checked'])) + if (!empty($arrayfields['f.date_last_gen']['checked'])) { print ''; - if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; + if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; print ''; - $formother->select_year($search_year?$search_year:-1, 'search_year', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle'); + $formother->select_year($search_year ? $search_year : -1, 'search_year', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle'); print ' | '; } // Date next generation - if (! empty($arrayfields['f.date_when']['checked'])) + if (!empty($arrayfields['f.date_when']['checked'])) { print ''; - if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; + if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; print ''; - $formother->select_year($search_year_date_when?$search_year_date_when:-1, 'search_year_date_when', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle'); + $formother->select_year($search_year_date_when ? $search_year_date_when : -1, 'search_year_date_when', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle'); print ' | '; } // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php'; // Fields from hook - $parameters=array('arrayfields'=>$arrayfields); - $reshook=$hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook + $parameters = array('arrayfields'=>$arrayfields); + $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Date creation - if (! empty($arrayfields['f.datec']['checked'])) + if (!empty($arrayfields['f.datec']['checked'])) { print ''; print ' | '; } // Date modification - if (! empty($arrayfields['f.tms']['checked'])) + if (!empty($arrayfields['f.tms']['checked'])) { print ''; print ' | '; } // Status - if (! empty($arrayfields['status']['checked'])) + if (!empty($arrayfields['status']['checked'])) { print ''; - $liststatus=array( + $liststatus = array( 0=>$langs->trans("Draft"), 1=>$langs->trans("Active"), -1=>$langs->trans("Disabled"), @@ -462,145 +462,145 @@ if ($resql) } // Action column print ' | '; - $searchpicto=$form->showFilterAndCheckAddButtons(0, 'checkforselect', 1); + $searchpicto = $form->showFilterAndCheckAddButtons(0, 'checkforselect', 1); print $searchpicto; print ' | '; print "|
| '; print $invoicerectmp->getNomUrl(1); print ""; print " | \n"; - if (! $i) $totalarray['nbfield']++; + if (!$i) $totalarray['nbfield']++; } - if (! empty($arrayfields['s.nom']['checked'])) + if (!empty($arrayfields['s.nom']['checked'])) { print ''.$companystatic->getNomUrl(1, 'customer').' | '; - if (! $i) $totalarray['nbfield']++; + if (!$i) $totalarray['nbfield']++; } - if (! empty($arrayfields['f.total']['checked'])) + if (!empty($arrayfields['f.total']['checked'])) { print ''.price($objp->total).' | '."\n"; - if (! $i) $totalarray['nbfield']++; - if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.total'; + if (!$i) $totalarray['nbfield']++; + if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total'; $totalarray['val']['f.total'] += $objp->total; } - if (! empty($arrayfields['f.tva']['checked'])) + if (!empty($arrayfields['f.tva']['checked'])) { print ''.price($objp->total_vat).' | '."\n"; - if (! $i) $totalarray['nbfield']++; - if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.tva'; + if (!$i) $totalarray['nbfield']++; + if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.tva'; $totalarray['val']['f.tva'] += $objp->total_vat; } - if (! empty($arrayfields['f.total_ttc']['checked'])) + if (!empty($arrayfields['f.total_ttc']['checked'])) { print ''.price($objp->total_ttc).' | '."\n"; - if (! $i) $totalarray['nbfield']++; - if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.total_ttc'; + if (!$i) $totalarray['nbfield']++; + if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc'; $totalarray['val']['f.total_ttc'] += $objp->total_ttc; } // Payment term - if (! empty($arrayfields['f.fk_cond_reglement']['checked'])) + if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) { print ''; $form->form_conditions_reglement('', $objp->fk_cond_reglement, 'none'); print ' | '."\n"; - if (! $i) $totalarray['nbfield']++; + if (!$i) $totalarray['nbfield']++; } // Payment mode - if (! empty($arrayfields['f.fk_mode_reglement']['checked'])) + if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) { print ''; $form->form_modes_reglement('', $objp->fk_mode_reglement, 'none'); print ' | '."\n"; - if (! $i) $totalarray['nbfield']++; + if (!$i) $totalarray['nbfield']++; } - if (! empty($arrayfields['recurring']['checked'])) + if (!empty($arrayfields['recurring']['checked'])) { - print ''.yn($objp->frequency?1:0).' | '; - if (! $i) $totalarray['nbfield']++; + print ''.yn($objp->frequency ? 1 : 0).' | '; + if (!$i) $totalarray['nbfield']++; } - if (! empty($arrayfields['f.frequency']['checked'])) + if (!empty($arrayfields['f.frequency']['checked'])) { print ''.($objp->frequency > 0 ? $objp->frequency : '').' | '; - if (! $i) $totalarray['nbfield']++; + if (!$i) $totalarray['nbfield']++; } - if (! empty($arrayfields['f.unit_frequency']['checked'])) + if (!empty($arrayfields['f.unit_frequency']['checked'])) { print ''.($objp->frequency > 0 ? $objp->unit_frequency : '').' | '; - if (! $i) $totalarray['nbfield']++; + if (!$i) $totalarray['nbfield']++; } - if (! empty($arrayfields['f.nb_gen_done']['checked'])) + if (!empty($arrayfields['f.nb_gen_done']['checked'])) { print ''; - print ($objp->frequency > 0 ? $objp->nb_gen_done.($objp->nb_gen_max>0?' / '. $objp->nb_gen_max:'') : ''.$langs->trans('NA').''); + print ($objp->frequency > 0 ? $objp->nb_gen_done.($objp->nb_gen_max > 0 ? ' / '.$objp->nb_gen_max : '') : ''.$langs->trans('NA').''); print ' | '; - if (! $i) $totalarray['nbfield']++; + if (!$i) $totalarray['nbfield']++; } // Date last generation - if (! empty($arrayfields['f.date_last_gen']['checked'])) + if (!empty($arrayfields['f.date_last_gen']['checked'])) { print ''; print ($objp->frequency > 0 ? dol_print_date($db->jdate($objp->date_last_gen), 'day') : ''.$langs->trans('NA').''); print ' | '; - if (! $i) $totalarray['nbfield']++; + if (!$i) $totalarray['nbfield']++; } // Date next generation - if (! empty($arrayfields['f.date_when']['checked'])) + if (!empty($arrayfields['f.date_when']['checked'])) { print '';
print ' ';
- print ($objp->frequency ? ($invoicerectmp->isMaxNbGenReached()?' ';
print ' | ';
- if (! $i) $totalarray['nbfield']++;
+ if (!$i) $totalarray['nbfield']++;
}
- if (! empty($arrayfields['f.datec']['checked']))
+ if (!empty($arrayfields['f.datec']['checked']))
{
print ''; print dol_print_date($db->jdate($objp->datec), 'dayhour'); print ' | '; - if (! $i) $totalarray['nbfield']++; + if (!$i) $totalarray['nbfield']++; } - if (! empty($arrayfields['f.tms']['checked'])) + if (!empty($arrayfields['f.tms']['checked'])) { print ''; print dol_print_date($db->jdate($objp->tms), 'dayhour'); print ' | '; - if (! $i) $totalarray['nbfield']++; + if (!$i) $totalarray['nbfield']++; } $obj = $objp; // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php'; // Fields from hook - $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$objp, 'i'=>$i, 'totalarray'=>&$totalarray); - $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook + $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$objp, 'i'=>$i, 'totalarray'=>&$totalarray); + $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Status - if (! empty($arrayfields['status']['checked'])) { + if (!empty($arrayfields['status']['checked'])) { print ''; print $invoicerectmp->getLibStatut(3, 0); print ' | '; - if (! $i) $totalarray['nbfield']++; + if (!$i) $totalarray['nbfield']++; } // Action column print '';
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index ba04782eafe..a945e8cb5a5 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -64,23 +64,23 @@ class Contact extends CommonObject
/**
* @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
*/
- public $fields=array(
- 'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
- 'lastname' =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),
- 'firstname' =>array('type'=>'varchar(128)', 'label'=>'Firstname', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>11, 'searchall'=>1),
- 'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
- 'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>60),
- 'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>61),
- 'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500),
- 'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
+ public $fields = array(
+ 'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
+ 'lastname' =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),
+ 'firstname' =>array('type'=>'varchar(128)', 'label'=>'Firstname', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>11, 'searchall'=>1),
+ 'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
+ 'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>60),
+ 'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>61),
+ 'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500),
+ 'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
//'date_valid' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>502),
- 'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510),
- 'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
+ 'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510),
+ 'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
//'fk_user_valid' =>array('type'=>'integer', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>512),
- 'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>1, 'position'=>1000),
+ 'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>1, 'position'=>1000),
);
- public $civility_id; // In fact we store civility_code
+ public $civility_id; // In fact we store civility_code
public $civility_code;
public $civility;
@@ -92,14 +92,14 @@ class Contact extends CommonObject
public $zip;
public $town;
- public $state_id; // Id of department
- public $state_code; // Code of department
- public $state; // Label of department
+ public $state_id; // Id of department
+ public $state_code; // Code of department
+ public $state; // Label of department
- public $poste; // Position
+ public $poste; // Position
- public $socid; // fk_soc
- public $statut; // 0=inactif, 1=actif
+ public $socid; // fk_soc
+ public $statut; // 0=inactif, 1=actif
public $code;
@@ -181,9 +181,9 @@ class Contact extends CommonObject
* Old copy
* @var Contact
*/
- public $oldcopy; // To contains a clone of this when we need to save old properties of object
+ public $oldcopy; // To contains a clone of this when we need to save old properties of object
- public $roles=array();
+ public $roles = array();
/**
@@ -208,28 +208,28 @@ class Contact extends CommonObject
// phpcs:enable
global $user;
- $this->nb=array();
+ $this->nb = array();
$clause = "WHERE";
$sql = "SELECT count(sp.rowid) as nb";
- $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
+ $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
if (!$user->rights->societe->client->voir && !$user->socid)
{
- $sql.= ", ".MAIN_DB_PREFIX."societe as s";
- $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= " WHERE sp.fk_soc = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ $sql .= ", ".MAIN_DB_PREFIX."societe as s";
+ $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql .= " WHERE sp.fk_soc = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
$clause = "AND";
}
- $sql.= ' '.$clause.' sp.entity IN ('.getEntity($this->element).')';
- $sql.= " AND (sp.priv='0' OR (sp.priv='1' AND sp.fk_user_creat=".$user->id."))";
- if ($user->socid > 0) $sql.=" AND sp.fk_soc = ".$user->socid;
+ $sql .= ' '.$clause.' sp.entity IN ('.getEntity($this->element).')';
+ $sql .= " AND (sp.priv='0' OR (sp.priv='1' AND sp.fk_user_creat=".$user->id."))";
+ if ($user->socid > 0) $sql .= " AND sp.fk_soc = ".$user->socid;
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
- while ($obj=$this->db->fetch_object($resql))
+ while ($obj = $this->db->fetch_object($resql))
{
- $this->nb["contacts"]=$obj->nb;
+ $this->nb["contacts"] = $obj->nb;
}
$this->db->free($resql);
return 1;
@@ -386,7 +386,7 @@ class Contact extends CommonObject
$this->town = (empty($this->town) ? '' : $this->town);
$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
if (empty($this->statut)) $this->statut = 0;
- if (empty($this->civility_code) && ! is_numeric($this->civility_id)) $this->civility_code = $this->civility_id; // For backward compatibility
+ if (empty($this->civility_code) && !is_numeric($this->civility_id)) $this->civility_code = $this->civility_id; // For backward compatibility
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET ";
@@ -406,16 +406,16 @@ class Contact extends CommonObject
$sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
$sql .= ", photo='".$this->db->escape($this->photo)."'";
$sql .= ", birthday=".($this->birthday ? "'".$this->db->idate($this->birthday)."'" : "null");
- $sql .= ", note_private = ".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
- $sql .= ", note_public = ".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
- $sql .= ", phone = ".(isset($this->phone_pro)?"'".$this->db->escape($this->phone_pro)."'":"null");
- $sql .= ", phone_perso = ".(isset($this->phone_perso)?"'".$this->db->escape($this->phone_perso)."'":"null");
- $sql .= ", phone_mobile = ".(isset($this->phone_mobile)?"'".$this->db->escape($this->phone_mobile)."'":"null");
+ $sql .= ", note_private = ".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
+ $sql .= ", note_public = ".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
+ $sql .= ", phone = ".(isset($this->phone_pro) ? "'".$this->db->escape($this->phone_pro)."'" : "null");
+ $sql .= ", phone_perso = ".(isset($this->phone_perso) ? "'".$this->db->escape($this->phone_perso)."'" : "null");
+ $sql .= ", phone_mobile = ".(isset($this->phone_mobile) ? "'".$this->db->escape($this->phone_mobile)."'" : "null");
$sql .= ", priv = '".$this->db->escape($this->priv)."'";
$sql .= ", statut = ".$this->db->escape($this->statut);
- $sql .= ", fk_user_modif=".($user->id > 0 ? "'".$this->db->escape($user->id)."'":"NULL");
- $sql .= ", default_lang=".($this->default_lang?"'".$this->db->escape($this->default_lang)."'":"NULL");
- $sql .= ", entity = " . $this->db->escape($this->entity);
+ $sql .= ", fk_user_modif=".($user->id > 0 ? "'".$this->db->escape($user->id)."'" : "NULL");
+ $sql .= ", default_lang=".($this->default_lang ? "'".$this->db->escape($this->default_lang)."'" : "NULL");
+ $sql .= ", entity = ".$this->db->escape($this->entity);
$sql .= " WHERE rowid=".$this->db->escape($id);
dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -525,15 +525,15 @@ class Contact extends CommonObject
}
}
- if (! $error && ! $notrigger)
+ if (!$error && !$notrigger)
{
// Call trigger
- $result=$this->call_trigger('CONTACT_MODIFY', $user);
+ $result = $this->call_trigger('CONTACT_MODIFY', $user);
if ($result < 0) { $error++; }
// End call triggers
}
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return 1;
@@ -757,37 +757,37 @@ class Contact extends CommonObject
$langs->load("dict");
- dol_syslog(get_class($this) . "::fetch id=" . $id . " ref_ext=" . $ref_ext . " email=" . $email, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch id=".$id." ref_ext=".$ref_ext." email=".$email, LOG_DEBUG);
if (empty($id) && empty($ref_ext) && empty($email))
{
- $this->error='BadParameter';
+ $this->error = 'BadParameter';
return -1;
}
$langs->load("companies");
$sql = "SELECT c.rowid, c.entity, c.fk_soc, c.ref_ext, c.civility as civility_code, c.lastname, c.firstname,";
- $sql.= " c.address, c.statut, c.zip, c.town,";
- $sql.= " c.fk_pays as country_id,";
- $sql.= " c.fk_departement as state_id,";
- $sql.= " c.birthday,";
- $sql.= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email,";
- $sql.= " c.socialnetworks,";
- $sql.= " c.photo,";
- $sql.= " c.priv, c.note_private, c.note_public, c.default_lang, c.canvas,";
- $sql.= " c.import_key,";
- $sql.= " c.datec as date_creation, c.tms as date_modification,";
- $sql.= " co.label as country, co.code as country_code,";
- $sql.= " d.nom as state, d.code_departement as state_code,";
- $sql.= " u.rowid as user_id, u.login as user_login,";
- $sql.= " s.nom as socname, s.address as socaddress, s.zip as soccp, s.town as soccity, s.default_lang as socdefault_lang";
- $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON c.fk_pays = co.rowid";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON c.fk_departement = d.rowid";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
- if ($id) $sql.= " WHERE c.rowid = ". $id;
+ $sql .= " c.address, c.statut, c.zip, c.town,";
+ $sql .= " c.fk_pays as country_id,";
+ $sql .= " c.fk_departement as state_id,";
+ $sql .= " c.birthday,";
+ $sql .= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email,";
+ $sql .= " c.socialnetworks,";
+ $sql .= " c.photo,";
+ $sql .= " c.priv, c.note_private, c.note_public, c.default_lang, c.canvas,";
+ $sql .= " c.import_key,";
+ $sql .= " c.datec as date_creation, c.tms as date_modification,";
+ $sql .= " co.label as country, co.code as country_code,";
+ $sql .= " d.nom as state, d.code_departement as state_code,";
+ $sql .= " u.rowid as user_id, u.login as user_login,";
+ $sql .= " s.nom as socname, s.address as socaddress, s.zip as soccp, s.town as soccity, s.default_lang as socdefault_lang";
+ $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON c.fk_pays = co.rowid";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON c.fk_departement = d.rowid";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
+ if ($id) $sql .= " WHERE c.rowid = ".$id;
else
{
$sql .= " WHERE c.entity IN (".getEntity($this->element).")";
@@ -799,47 +799,47 @@ class Contact extends CommonObject
}
}
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
if ($this->db->num_rows($resql))
{
$obj = $this->db->fetch_object($resql);
- $this->id = $obj->rowid;
- $this->entity = $obj->entity;
- $this->ref = $obj->rowid;
- $this->ref_ext = $obj->ref_ext;
+ $this->id = $obj->rowid;
+ $this->entity = $obj->entity;
+ $this->ref = $obj->rowid;
+ $this->ref_ext = $obj->ref_ext;
$this->civility_code = $obj->civility_code;
- $this->civility = $obj->civility_code?($langs->trans("Civility".$obj->civility_code) != ("Civility".$obj->civility_code) ? $langs->trans("Civility".$obj->civility_code) : $obj->civility_code):'';
+ $this->civility = $obj->civility_code ? ($langs->trans("Civility".$obj->civility_code) != ("Civility".$obj->civility_code) ? $langs->trans("Civility".$obj->civility_code) : $obj->civility_code) : '';
- $this->lastname = $obj->lastname;
- $this->firstname = $obj->firstname;
- $this->address = $obj->address;
- $this->zip = $obj->zip;
- $this->town = $obj->town;
+ $this->lastname = $obj->lastname;
+ $this->firstname = $obj->firstname;
+ $this->address = $obj->address;
+ $this->zip = $obj->zip;
+ $this->town = $obj->town;
$this->date_creation = $this->db->jdate($obj->date_creation);
$this->date_modification = $this->db->jdate($obj->date_modification);
- $this->state_id = $obj->state_id;
- $this->state_code = $obj->state_code;
- $this->state = $obj->state;
+ $this->state_id = $obj->state_id;
+ $this->state_code = $obj->state_code;
+ $this->state = $obj->state;
- $this->country_id = $obj->country_id;
- $this->country_code = $obj->country_id?$obj->country_code:'';
- $this->country = $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
+ $this->country_id = $obj->country_id;
+ $this->country_code = $obj->country_id ? $obj->country_code : '';
+ $this->country = $obj->country_id ? ($langs->trans('Country'.$obj->country_code) != 'Country'.$obj->country_code ? $langs->transnoentities('Country'.$obj->country_code) : $obj->country) : '';
$this->socid = $obj->fk_soc;
$this->socname = $obj->socname;
$this->poste = $obj->poste;
- $this->statut = $obj->statut;
+ $this->statut = $obj->statut;
- $this->phone_pro = trim($obj->phone);
- $this->fax = trim($obj->fax);
- $this->phone_perso = trim($obj->phone_perso);
- $this->phone_mobile = trim($obj->phone_mobile);
+ $this->phone_pro = trim($obj->phone);
+ $this->fax = trim($obj->fax);
+ $this->phone_perso = trim($obj->phone_perso);
+ $this->phone_mobile = trim($obj->phone_mobile);
$this->email = $obj->email;
$this->socialnetworks = (array) json_decode($obj->socialnetworks, true);
@@ -847,14 +847,14 @@ class Contact extends CommonObject
$this->priv = $obj->priv;
$this->mail = $obj->email;
- $this->birthday = $this->db->jdate($obj->birthday);
- $this->note = $obj->note_private; // deprecated
+ $this->birthday = $this->db->jdate($obj->birthday);
+ $this->note = $obj->note_private; // deprecated
$this->note_private = $obj->note_private;
- $this->note_public = $obj->note_public;
+ $this->note_public = $obj->note_public;
$this->default_lang = $obj->default_lang;
- $this->user_id = $obj->user_id;
+ $this->user_id = $obj->user_id;
$this->user_login = $obj->user_login;
- $this->canvas = $obj->canvas;
+ $this->canvas = $obj->canvas;
$this->import_key = $obj->import_key;
@@ -1617,7 +1617,7 @@ class Contact extends CommonObject
$this->db->begin();
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_contacts WHERE fk_soc=".$this->socid." AND fk_socpeople=".$this->id;;
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_contacts WHERE fk_soc=".$this->socid." AND fk_socpeople=".$this->id; ;
dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
$result = $this->db->query($sql);
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 48baff0f8fd..6c0a20bc6db 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -28,9 +28,9 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
*/
class box_graph_invoices_permonth extends ModeleBoxes
{
- public $boxcode="invoicespermonth";
- public $boximg="object_bill";
- public $boxlabel="BoxCustomersInvoicesPerMonth";
+ public $boxcode = "invoicespermonth";
+ public $boximg = "object_bill";
+ public $boxlabel = "BoxCustomersInvoicesPerMonth";
public $depends = array("facture");
/**
@@ -52,9 +52,9 @@ class box_graph_invoices_permonth extends ModeleBoxes
{
global $user;
- $this->db=$db;
+ $this->db = $db;
- $this->hidden = ! ($user->rights->facture->lire);
+ $this->hidden = !($user->rights->facture->lire);
}
/**
@@ -67,14 +67,14 @@ class box_graph_invoices_permonth extends ModeleBoxes
{
global $conf, $user, $langs;
- $this->max=$max;
+ $this->max = $max;
- $refreshaction='refresh_'.$this->boxcode;
+ $refreshaction = 'refresh_'.$this->boxcode;
//include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
//$facturestatic=new Facture($this->db);
- $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
+ $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1;
$text = $langs->trans("BoxCustomersInvoicesPerMonth", $max);
@@ -89,50 +89,50 @@ class box_graph_invoices_permonth extends ModeleBoxes
'target'=>'none' // Set '' to get target="_blank"
);
- $dir=''; // We don't need a path because image file will not be saved into disk
- $prefix='';
- $socid=0;
- 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
+ $dir = ''; // We don't need a path because image file will not be saved into disk
+ $prefix = '';
+ $socid = 0;
+ 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)
{
$mesg = '';
- $param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
- $param_shownb='DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
- $param_showtot='DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
+ $param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+ $param_shownb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
+ $param_showtot = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
- $autosetarray=preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
+ $autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray))
{
- $endyear=GETPOST($param_year, 'int');
- $shownb=GETPOST($param_shownb, 'alpha');
- $showtot=GETPOST($param_showtot, 'alpha');
+ $endyear = GETPOST($param_year, 'int');
+ $shownb = GETPOST($param_shownb, 'alpha');
+ $showtot = GETPOST($param_showtot, 'alpha');
}
else
{
- $tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
- $endyear=$tmparray['year'];
- $shownb=$tmparray['shownb'];
- $showtot=$tmparray['showtot'];
+ $tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
+ $endyear = $tmparray['year'];
+ $shownb = $tmparray['shownb'];
+ $showtot = $tmparray['showtot'];
}
- if (empty($shownb) && empty($showtot)) { $shownb=1; $showtot=1; }
- $nowarray=dol_getdate(dol_now(), true);
- if (empty($endyear)) $endyear=$nowarray['year'];
- $startyear=$endyear-1;
- $mode='customer';
- $WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
- $HEIGHT='192';
+ if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
+ $nowarray = dol_getdate(dol_now(), true);
+ if (empty($endyear)) $endyear = $nowarray['year'];
+ $startyear = $endyear - 1;
+ $mode = 'customer';
+ $WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
+ $HEIGHT = '192';
$stats = new FactureStats($this->db, $socid, $mode, 0);
// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
if ($shownb)
{
- $data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
+ $data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
$filenamenb = $dir."/".$prefix."invoicesnbinyear-".$endyear.".png";
// default value for customer mode
@@ -141,22 +141,22 @@ class box_graph_invoices_permonth extends ModeleBoxes
$px1 = new DolGraph();
$mesg = $px1->isGraphKo();
- if (! $mesg)
+ if (!$mesg)
{
$langs->load("bills");
$px1->SetData($data1);
unset($data1);
- $i=$startyear;$legend=array();
+ $i = $startyear; $legend = array();
while ($i <= $endyear)
{
if ($startmonth != 1)
{
- $legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+ $legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
}
else
{
- $legend[]=$i;
+ $legend[] = $i;
}
$i++;
}
@@ -168,7 +168,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
$px1->SetShading(3);
$px1->SetHorizTickIncrement(1);
$px1->SetCssPrefix("cssboxes");
- $px1->mode='depth';
+ $px1->mode = 'depth';
$px1->SetTitle($langs->trans("NumberOfBillsByMonth"));
$px1->draw($filenamenb, $fileurlnb);
@@ -178,7 +178,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
if ($showtot)
{
- $data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
+ $data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
$filenamenb = $dir."/".$prefix."invoicesamountinyear-".$endyear.".png";
// default value for customer mode
@@ -187,22 +187,22 @@ class box_graph_invoices_permonth extends ModeleBoxes
$px2 = new DolGraph();
$mesg = $px2->isGraphKo();
- if (! $mesg)
+ if (!$mesg)
{
$langs->load("bills");
$px2->SetData($data2);
unset($data2);
- $i=$startyear;$legend=array();
+ $i = $startyear; $legend = array();
while ($i <= $endyear)
{
if ($startmonth != 1)
{
- $legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+ $legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
}
else
{
- $legend[]=$i;
+ $legend[] = $i;
}
$i++;
}
@@ -214,7 +214,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
$px2->SetShading(3);
$px2->SetHorizTickIncrement(1);
$px2->SetCssPrefix("cssboxes");
- $px2->mode='depth';
+ $px2->mode = 'depth';
$px2->SetTitle($langs->trans("AmountOfBillsByMonthHT"));
$px2->draw($filenamenb, $fileurlnb);
@@ -224,51 +224,51 @@ class box_graph_invoices_permonth extends ModeleBoxes
if (empty($conf->use_javascript_ajax))
{
$langs->load("errors");
- $mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+ $mesg = $langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
}
- if (! $mesg)
+ if (!$mesg)
{
- $stringtoshow='';
- $stringtoshow.='';
- $stringtoshow.='';
+ $stringtoshow .= '';
if ($shownb && $showtot)
{
- $stringtoshow.=' ';
- $stringtoshow.=' ';
}
- $this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover center"','textnoformat'=>$stringtoshow);
+ $this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover center"', 'textnoformat'=>$stringtoshow);
}
else
{
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index f9e2d3ccc25..52dcdc995cd 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -28,9 +28,9 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
*/
class box_graph_invoices_supplier_permonth extends ModeleBoxes
{
- public $boxcode="invoicessupplierpermonth";
- public $boximg="object_bill";
- public $boxlabel="BoxSuppliersInvoicesPerMonth";
+ public $boxcode = "invoicessupplierpermonth";
+ public $boximg = "object_bill";
+ public $boxlabel = "BoxSuppliersInvoicesPerMonth";
public $depends = array("fournisseur");
/**
@@ -52,9 +52,9 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
{
global $user;
- $this->db=$db;
+ $this->db = $db;
- $this->hidden = ! ($user->rights->fournisseur->facture->lire);
+ $this->hidden = !($user->rights->fournisseur->facture->lire);
}
/**
@@ -67,13 +67,13 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
{
global $conf, $user, $langs;
- $this->max=$max;
+ $this->max = $max;
- $refreshaction='refresh_'.$this->boxcode;
+ $refreshaction = 'refresh_'.$this->boxcode;
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
- $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
+ $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1;
$text = $langs->trans("BoxSuppliersInvoicesPerMonth", $max);
@@ -88,48 +88,48 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
'target'=>'none' // Set '' to get target="_blank"
);
- $dir=''; // We don't need a path because image file will not be saved into disk
- $prefix='';
- $socid=0;
- 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
+ $dir = ''; // We don't need a path because image file will not be saved into disk
+ $prefix = '';
+ $socid = 0;
+ 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)
{
- $param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
- $param_shownb='DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
- $param_showtot='DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
+ $param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+ $param_shownb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
+ $param_showtot = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
- $autosetarray=preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
+ $autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray))
{
- $endyear=GETPOST($param_year, 'int');
- $shownb=GETPOST($param_shownb, 'alpha');
- $showtot=GETPOST($param_showtot, 'alpha');
+ $endyear = GETPOST($param_year, 'int');
+ $shownb = GETPOST($param_shownb, 'alpha');
+ $showtot = GETPOST($param_showtot, 'alpha');
}
else
{
- $tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
- $endyear=$tmparray['year'];
- $shownb=$tmparray['shownb'];
- $showtot=$tmparray['showtot'];
+ $tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
+ $endyear = $tmparray['year'];
+ $shownb = $tmparray['shownb'];
+ $showtot = $tmparray['showtot'];
}
- if (empty($shownb) && empty($showtot)) { $shownb=1; $showtot=1; }
- $nowarray=dol_getdate(dol_now(), true);
- if (empty($endyear)) $endyear=$nowarray['year'];
- $startyear=$endyear-1;
- $mode='supplier';
- $WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
- $HEIGHT='192';
+ if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
+ $nowarray = dol_getdate(dol_now(), true);
+ if (empty($endyear)) $endyear = $nowarray['year'];
+ $startyear = $endyear - 1;
+ $mode = 'supplier';
+ $WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
+ $HEIGHT = '192';
$stats = new FactureStats($this->db, $socid, $mode, 0);
// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
if ($shownb)
{
- $data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
+ $data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
$filenamenb = $dir."/".$prefix."invoicessuppliernbinyear-".$year.".png";
// default value for customer mode
@@ -138,23 +138,23 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
$px1 = new DolGraph();
$mesg = $px1->isGraphKo();
- if (! $mesg)
+ if (!$mesg)
{
$langs->load("bills");
$px1->SetData($data1);
unset($data1);
- $i=$startyear;
- $legend=array();
+ $i = $startyear;
+ $legend = array();
while ($i <= $endyear)
{
if ($startmonth != 1)
{
- $legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+ $legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
}
else
{
- $legend[]=$i;
+ $legend[] = $i;
}
$i++;
}
@@ -166,7 +166,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
$px1->SetShading(3);
$px1->SetHorizTickIncrement(1);
$px1->SetCssPrefix("cssboxes");
- $px1->mode='depth';
+ $px1->mode = 'depth';
$px1->SetTitle($langs->trans("NumberOfBillsByMonth"));
$px1->draw($filenamenb, $fileurlnb);
@@ -176,7 +176,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
if ($showtot)
{
- $data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
+ $data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
$filenamenb = $dir."/".$prefix."invoicessupplieramountinyear-".$year.".png";
// default value for customer mode
@@ -185,22 +185,22 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
$px2 = new DolGraph();
$mesg = $px2->isGraphKo();
- if (! $mesg)
+ if (!$mesg)
{
$langs->load("bills");
$px2->SetData($data2);
unset($data2);
- $i=$startyear;$legend=array();
+ $i = $startyear; $legend = array();
while ($i <= $endyear)
{
if ($startmonth != 1)
{
- $legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+ $legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
}
else
{
- $legend[]=$i;
+ $legend[] = $i;
}
$i++;
}
@@ -212,7 +212,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
$px2->SetShading(3);
$px2->SetHorizTickIncrement(1);
$px2->SetCssPrefix("cssboxes");
- $px2->mode='depth';
+ $px2->mode = 'depth';
$px2->SetTitle($langs->trans("AmountOfBillsByMonthHT"));
$px2->draw($filenamenb, $fileurlnb);
@@ -222,51 +222,51 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
if (empty($conf->use_javascript_ajax))
{
$langs->load("errors");
- $mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+ $mesg = $langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
}
- if (! $mesg)
+ if (!$mesg)
{
- $stringtoshow='';
- $stringtoshow.='';
- $stringtoshow.='';
+ $stringtoshow .= '';
if ($shownb && $showtot)
{
- $stringtoshow.='';
+ $stringtoshow .= ' ';
+ $stringtoshow .= '';
+ $stringtoshow .= ' ';
+ $stringtoshow .= '';
}
- if ($shownb) $stringtoshow.=$px1->show();
+ if ($shownb) $stringtoshow .= $px1->show();
if ($shownb && $showtot)
{
- $stringtoshow.=' ';
- $stringtoshow.='';
+ $stringtoshow .= ' ';
+ $stringtoshow .= '';
}
- if ($showtot) $stringtoshow.=$px2->show();
+ if ($showtot) $stringtoshow .= $px2->show();
if ($shownb && $showtot)
{
- $stringtoshow.=' ';
- $stringtoshow.='';
- $stringtoshow.=' ';
}
- $this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"','td' => 'class="nohover center"','textnoformat'=>$stringtoshow);
+ $this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover center"', 'textnoformat'=>$stringtoshow);
}
else
{
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 244bd7d7083..45459805f00 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -28,9 +28,9 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
*/
class box_graph_orders_permonth extends ModeleBoxes
{
- public $boxcode="orderspermonth";
- public $boximg="object_order";
- public $boxlabel="BoxCustomersOrdersPerMonth";
+ public $boxcode = "orderspermonth";
+ public $boximg = "object_order";
+ public $boxlabel = "BoxCustomersOrdersPerMonth";
public $depends = array("commande");
/**
@@ -52,9 +52,9 @@ class box_graph_orders_permonth extends ModeleBoxes
{
global $user;
- $this->db=$db;
+ $this->db = $db;
- $this->hidden = ! ($user->rights->commande->lire);
+ $this->hidden = !($user->rights->commande->lire);
}
/**
@@ -67,14 +67,14 @@ class box_graph_orders_permonth extends ModeleBoxes
{
global $conf, $user, $langs;
- $this->max=$max;
+ $this->max = $max;
- $refreshaction='refresh_'.$this->boxcode;
+ $refreshaction = 'refresh_'.$this->boxcode;
//include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
//$commandestatic=new Commande($this->db);
- $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
+ $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1;
$text = $langs->trans("BoxCustomersOrdersPerMonth", $max);
@@ -89,50 +89,50 @@ class box_graph_orders_permonth extends ModeleBoxes
'target'=>'none' // Set '' to get target="_blank"
);
- $dir=''; // We don't need a path because image file will not be saved into disk
- $prefix='';
- $socid=0;
- 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
+ $dir = ''; // We don't need a path because image file will not be saved into disk
+ $prefix = '';
+ $socid = 0;
+ 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)
{
$langs->load("orders");
- $param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
- $param_shownb='DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
- $param_showtot='DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
+ $param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+ $param_shownb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
+ $param_showtot = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
- $autosetarray=preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
+ $autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray))
{
- $endyear=GETPOST($param_year, 'int');
- $shownb=GETPOST($param_shownb, 'alpha');
- $showtot=GETPOST($param_showtot, 'alpha');
+ $endyear = GETPOST($param_year, 'int');
+ $shownb = GETPOST($param_shownb, 'alpha');
+ $showtot = GETPOST($param_showtot, 'alpha');
}
else
{
- $tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
- $endyear=$tmparray['year'];
- $shownb=$tmparray['shownb'];
- $showtot=$tmparray['showtot'];
+ $tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
+ $endyear = $tmparray['year'];
+ $shownb = $tmparray['shownb'];
+ $showtot = $tmparray['showtot'];
}
- if (empty($shownb) && empty($showtot)) { $shownb=1; $showtot=1; }
- $nowarray=dol_getdate(dol_now(), true);
- if (empty($endyear)) $endyear=$nowarray['year'];
- $startyear=$endyear-1;
- $mode='customer';
- $WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
- $HEIGHT='192';
+ if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
+ $nowarray = dol_getdate(dol_now(), true);
+ if (empty($endyear)) $endyear = $nowarray['year'];
+ $startyear = $endyear - 1;
+ $mode = 'customer';
+ $WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
+ $HEIGHT = '192';
$stats = new CommandeStats($this->db, $socid, $mode, 0);
// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
if ($shownb)
{
- $data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
+ $data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
$filenamenb = $dir."/".$prefix."ordersnbinyear-".$endyear.".png";
// default value for customer mode
@@ -141,21 +141,21 @@ class box_graph_orders_permonth extends ModeleBoxes
$px1 = new DolGraph();
$mesg = $px1->isGraphKo();
- if (! $mesg)
+ if (!$mesg)
{
$px1->SetData($data1);
unset($data1);
- $i=$startyear;
- $legend=array();
+ $i = $startyear;
+ $legend = array();
while ($i <= $endyear)
{
if ($startmonth != 1)
{
- $legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+ $legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
}
else
{
- $legend[]=$i;
+ $legend[] = $i;
}
$i++;
}
@@ -167,7 +167,7 @@ class box_graph_orders_permonth extends ModeleBoxes
$px1->SetShading(3);
$px1->SetHorizTickIncrement(1);
$px1->SetCssPrefix("cssboxes");
- $px1->mode='depth';
+ $px1->mode = 'depth';
$px1->SetTitle($langs->trans("NumberOfOrdersByMonth"));
$px1->draw($filenamenb, $fileurlnb);
@@ -177,7 +177,7 @@ class box_graph_orders_permonth extends ModeleBoxes
// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
if ($showtot)
{
- $data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
+ $data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
$filenamenb = $dir."/".$prefix."ordersamountinyear-".$endyear.".png";
// default value for customer mode
@@ -186,20 +186,20 @@ class box_graph_orders_permonth extends ModeleBoxes
$px2 = new DolGraph();
$mesg = $px2->isGraphKo();
- if (! $mesg)
+ if (!$mesg)
{
$px2->SetData($data2);
unset($data2);
- $i=$startyear;$legend=array();
+ $i = $startyear; $legend = array();
while ($i <= $endyear)
{
if ($startmonth != 1)
{
- $legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+ $legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
}
else
{
- $legend[]=$i;
+ $legend[] = $i;
}
$i++;
}
@@ -211,7 +211,7 @@ class box_graph_orders_permonth extends ModeleBoxes
$px2->SetShading(3);
$px2->SetHorizTickIncrement(1);
$px2->SetCssPrefix("cssboxes");
- $px2->mode='depth';
+ $px2->mode = 'depth';
$px2->SetTitle($langs->trans("AmountOfOrdersByMonthHT"));
$px2->draw($filenamenb, $fileurlnb);
@@ -221,49 +221,49 @@ class box_graph_orders_permonth extends ModeleBoxes
if (empty($conf->use_javascript_ajax))
{
$langs->load("errors");
- $mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+ $mesg = $langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
}
- if (! $mesg)
+ if (!$mesg)
{
- $stringtoshow='';
- $stringtoshow.='';
- $stringtoshow.='';
+ $stringtoshow .= '';
if ($shownb && $showtot)
{
- $stringtoshow.='';
+ $stringtoshow .= ' ';
+ $stringtoshow .= '';
+ $stringtoshow .= ' ';
+ $stringtoshow .= '';
}
- if ($shownb) $stringtoshow.=$px1->show();
+ if ($shownb) $stringtoshow .= $px1->show();
if ($shownb && $showtot)
{
- $stringtoshow.=' ';
- $stringtoshow.='';
+ $stringtoshow .= ' ';
+ $stringtoshow .= '';
}
- if ($showtot) $stringtoshow.=$px2->show();
+ if ($showtot) $stringtoshow .= $px2->show();
if ($shownb && $showtot)
{
- $stringtoshow.=' ';
- $stringtoshow.='';
- $stringtoshow.=' ';
}
$this->info_box_contents[0][0] = array(
'tr'=>'class="oddeven nohover"',
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 3ceb04b7d4c..99426be8cb1 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -28,9 +28,9 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
*/
class box_graph_orders_supplier_permonth extends ModeleBoxes
{
- public $boxcode="orderssupplierpermonth";
- public $boximg="object_order";
- public $boxlabel="BoxSuppliersOrdersPerMonth";
+ public $boxcode = "orderssupplierpermonth";
+ public $boximg = "object_order";
+ public $boxlabel = "BoxSuppliersOrdersPerMonth";
public $depends = array("fournisseur");
/**
@@ -52,9 +52,9 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
{
global $user;
- $this->db=$db;
+ $this->db = $db;
- $this->hidden = ! ($user->rights->fournisseur->commande->lire);
+ $this->hidden = !($user->rights->fournisseur->commande->lire);
}
/**
@@ -67,13 +67,13 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
{
global $conf, $user, $langs;
- $this->max=$max;
+ $this->max = $max;
- $refreshaction='refresh_'.$this->boxcode;
+ $refreshaction = 'refresh_'.$this->boxcode;
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
- $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
+ $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1;
$text = $langs->trans("BoxSuppliersOrdersPerMonth", $max);
@@ -88,50 +88,50 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
'target'=>'none' // Set '' to get target="_blank"
);
- $dir=''; // We don't need a path because image file will not be saved into disk
- $prefix='';
- $socid=0;
- 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
+ $dir = ''; // We don't need a path because image file will not be saved into disk
+ $prefix = '';
+ $socid = 0;
+ 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)
{
$langs->load("orders");
- $param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
- $param_shownb='DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
- $param_showtot='DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
+ $param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+ $param_shownb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
+ $param_showtot = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
- $autosetarray=preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
+ $autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray))
{
- $endyear=GETPOST($param_year, 'int');
- $shownb=GETPOST($param_shownb, 'alpha');
- $showtot=GETPOST($param_showtot, 'alpha');
+ $endyear = GETPOST($param_year, 'int');
+ $shownb = GETPOST($param_shownb, 'alpha');
+ $showtot = GETPOST($param_showtot, 'alpha');
}
else
{
- $tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
- $endyear=$tmparray['year'];
- $shownb=$tmparray['shownb'];
- $showtot=$tmparray['showtot'];
+ $tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
+ $endyear = $tmparray['year'];
+ $shownb = $tmparray['shownb'];
+ $showtot = $tmparray['showtot'];
}
- if (empty($shownb) && empty($showtot)) { $shownb=1; $showtot=1; }
- $nowarray=dol_getdate(dol_now(), true);
- if (empty($endyear)) $endyear=$nowarray['year'];
- $startyear=$endyear-1;
- $mode='supplier';
- $WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
- $HEIGHT='192';
+ if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
+ $nowarray = dol_getdate(dol_now(), true);
+ if (empty($endyear)) $endyear = $nowarray['year'];
+ $startyear = $endyear - 1;
+ $mode = 'supplier';
+ $WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
+ $HEIGHT = '192';
$stats = new CommandeStats($this->db, $socid, $mode, 0);
// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
if ($shownb)
{
- $data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
+ $data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
$filenamenb = $dir."/".$prefix."orderssuppliernbinyear-".$endyear.".png";
// default value for customer mode
@@ -140,21 +140,21 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
$px1 = new DolGraph();
$mesg = $px1->isGraphKo();
- if (! $mesg)
+ if (!$mesg)
{
$px1->SetData($data1);
unset($data1);
- $i=$startyear;
- $legend=array();
+ $i = $startyear;
+ $legend = array();
while ($i <= $endyear)
{
if ($startmonth != 1)
{
- $legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+ $legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
}
else
{
- $legend[]=$i;
+ $legend[] = $i;
}
$i++;
}
@@ -166,7 +166,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
$px1->SetShading(3);
$px1->SetHorizTickIncrement(1);
$px1->SetCssPrefix("cssboxes");
- $px1->mode='depth';
+ $px1->mode = 'depth';
$px1->SetTitle($langs->trans("NumberOfOrdersByMonth"));
$px1->draw($filenamenb, $fileurlnb);
@@ -176,7 +176,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
if ($showtot)
{
- $data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
+ $data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
$filenamenb = $dir."/".$prefix."orderssupplieramountinyear-".$endyear.".png";
// default value for customer mode
@@ -185,20 +185,20 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
$px2 = new DolGraph();
$mesg = $px2->isGraphKo();
- if (! $mesg)
+ if (!$mesg)
{
$px2->SetData($data2);
unset($data2);
- $i=$startyear;$legend=array();
+ $i = $startyear; $legend = array();
while ($i <= $endyear)
{
if ($startmonth != 1)
{
- $legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+ $legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
}
else
{
- $legend[]=$i;
+ $legend[] = $i;
}
$i++;
}
@@ -210,7 +210,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
$px2->SetShading(3);
$px2->SetHorizTickIncrement(1);
$px2->SetCssPrefix("cssboxes");
- $px2->mode='depth';
+ $px2->mode = 'depth';
$px2->SetTitle($langs->trans("AmountOfOrdersByMonthHT"));
$px2->draw($filenamenb, $fileurlnb);
@@ -220,49 +220,49 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
if (empty($conf->use_javascript_ajax))
{
$langs->load("errors");
- $mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+ $mesg = $langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
}
- if (! $mesg)
+ if (!$mesg)
{
- $stringtoshow='';
- $stringtoshow.='';
- $stringtoshow.='';
+ $stringtoshow .= '';
if ($shownb && $showtot)
{
- $stringtoshow.='';
+ $stringtoshow .= ' ';
+ $stringtoshow .= '';
+ $stringtoshow .= ' ';
+ $stringtoshow .= '';
}
- if ($shownb) $stringtoshow.=$px1->show();
+ if ($shownb) $stringtoshow .= $px1->show();
if ($shownb && $showtot)
{
- $stringtoshow.=' ';
- $stringtoshow.='';
+ $stringtoshow .= ' ';
+ $stringtoshow .= '';
}
- if ($showtot) $stringtoshow.=$px2->show();
+ if ($showtot) $stringtoshow .= $px2->show();
if ($shownb && $showtot)
{
- $stringtoshow.=' ';
- $stringtoshow.='';
- $stringtoshow.=' ';
}
$this->info_box_contents[0][0] = array(
'tr'=>'class="oddeven nohover"',
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 48493eeac92..c61bc2569be 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -29,10 +29,10 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
*/
class box_graph_product_distribution extends ModeleBoxes
{
- public $boxcode="productdistribution";
- public $boximg="object_product";
- public $boxlabel="BoxProductDistribution";
- public $depends = array("product|service","facture|propal|commande");
+ public $boxcode = "productdistribution";
+ public $boximg = "object_product";
+ public $boxlabel = "BoxProductDistribution";
+ public $depends = array("product|service", "facture|propal|commande");
/**
* @var DoliDB Database handler.
@@ -55,12 +55,12 @@ class box_graph_product_distribution extends ModeleBoxes
{
global $user, $conf;
- $this->db=$db;
+ $this->db = $db;
- $this->hidden = ! (
- (! empty($conf->facture->enabled) && ! empty($user->rights->facture->lire))
- || (! empty($conf->commande->enabled) && ! empty($user->rights->commande->lire))
- || (! empty($conf->propal->enabled) && ! empty($user->rights->propale->lire))
+ $this->hidden = !(
+ (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire))
+ || (!empty($conf->commande->enabled) && !empty($user->rights->commande->lire))
+ || (!empty($conf->propal->enabled) && !empty($user->rights->propale->lire))
);
}
@@ -74,43 +74,43 @@ class box_graph_product_distribution extends ModeleBoxes
{
global $conf, $user, $langs;
- $this->max=$max;
+ $this->max = $max;
- $refreshaction='refresh_'.$this->boxcode;
+ $refreshaction = 'refresh_'.$this->boxcode;
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
- $param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
- $param_showinvoicenb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showinvoicenb';
- $param_showpropalnb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showpropalnb';
- $param_showordernb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showordernb';
- $autosetarray=preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
+ $param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+ $param_showinvoicenb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showinvoicenb';
+ $param_showpropalnb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showpropalnb';
+ $param_showordernb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showordernb';
+ $autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray))
{
- $year=GETPOST($param_year, 'int');
- $showinvoicenb=GETPOST($param_showinvoicenb, 'alpha');
- $showpropalnb=GETPOST($param_showpropalnb, 'alpha');
- $showordernb=GETPOST($param_showordernb, 'alpha');
+ $year = GETPOST($param_year, 'int');
+ $showinvoicenb = GETPOST($param_showinvoicenb, 'alpha');
+ $showpropalnb = GETPOST($param_showpropalnb, 'alpha');
+ $showordernb = GETPOST($param_showordernb, 'alpha');
}
else
{
- $tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
- $year=$tmparray['year'];
- $showinvoicenb=$tmparray['showinvoicenb'];
- $showpropalnb=$tmparray['showpropalnb'];
- $showordernb=$tmparray['showordernb'];
+ $tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
+ $year = $tmparray['year'];
+ $showinvoicenb = $tmparray['showinvoicenb'];
+ $showpropalnb = $tmparray['showpropalnb'];
+ $showordernb = $tmparray['showordernb'];
}
- if (empty($showinvoicenb) && empty($showpropalnb) && empty($showordernb)) { $showpropalnb=1; $showinvoicenb=1; $showordernb=1; }
- if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) $showinvoicenb=0;
- if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) $showpropalnb=0;
- if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) $showordernb=0;
+ if (empty($showinvoicenb) && empty($showpropalnb) && empty($showordernb)) { $showpropalnb = 1; $showinvoicenb = 1; $showordernb = 1; }
+ if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) $showinvoicenb = 0;
+ if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) $showpropalnb = 0;
+ if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) $showordernb = 0;
- $nowarray=dol_getdate(dol_now(), true);
- if (empty($year)) $year=$nowarray['year'];
+ $nowarray = dol_getdate(dol_now(), true);
+ if (empty($year)) $year = $nowarray['year'];
- $nbofgraph=0;
+ $nbofgraph = 0;
if ($showinvoicenb) $nbofgraph++;
if ($showpropalnb) $nbofgraph++;
if ($showordernb) $nbofgraph++;
@@ -128,13 +128,13 @@ class box_graph_product_distribution extends ModeleBoxes
);
- $socid=empty($user->socid)?0:$user->socid;
- $userid=0; // No filter on user creation
+ $socid = empty($user->socid) ? 0 : $user->socid;
+ $userid = 0; // No filter on user creation
- $WIDTH=($nbofgraph >= 2 || ! empty($conf->dol_optimize_smallscreen))?'160':'320';
- $HEIGHT='192';
+ $WIDTH = ($nbofgraph >= 2 || !empty($conf->dol_optimize_smallscreen)) ? '160' : '320';
+ $HEIGHT = '192';
- if (! empty($conf->facture->enabled) && ! empty($user->rights->facture->lire))
+ if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire))
{
// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
if ($showinvoicenb)
@@ -143,34 +143,34 @@ class box_graph_product_distribution extends ModeleBoxes
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
$showpointvalue = 1; $nocolor = 0;
- $mode='customer';
- $stats_invoice = new FactureStats($this->db, $socid, $mode, ($userid>0?$userid:0));
- $data1 = $stats_invoice->getAllByProductEntry($year, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)));
+ $mode = 'customer';
+ $stats_invoice = new FactureStats($this->db, $socid, $mode, ($userid > 0 ? $userid : 0));
+ $data1 = $stats_invoice->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)));
if (empty($data1))
{
- $showpointvalue=0;
- $nocolor=1;
- $data1=array(array(0=>$langs->trans("None"),1=>1));
+ $showpointvalue = 0;
+ $nocolor = 1;
+ $data1 = array(array(0=>$langs->trans("None"), 1=>1));
}
$filenamenb = $dir."/prodserforinvoice-".$year.".png";
$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=productstats&file=prodserforinvoice-'.$year.'.png';
$px1 = new DolGraph();
$mesg = $px1->isGraphKo();
- if (! $mesg)
+ if (!$mesg)
{
- $i=0;$tot=count($data1);$legend=array();
+ $i = 0; $tot = count($data1); $legend = array();
while ($i <= $tot)
{
- $data1[$i][0]=dol_trunc($data1[$i][0], 5); // Required to avoid error "Could not draw pie with labels contained inside canvas"
- $legend[]=$data1[$i][0];
+ $data1[$i][0] = dol_trunc($data1[$i][0], 5); // Required to avoid error "Could not draw pie with labels contained inside canvas"
+ $legend[] = $data1[$i][0];
$i++;
}
$px1->SetData($data1);
unset($data1);
- if ($nocolor) $px1->SetDataColor(array(array(220,220,220)));
+ if ($nocolor) $px1->SetDataColor(array(array(220, 220, 220)));
$px1->SetLegend($legend);
$px1->setShowLegend(0);
$px1->setShowPointValue($showpointvalue);
@@ -192,7 +192,7 @@ class box_graph_product_distribution extends ModeleBoxes
}
}
- if (! empty($conf->propal->enabled) && ! empty($user->rights->propale->lire))
+ if (!empty($conf->propal->enabled) && !empty($user->rights->propale->lire))
{
// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
if ($showpropalnb)
@@ -201,13 +201,13 @@ class box_graph_product_distribution extends ModeleBoxes
include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
$showpointvalue = 1; $nocolor = 0;
- $stats_proposal = new PropaleStats($this->db, $socid, ($userid>0?$userid:0));
- $data2 = $stats_proposal->getAllByProductEntry($year, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)));
+ $stats_proposal = new PropaleStats($this->db, $socid, ($userid > 0 ? $userid : 0));
+ $data2 = $stats_proposal->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)));
if (empty($data2))
{
$showpointvalue = 0;
$nocolor = 1;
- $data2=array(array(0=>$langs->trans("None"),1=>1));
+ $data2 = array(array(0=>$langs->trans("None"), 1=>1));
}
$filenamenb = $dir."/prodserforpropal-".$year.".png";
@@ -215,20 +215,20 @@ class box_graph_product_distribution extends ModeleBoxes
$px2 = new DolGraph();
$mesg = $px2->isGraphKo();
- if (! $mesg)
+ if (!$mesg)
{
- $i=0;$tot=count($data2);$legend=array();
+ $i = 0; $tot = count($data2); $legend = array();
while ($i <= $tot)
{
- $data2[$i][0]=dol_trunc($data2[$i][0], 5); // Required to avoid error "Could not draw pie with labels contained inside canvas"
- $legend[]=$data2[$i][0];
+ $data2[$i][0] = dol_trunc($data2[$i][0], 5); // Required to avoid error "Could not draw pie with labels contained inside canvas"
+ $legend[] = $data2[$i][0];
$i++;
}
$px2->SetData($data2);
unset($data2);
- if ($nocolor) $px2->SetDataColor(array(array(220,220,220)));
+ if ($nocolor) $px2->SetDataColor(array(array(220, 220, 220)));
$px2->SetLegend($legend);
$px2->setShowLegend(0);
$px2->setShowPointValue($showpointvalue);
@@ -250,7 +250,7 @@ class box_graph_product_distribution extends ModeleBoxes
}
}
- if (! empty($conf->commande->enabled) && ! empty($user->rights->commande->lire))
+ if (!empty($conf->commande->enabled) && !empty($user->rights->commande->lire))
{
// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
if ($showordernb)
@@ -259,14 +259,14 @@ class box_graph_product_distribution extends ModeleBoxes
include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
$showpointvalue = 1; $nocolor = 0;
- $mode='customer';
- $stats_order = new CommandeStats($this->db, $socid, $mode, ($userid>0?$userid:0));
- $data3 = $stats_order->getAllByProductEntry($year, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)));
+ $mode = 'customer';
+ $stats_order = new CommandeStats($this->db, $socid, $mode, ($userid > 0 ? $userid : 0));
+ $data3 = $stats_order->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)));
if (empty($data3))
{
$showpointvalue = 0;
$nocolor = 1;
- $data3=array(array(0=>$langs->trans("None"),1=>1));
+ $data3 = array(array(0=>$langs->trans("None"), 1=>1));
}
$filenamenb = $dir."/prodserfororder-".$year.".png";
@@ -274,20 +274,20 @@ class box_graph_product_distribution extends ModeleBoxes
$px3 = new DolGraph();
$mesg = $px3->isGraphKo();
- if (! $mesg)
+ if (!$mesg)
{
- $i=0;$tot=count($data3);$legend=array();
+ $i = 0; $tot = count($data3); $legend = array();
while ($i <= $tot)
{
- $data3[$i][0]=dol_trunc($data3[$i][0], 5); // Required to avoid error "Could not draw pie with labels contained inside canvas"
- $legend[]=$data3[$i][0];
+ $data3[$i][0] = dol_trunc($data3[$i][0], 5); // Required to avoid error "Could not draw pie with labels contained inside canvas"
+ $legend[] = $data3[$i][0];
$i++;
}
$px3->SetData($data3);
unset($data3);
- if ($nocolor) $px3->SetDataColor(array(array(220,220,220)));
+ if ($nocolor) $px3->SetDataColor(array(array(220, 220, 220)));
$px3->SetLegend($legend);
$px3->setShowLegend(0);
$px3->setShowPointValue($showpointvalue);
@@ -312,76 +312,76 @@ class box_graph_product_distribution extends ModeleBoxes
if (empty($nbofgraph))
{
$langs->load("errors");
- $mesg=$langs->trans("ReadPermissionNotAllowed");
+ $mesg = $langs->trans("ReadPermissionNotAllowed");
}
if (empty($conf->use_javascript_ajax))
{
$langs->load("errors");
- $mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+ $mesg = $langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
}
- if (! $mesg)
+ if (!$mesg)
{
- $stringtoshow='';
- $stringtoshow.='';
- $stringtoshow.='';
if ($nbofgraph == 1)
{
- if ($showinvoicenb) $stringtoshow.=$px1->show();
- elseif ($showpropalnb) $stringtoshow.=$px2->show();
- else $stringtoshow.=$px3->show();
+ if ($showinvoicenb) $stringtoshow .= $px1->show();
+ elseif ($showpropalnb) $stringtoshow .= $px2->show();
+ else $stringtoshow .= $px3->show();
}
if ($nbofgraph == 2)
{
- $stringtoshow.='';
+ $stringtoshow .= ' ';
+ $stringtoshow .= '';
+ $stringtoshow .= ' ';
+ $stringtoshow .= '';
}
- if ($shownb) $stringtoshow.=$px1->show();
+ if ($shownb) $stringtoshow .= $px1->show();
if ($shownb && $showtot)
{
- $stringtoshow.=' ';
- $stringtoshow.='';
+ $stringtoshow .= ' ';
+ $stringtoshow .= '';
}
- if ($showtot) $stringtoshow.=$px2->show();
+ if ($showtot) $stringtoshow .= $px2->show();
if ($shownb && $showtot)
{
- $stringtoshow.=' ';
- $stringtoshow.='';
- if ($showinvoicenb) $stringtoshow.=$px1->show();
- elseif ($showpropalnb) $stringtoshow.=$px2->show();
- $stringtoshow.=' ';
- if ($showordernb) $stringtoshow.=$px3->show();
- elseif ($showpropalnb) $stringtoshow.=$px2->show();
- $stringtoshow.=' ';
+ if ($showinvoicenb) $stringtoshow .= $px1->show();
+ elseif ($showpropalnb) $stringtoshow .= $px2->show();
+ $stringtoshow .= ' ';
+ if ($showordernb) $stringtoshow .= $px3->show();
+ elseif ($showpropalnb) $stringtoshow .= $px2->show();
+ $stringtoshow .= ' ';
- $stringtoshow.=$px1->show();
- $stringtoshow.=' ';
- $stringtoshow.=$px2->show();
- $stringtoshow.=' ';
- $stringtoshow.=$px3->show();
- $stringtoshow.=' ';
+ $stringtoshow .= $px1->show();
+ $stringtoshow .= ' ';
+ $stringtoshow .= $px2->show();
+ $stringtoshow .= ' ';
+ $stringtoshow .= $px3->show();
+ $stringtoshow .= ' ';
- $stringtoshow.=' ';
}
$this->info_box_contents[0][0] = array(
'tr'=>'class="oddeven nohover"',
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index 80264796186..2ae0ede3c21 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -118,16 +118,16 @@ class box_task extends ModeleBoxes
// list the summary of the orders
if ($user->rights->projet->lire) {
- $boxcontent.= ''."\n";
- $boxcontent.= '';
+ $stringtoshow .= ' ';
+ $stringtoshow .= '';
+ $stringtoshow .= ' ';
+ $stringtoshow .= '';
}
- if ($shownb) $stringtoshow.=$px1->show();
+ if ($shownb) $stringtoshow .= $px1->show();
if ($shownb && $showtot)
{
- $stringtoshow.=' ';
- $stringtoshow.='';
+ $stringtoshow .= ' ';
+ $stringtoshow .= '';
}
- if ($showtot) $stringtoshow.=$px2->show();
+ if ($showtot) $stringtoshow .= $px2->show();
if ($shownb && $showtot)
{
- $stringtoshow.=' ';
- $stringtoshow.=''."\n";
- $boxcontent.= ' |
| '; - $out.=$form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody'); - $out.=' | '; - $out.= ''; + $out .= ' | ||||||||||||||||
| '; + $out .= $form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody'); + $out .= ' | '; + $out .= ''; if ($this->withbodyreadonly) { - $out.= nl2br($defaultmessage); - $out.= ''; + $out .= nl2br($defaultmessage); + $out .= ''; } else { - if (! isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes'; + if (!isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes'; // Editor wysiwyg require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; if ($this->withfckeditor == -1) { - if (! empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $this->withfckeditor=1; - else $this->withfckeditor=0; + if (!empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $this->withfckeditor = 1; + else $this->withfckeditor = 0; } - $doleditor=new DolEditor('message', $defaultmessage, '', 280, $this->ckeditortoolbar, 'In', true, true, $this->withfckeditor, 8, '95%'); - $out.= $doleditor->Create(1); + $doleditor = new DolEditor('message', $defaultmessage, '', 280, $this->ckeditortoolbar, 'In', true, true, $this->withfckeditor, 8, '95%'); + $out .= $doleditor->Create(1); } - $out.= " |
| '.$langs->trans("ProductAccountancySellCode").' | '; print ''; - if($type = 0) { - $accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell')?GETPOST('accountancy_code_sell', 'alpha'):$conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT); + if ($type = 0) { + $accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell') ?GETPOST('accountancy_code_sell', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT); } else { - $accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell')?GETPOST('accountancy_code_sell', 'alpha'):$conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT); + $accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell') ?GETPOST('accountancy_code_sell', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT); } print $formaccounting->select_account($accountancy_code_sell, 'accountancy_code_sell', 1, null, 1, 1, ''); print ' | ||||
| '.$langs->trans("ProductAccountancySellIntraCode").' | '; print ''; - if($type = 0) { - $accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra')?GETPOST('accountancy_code_sell_intra', 'alpha'):$conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT); + if ($type = 0) { + $accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra') ?GETPOST('accountancy_code_sell_intra', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT); } else { - $accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra')?GETPOST('accountancy_code_sell_intra', 'alpha'):$conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT); + $accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra') ?GETPOST('accountancy_code_sell_intra', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT); } print $formaccounting->select_account($accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, null, 1, 1, ''); print ' | ||||
| '.$langs->trans("ProductAccountancySellExportCode").' | '; print ''; - if($type = 0) + if ($type = 0) { - $accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export')?GETPOST('accountancy_code_sell_export', 'alpha'):$conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT); + $accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export') ?GETPOST('accountancy_code_sell_export', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT); } else { - $accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export')?GETPOST('accountancy_code_sell_export', 'alpha'):$conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT); + $accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export') ?GETPOST('accountancy_code_sell_export', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT); } print $formaccounting->select_account($accountancy_code_sell_export, 'accountancy_code_sell_export', 1, null, 1, 1, ''); print ' | '.$langs->trans("Warehouse").' | '; print ''; - print $formproduct->selectWarehouses((GETPOST("dwid")?GETPOST("dwid", 'int'):(GETPOST('id_entrepot')?GETPOST('id_entrepot', 'int'):($object->element=='product' && $object->fk_default_warehouse?$object->fk_default_warehouse:'ifone'))), 'id_entrepot', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'minwidth100'); + print $formproduct->selectWarehouses((GETPOST("dwid") ?GETPOST("dwid", 'int') : (GETPOST('id_entrepot') ?GETPOST('id_entrepot', 'int') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone'))), 'id_entrepot', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'minwidth100'); print ' '; print ' | '; } @@ -81,10 +81,10 @@ if ($object->element == 'stock') { print ''.$langs->trans("Product").' | '; print ''; - $form->select_produits(GETPOST('product_id', 'int'), 'product_id', (empty($conf->global->STOCK_SUPPORTS_SERVICES)?'0':''), 0, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500'); + $form->select_produits(GETPOST('product_id', 'int'), 'product_id', (empty($conf->global->STOCK_SUPPORTS_SERVICES) ? '0' : ''), 0, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500'); print ' '; print ' | '; } @@ -96,7 +96,7 @@ if ($object->element == 'stock') print '
| '.$langs->trans("UnitPurchaseValue").' | '; print ''; -if (! empty($conf->projet->enabled)) +if (!empty($conf->projet->enabled)) { print ' | '.$langs->trans('Project').' | '; print ''; @@ -106,36 +106,36 @@ if (! empty($conf->projet->enabled)) print ' | ||
| ';
+ print ' | '; print ''; print ' | '; print '||||
| '.$langs->trans("EatByDate").' | '; - $eatbyselected=dol_mktime(0, 0, 0, GETPOST('eatbymonth'), GETPOST('eatbyday'), GETPOST('eatbyyear')); + $eatbyselected = dol_mktime(0, 0, 0, GETPOST('eatbymonth'), GETPOST('eatbyday'), GETPOST('eatbyyear')); print $form->selectDate($eatbyselected, 'eatby', '', '', 1, ""); print ' | '; print ''.$langs->trans("SellByDate").' | '; - $sellbyselected=dol_mktime(0, 0, 0, GETPOST('sellbymonth'), GETPOST('sellbyday'), GETPOST('sellbyyear')); + $sellbyselected = dol_mktime(0, 0, 0, GETPOST('sellbymonth'), GETPOST('sellbyday'), GETPOST('sellbyyear')); print $form->selectDate($sellbyselected, 'sellby', '', '', 1, ""); print ' | '; print '||
| '.$langs->trans("MovementLabel").' | '; print ''; print ''; print ' | '; - print ''.$langs->trans("InventoryCode").' | '; + print ' | '.$langs->trans("InventoryCode").' | '; print ' |