';
@@ -414,28 +414,28 @@ if ($action == 'create')
if ($id > 0)
{
$object = new ChargeSociales($db);
- $result=$object->fetch($id);
+ $result = $object->fetch($id);
if ($result > 0)
{
- $head=tax_prepare_head($object);
+ $head = tax_prepare_head($object);
$totalpaye = $object->getSommePaiement();
// Clone confirmation
if ($action === 'clone')
{
- $formquestion=array(
+ $formquestion = array(
array('type' => 'text', 'name' => 'clone_label', 'label' => $langs->trans("Label"), 'value' => $langs->trans("CopyOf").' '.$object->label),
);
- if (! empty($conf->global->TAX_ADD_CLON_FOR_NEXT_MONTH_CHECKBOX))
+ if (!empty($conf->global->TAX_ADD_CLON_FOR_NEXT_MONTH_CHECKBOX))
{
- $formquestion[]=array('type' => 'checkbox', 'name' => 'clone_for_next_month', 'label' => $langs->trans("CloneTaxForNextMonth"), 'value' => 1);
+ $formquestion[] = array('type' => 'checkbox', 'name' => 'clone_for_next_month', 'label' => $langs->trans("CloneTaxForNextMonth"), 'value' => 1);
}
else
{
- $formquestion[]=array('type' => 'date', 'name' => 'clone_period', 'label' => $langs->trans("PeriodEndDate"), 'value' => -1);
- $formquestion[]=array('type' => 'date', 'name' => 'clone_date_ech', 'label' => $langs->trans("DateDue"), 'value' => -1);
+ $formquestion[] = array('type' => 'date', 'name' => 'clone_period', 'label' => $langs->trans("PeriodEndDate"), 'value' => -1);
+ $formquestion[] = array('type' => 'date', 'name' => 'clone_date_ech', 'label' => $langs->trans("DateDue"), 'value' => -1);
}
print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneTax', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
@@ -558,18 +558,18 @@ if ($id > 0)
print $langs->trans('PaymentMode');
print '';
if ($action != 'editmode')
- print '';
print '';
@@ -595,25 +595,25 @@ if ($id > 0)
print '';
$nbcols = 3;
- if (! empty($conf->banque->enabled)) {
- $nbcols ++;
+ if (!empty($conf->banque->enabled)) {
+ $nbcols++;
}
/*
* Payments
*/
$sql = "SELECT p.rowid, p.num_paiement, datep as dp, p.amount,";
- $sql.= " c.code as type_code,c.libelle as paiement_type,";
- $sql.= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal';
- $sql.= " FROM ".MAIN_DB_PREFIX."paiementcharge as p";
- $sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank as b ON p.fk_bank = b.rowid';
- $sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank_account as ba ON b.fk_account = ba.rowid';
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepaiement = c.id";
- $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs";
- $sql.= " WHERE p.fk_charge = ".$id;
- $sql.= " AND p.fk_charge = cs.rowid";
- $sql.= " AND cs.entity IN (".getEntity('tax').")";
- $sql.= " ORDER BY dp DESC";
+ $sql .= " c.code as type_code,c.libelle as paiement_type,";
+ $sql .= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal';
+ $sql .= " FROM ".MAIN_DB_PREFIX."paiementcharge as p";
+ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
+ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepaiement = c.id";
+ $sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
+ $sql .= " WHERE p.fk_charge = ".$id;
+ $sql .= " AND p.fk_charge = cs.rowid";
+ $sql .= " AND cs.entity IN (".getEntity('tax').")";
+ $sql .= " ORDER BY dp DESC";
//print $sql;
$resql = $db->query($sql);
@@ -624,14 +624,14 @@ if ($id > 0)
$num = $db->num_rows($resql);
$i = 0; $total = 0;
- print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+ print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '
';
print '';
print ''.$langs->trans("RefPayment").' ';
print ''.$langs->trans("Date").' ';
print ''.$langs->trans("Type").' ';
- if (! empty($conf->banque->enabled)) {
- print '' . $langs->trans('BankAccount') . ' ';
+ if (!empty($conf->banque->enabled)) {
+ print ''.$langs->trans('BankAccount').' ';
}
print ''.$langs->trans("Amount").' ';
print ' ';
@@ -645,16 +645,16 @@ if ($id > 0)
print '';
print ''.img_object($langs->trans("Payment"), "payment").' '.$objp->rowid.' ';
print ''.dol_print_date($db->jdate($objp->dp), 'day')." \n";
- $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
+ $labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
print "".$labeltype.' '.$objp->num_paiement." \n";
- if (! empty($conf->banque->enabled))
+ if (!empty($conf->banque->enabled))
{
$bankaccountstatic->id = $objp->baid;
$bankaccountstatic->ref = $objp->baref;
$bankaccountstatic->label = $objp->baref;
$bankaccountstatic->number = $objp->banumber;
- if (! empty($conf->accounting->enabled)) {
+ if (!empty($conf->accounting->enabled)) {
$bankaccountstatic->account_number = $objp->account_number;
$accountingjournal = new AccountingJournal($db);
@@ -687,7 +687,7 @@ if ($id > 0)
$cssforamountpaymentcomplete = 'amountpaymentcomplete';
print ''.$langs->trans("RemainderToPay")." : ";
- print ''.price($resteapayer)." '.price($resteapayer)." \n";
print "
";
print '
';
@@ -730,7 +730,7 @@ if ($id > 0)
// Reopen
if ($object->paye && $user->rights->tax->charges->creer)
{
- print "
";
+ print "
";
}
// Edit
@@ -746,7 +746,7 @@ if ($id > 0)
}
// Classify 'paid'
- if ($object->paye == 0 && round($resteapayer) <=0 && $user->rights->tax->charges->creer)
+ if ($object->paye == 0 && round($resteapayer) <= 0 && $user->rights->tax->charges->creer)
{
print "
";
}
@@ -754,7 +754,7 @@ if ($id > 0)
// Clone
if ($user->rights->tax->charges->creer)
{
- print "
";
+ print "
";
}
// Delete
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index f8a43d70494..88cc24dcb2a 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -30,7 +30,7 @@
* \ingroup societe
* \brief File of contacts class
*/
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
/**
@@ -41,12 +41,12 @@ class Contact extends CommonObject
/**
* @var string ID to identify managed object
*/
- public $element='contact';
+ public $element = 'contact';
/**
* @var string Name of table without prefix where object is stored
*/
- public $table_element='socpeople';
+ public $table_element = 'socpeople';
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
@@ -166,10 +166,10 @@ class Contact extends CommonObject
public $birthday;
public $default_lang;
- public $ref_facturation; // Reference number of invoice for which it is contact
- public $ref_contrat; // Nb de reference contrat pour lequel il est contact
- public $ref_commande; // Nb de reference commande pour lequel il est contact
- public $ref_propal; // Nb de reference propal pour lequel il est contact
+ public $ref_facturation; // Reference number of invoice for which it is contact
+ public $ref_contrat; // Nb de reference contrat pour lequel il est contact
+ public $ref_commande; // Nb de reference commande pour lequel il est contact
+ public $ref_propal; // Nb de reference propal pour lequel il est contact
public $user_id;
public $user_login;
@@ -194,7 +194,7 @@ class Contact extends CommonObject
public function __construct($db)
{
$this->db = $db;
- $this->statut = 1; // By default, status is enabled
+ $this->statut = 1; // By default, status is enabled
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -237,7 +237,7 @@ class Contact extends CommonObject
else
{
dol_print_error($this->db);
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
return -1;
}
}
@@ -252,84 +252,84 @@ class Contact extends CommonObject
{
global $conf, $langs;
- $error=0;
- $now=dol_now();
+ $error = 0;
+ $now = dol_now();
$this->db->begin();
// Clean parameters
- $this->lastname=$this->lastname?trim($this->lastname):trim($this->name);
- $this->firstname=trim($this->firstname);
- if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname=ucwords($this->lastname);
- if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname=ucwords($this->firstname);
+ $this->lastname = $this->lastname ?trim($this->lastname) : trim($this->name);
+ $this->firstname = trim($this->firstname);
+ if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname = ucwords($this->lastname);
+ if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname = ucwords($this->firstname);
if (empty($this->socid)) $this->socid = 0;
if (empty($this->priv)) $this->priv = 0;
if (empty($this->statut)) $this->statut = 0; // This is to convert '' into '0' to avoid bad sql request
- $this->entity = ((isset($this->entity) && is_numeric($this->entity))?$this->entity:$conf->entity);
+ $this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."socpeople (";
- $sql.= " datec";
- $sql.= ", fk_soc";
- $sql.= ", lastname";
- $sql.= ", firstname";
- $sql.= ", fk_user_creat";
- $sql.= ", priv";
- $sql.= ", statut";
- $sql.= ", canvas";
- $sql.= ", entity";
- $sql.= ", ref_ext";
- $sql.= ", import_key";
- $sql.= ") VALUES (";
- $sql.= "'".$this->db->idate($now)."',";
- if ($this->socid > 0) $sql.= " ".$this->db->escape($this->socid).",";
- else $sql.= "null,";
- $sql.= "'".$this->db->escape($this->lastname)."',";
- $sql.= "'".$this->db->escape($this->firstname)."',";
- $sql.= " ".($user->id > 0 ? "'".$this->db->escape($user->id)."'":"null").",";
- $sql.= " ".$this->db->escape($this->priv).",";
- $sql.= " ".$this->db->escape($this->statut).",";
- $sql.= " ".(! empty($this->canvas)?"'".$this->db->escape($this->canvas)."'":"null").",";
- $sql.= " ".$this->db->escape($this->entity).",";
- $sql.= "'".$this->db->escape($this->ref_ext)."',";
- $sql.= " ".(! empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
- $sql.= ")";
+ $sql .= " datec";
+ $sql .= ", fk_soc";
+ $sql .= ", lastname";
+ $sql .= ", firstname";
+ $sql .= ", fk_user_creat";
+ $sql .= ", priv";
+ $sql .= ", statut";
+ $sql .= ", canvas";
+ $sql .= ", entity";
+ $sql .= ", ref_ext";
+ $sql .= ", import_key";
+ $sql .= ") VALUES (";
+ $sql .= "'".$this->db->idate($now)."',";
+ if ($this->socid > 0) $sql .= " ".$this->db->escape($this->socid).",";
+ else $sql .= "null,";
+ $sql .= "'".$this->db->escape($this->lastname)."',";
+ $sql .= "'".$this->db->escape($this->firstname)."',";
+ $sql .= " ".($user->id > 0 ? "'".$this->db->escape($user->id)."'" : "null").",";
+ $sql .= " ".$this->db->escape($this->priv).",";
+ $sql .= " ".$this->db->escape($this->statut).",";
+ $sql .= " ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null").",";
+ $sql .= " ".$this->db->escape($this->entity).",";
+ $sql .= "'".$this->db->escape($this->ref_ext)."',";
+ $sql .= " ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+ $sql .= ")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."socpeople");
- if (! $error)
+ if (!$error)
{
- $result=$this->update($this->id, $user, 1, 'add');
+ $result = $this->update($this->id, $user, 1, 'add');
if ($result < 0)
{
$error++;
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
}
}
- if (! $error)
+ if (!$error)
{
- $result=$this->update_perso($this->id, $user, 1); // TODO Remove function update_perso, should be same than update
+ $result = $this->update_perso($this->id, $user, 1); // TODO Remove function update_perso, should be same than update
if ($result < 0)
{
$error++;
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
}
}
- if (! $error)
+ if (!$error)
{
// Call trigger
- $result=$this->call_trigger('CONTACT_CREATE', $user);
+ $result = $this->call_trigger('CONTACT_CREATE', $user);
if ($result < 0) { $error++; }
// End call triggers
}
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return $this->id;
@@ -343,7 +343,7 @@ class Contact extends CommonObject
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
$this->db->rollback();
dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
@@ -365,26 +365,26 @@ class Contact extends CommonObject
{
global $conf, $langs, $hookmanager;
- $error=0;
+ $error = 0;
$this->id = $id;
- $this->entity = ((isset($this->entity) && is_numeric($this->entity))?$this->entity:$conf->entity);
+ $this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
// Clean parameters
- $this->lastname=trim($this->lastname)?trim($this->lastname):trim($this->lastname);
- $this->firstname=trim($this->firstname);
- $this->email=trim($this->email);
- $this->phone_pro=trim($this->phone_pro);
- $this->phone_perso=trim($this->phone_perso);
- $this->phone_mobile=trim($this->phone_mobile);
- $this->jabberid=trim($this->jabberid);
- $this->skype=trim($this->skype);
- $this->photo=trim($this->photo);
- $this->fax=trim($this->fax);
- $this->zip=(empty($this->zip)?'':$this->zip);
- $this->town=(empty($this->town)?'':$this->town);
- $this->country_id=($this->country_id > 0?$this->country_id:$this->country_id);
+ $this->lastname = trim($this->lastname) ?trim($this->lastname) : trim($this->lastname);
+ $this->firstname = trim($this->firstname);
+ $this->email = trim($this->email);
+ $this->phone_pro = trim($this->phone_pro);
+ $this->phone_perso = trim($this->phone_perso);
+ $this->phone_mobile = trim($this->phone_mobile);
+ $this->jabberid = trim($this->jabberid);
+ $this->skype = trim($this->skype);
+ $this->photo = trim($this->photo);
+ $this->fax = trim($this->fax);
+ $this->zip = (empty($this->zip) ? '' : $this->zip);
+ $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
$this->db->begin();
@@ -398,8 +398,8 @@ class Contact extends CommonObject
$sql .= ", address='".$this->db->escape($this->address)."'";
$sql .= ", zip='".$this->db->escape($this->zip)."'";
$sql .= ", town='".$this->db->escape($this->town)."'";
- $sql .= ", fk_pays=".($this->country_id>0?$this->country_id:'NULL');
- $sql .= ", fk_departement=".($this->state_id>0?$this->state_id:'NULL');
+ $sql .= ", fk_pays=".($this->country_id > 0 ? $this->country_id : 'NULL');
+ $sql .= ", fk_departement=".($this->state_id > 0 ? $this->state_id : 'NULL');
$sql .= ", poste='".$this->db->escape($this->poste)."'";
$sql .= ", fax='".$this->db->escape($this->fax)."'";
$sql .= ", email='".$this->db->escape($this->email)."'";
@@ -427,27 +427,27 @@ class Contact extends CommonObject
unset($this->state_code);
unset($this->state);
- $action='update';
+ $action = 'update';
// Actions on extra fields
- if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
+ if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
{
- $result=$this->insertExtraFields();
+ $result = $this->insertExtraFields();
if ($result < 0)
{
$error++;
}
}
- if (! $error) {
- $result=$this->updateRoles();
+ if (!$error) {
+ $result = $this->updateRoles();
if ($result < 0)
{
$error++;
}
}
- if (! $error && $this->user_id > 0)
+ if (!$error && $this->user_id > 0)
{
// If contact is linked to a user
$tmpobj = new User($this->db);
@@ -480,7 +480,7 @@ class Contact extends CommonObject
}
if ($tmpobj->zip != $this->zip)
{
- $tmpobj->state_id=$this->state_id;
+ $tmpobj->state_id = $this->state_id;
$usermustbemodified++;
}
if ($tmpobj->country_id != $this->country_id)
@@ -547,7 +547,7 @@ class Contact extends CommonObject
}
else
{
- $this->error=$this->db->lasterror().' sql='.$sql;
+ $this->error = $this->db->lasterror().' sql='.$sql;
$this->db->rollback();
return -1;
}
@@ -569,10 +569,10 @@ class Contact extends CommonObject
{
// phpcs:enable
global $conf;
- $dn='';
- if ($mode==0) $dn=$conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS].",".$conf->global->LDAP_CONTACT_DN;
- elseif ($mode==1) $dn=$conf->global->LDAP_CONTACT_DN;
- elseif ($mode==2) $dn=$conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS];
+ $dn = '';
+ if ($mode == 0) $dn = $conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS].",".$conf->global->LDAP_CONTACT_DN;
+ elseif ($mode == 1) $dn = $conf->global->LDAP_CONTACT_DN;
+ elseif ($mode == 2) $dn = $conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS];
return $dn;
}
@@ -592,14 +592,14 @@ class Contact extends CommonObject
$info = array();
// Object classes
- $info["objectclass"]=explode(',', $conf->global->LDAP_CONTACT_OBJECT_CLASS);
+ $info["objectclass"] = explode(',', $conf->global->LDAP_CONTACT_OBJECT_CLASS);
- $this->fullname=$this->getFullName($langs);
+ $this->fullname = $this->getFullName($langs);
// Fields
- if ($this->fullname && ! empty($conf->global->LDAP_CONTACT_FIELD_FULLNAME)) $info[$conf->global->LDAP_CONTACT_FIELD_FULLNAME] = $this->fullname;
- if ($this->lastname && ! empty($conf->global->LDAP_CONTACT_FIELD_NAME)) $info[$conf->global->LDAP_CONTACT_FIELD_NAME] = $this->lastname;
- if ($this->firstname && ! empty($conf->global->LDAP_CONTACT_FIELD_FIRSTNAME)) $info[$conf->global->LDAP_CONTACT_FIELD_FIRSTNAME] = $this->firstname;
+ if ($this->fullname && !empty($conf->global->LDAP_CONTACT_FIELD_FULLNAME)) $info[$conf->global->LDAP_CONTACT_FIELD_FULLNAME] = $this->fullname;
+ if ($this->lastname && !empty($conf->global->LDAP_CONTACT_FIELD_NAME)) $info[$conf->global->LDAP_CONTACT_FIELD_NAME] = $this->lastname;
+ if ($this->firstname && !empty($conf->global->LDAP_CONTACT_FIELD_FIRSTNAME)) $info[$conf->global->LDAP_CONTACT_FIELD_FIRSTNAME] = $this->firstname;
if ($this->poste) $info["title"] = $this->poste;
if ($this->socid > 0)
@@ -612,17 +612,17 @@ class Contact extends CommonObject
if ($soc->client == 2) $info["businessCategory"] = "Prospects";
if ($soc->fournisseur == 1) $info["businessCategory"] = "Suppliers";
}
- if ($this->address && ! empty($conf->global->LDAP_CONTACT_FIELD_ADDRESS)) $info[$conf->global->LDAP_CONTACT_FIELD_ADDRESS] = $this->address;
- if ($this->zip && ! empty($conf->global->LDAP_CONTACT_FIELD_ZIP)) $info[$conf->global->LDAP_CONTACT_FIELD_ZIP] = $this->zip;
- if ($this->town && ! empty($conf->global->LDAP_CONTACT_FIELD_TOWN)) $info[$conf->global->LDAP_CONTACT_FIELD_TOWN] = $this->town;
- if ($this->country_code && ! empty($conf->global->LDAP_CONTACT_FIELD_COUNTRY)) $info[$conf->global->LDAP_CONTACT_FIELD_COUNTRY] = $this->country_code;
- if ($this->phone_pro && ! empty($conf->global->LDAP_CONTACT_FIELD_PHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_PHONE] = $this->phone_pro;
- if ($this->phone_perso && ! empty($conf->global->LDAP_CONTACT_FIELD_HOMEPHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE] = $this->phone_perso;
- if ($this->phone_mobile && ! empty($conf->global->LDAP_CONTACT_FIELD_MOBILE)) $info[$conf->global->LDAP_CONTACT_FIELD_MOBILE] = $this->phone_mobile;
- if ($this->fax && ! empty($conf->global->LDAP_CONTACT_FIELD_FAX)) $info[$conf->global->LDAP_CONTACT_FIELD_FAX] = $this->fax;
- if ($this->skype && ! empty($conf->global->LDAP_CONTACT_FIELD_SKYPE)) $info[$conf->global->LDAP_CONTACT_FIELD_SKYPE] = $this->skype;
- if ($this->note_private && ! empty($conf->global->LDAP_CONTACT_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_CONTACT_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_private, 2);
- if ($this->email && ! empty($conf->global->LDAP_CONTACT_FIELD_MAIL)) $info[$conf->global->LDAP_CONTACT_FIELD_MAIL] = $this->email;
+ if ($this->address && !empty($conf->global->LDAP_CONTACT_FIELD_ADDRESS)) $info[$conf->global->LDAP_CONTACT_FIELD_ADDRESS] = $this->address;
+ if ($this->zip && !empty($conf->global->LDAP_CONTACT_FIELD_ZIP)) $info[$conf->global->LDAP_CONTACT_FIELD_ZIP] = $this->zip;
+ if ($this->town && !empty($conf->global->LDAP_CONTACT_FIELD_TOWN)) $info[$conf->global->LDAP_CONTACT_FIELD_TOWN] = $this->town;
+ if ($this->country_code && !empty($conf->global->LDAP_CONTACT_FIELD_COUNTRY)) $info[$conf->global->LDAP_CONTACT_FIELD_COUNTRY] = $this->country_code;
+ if ($this->phone_pro && !empty($conf->global->LDAP_CONTACT_FIELD_PHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_PHONE] = $this->phone_pro;
+ if ($this->phone_perso && !empty($conf->global->LDAP_CONTACT_FIELD_HOMEPHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE] = $this->phone_perso;
+ if ($this->phone_mobile && !empty($conf->global->LDAP_CONTACT_FIELD_MOBILE)) $info[$conf->global->LDAP_CONTACT_FIELD_MOBILE] = $this->phone_mobile;
+ if ($this->fax && !empty($conf->global->LDAP_CONTACT_FIELD_FAX)) $info[$conf->global->LDAP_CONTACT_FIELD_FAX] = $this->fax;
+ if ($this->skype && !empty($conf->global->LDAP_CONTACT_FIELD_SKYPE)) $info[$conf->global->LDAP_CONTACT_FIELD_SKYPE] = $this->skype;
+ if ($this->note_private && !empty($conf->global->LDAP_CONTACT_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_CONTACT_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_private, 2);
+ if ($this->email && !empty($conf->global->LDAP_CONTACT_FIELD_MAIL)) $info[$conf->global->LDAP_CONTACT_FIELD_MAIL] = $this->email;
if ($conf->global->LDAP_SERVER_TYPE == 'egroupware')
{
@@ -630,7 +630,7 @@ class Contact extends CommonObject
$info['uidnumber'] = $this->id;
- $info['phpgwTz'] = 0;
+ $info['phpgwTz'] = 0;
$info['phpgwMailType'] = 'INTERNET';
$info['phpgwMailHomeType'] = 'INTERNET';
@@ -665,24 +665,24 @@ class Contact extends CommonObject
public function update_perso($id, $user = null, $notrigger = 0)
{
// phpcs:enable
- $error=0;
- $result=false;
+ $error = 0;
+ $result = false;
$this->db->begin();
// Mis a jour contact
$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET";
- $sql.= " birthday=".($this->birthday ? "'".$this->db->idate($this->birthday)."'" : "null");
- $sql.= ", photo = ".($this->photo? "'".$this->db->escape($this->photo)."'" : "null");
+ $sql .= " birthday=".($this->birthday ? "'".$this->db->idate($this->birthday)."'" : "null");
+ $sql .= ", photo = ".($this->photo ? "'".$this->db->escape($this->photo)."'" : "null");
if ($user) $sql .= ", fk_user_modif=".$user->id;
- $sql.= " WHERE rowid=".$this->db->escape($id);
+ $sql .= " WHERE rowid=".$this->db->escape($id);
dol_syslog(get_class($this)."::update_perso this->birthday=".$this->birthday." -", LOG_DEBUG);
$resql = $this->db->query($sql);
- if (! $resql)
+ if (!$resql)
{
$error++;
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
}
// Mis a jour alerte birthday
@@ -691,16 +691,16 @@ class Contact extends CommonObject
//check existing
$sql_check = "SELECT rowid FROM ".MAIN_DB_PREFIX."user_alert WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
$result_check = $this->db->query($sql_check);
- if (! $result_check || ($this->db->num_rows($result_check)<1))
+ if (!$result_check || ($this->db->num_rows($result_check) < 1))
{
//insert
$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_alert(type,fk_contact,fk_user) ";
- $sql.= "VALUES (1,".$this->db->escape($id).",".$user->id.")";
+ $sql .= "VALUES (1,".$this->db->escape($id).",".$user->id.")";
$result = $this->db->query($sql);
- if (! $result)
+ if (!$result)
{
$error++;
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
}
}
else
@@ -711,24 +711,24 @@ class Contact extends CommonObject
else
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_alert ";
- $sql.= "WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
+ $sql .= "WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
$result = $this->db->query($sql);
- if (! $result)
+ if (!$result)
{
$error++;
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
}
}
- 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;
@@ -864,9 +864,9 @@ class Contact extends CommonObject
// Search Dolibarr user linked to this contact
$sql = "SELECT u.rowid ";
$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
- $sql .= " WHERE u.fk_socpeople = ". $this->id;
+ $sql .= " WHERE u.fk_socpeople = ".$this->id;
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
if ($this->db->num_rows($resql))
@@ -879,7 +879,7 @@ class Contact extends CommonObject
}
else
{
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -1;
}
@@ -890,7 +890,7 @@ class Contact extends CommonObject
$sql .= " FROM ".MAIN_DB_PREFIX."user_alert";
$sql .= " WHERE fk_user = ".$user->id." AND fk_contact = ".$this->db->escape($id);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
if ($this->db->num_rows($resql))
@@ -903,7 +903,7 @@ class Contact extends CommonObject
}
else
{
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -1;
}
}
@@ -912,8 +912,8 @@ class Contact extends CommonObject
// fetch optionals attributes and labels
$this->fetch_optionals();
- $resultRole=$this->fetchRoles();
- if ($resultRole<0) {
+ $resultRole = $this->fetchRoles();
+ if ($resultRole < 0) {
return $resultRole;
}
@@ -921,13 +921,13 @@ class Contact extends CommonObject
}
else
{
- $this->error=$langs->trans("RecordNotFound");
+ $this->error = $langs->trans("RecordNotFound");
return 0;
}
}
else
{
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -1;
}
}
@@ -943,7 +943,7 @@ class Contact extends CommonObject
unset($this->gender);
if (in_array($this->civility_id, array('MR'))) {
$this->gender = 'man';
- } elseif(in_array($this->civility_id, array('MME','MLE'))) {
+ } elseif (in_array($this->civility_id, array('MME', 'MLE'))) {
$this->gender = 'woman';
}
}
@@ -962,26 +962,26 @@ class Contact extends CommonObject
{
// phpcs:enable
// Compte les elements pour lesquels il est contact
- $sql ="SELECT tc.element, count(ec.rowid) as nb";
- $sql.=" FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc";
- $sql.=" WHERE ec.fk_c_type_contact = tc.rowid";
- $sql.=" AND fk_socpeople = ". $this->id;
- $sql.=" AND tc.source = 'external'";
- $sql.=" GROUP BY tc.element";
+ $sql = "SELECT tc.element, count(ec.rowid) as nb";
+ $sql .= " FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc";
+ $sql .= " WHERE ec.fk_c_type_contact = tc.rowid";
+ $sql .= " AND fk_socpeople = ".$this->id;
+ $sql .= " AND tc.source = 'external'";
+ $sql .= " GROUP BY tc.element";
dol_syslog(get_class($this)."::load_ref_elements", LOG_DEBUG);
- $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))
{
if ($obj->nb)
{
- if ($obj->element=='facture') $this->ref_facturation = $obj->nb;
- elseif ($obj->element=='contrat') $this->ref_contrat = $obj->nb;
- elseif ($obj->element=='commande') $this->ref_commande = $obj->nb;
- elseif ($obj->element=='propal') $this->ref_propal = $obj->nb;
+ if ($obj->element == 'facture') $this->ref_facturation = $obj->nb;
+ elseif ($obj->element == 'contrat') $this->ref_contrat = $obj->nb;
+ elseif ($obj->element == 'commande') $this->ref_commande = $obj->nb;
+ elseif ($obj->element == 'propal') $this->ref_propal = $obj->nb;
}
}
$this->db->free($resql);
@@ -989,7 +989,7 @@ class Contact extends CommonObject
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
return -1;
}
}
@@ -1004,41 +1004,41 @@ class Contact extends CommonObject
{
global $conf, $langs, $user;
- $error=0;
+ $error = 0;
//$this->old_lastname = $obj->lastname;
//$this->old_firstname = $obj->firstname;
$this->db->begin();
- if (! $error)
+ if (!$error)
{
// Get all rowid of element_contact linked to a type that is link to llx_socpeople
$sql = "SELECT ec.rowid";
- $sql.= " FROM ".MAIN_DB_PREFIX."element_contact ec,";
- $sql.= " ".MAIN_DB_PREFIX."c_type_contact tc";
- $sql.= " WHERE ec.fk_socpeople=".$this->id;
- $sql.= " AND ec.fk_c_type_contact=tc.rowid";
- $sql.= " AND tc.source='external'";
+ $sql .= " FROM ".MAIN_DB_PREFIX."element_contact ec,";
+ $sql .= " ".MAIN_DB_PREFIX."c_type_contact tc";
+ $sql .= " WHERE ec.fk_socpeople=".$this->id;
+ $sql .= " AND ec.fk_c_type_contact=tc.rowid";
+ $sql .= " AND tc.source='external'";
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
- $num=$this->db->num_rows($resql);
+ $num = $this->db->num_rows($resql);
- $i=0;
- while ($i < $num && ! $error)
+ $i = 0;
+ while ($i < $num && !$error)
{
$obj = $this->db->fetch_object($resql);
$sqldel = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
- $sqldel.=" WHERE rowid = ".$obj->rowid;
+ $sqldel .= " WHERE rowid = ".$obj->rowid;
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$result = $this->db->query($sqldel);
- if (! $result)
+ if (!$result)
{
$error++;
- $this->error=$this->db->error().' sql='.$sqldel;
+ $this->error = $this->db->error().' sql='.$sqldel;
}
$i++;
@@ -1047,67 +1047,67 @@ class Contact extends CommonObject
else
{
$error++;
- $this->error=$this->db->error().' sql='.$sql;
+ $this->error = $this->db->error().' sql='.$sql;
}
}
- if (! $error)
+ if (!$error)
{
// Remove Roles
$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_contacts WHERE fk_socpeople = ".$this->id;
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
- $resql=$this->db->query($sql);
- if (! $resql)
+ $resql = $this->db->query($sql);
+ if (!$resql)
{
$error++;
$this->error .= $this->db->lasterror();
- $errorflag=-1;
+ $errorflag = -1;
}
}
- if (! $error)
+ if (!$error)
{
// Remove category
$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_contact WHERE fk_socpeople = ".$this->id;
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
- $resql=$this->db->query($sql);
- if (! $resql)
+ $resql = $this->db->query($sql);
+ if (!$resql)
{
$error++;
$this->error .= $this->db->lasterror();
- $errorflag=-1;
+ $errorflag = -1;
}
}
- if (! $error)
+ if (!$error)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople";
$sql .= " WHERE rowid=".$this->id;
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$result = $this->db->query($sql);
- if (! $result)
+ if (!$result)
{
$error++;
- $this->error=$this->db->error().' sql='.$sql;
+ $this->error = $this->db->error().' sql='.$sql;
}
}
// Removed extrafields
- if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) {
+ if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) {
// For avoid conflicts if trigger used
- $result=$this->deleteExtraFields();
+ $result = $this->deleteExtraFields();
if ($result < 0) $error++;
}
- if (! $error && ! $notrigger)
+ if (!$error && !$notrigger)
{
// Call trigger
- $result=$this->call_trigger('CONTACT_DELETE', $user);
+ $result = $this->call_trigger('CONTACT_DELETE', $user);
if ($result < 0) { $error++; }
// End call triggers
}
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return 1;
@@ -1130,11 +1130,11 @@ class Contact extends CommonObject
public function info($id)
{
$sql = "SELECT c.rowid, c.datec as datec, c.fk_user_creat,";
- $sql.= " c.tms as tms, c.fk_user_modif";
- $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
- $sql.= " WHERE c.rowid = ".$this->db->escape($id);
+ $sql .= " c.tms as tms, c.fk_user_modif";
+ $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
+ $sql .= " WHERE c.rowid = ".$this->db->escape($id);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
if ($this->db->num_rows($resql))
@@ -1146,7 +1146,7 @@ class Contact extends CommonObject
if ($obj->fk_user_creat) {
$cuser = new User($this->db);
$cuser->fetch($obj->fk_user_creat);
- $this->user_creation = $cuser;
+ $this->user_creation = $cuser;
}
if ($obj->fk_user_modif) {
@@ -1175,22 +1175,22 @@ class Contact extends CommonObject
public function getNbOfEMailings()
{
$sql = "SELECT count(mc.email) as nb";
- $sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."mailing as m";
- $sql.= " WHERE mc.fk_mailing=m.rowid AND mc.email = '".$this->db->escape($this->email)."' ";
- $sql.= " AND m.entity IN (".getEntity($this->element).") AND mc.statut NOT IN (-1,0)"; // -1 error, 0 not sent, 1 sent with success
+ $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."mailing as m";
+ $sql .= " WHERE mc.fk_mailing=m.rowid AND mc.email = '".$this->db->escape($this->email)."' ";
+ $sql .= " AND m.entity IN (".getEntity($this->element).") AND mc.statut NOT IN (-1,0)"; // -1 error, 0 not sent, 1 sent with success
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$obj = $this->db->fetch_object($resql);
- $nb=$obj->nb;
+ $nb = $obj->nb;
$this->db->free($resql);
return $nb;
}
else
{
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -1;
}
}
@@ -1211,41 +1211,41 @@ class Contact extends CommonObject
{
global $conf, $langs, $hookmanager;
- $result='';
+ $result = '';
- $label = '
' . $langs->trans("ShowContact") . ' ';
- $label.= '
' . $langs->trans("Name") . ': '.$this->getFullName($langs);
+ $label = '
'.$langs->trans("ShowContact").' ';
+ $label .= '
'.$langs->trans("Name").': '.$this->getFullName($langs);
//if ($this->civility_id) $label.= '
' . $langs->trans("Civility") . ': '.$this->civility_id; // TODO Translate cibilty_id code
- if (! empty($this->poste)) $label.= '
' . $langs->trans("Poste") . ': '.$this->poste;
- $label.= '
' . $langs->trans("EMail") . ': '.$this->email;
+ if (!empty($this->poste)) $label .= '
'.$langs->trans("Poste").': '.$this->poste;
+ $label .= '
'.$langs->trans("EMail").': '.$this->email;
$phonelist = array();
if ($this->phone_pro) $phonelist[] = dol_print_phone($this->phone_pro, $this->country_code, $this->id, 0, '', ' ', 'phone');
if ($this->phone_mobile) $phonelist[] = dol_print_phone($this->phone_mobile, $this->country_code, $this->id, 0, '', ' ', 'mobile');
if ($this->phone_perso) $phonelist[] = dol_print_phone($this->phone_perso, $this->country_code, $this->id, 0, '', ' ', 'phone');
- $label.= '
' . $langs->trans("Phone") . ': '.implode(' ', $phonelist);
- $label.= '
' . $langs->trans("Address") . ': '.dol_format_address($this, 1, ' ', $langs);
+ $label .= '
'.$langs->trans("Phone").': '.implode(' ', $phonelist);
+ $label .= '
'.$langs->trans("Address").': '.dol_format_address($this, 1, ' ', $langs);
$url = DOL_URL_ROOT.'/contact/card.php?id='.$this->id;
if ($option !== 'nolink')
{
// Add param to save lastsearch_values or not
- $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
- if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
- if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+ if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
}
$url .= $moreparam;
- $linkclose="";
+ $linkclose = "";
if (empty($notooltip)) {
- if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
{
- $label=$langs->trans("ShowContact");
- $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ $label = $langs->trans("ShowContact");
+ $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
}
- $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
- $linkclose.= ' class="classfortooltip"';
+ $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose .= ' class="classfortooltip"';
/*
$hookmanager->initHooks(array('contactdao'));
@@ -1256,24 +1256,24 @@ class Contact extends CommonObject
}
$linkstart = '
';
- $linkend=' ';
+ $linkstart .= $linkclose.'>';
+ $linkend = '';
if ($option == 'xxx')
{
$linkstart = '
';
- $linkend=' ';
+ $linkend = '';
}
- $result.=$linkstart;
- if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
- if ($withpicto != 2) $result.=($maxlen?dol_trunc($this->getFullName($langs), $maxlen):$this->getFullName($langs));
- $result.=$linkend;
+ $result .= $linkstart;
+ if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip ? 0 : 1);
+ if ($withpicto != 2) $result .= ($maxlen ?dol_trunc($this->getFullName($langs), $maxlen) : $this->getFullName($langs));
+ $result .= $linkend;
global $action;
$hookmanager->initHooks(array('contactdao'));
- $parameters=array('id'=>$this->id, 'getnomurl'=>$result);
- $reshook=$hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) $result = $hookmanager->resPrint;
else $result .= $hookmanager->resPrint;
@@ -1289,7 +1289,7 @@ class Contact extends CommonObject
{
global $langs;
- $code=($this->civility_code ? $this->civility_code : (! empty($this->civility_id)?$this->civility:(! empty($this->civilite)?$this->civilite:'')));
+ $code = ($this->civility_code ? $this->civility_code : (!empty($this->civility_id) ? $this->civility : (!empty($this->civilite) ? $this->civilite : '')));
if (empty($code)) return '';
$langs->load("dict");
@@ -1334,7 +1334,7 @@ class Contact extends CommonObject
);
$statusType = 'status4';
- if ($status==0 || $status==5) $statusType = 'status5';
+ if ($status == 0 || $status == 5) $statusType = 'status5';
$label = $langs->trans($labelStatus[$status]);
$labelshort = $langs->trans($labelStatusShort[$status]);
@@ -1354,7 +1354,7 @@ class Contact extends CommonObject
{
// phpcs:enable
global $langs;
- if ($status=='1') return $langs->trans('ContactPrivate');
+ if ($status == '1') return $langs->trans('ContactPrivate');
else return $langs->trans('ContactPublic');
}
@@ -1374,12 +1374,12 @@ class Contact extends CommonObject
$resql = $this->db->query($sql);
if ($resql) {
$obj = $this->db->fetch_object($resql);
- if ($obj) $socid=$obj->rowid;
+ if ($obj) $socid = $obj->rowid;
}
// Initialise parameters
- $this->id=0;
- $this->specimen=1;
+ $this->id = 0;
+ $this->specimen = 1;
$this->lastname = 'DOLIBARR';
$this->firstname = 'SPECIMEN';
$this->address = '21 jump street';
@@ -1398,11 +1398,11 @@ class Contact extends CommonObject
$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)';
$this->socid = $socid;
- $this->statut=1;
+ $this->statut = 1;
return 1;
}
@@ -1414,9 +1414,9 @@ class Contact extends CommonObject
*/
public function setstatus($status)
{
- global $conf,$langs,$user;
+ global $conf, $langs, $user;
- $error=0;
+ $error = 0;
// Check parameters
if ($this->statut == $status) return 0;
@@ -1426,15 +1426,15 @@ class Contact extends CommonObject
// Desactive utilisateur
$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople";
- $sql.= " SET statut = ".$this->statut;
- $sql.= " WHERE rowid = ".$this->id;
+ $sql .= " SET statut = ".$this->statut;
+ $sql .= " WHERE rowid = ".$this->id;
$result = $this->db->query($sql);
dol_syslog(get_class($this)."::setstatus", LOG_DEBUG);
if ($result)
{
// Call trigger
- $result=$this->call_trigger('CONTACT_ENABLEDISABLE', $user);
+ $result = $this->call_trigger('CONTACT_ENABLEDISABLE', $user);
if ($result < 0) { $error++; }
// End call triggers
}
@@ -1469,7 +1469,7 @@ class Contact extends CommonObject
}
// Get current categories
- require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$c = new Categorie($this->db);
$existing = $c->containing($this->id, Categorie::TYPE_CONTACT, 'id');
@@ -1523,34 +1523,34 @@ class Contact extends CommonObject
public function fetchRoles()
{
global $langs;
- $error= 0;
- $num=0;
+ $error = 0;
+ $num = 0;
- $sql ="SELECT tc.rowid, tc.element, tc.source, tc.code, tc.libelle, sc.rowid as contactroleid";
- $sql.=" FROM ".MAIN_DB_PREFIX."societe_contacts as sc ";
- $sql.=" INNER JOIN ".MAIN_DB_PREFIX."c_type_contact as tc";
- $sql.=" ON tc.rowid = sc.fk_c_type_contact";
- $sql.=" AND sc.fk_socpeople = ". $this->id;
- $sql.=" AND tc.source = 'external' AND tc.active=1";
- $sql.=" AND sc.entity IN (".getEntity('societe').')';
+ $sql = "SELECT tc.rowid, tc.element, tc.source, tc.code, tc.libelle, sc.rowid as contactroleid";
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe_contacts as sc ";
+ $sql .= " INNER JOIN ".MAIN_DB_PREFIX."c_type_contact as tc";
+ $sql .= " ON tc.rowid = sc.fk_c_type_contact";
+ $sql .= " AND sc.fk_socpeople = ".$this->id;
+ $sql .= " AND tc.source = 'external' AND tc.active=1";
+ $sql .= " AND sc.entity IN (".getEntity('societe').')';
dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
- $this->roles=array();
- $resql=$this->db->query($sql);
+ $this->roles = array();
+ $resql = $this->db->query($sql);
if ($resql) {
$num = $this->db->num_rows($resql);
if ($num > 0) {
while ($obj = $this->db->fetch_object($resql)) {
- $transkey="TypeContact_".$obj->element."_".$obj->source."_".$obj->code;
+ $transkey = "TypeContact_".$obj->element."_".$obj->source."_".$obj->code;
$libelle_element = $langs->trans('ContactDefault_'.$obj->element);
- $this->roles[$obj->contactroleid]=array('id'=>$obj->rowid,'element'=>$obj->element,'source'=>$obj->source,'code'=>$obj->code,'label'=>$libelle_element. ' - '.($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle));
+ $this->roles[$obj->contactroleid] = array('id'=>$obj->rowid, 'element'=>$obj->element, 'source'=>$obj->source, 'code'=>$obj->code, 'label'=>$libelle_element.' - '.($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle));
}
}
} else {
$error++;
- $this->error=$this->db->lasterror();
- $this->errors[]=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
+ $this->errors[] = $this->db->lasterror();
}
if (empty($error)) {
@@ -1569,26 +1569,26 @@ class Contact extends CommonObject
*/
public function getContactRoles($element = '')
{
- $tab=array();
+ $tab = array();
$sql = "SELECT sc.fk_socpeople as id, sc.fk_c_type_contact";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
- $sql.= ", ".MAIN_DB_PREFIX."societe_contacts sc";
- $sql.= " WHERE sc.fk_soc =".$this->socid;
- $sql.= " AND sc.fk_c_type_contact=tc.rowid";
- $sql.= " AND tc.element='".$element."'";
- $sql.= " AND tc.active=1";
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
+ $sql .= ", ".MAIN_DB_PREFIX."societe_contacts sc";
+ $sql .= " WHERE sc.fk_soc =".$this->socid;
+ $sql .= " AND sc.fk_c_type_contact=tc.rowid";
+ $sql .= " AND tc.element='".$element."'";
+ $sql .= " AND tc.active=1";
dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
- $num=$this->db->num_rows($resql);
- $i=0;
+ $num = $this->db->num_rows($resql);
+ $i = 0;
while ($i < $num)
{
$obj = $this->db->fetch_object($resql);
- $tab[]=array('fk_socpeople'=>$obj->id, 'type_contact'=>$obj->fk_c_type_contact);
+ $tab[] = array('fk_socpeople'=>$obj->id, 'type_contact'=>$obj->fk_c_type_contact);
$i++;
}
@@ -1597,7 +1597,7 @@ class Contact extends CommonObject
}
else
{
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
dol_print_error($this->db);
return -1;
}
@@ -1613,7 +1613,7 @@ class Contact extends CommonObject
{
global $conf;
- $error=0;
+ $error = 0;
$this->db->begin();
@@ -1622,29 +1622,29 @@ class Contact extends CommonObject
dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
$result = $this->db->query($sql);
if (!$result) {
- $this->errors[]=$this->db->lasterror().' sql='.$sql;
+ $this->errors[] = $this->db->lasterror().' sql='.$sql;
$error++;
} else {
- if (count($this->roles)>0) {
+ if (count($this->roles) > 0) {
foreach ($this->roles as $keyRoles => $valRoles) {
- $sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_contacts";
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_contacts";
$sql .= " (entity,";
$sql .= "date_creation,";
$sql .= "fk_soc,";
$sql .= "fk_c_type_contact,";
$sql .= "fk_socpeople) ";
- $sql .= " VALUES (" . $conf->entity . ",";
- $sql .= "'" . $this->db->idate(dol_now()) . "',";
- $sql .= $this->socid . ", ";
- $sql .= $valRoles . " , " ;
+ $sql .= " VALUES (".$conf->entity.",";
+ $sql .= "'".$this->db->idate(dol_now())."',";
+ $sql .= $this->socid.", ";
+ $sql .= $valRoles." , ";
$sql .= $this->id;
$sql .= ")";
- dol_syslog(get_class($this) . "::".__METHOD__, LOG_DEBUG);
+ dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
$result = $this->db->query($sql);
if (!$result)
{
- $this->errors[]=$this->db->lasterror().' sql='.$sql;
+ $this->errors[] = $this->db->lasterror().' sql='.$sql;
$error++;
}
}
@@ -1654,9 +1654,9 @@ class Contact extends CommonObject
$this->db->commit();
return 1;
} else {
- $this->error=implode(' ', $this->errors);
+ $this->error = implode(' ', $this->errors);
$this->db->rollback();
- return $error*-1;
+ return $error * -1;
}
}
}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 48fe598c198..b85ed6c5a3b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -59,7 +59,7 @@ class Form
/**
* @var string Error code (or message)
*/
- public $error='';
+ public $error = '';
/**
* @var string[] Array of error strings
@@ -69,12 +69,12 @@ class Form
public $num;
// Cache arrays
- public $cache_types_paiements=array();
- public $cache_conditions_paiements=array();
- public $cache_availability=array();
- public $cache_demand_reason=array();
- public $cache_types_fees=array();
- public $cache_vatrates=array();
+ public $cache_types_paiements = array();
+ public $cache_conditions_paiements = array();
+ public $cache_availability = array();
+ public $cache_demand_reason = array();
+ public $cache_types_fees = array();
+ public $cache_vatrates = array();
/**
@@ -104,43 +104,43 @@ class Form
*/
public function editfieldkey($text, $htmlname, $preselected, $object, $perm, $typeofdata = 'string', $moreparam = '', $fieldrequired = 0, $notabletag = 0, $paramid = 'id')
{
- global $conf,$langs;
+ global $conf, $langs;
- $ret='';
+ $ret = '';
// TODO change for compatibility
- if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! preg_match('/^select;/', $typeofdata))
+ if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;/', $typeofdata))
{
- if (! empty($perm))
+ if (!empty($perm))
{
- $tmp=explode(':', $typeofdata);
- $ret.= '
';
- if ($fieldrequired) $ret.='';
- $ret.= $langs->trans($text);
- if ($fieldrequired) $ret.=' ';
- $ret.= '
'."\n";
+ $tmp = explode(':', $typeofdata);
+ $ret .= '
';
+ if ($fieldrequired) $ret .= '';
+ $ret .= $langs->trans($text);
+ if ($fieldrequired) $ret .= ' ';
+ $ret .= '
'."\n";
}
else
{
- if ($fieldrequired) $ret.='
';
- $ret.= $langs->trans($text);
- if ($fieldrequired) $ret.=' ';
+ if ($fieldrequired) $ret .= '
';
+ $ret .= $langs->trans($text);
+ if ($fieldrequired) $ret .= ' ';
}
}
else
{
- if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret.='
';
- if ($fieldrequired) $ret.='';
- $ret.=$langs->trans($text);
- if ($fieldrequired) $ret.=' ';
- if (! empty($notabletag)) $ret.=' ';
- if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret.=' ';
- if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret.='';
- if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret.='id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).' ';
- if (! empty($notabletag) && $notabletag == 1) $ret.=' : ';
- if (! empty($notabletag) && $notabletag == 3) $ret.=' ';
- if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret.=' ';
- if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret.='
';
+ if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '
';
+ if ($fieldrequired) $ret .= '';
+ $ret .= $langs->trans($text);
+ if ($fieldrequired) $ret .= ' ';
+ if (!empty($notabletag)) $ret .= ' ';
+ if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= ' ';
+ if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '';
+ if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= 'id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).' ';
+ if (!empty($notabletag) && $notabletag == 1) $ret .= ' : ';
+ if (!empty($notabletag) && $notabletag == 3) $ret .= ' ';
+ if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= ' ';
+ if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '
';
}
return $ret;
@@ -166,128 +166,128 @@ class Form
*/
public function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata = 'string', $editvalue = '', $extObject = null, $custommsg = null, $moreparam = '', $notabletag = 0, $formatfunc = '', $paramid = 'id')
{
- global $conf,$langs,$db;
+ global $conf, $langs, $db;
- $ret='';
+ $ret = '';
// Check parameters
if (empty($typeofdata)) return 'ErrorBadParameter';
// When option to edit inline is activated
- if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! preg_match('/^select;|datehourpicker/', $typeofdata)) // TODO add jquery timepicker and support select
+ if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|datehourpicker/', $typeofdata)) // TODO add jquery timepicker and support select
{
- $ret.=$this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);
+ $ret .= $this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);
}
else
{
if (GETPOST('action', 'aZ09') == 'edit'.$htmlname)
{
- $ret.="\n";
- $ret.='
'."\n";
}
else
{
- if (preg_match('/^(email)/', $typeofdata)) $ret.=dol_print_email($value, 0, 0, 0, 0, 1);
- elseif (preg_match('/^(amount|numeric)/', $typeofdata)) $ret.=($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
- elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata)) $ret.=dol_htmlentitiesbr($value);
- elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret.=dol_print_date($value, 'day');
- elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') $ret.=dol_print_date($value, 'dayhour');
+ if (preg_match('/^(email)/', $typeofdata)) $ret .= dol_print_email($value, 0, 0, 0, 0, 1);
+ elseif (preg_match('/^(amount|numeric)/', $typeofdata)) $ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
+ elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata)) $ret .= dol_htmlentitiesbr($value);
+ elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret .= dol_print_date($value, 'day');
+ elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') $ret .= dol_print_date($value, 'dayhour');
elseif (preg_match('/^select;/', $typeofdata))
{
- $arraydata=explode(',', preg_replace('/^select;/', '', $typeofdata));
- foreach($arraydata as $val)
+ $arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
+ foreach ($arraydata as $val)
{
- $tmp=explode(':', $val);
- $arraylist[$tmp[0]]=$tmp[1];
+ $tmp = explode(':', $val);
+ $arraylist[$tmp[0]] = $tmp[1];
}
- $ret.=$arraylist[$value];
+ $ret .= $arraylist[$value];
}
elseif (preg_match('/^ckeditor/', $typeofdata))
{
- $tmpcontent=dol_htmlentitiesbr($value);
- if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+ $tmpcontent = dol_htmlentitiesbr($value);
+ if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
{
- $firstline=preg_replace('/
.*/', '', $tmpcontent);
- $firstline=preg_replace('/[\n\r].*/', '', $firstline);
- $tmpcontent=$firstline.((strlen($firstline) != strlen($tmpcontent))?'...':'');
+ $firstline = preg_replace('/
.*/', '', $tmpcontent);
+ $firstline = preg_replace('/[\n\r].*/', '', $firstline);
+ $tmpcontent = $firstline.((strlen($firstline) != strlen($tmpcontent)) ? '...' : '');
}
- $ret.=$tmpcontent;
+ $ret .= $tmpcontent;
}
- else $ret.=$value;
+ else $ret .= $value;
if ($formatfunc && method_exists($object, $formatfunc))
{
- $ret=$object->$formatfunc($ret);
+ $ret = $object->$formatfunc($ret);
}
}
}
@@ -311,7 +311,7 @@ class Form
{
global $conf;
- $out='';
+ $out = '';
// Check parameters
if (preg_match('/^text/', $inputType)) $value = dol_nl2br($value);
@@ -320,14 +320,14 @@ class Form
if ($condition)
{
- $element = false;
- $table_element = false;
+ $element = false;
+ $table_element = false;
$fk_element = false;
$loadmethod = false;
$savemethod = false;
$ext_element = false;
$button_only = false;
- $inputOption = '';
+ $inputOption = '';
if (is_object($object))
{
@@ -343,46 +343,46 @@ class Form
if (preg_match('/^(string|email|numeric)/', $inputType))
{
- $tmp=explode(':', $inputType);
- $inputType=$tmp[0];
- if (! empty($tmp[1])) $inputOption=$tmp[1];
- if (! empty($tmp[2])) $savemethod=$tmp[2];
- $out.= '
'."\n";
+ $tmp = explode(':', $inputType);
+ $inputType = $tmp[0];
+ if (!empty($tmp[1])) $inputOption = $tmp[1];
+ if (!empty($tmp[2])) $savemethod = $tmp[2];
+ $out .= '
'."\n";
}
elseif ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType)))
{
- $tmp=explode(':', $inputType);
- $inputType=$tmp[0];
- if (! empty($tmp[1])) $inputOption=$tmp[1];
- if (! empty($tmp[2])) $savemethod=$tmp[2];
+ $tmp = explode(':', $inputType);
+ $inputType = $tmp[0];
+ if (!empty($tmp[1])) $inputOption = $tmp[1];
+ if (!empty($tmp[2])) $savemethod = $tmp[2];
- $out.= '
'."\n"; // Use for timestamp format
+ $out .= '
'."\n"; // Use for timestamp format
}
elseif (preg_match('/^(select|autocomplete)/', $inputType))
{
- $tmp=explode(':', $inputType);
- $inputType=$tmp[0]; $loadmethod=$tmp[1];
- if (! empty($tmp[2])) $savemethod=$tmp[2];
- if (! empty($tmp[3])) $button_only=true;
+ $tmp = explode(':', $inputType);
+ $inputType = $tmp[0]; $loadmethod = $tmp[1];
+ if (!empty($tmp[2])) $savemethod = $tmp[2];
+ if (!empty($tmp[3])) $button_only = true;
}
elseif (preg_match('/^textarea/', $inputType))
{
- $tmp=explode(':', $inputType);
- $inputType=$tmp[0];
- $rows=(empty($tmp[1])?'8':$tmp[1]);
- $cols=(empty($tmp[2])?'80':$tmp[2]);
+ $tmp = explode(':', $inputType);
+ $inputType = $tmp[0];
+ $rows = (empty($tmp[1]) ? '8' : $tmp[1]);
+ $cols = (empty($tmp[2]) ? '80' : $tmp[2]);
}
elseif (preg_match('/^ckeditor/', $inputType))
{
- $tmp=explode(':', $inputType);
- $inputType=$tmp[0]; $toolbar=$tmp[1];
- if (! empty($tmp[2])) $width=$tmp[2];
- if (! empty($tmp[3])) $heigth=$tmp[3];
- if (! empty($tmp[4])) $savemethod=$tmp[4];
+ $tmp = explode(':', $inputType);
+ $inputType = $tmp[0]; $toolbar = $tmp[1];
+ if (!empty($tmp[2])) $width = $tmp[2];
+ if (!empty($tmp[3])) $heigth = $tmp[3];
+ if (!empty($tmp[4])) $savemethod = $tmp[4];
- if (! empty($conf->fckeditor->enabled))
+ if (!empty($conf->fckeditor->enabled))
{
- $out.= '
'."\n";
+ $out .= '
'."\n";
}
else
{
@@ -390,30 +390,30 @@ class Form
}
}
- $out.= '
'."\n";
- $out.= '
'."\n";
- $out.= '
'."\n";
- $out.= '
'."\n";
- if (! empty($savemethod)) $out.= '
'."\n";
- if (! empty($ext_element)) $out.= '
'."\n";
- if (! empty($custommsg))
+ $out .= '
'."\n";
+ $out .= '
'."\n";
+ $out .= '
'."\n";
+ $out .= '
'."\n";
+ if (!empty($savemethod)) $out .= '
'."\n";
+ if (!empty($ext_element)) $out .= '
'."\n";
+ if (!empty($custommsg))
{
if (is_array($custommsg))
{
if (!empty($custommsg['success']))
- $out.= '
'."\n";
+ $out .= '
'."\n";
if (!empty($custommsg['error']))
- $out.= '
'."\n";
+ $out .= '
'."\n";
}
else
- $out.= '
'."\n";
+ $out .= '
'."\n";
}
if ($inputType == 'textarea') {
- $out.= '
'."\n";
- $out.= '
'."\n";
+ $out .= '
'."\n";
+ $out .= '
'."\n";
}
- $out.= '
'.$value.' '."\n";
- $out.= '
'.(! empty($editvalue) ? $editvalue : $value).' '."\n";
+ $out .= '
'.$value.' '."\n";
+ $out .= '
'.(!empty($editvalue) ? $editvalue : $value).' '."\n";
}
else
{
@@ -447,68 +447,68 @@ class Form
global $conf;
if ($incbefore) $text = $incbefore.$text;
- if (! $htmltext) return $text;
+ if (!$htmltext) return $text;
- $tag='td';
- if ($notabs == 2) $tag='div';
- if ($notabs == 3) $tag='span';
+ $tag = 'td';
+ if ($notabs == 2) $tag = 'div';
+ if ($notabs == 3) $tag = 'span';
// Sanitize tooltip
//$htmltext=str_replace("\\","\\\\",$htmltext);
- $htmltext=str_replace("\r", "", $htmltext);
- $htmltext=str_replace("\n", "", $htmltext);
+ $htmltext = str_replace("\r", "", $htmltext);
+ $htmltext = str_replace("\n", "", $htmltext);
- $extrastyle='';
- if ($direction < 0) { $extracss=($extracss?$extracss.' ':'').($notabs != 3 ? 'inline-block' : ''); $extrastyle='padding: 0px; padding-left: 3px !important;'; }
- if ($direction > 0) { $extracss=($extracss?$extracss.' ':'').($notabs != 3 ? 'inline-block' : ''); $extrastyle='padding: 0px; padding-right: 3px !important;'; }
+ $extrastyle = '';
+ if ($direction < 0) { $extracss = ($extracss ? $extracss.' ' : '').($notabs != 3 ? 'inline-block' : ''); $extrastyle = 'padding: 0px; padding-left: 3px !important;'; }
+ if ($direction > 0) { $extracss = ($extracss ? $extracss.' ' : '').($notabs != 3 ? 'inline-block' : ''); $extrastyle = 'padding: 0px; padding-right: 3px !important;'; }
- $classfortooltip='classfortooltip';
+ $classfortooltip = 'classfortooltip';
- $s='';$textfordialog='';
+ $s = ''; $textfordialog = '';
if ($tooltiptrigger == '')
{
- $htmltext=str_replace('"', """, $htmltext);
+ $htmltext = str_replace('"', """, $htmltext);
}
else
{
- $classfortooltip='classfortooltiponclick';
- $textfordialog.='
'.$htmltext.'
';
+ $classfortooltip = 'classfortooltiponclick';
+ $textfordialog .= '
'.$htmltext.'
';
}
if ($tooltipon == 2 || $tooltipon == 3)
{
- $paramfortooltipimg=' class="'.$classfortooltip.($notabs != 3 ? ' inline-block' : '').($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'"';
- if ($tooltiptrigger == '') $paramfortooltipimg.=' title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on img tag to store tooltip
- else $paramfortooltipimg.=' dolid="'.$tooltiptrigger.'"';
+ $paramfortooltipimg = ' class="'.$classfortooltip.($notabs != 3 ? ' inline-block' : '').($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'"';
+ if ($tooltiptrigger == '') $paramfortooltipimg .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on img tag to store tooltip
+ else $paramfortooltipimg .= ' dolid="'.$tooltiptrigger.'"';
}
- else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':'').($extrastyle?' style="'.$extrastyle.'"':''); // Attribut to put on td text tag
+ else $paramfortooltipimg = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
if ($tooltipon == 1 || $tooltipon == 3)
{
- $paramfortooltiptd=' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" ';
- if ($tooltiptrigger == '') $paramfortooltiptd.=' title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on td tag to store tooltip
- else $paramfortooltiptd.=' dolid="'.$tooltiptrigger.'"';
+ $paramfortooltiptd = ' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'" ';
+ if ($tooltiptrigger == '') $paramfortooltiptd .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on td tag to store tooltip
+ else $paramfortooltiptd .= ' dolid="'.$tooltiptrigger.'"';
}
- else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':'').($extrastyle?' style="'.$extrastyle.'"':''); // Attribut to put on td text tag
- if (empty($notabs)) $s.='
';
- elseif ($notabs == 2) $s.='';
+ else $paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
+ if (empty($notabs)) $s .= '
';
+ elseif ($notabs == 2) $s .= '';
// Define value if value is before
if ($direction < 0) {
- $s.='<'.$tag.$paramfortooltipimg;
+ $s .= '<'.$tag.$paramfortooltipimg;
if ($tag == 'td') {
$s .= ' class=valigntop" width="14"';
}
- $s.= '>'.$textfordialog.$img.'';
+ $s .= '>'.$textfordialog.$img.'';
}
// Use another method to help avoid having a space in value in order to use this value with jquery
// Define label
- if ((string) $text != '') $s.='<'.$tag.$paramfortooltiptd.'>'.$text.'';
+ if ((string) $text != '') $s .= '<'.$tag.$paramfortooltiptd.'>'.$text.'';
// Define value if value is after
if ($direction > 0) {
- $s.='<'.$tag.$paramfortooltipimg;
+ $s .= '<'.$tag.$paramfortooltipimg;
if ($tag == 'td') $s .= ' class="valignmiddle" width="14"';
- $s.= '>'.$textfordialog.$img.'';
+ $s .= '>'.$textfordialog.$img.'';
}
- if (empty($notabs)) $s.='
';
- elseif ($notabs == 2) $s.='
';
+ elseif ($notabs == 2) $s .= '
';
return $s;
}
@@ -532,7 +532,7 @@ class Form
global $conf, $langs;
$alt = '';
- if ($tooltiptrigger) $alt=$langs->transnoentitiesnoconv("ClickToShowHelp");
+ if ($tooltiptrigger) $alt = $langs->transnoentitiesnoconv("ClickToShowHelp");
//For backwards compatibility
if ($type == '0') $type = 'info';
@@ -550,7 +550,7 @@ class Form
}
// If info or help with smartphone, show only text (tooltip hover can't works)
- if (! empty($conf->dol_no_mouse_hover) && empty($tooltiptrigger))
+ if (!empty($conf->dol_no_mouse_hover) && empty($tooltiptrigger))
{
if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable') return $text;
}
@@ -560,16 +560,16 @@ class Form
//if ($type == 'info' || $type == 'help') return '
'.$text.'' ';
//}
- $img='';
+ $img = '';
if ($type == 'info') $img = img_help(0, $alt);
elseif ($type == 'help') $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
elseif ($type == 'helpclickable') $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
elseif ($type == 'superadmin') $img = img_picto($alt, 'redstar');
elseif ($type == 'admin') $img = img_picto($alt, 'star');
elseif ($type == 'warning') $img = img_warning($alt);
- elseif ($type != 'none') $img = img_picto($alt, $type); // $type can be an image path
+ elseif ($type != 'none') $img = img_picto($alt, $type); // $type can be an image path
- return $this->textwithtooltip($text, $htmltext, ((($tooltiptrigger && ! $img) || strpos($type, 'clickable'))?3:2), $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger, $forcenowrap);
+ return $this->textwithtooltip($text, $htmltext, ((($tooltiptrigger && !$img) || strpos($type, 'clickable')) ? 3 : 2), $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger, $forcenowrap);
}
/**
@@ -582,39 +582,39 @@ class Form
*/
public function selectMassAction($selected, $arrayofaction, $alwaysvisible = 0)
{
- global $conf,$langs,$hookmanager;
+ global $conf, $langs, $hookmanager;
if (count($arrayofaction) == 0) return;
- $disabled=0;
- $ret='
';
- if (! empty($conf->use_javascript_ajax))
+ if (!empty($conf->use_javascript_ajax))
{
- $ret.='
+ $ret .= '
';
- $out.=$this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
- $out.='
';
- $out.='
';
+ $out .= '
';
+ $out .= '';
+ $out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
+ $out .= '
';
+ $out .= '
';
}
- $assignedtouser=array();
+ $assignedtouser = array();
if (!empty($_SESSION['assignedtouser']))
{
- $assignedtouser=json_decode($_SESSION['assignedtouser'], true);
+ $assignedtouser = json_decode($_SESSION['assignedtouser'], true);
}
- $nbassignetouser=count($assignedtouser);
+ $nbassignetouser = count($assignedtouser);
- if ($nbassignetouser && $action != 'view') $out.='
';
- if ($nbassignetouser) $out.='
';
- $i=0; $ownerid=0;
- foreach($assignedtouser as $key => $value)
+ if ($nbassignetouser && $action != 'view') $out .= ' ';
//$out.='';
return $out;
@@ -1897,31 +1897,31 @@ class Form
public function select_produits($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $status = 1, $finished = 2, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $selected_combinations = array())
{
// phpcs:enable
- global $langs,$conf;
+ global $langs, $conf;
// check parameters
- $price_level = (! empty($price_level) ? $price_level : 0);
- if (is_null($ajaxoptions)) $ajaxoptions=array();
+ $price_level = (!empty($price_level) ? $price_level : 0);
+ if (is_null($ajaxoptions)) $ajaxoptions = array();
- if(strval($filtertype) === '' && (!empty($conf->product->enabled) || !empty($conf->service->enabled))){
- if(!empty($conf->product->enabled) && empty($conf->service->enabled)){
+ if (strval($filtertype) === '' && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
+ if (!empty($conf->product->enabled) && empty($conf->service->enabled)) {
$filtertype = '0';
}
- elseif(empty($conf->product->enabled) && !empty($conf->service->enabled)){
+ elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) {
$filtertype = '1';
}
}
- if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
+ if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
{
- $placeholder='';
+ $placeholder = '';
if ($selected && empty($selected_input_value))
{
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
$producttmpselect = new Product($this->db);
$producttmpselect->fetch($selected);
- $selected_input_value=$producttmpselect->ref;
+ $selected_input_value = $producttmpselect->ref;
unset($producttmpselect);
}
// handle case where product or service module is disabled + no filter specified
@@ -1935,10 +1935,10 @@ class Form
}
}
// mode=1 means customers products
- $urloption='htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus;
+ $urloption = 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus;
//Price by customer
- if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
- $urloption.='&socid='.$socid;
+ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
+ $urloption .= '&socid='.$socid;
}
print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
@@ -2017,7 +2017,7 @@ class Form
}
if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
elseif ($hidelabel > 1) {
- $placeholder=' placeholder="'.$langs->trans("RefOrLabel").'"';
+ $placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';
if ($hidelabel == 2) {
print img_picto($langs->trans("Search"), 'search');
}
@@ -2060,10 +2060,10 @@ class Form
public function select_produits_list($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $filterkey = '', $status = 1, $finished = 2, $outputmode = 0, $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '')
{
// phpcs:enable
- global $langs,$conf,$user,$db;
+ global $langs, $conf, $user, $db;
- $out='';
- $outarray=array();
+ $out = '';
+ $outarray = array();
// Units
if ($conf->global->PRODUCT_USE_UNITS) {
@@ -2071,7 +2071,7 @@ class Form
}
$warehouseStatusArray = array();
- if (! empty($warehouseStatus))
+ if (!empty($warehouseStatus))
{
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
if (preg_match('/warehouseclosed/', $warehouseStatus))
@@ -2091,7 +2091,7 @@ class Form
$selectFields = " p.rowid, p.label, p.ref, p.description, p.barcode, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.duration, p.fk_price_expression";
if (count($warehouseStatusArray))
{
- $selectFieldsGrouped = ", sum(".$db->ifsql("e.statut IS NULL", "0", "ps.reel").") as stock"; // e.statut is null if there is no record in stock
+ $selectFieldsGrouped = ", sum(".$db->ifsql("e.statut IS NULL", "0", "ps.reel").") as stock"; // e.statut is null if there is no record in stock
}
else
{
@@ -2099,12 +2099,12 @@ class Form
}
$sql = "SELECT ";
- $sql.= $selectFields . $selectFieldsGrouped;
+ $sql .= $selectFields.$selectFieldsGrouped;
- if (! empty($conf->global->PRODUCT_SORT_BY_CATEGORY))
+ if (!empty($conf->global->PRODUCT_SORT_BY_CATEGORY))
{
//Product category
- $sql.= ", (SELECT ".MAIN_DB_PREFIX."categorie_product.fk_categorie
+ $sql .= ", (SELECT ".MAIN_DB_PREFIX."categorie_product.fk_categorie
FROM ".MAIN_DB_PREFIX."categorie_product
WHERE ".MAIN_DB_PREFIX."categorie_product.fk_product=p.rowid
LIMIT 1
@@ -2112,70 +2112,70 @@ class Form
}
//Price by customer
- if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid))
+ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid))
{
- $sql.=', pcp.rowid as idprodcustprice, pcp.price as custprice, pcp.price_ttc as custprice_ttc,';
- $sql.=' pcp.price_base_type as custprice_base_type, pcp.tva_tx as custtva_tx';
- $selectFields.= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx";
+ $sql .= ', pcp.rowid as idprodcustprice, pcp.price as custprice, pcp.price_ttc as custprice_ttc,';
+ $sql .= ' pcp.price_base_type as custprice_base_type, pcp.tva_tx as custtva_tx';
+ $selectFields .= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx";
}
// Units
- if (! empty($conf->global->PRODUCT_USE_UNITS)) {
+ if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
$selectFields .= ', unit_long, unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units';
}
// Multilang : we add translation
- if (! empty($conf->global->MAIN_MULTILANGS))
+ if (!empty($conf->global->MAIN_MULTILANGS))
{
- $sql.= ", pl.label as label_translated";
- $selectFields.= ", label_translated";
+ $sql .= ", pl.label as label_translated";
+ $selectFields .= ", label_translated";
}
// Price by quantity
- if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
+ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
{
- $sql.= ", (SELECT pp.rowid FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid";
- if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $sql.= " AND price_level=".$price_level;
- $sql.= " ORDER BY date_price";
- $sql.= " DESC LIMIT 1) as price_rowid";
- $sql.= ", (SELECT pp.price_by_qty FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid"; // price_by_qty is 1 if some prices by qty exists in subtable
- if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $sql.= " AND price_level=".$price_level;
- $sql.= " ORDER BY date_price";
- $sql.= " DESC LIMIT 1) as price_by_qty";
- $selectFields.= ", price_rowid, price_by_qty";
+ $sql .= ", (SELECT pp.rowid FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid";
+ if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $sql .= " AND price_level=".$price_level;
+ $sql .= " ORDER BY date_price";
+ $sql .= " DESC LIMIT 1) as price_rowid";
+ $sql .= ", (SELECT pp.price_by_qty FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid"; // price_by_qty is 1 if some prices by qty exists in subtable
+ if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $sql .= " AND price_level=".$price_level;
+ $sql .= " ORDER BY date_price";
+ $sql .= " DESC LIMIT 1) as price_by_qty";
+ $selectFields .= ", price_rowid, price_by_qty";
}
- $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
+ $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
if (count($warehouseStatusArray))
{
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_product = p.rowid";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on ps.fk_entrepot = e.rowid AND e.entity IN (".getEntity('stock').")";
- $sql.= ' AND e.statut IN ('.$this->db->escape(implode(',', $warehouseStatusArray)).')'; // Return line if product is inside the selected stock. If not, an empty line will be returned so we will count 0.
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_product = p.rowid";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on ps.fk_entrepot = e.rowid AND e.entity IN (".getEntity('stock').")";
+ $sql .= ' AND e.statut IN ('.$this->db->escape(implode(',', $warehouseStatusArray)).')'; // Return line if product is inside the selected stock. If not, an empty line will be returned so we will count 0.
}
// include search in supplier ref
- if(!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF))
+ if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF))
{
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
}
//Price by customer
- if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
- $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."product_customer_price as pcp ON pcp.fk_soc=".$socid." AND pcp.fk_product=p.rowid";
+ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_customer_price as pcp ON pcp.fk_soc=".$socid." AND pcp.fk_product=p.rowid";
}
// Units
- if (! empty($conf->global->PRODUCT_USE_UNITS)) {
- $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_units u ON u.rowid = p.fk_unit";
+ if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";
}
// Multilang : we add translation
- if (! empty($conf->global->MAIN_MULTILANGS))
+ if (!empty($conf->global->MAIN_MULTILANGS))
{
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang='". $langs->getDefaultLang() ."'";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang='".$langs->getDefaultLang()."'";
}
if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";
}
- $sql.= ' WHERE p.entity IN ('.getEntity('product').')';
+ $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {
$sql .= " AND pac.rowid IS NULL";
@@ -2183,103 +2183,103 @@ class Form
if ($finished == 0)
{
- $sql.= " AND p.finished = ".$finished;
+ $sql .= " AND p.finished = ".$finished;
}
elseif ($finished == 1)
{
- $sql.= " AND p.finished = ".$finished;
- if ($status >= 0) $sql.= " AND p.tosell = ".$status;
+ $sql .= " AND p.finished = ".$finished;
+ if ($status >= 0) $sql .= " AND p.tosell = ".$status;
}
elseif ($status >= 0)
{
- $sql.= " AND p.tosell = ".$status;
+ $sql .= " AND p.tosell = ".$status;
}
// Filter by product type
- if (strval($filtertype) != '') $sql.= " AND p.fk_product_type = ".$filtertype;
+ if (strval($filtertype) != '') $sql .= " AND p.fk_product_type = ".$filtertype;
elseif (empty($conf->product->enabled)) { // when product module is disabled, show services only
- $sql.= " AND p.fk_product_type = 1";
+ $sql .= " AND p.fk_product_type = 1";
}
elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
- $sql.= " AND p.fk_product_type = 0";
+ $sql .= " AND p.fk_product_type = 0";
}
// Add criteria on ref/label
if ($filterkey != '')
{
- $sql.=' AND (';
- $prefix=empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE)?'%':''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
+ $sql .= ' AND (';
+ $prefix = empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE) ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
// For natural search
$scrit = explode(' ', $filterkey);
- $i=0;
- if (count($scrit) > 1) $sql.="(";
+ $i = 0;
+ if (count($scrit) > 1) $sql .= "(";
foreach ($scrit as $crit)
{
- if ($i > 0) $sql.=" AND ";
- $sql.="(p.ref LIKE '".$db->escape($prefix.$crit)."%' OR p.label LIKE '".$db->escape($prefix.$crit)."%'";
- if (! empty($conf->global->MAIN_MULTILANGS)) $sql.=" OR pl.label LIKE '".$db->escape($prefix.$crit)."%'";
+ if ($i > 0) $sql .= " AND ";
+ $sql .= "(p.ref LIKE '".$db->escape($prefix.$crit)."%' OR p.label LIKE '".$db->escape($prefix.$crit)."%'";
+ if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " OR pl.label LIKE '".$db->escape($prefix.$crit)."%'";
if (!empty($conf->global->PRODUCT_AJAX_SEARCH_ON_DESCRIPTION))
{
- $sql.=" OR p.description LIKE '".$db->escape($prefix.$crit)."%'";
- if (! empty($conf->global->MAIN_MULTILANGS)) $sql.=" OR pl.description LIKE '".$db->escape($prefix.$crit)."%'";
+ $sql .= " OR p.description LIKE '".$db->escape($prefix.$crit)."%'";
+ if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " OR pl.description LIKE '".$db->escape($prefix.$crit)."%'";
}
- if (! empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) $sql.=" OR pfp.ref_fourn LIKE '".$db->escape($prefix.$crit)."%'";
- $sql.=")";
+ if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) $sql .= " OR pfp.ref_fourn LIKE '".$db->escape($prefix.$crit)."%'";
+ $sql .= ")";
$i++;
}
- if (count($scrit) > 1) $sql.=")";
- if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '".$db->escape($prefix.$filterkey)."%'";
- $sql.=')';
+ if (count($scrit) > 1) $sql .= ")";
+ if (!empty($conf->barcode->enabled)) $sql .= " OR p.barcode LIKE '".$db->escape($prefix.$filterkey)."%'";
+ $sql .= ')';
}
if (count($warehouseStatusArray))
{
- $sql.= ' GROUP BY'.$selectFields;
+ $sql .= ' GROUP BY'.$selectFields;
}
//Sort by category
- if(! empty($conf->global->PRODUCT_SORT_BY_CATEGORY))
+ if (!empty($conf->global->PRODUCT_SORT_BY_CATEGORY))
{
$sql .= " ORDER BY categorie_product_id ";
//ASC OR DESC order
- ($conf->global->PRODUCT_SORT_BY_CATEGORY == 1) ? $sql .="ASC" : $sql .="DESC";
+ ($conf->global->PRODUCT_SORT_BY_CATEGORY == 1) ? $sql .= "ASC" : $sql .= "DESC";
}
else
{
- $sql.= $db->order("p.ref");
+ $sql .= $db->order("p.ref");
}
- $sql.= $db->plimit($limit, 0);
+ $sql .= $db->plimit($limit, 0);
// Build output string
dol_syslog(get_class($this)."::select_produits_list search product", LOG_DEBUG);
- $result=$this->db->query($sql);
+ $result = $this->db->query($sql);
if ($result)
{
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
$num = $this->db->num_rows($result);
- $events=null;
+ $events = null;
- if (! $forcecombo)
+ if (!$forcecombo)
{
- include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
$out .= ajax_combobox($htmlname, $events, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT);
}
- $out.='
';
+ $out .= '';
- $textifempty='';
+ $textifempty = '';
// Do not use textifempty = ' ' or ' ' here, or search on key will search on ' key'.
//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
- if (! empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
+ if (!empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
{
- if ($showempty && ! is_numeric($showempty)) $textifempty=$langs->trans($showempty);
- else $textifempty.=$langs->trans("All");
+ if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+ else $textifempty .= $langs->trans("All");
}
else
{
- if ($showempty && ! is_numeric($showempty)) $textifempty=$langs->trans($showempty);
+ if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
}
- if ($showempty) $out.=''.$textifempty.' ';
+ if ($showempty) $out .= ''.$textifempty.' ';
$i = 0;
while ($num && $i < $num)
@@ -2291,9 +2291,9 @@ class Form
if ((!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($objp->price_by_qty) && $objp->price_by_qty == 1)
{ // Price by quantity will return many prices for the same product
$sql = "SELECT rowid, quantity, price, unitprice, remise_percent, remise, price_base_type";
- $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
- $sql.= " WHERE fk_product_price=".$objp->price_rowid;
- $sql.= " ORDER BY quantity ASC";
+ $sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
+ $sql .= " WHERE fk_product_price=".$objp->price_rowid;
+ $sql .= " ORDER BY quantity ASC";
dol_syslog(get_class($this)."::select_produits_list search price by qty", LOG_DEBUG);
$result2 = $this->db->query($sql);
@@ -2323,7 +2323,7 @@ class Form
// Add new entry
// "key" value of json key array is used by jQuery automatically as selected value
// "label" value of json key array is used by jQuery automatically as text for combo box
- $out.=$opt;
+ $out .= $opt;
array_push($outarray, $optJson);
}
}
@@ -2347,14 +2347,14 @@ class Form
// Add new entry
// "key" value of json key array is used by jQuery automatically as selected value
// "label" value of json key array is used by jQuery automatically as text for combo box
- $out.=$opt;
+ $out .= $opt;
array_push($outarray, $optJson);
}
$i++;
}
- $out.=' ';
+ $out .= ' ';
$this->db->free($result);
@@ -2384,59 +2384,59 @@ class Form
{
global $langs, $conf, $user, $db;
- $outkey='';
- $outval='';
- $outref='';
- $outlabel='';
- $outdesc='';
- $outbarcode='';
- $outtype='';
- $outprice_ht='';
- $outprice_ttc='';
- $outpricebasetype='';
- $outtva_tx='';
- $outqty=1;
- $outdiscount=0;
+ $outkey = '';
+ $outval = '';
+ $outref = '';
+ $outlabel = '';
+ $outdesc = '';
+ $outbarcode = '';
+ $outtype = '';
+ $outprice_ht = '';
+ $outprice_ttc = '';
+ $outpricebasetype = '';
+ $outtva_tx = '';
+ $outqty = 1;
+ $outdiscount = 0;
- $maxlengtharticle=(empty($conf->global->PRODUCT_MAX_LENGTH_COMBO)?48:$conf->global->PRODUCT_MAX_LENGTH_COMBO);
+ $maxlengtharticle = (empty($conf->global->PRODUCT_MAX_LENGTH_COMBO) ? 48 : $conf->global->PRODUCT_MAX_LENGTH_COMBO);
- $label=$objp->label;
- if (! empty($objp->label_translated)) $label=$objp->label_translated;
- if (! empty($filterkey) && $filterkey != '') $label=preg_replace('/('.preg_quote($filterkey).')/i', '
$1 ', $label, 1);
+ $label = $objp->label;
+ if (!empty($objp->label_translated)) $label = $objp->label_translated;
+ if (!empty($filterkey) && $filterkey != '') $label = preg_replace('/('.preg_quote($filterkey).')/i', '
$1 ', $label, 1);
- $outkey=$objp->rowid;
- $outref=$objp->ref;
- $outlabel=$objp->label;
- $outdesc=$objp->description;
- $outbarcode=$objp->barcode;
+ $outkey = $objp->rowid;
+ $outref = $objp->ref;
+ $outlabel = $objp->label;
+ $outdesc = $objp->description;
+ $outbarcode = $objp->barcode;
- $outtype=$objp->fk_product_type;
- $outdurationvalue=$outtype == Product::TYPE_SERVICE?substr($objp->duration, 0, dol_strlen($objp->duration)-1):'';
- $outdurationunit=$outtype == Product::TYPE_SERVICE?substr($objp->duration, -1):'';
+ $outtype = $objp->fk_product_type;
+ $outdurationvalue = $outtype == Product::TYPE_SERVICE ?substr($objp->duration, 0, dol_strlen($objp->duration) - 1) : '';
+ $outdurationunit = $outtype == Product::TYPE_SERVICE ?substr($objp->duration, -1) : '';
// Units
$outvalUnits = '';
- if (! empty($conf->global->PRODUCT_USE_UNITS)) {
+ if (!empty($conf->global->PRODUCT_USE_UNITS)) {
if (!empty($objp->unit_short)) {
- $outvalUnits .= ' - ' . $objp->unit_short;
+ $outvalUnits .= ' - '.$objp->unit_short;
}
}
- if (! empty($conf->global->PRODUCT_SHOW_DIMENSIONS_IN_COMBO)) {
- if (!empty($objp->weight) && $objp->weight_units!==null) {
+ if (!empty($conf->global->PRODUCT_SHOW_DIMENSIONS_IN_COMBO)) {
+ if (!empty($objp->weight) && $objp->weight_units !== null) {
$unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);
- $outvalUnits .= ' - ' . $unitToShow;
+ $outvalUnits .= ' - '.$unitToShow;
}
- if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units!==null) {
- $unitToShow = $objp->length . ' x ' . $objp->width . ' x ' . $objp->height . ' ' . measuringUnitString(0, 'size', $objp->length_units);
- $outvalUnits .= ' - ' . $unitToShow;
+ if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units !== null) {
+ $unitToShow = $objp->length.' x '.$objp->width.' x '.$objp->height.' '.measuringUnitString(0, 'size', $objp->length_units);
+ $outvalUnits .= ' - '.$unitToShow;
}
- if (!empty($objp->surface) && $objp->surface_units!==null) {
+ if (!empty($objp->surface) && $objp->surface_units !== null) {
$unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);
- $outvalUnits .= ' - ' . $unitToShow;
+ $outvalUnits .= ' - '.$unitToShow;
}
- if (!empty($objp->volume) && $objp->volume_units!==null) {
+ if (!empty($objp->volume) && $objp->volume_units !== null) {
$unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);
- $outvalUnits .= ' - ' . $unitToShow;
+ $outvalUnits .= ' - '.$unitToShow;
}
}
if ($outdurationvalue && $outdurationunit) {
@@ -2448,50 +2448,50 @@ class Form
'y' => $langs->trans('Year')
);
if (isset($da[$outdurationunit])) {
- $outvalUnits .= ' - ' . $outdurationvalue . ' ' . $langs->transnoentities($da[$outdurationunit].($outdurationvalue > 1 ? 's' : ''));
+ $outvalUnits .= ' - '.$outdurationvalue.' '.$langs->transnoentities($da[$outdurationunit].($outdurationvalue > 1 ? 's' : ''));
}
}
$opt = '
rowid == $selected)?' selected':'';
+ $opt .= ($objp->rowid == $selected) ? ' selected' : '';
if (!empty($objp->price_by_qty_rowid) && $objp->price_by_qty_rowid > 0)
{
- $opt.= ' pbq="'.$objp->price_by_qty_rowid.'" data-pbq="'.$objp->price_by_qty_rowid.'" data-pbqqty="'.$objp->price_by_qty_quantity.'" data-pbqpercent="'.$objp->price_by_qty_remise_percent.'"';
+ $opt .= ' pbq="'.$objp->price_by_qty_rowid.'" data-pbq="'.$objp->price_by_qty_rowid.'" data-pbqqty="'.$objp->price_by_qty_quantity.'" data-pbqpercent="'.$objp->price_by_qty_remise_percent.'"';
}
- if (! empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)))
+ if (!empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))
{
- if (! empty($user->rights->stock->lire)) {
- if ($objp->stock > 0) $opt.= ' class="product_line_stock_ok"';
- elseif ($objp->stock <= 0) $opt.= ' class="product_line_stock_too_low"';
+ if (!empty($user->rights->stock->lire)) {
+ if ($objp->stock > 0) $opt .= ' class="product_line_stock_ok"';
+ elseif ($objp->stock <= 0) $opt .= ' class="product_line_stock_too_low"';
}
}
- $opt.= '>';
- $opt.= $objp->ref;
- if ($outbarcode) $opt.=' ('.$outbarcode.')';
- $opt.=' - '.dol_trunc($label, $maxlengtharticle);
+ $opt .= '>';
+ $opt .= $objp->ref;
+ if ($outbarcode) $opt .= ' ('.$outbarcode.')';
+ $opt .= ' - '.dol_trunc($label, $maxlengtharticle);
$objRef = $objp->ref;
- if (! empty($filterkey) && $filterkey != '') $objRef=preg_replace('/('.preg_quote($filterkey).')/i', '$1 ', $objRef, 1);
- $outval.=$objRef;
- if ($outbarcode) $outval.=' ('.$outbarcode.')';
- $outval.=' - '.dol_trunc($label, $maxlengtharticle);
+ if (!empty($filterkey) && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey).')/i', '$1 ', $objRef, 1);
+ $outval .= $objRef;
+ if ($outbarcode) $outval .= ' ('.$outbarcode.')';
+ $outval .= ' - '.dol_trunc($label, $maxlengtharticle);
// Units
$opt .= $outvalUnits;
$outval .= $outvalUnits;
- $found=0;
+ $found = 0;
// Multiprice
// If we need a particular price level (from 1 to 6)
- if (empty($hidepriceinlabel) && $price_level >= 1 && (! empty($conf->global->PRODUIT_MULTIPRICES) || ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)))
+ if (empty($hidepriceinlabel) && $price_level >= 1 && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)))
{
$sql = "SELECT price, price_ttc, price_base_type, tva_tx";
- $sql.= " FROM ".MAIN_DB_PREFIX."product_price";
- $sql.= " WHERE fk_product='".$objp->rowid."'";
- $sql.= " AND entity IN (".getEntity('productprice').")";
- $sql.= " AND price_level=".$price_level;
- $sql.= " ORDER BY date_price DESC, rowid DESC"; // Warning DESC must be both on date_price and rowid.
- $sql.= " LIMIT 1";
+ $sql .= " FROM ".MAIN_DB_PREFIX."product_price";
+ $sql .= " WHERE fk_product='".$objp->rowid."'";
+ $sql .= " AND entity IN (".getEntity('productprice').")";
+ $sql .= " AND price_level=".$price_level;
+ $sql .= " ORDER BY date_price DESC, rowid DESC"; // Warning DESC must be both on date_price and rowid.
+ $sql .= " LIMIT 1";
dol_syslog(get_class($this).'::constructProductListOption search price for level '.$price_level.'', LOG_DEBUG);
$result2 = $this->db->query($sql);
@@ -2500,21 +2500,21 @@ class Form
$objp2 = $this->db->fetch_object($result2);
if ($objp2)
{
- $found=1;
+ $found = 1;
if ($objp2->price_base_type == 'HT')
{
- $opt.= ' - '.price($objp2->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
- $outval.= ' - '.price($objp2->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
+ $opt .= ' - '.price($objp2->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
+ $outval .= ' - '.price($objp2->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
}
else
{
- $opt.= ' - '.price($objp2->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
- $outval.= ' - '.price($objp2->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
+ $opt .= ' - '.price($objp2->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
+ $outval .= ' - '.price($objp2->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
}
- $outprice_ht=price($objp2->price);
- $outprice_ttc=price($objp2->price_ttc);
- $outpricebasetype=$objp2->price_base_type;
- $outtva_tx=$objp2->tva_tx;
+ $outprice_ht = price($objp2->price);
+ $outprice_ttc = price($objp2->price_ttc);
+ $outpricebasetype = $objp2->price_base_type;
+ $outtva_tx = $objp2->tva_tx;
}
}
else
@@ -2524,40 +2524,40 @@ class Form
}
// Price by quantity
- if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1 && (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)))
+ if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1 && (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)))
{
$found = 1;
- $outqty=$objp->quantity;
- $outdiscount=$objp->remise_percent;
+ $outqty = $objp->quantity;
+ $outdiscount = $objp->remise_percent;
if ($objp->quantity == 1)
{
- $opt.= ' - '.price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency)."/";
- $outval.= ' - '.price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency)."/";
- $opt.= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding
- $outval.=$langs->transnoentities("Unit");
+ $opt .= ' - '.price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency)."/";
+ $outval .= ' - '.price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency)."/";
+ $opt .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding
+ $outval .= $langs->transnoentities("Unit");
}
else
{
- $opt.= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
- $outval.= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
- $opt.= $langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding
- $outval.=$langs->transnoentities("Units");
+ $opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
+ $outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
+ $opt .= $langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding
+ $outval .= $langs->transnoentities("Units");
}
- $outprice_ht=price($objp->unitprice);
- $outprice_ttc=price($objp->unitprice * (1 + ($objp->tva_tx / 100)));
- $outpricebasetype=$objp->price_base_type;
- $outtva_tx=$objp->tva_tx;
+ $outprice_ht = price($objp->unitprice);
+ $outprice_ttc = price($objp->unitprice * (1 + ($objp->tva_tx / 100)));
+ $outpricebasetype = $objp->price_base_type;
+ $outtva_tx = $objp->tva_tx;
}
if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1)
{
- $opt.=" (".price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit").")"; // Do not use strtolower because it breaks utf8 encoding
- $outval.=" (".price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency)."/".$langs->transnoentities("Unit").")"; // Do not use strtolower because it breaks utf8 encoding
+ $opt .= " (".price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit").")"; // Do not use strtolower because it breaks utf8 encoding
+ $outval .= " (".price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency)."/".$langs->transnoentities("Unit").")"; // Do not use strtolower because it breaks utf8 encoding
}
if (empty($hidepriceinlabel) && !empty($objp->remise_percent) && $objp->remise_percent >= 1)
{
- $opt.=" - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';
- $outval.=" - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';
+ $opt .= " - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';
+ $outval .= " - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';
}
// Price by customer
@@ -2569,79 +2569,79 @@ class Form
if ($objp->custprice_base_type == 'HT')
{
- $opt.= ' - '.price($objp->custprice, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
- $outval.= ' - '.price($objp->custprice, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
+ $opt .= ' - '.price($objp->custprice, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
+ $outval .= ' - '.price($objp->custprice, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
}
else
{
- $opt.= ' - '.price($objp->custprice_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
- $outval.= ' - '.price($objp->custprice_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
+ $opt .= ' - '.price($objp->custprice_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
+ $outval .= ' - '.price($objp->custprice_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
}
- $outprice_ht=price($objp->custprice);
- $outprice_ttc=price($objp->custprice_ttc);
- $outpricebasetype=$objp->custprice_base_type;
- $outtva_tx=$objp->custtva_tx;
+ $outprice_ht = price($objp->custprice);
+ $outprice_ttc = price($objp->custprice_ttc);
+ $outpricebasetype = $objp->custprice_base_type;
+ $outtva_tx = $objp->custtva_tx;
}
}
// If level no defined or multiprice not found, we used the default price
- if (empty($hidepriceinlabel) && ! $found)
+ if (empty($hidepriceinlabel) && !$found)
{
if ($objp->price_base_type == 'HT')
{
- $opt.= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
- $outval.= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
+ $opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
+ $outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
}
else
{
- $opt.= ' - '.price($objp->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
- $outval.= ' - '.price($objp->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
+ $opt .= ' - '.price($objp->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
+ $outval .= ' - '.price($objp->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
}
- $outprice_ht=price($objp->price);
- $outprice_ttc=price($objp->price_ttc);
- $outpricebasetype=$objp->price_base_type;
- $outtva_tx=$objp->tva_tx;
+ $outprice_ht = price($objp->price);
+ $outprice_ttc = price($objp->price_ttc);
+ $outpricebasetype = $objp->price_base_type;
+ $outtva_tx = $objp->tva_tx;
}
- if (! empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)))
+ if (!empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))
{
- if (! empty($user->rights->stock->lire)) {
- $opt.= ' - '.$langs->trans("Stock").':'.$objp->stock;
+ if (!empty($user->rights->stock->lire)) {
+ $opt .= ' - '.$langs->trans("Stock").':'.$objp->stock;
if ($objp->stock > 0) {
- $outval.= ' - ';
+ $outval .= ' - ';
}elseif ($objp->stock <= 0) {
- $outval.= ' - ';
+ $outval .= ' - ';
}
- $outval.= $langs->transnoentities("Stock").':'.$objp->stock;
- $outval.= ' ';
- if (! empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO)) // Warning, this option may slow down combo list generation
+ $outval .= $langs->transnoentities("Stock").':'.$objp->stock;
+ $outval .= ' ';
+ if (!empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO)) // Warning, this option may slow down combo list generation
{
$langs->load("stocks");
- $tmpproduct=new Product($this->db);
+ $tmpproduct = new Product($this->db);
$tmpproduct->fetch($objp->rowid);
$tmpproduct->load_virtual_stock();
$virtualstock = $tmpproduct->stock_theorique;
- $opt.= ' - '.$langs->trans("VirtualStock").':'.$virtualstock;
+ $opt .= ' - '.$langs->trans("VirtualStock").':'.$virtualstock;
- $outval.=' - '.$langs->transnoentities("VirtualStock").':';
+ $outval .= ' - '.$langs->transnoentities("VirtualStock").':';
if ($virtualstock > 0) {
- $outval.= ' - ';
+ $outval .= ' - ';
}elseif ($virtualstock <= 0) {
- $outval.= ' - ';
+ $outval .= ' - ';
}
- $outval.=$virtualstock;
- $outval.=' ';
+ $outval .= $virtualstock;
+ $outval .= ' ';
unset($tmpproduct);
}
}
}
- $opt.= " \n";
+ $opt .= "\n";
$optJson = array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'label2'=>$outlabel, 'desc'=>$outdesc, 'type'=>$outtype, 'price_ht'=>price2num($outprice_ht), 'price_ttc'=>price2num($outprice_ttc), 'pricebasetype'=>$outpricebasetype, 'tva_tx'=>$outtva_tx, 'qty'=>$outqty, 'discount'=>$outdiscount, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit);
}
@@ -2663,25 +2663,25 @@ class Form
public function select_produits_fournisseurs($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $ajaxoptions = array(), $hidelabel = 0, $alsoproductwithnosupplierprice = 0, $morecss = '')
{
// phpcs:enable
- global $langs,$conf;
+ global $langs, $conf;
global $price_level, $status, $finished;
- $selected_input_value='';
- if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
+ $selected_input_value = '';
+ if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
{
if ($selected > 0)
{
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
$producttmpselect = new Product($this->db);
$producttmpselect->fetch($selected);
- $selected_input_value=$producttmpselect->ref;
+ $selected_input_value = $producttmpselect->ref;
unset($producttmpselect);
}
// mode=2 means suppliers products
- $urloption=($socid > 0?'socid='.$socid.'&':'').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished.'&alsoproductwithnosupplierprice='.$alsoproductwithnosupplierprice;
+ $urloption = ($socid > 0 ? 'socid='.$socid.'&' : '').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished.'&alsoproductwithnosupplierprice='.$alsoproductwithnosupplierprice;
print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
- print ($hidelabel?'':$langs->trans("RefOrLabel").' : ').'
';
+ print ($hidelabel ? '' : $langs->trans("RefOrLabel").' : ').'
';
}
else
{
@@ -2709,10 +2709,10 @@ class Form
public function select_produits_fournisseurs_list($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $filterkey = '', $statut = -1, $outputmode = 0, $limit = 100, $alsoproductwithnosupplierprice = 0, $morecss = '')
{
// phpcs:enable
- global $langs,$conf,$db;
+ global $langs, $conf, $db;
- $out='';
- $outarray=array();
+ $out = '';
+ $outarray = array();
$langs->load('stocks');
// Units
@@ -2721,55 +2721,55 @@ class Form
}
$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration, p.fk_product_type,";
- $sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";
- $sql.= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.fk_soc, s.nom as name,";
- $sql.= " pfp.supplier_reputation";
+ $sql .= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";
+ $sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.fk_soc, s.nom as name,";
+ $sql .= " pfp.supplier_reputation";
// Units
if ($conf->global->PRODUCT_USE_UNITS) {
$sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
}
- if (! empty($conf->barcode->enabled)) $sql.= " ,pfp.barcode";
- $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
- if ($socid) $sql.= " AND pfp.fk_soc = ".$socid;
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
+ if (!empty($conf->barcode->enabled)) $sql .= " ,pfp.barcode";
+ $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
+ if ($socid) $sql .= " AND pfp.fk_soc = ".$socid;
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
// Units
if ($conf->global->PRODUCT_USE_UNITS) {
- $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_units u ON u.rowid = p.fk_unit";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";
}
- $sql.= " WHERE p.entity IN (".getEntity('product').")";
- $sql.= " AND p.tobuy = 1";
- if (strval($filtertype) != '') $sql.=" AND p.fk_product_type=".$this->db->escape($filtertype);
- if (! empty($filtre)) $sql.=" ".$filtre;
+ $sql .= " WHERE p.entity IN (".getEntity('product').")";
+ $sql .= " AND p.tobuy = 1";
+ if (strval($filtertype) != '') $sql .= " AND p.fk_product_type=".$this->db->escape($filtertype);
+ if (!empty($filtre)) $sql .= " ".$filtre;
// Add criteria on ref/label
if ($filterkey != '')
{
- $sql.=' AND (';
- $prefix=empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE)?'%':''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
+ $sql .= ' AND (';
+ $prefix = empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE) ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
// For natural search
$scrit = explode(' ', $filterkey);
- $i=0;
- if (count($scrit) > 1) $sql.="(";
+ $i = 0;
+ if (count($scrit) > 1) $sql .= "(";
foreach ($scrit as $crit)
{
- if ($i > 0) $sql.=" AND ";
- $sql.="(pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%' OR p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%')";
+ if ($i > 0) $sql .= " AND ";
+ $sql .= "(pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%' OR p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%')";
$i++;
}
- if (count($scrit) > 1) $sql.=")";
- if (! empty($conf->barcode->enabled)){
- $sql.= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
- $sql.= " OR pfp.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
+ if (count($scrit) > 1) $sql .= ")";
+ if (!empty($conf->barcode->enabled)) {
+ $sql .= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
+ $sql .= " OR pfp.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
}
- $sql.=')';
+ $sql .= ')';
}
- $sql.= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";
- $sql.= $db->plimit($limit, 0);
+ $sql .= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";
+ $sql .= $db->plimit($limit, 0);
// Build output string
dol_syslog(get_class($this)."::select_produits_fournisseurs_list", LOG_DEBUG);
- $result=$this->db->query($sql);
+ $result = $this->db->query($sql);
if ($result)
{
require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
@@ -2777,47 +2777,47 @@ class Form
$num = $this->db->num_rows($result);
//$out.='
'; // remove select to have id same with combo and ajax
- $out.='';
- if (! $selected) $out.=' ';
- else $out.=' ';
+ $out .= '';
+ if (!$selected) $out .= ' ';
+ else $out .= ' ';
$i = 0;
while ($i < $num)
{
$objp = $this->db->fetch_object($result);
- $outkey=$objp->idprodfournprice; // id in table of price
- if (! $outkey && $alsoproductwithnosupplierprice) $outkey='idprod_'.$objp->rowid; // id of product
+ $outkey = $objp->idprodfournprice; // id in table of price
+ if (!$outkey && $alsoproductwithnosupplierprice) $outkey = 'idprod_'.$objp->rowid; // id of product
- $outref=$objp->ref;
- $outval='';
- $outqty=1;
- $outdiscount=0;
- $outtype=$objp->fk_product_type;
- $outdurationvalue=$outtype == Product::TYPE_SERVICE?substr($objp->duration, 0, dol_strlen($objp->duration)-1):'';
- $outdurationunit=$outtype == Product::TYPE_SERVICE?substr($objp->duration, -1):'';
+ $outref = $objp->ref;
+ $outval = '';
+ $outqty = 1;
+ $outdiscount = 0;
+ $outtype = $objp->fk_product_type;
+ $outdurationvalue = $outtype == Product::TYPE_SERVICE ?substr($objp->duration, 0, dol_strlen($objp->duration) - 1) : '';
+ $outdurationunit = $outtype == Product::TYPE_SERVICE ?substr($objp->duration, -1) : '';
// Units
$outvalUnits = '';
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($objp->unit_short)) {
- $outvalUnits .= ' - ' . $objp->unit_short;
+ $outvalUnits .= ' - '.$objp->unit_short;
}
- if (!empty($objp->weight) && $objp->weight_units!==null) {
+ if (!empty($objp->weight) && $objp->weight_units !== null) {
$unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);
- $outvalUnits .= ' - ' . $unitToShow;
+ $outvalUnits .= ' - '.$unitToShow;
}
- if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units!==null) {
- $unitToShow = $objp->length . ' x ' . $objp->width . ' x ' . $objp->height . ' ' . measuringUnitString(0, 'size', $objp->length_units);
- $outvalUnits .= ' - ' . $unitToShow;
+ if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units !== null) {
+ $unitToShow = $objp->length.' x '.$objp->width.' x '.$objp->height.' '.measuringUnitString(0, 'size', $objp->length_units);
+ $outvalUnits .= ' - '.$unitToShow;
}
- if (!empty($objp->surface) && $objp->surface_units!==null) {
+ if (!empty($objp->surface) && $objp->surface_units !== null) {
$unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);
- $outvalUnits .= ' - ' . $unitToShow;
+ $outvalUnits .= ' - '.$unitToShow;
}
- if (!empty($objp->volume) && $objp->volume_units!==null) {
+ if (!empty($objp->volume) && $objp->volume_units !== null) {
$unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);
- $outvalUnits .= ' - ' . $unitToShow;
+ $outvalUnits .= ' - '.$unitToShow;
}
if ($outdurationvalue && $outdurationunit) {
$da = array(
@@ -2828,34 +2828,34 @@ class Form
'y' => $langs->trans('Year')
);
if (isset($da[$outdurationunit])) {
- $outvalUnits .= ' - ' . $outdurationvalue . ' ' . $langs->transnoentities($da[$outdurationunit].($outdurationvalue > 1 ? 's' : ''));
+ $outvalUnits .= ' - '.$outdurationvalue.' '.$langs->transnoentities($da[$outdurationunit].($outdurationvalue > 1 ? 's' : ''));
}
}
}
$objRef = $objp->ref;
- if ($filterkey && $filterkey != '') $objRef=preg_replace('/('.preg_quote($filterkey).')/i', '$1 ', $objRef, 1);
+ if ($filterkey && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey).')/i', '$1 ', $objRef, 1);
$objRefFourn = $objp->ref_fourn;
- if ($filterkey && $filterkey != '') $objRefFourn=preg_replace('/('.preg_quote($filterkey).')/i', '$1 ', $objRefFourn, 1);
+ if ($filterkey && $filterkey != '') $objRefFourn = preg_replace('/('.preg_quote($filterkey).')/i', '$1 ', $objRefFourn, 1);
$label = $objp->label;
- if ($filterkey && $filterkey != '') $label=preg_replace('/('.preg_quote($filterkey).')/i', '$1 ', $label, 1);
+ if ($filterkey && $filterkey != '') $label = preg_replace('/('.preg_quote($filterkey).')/i', '$1 ', $label, 1);
$optlabel = $objp->ref;
- if (! empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))
- $optlabel.=' ('.$objp->ref_fourn.') ';
+ if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))
+ $optlabel .= ' ('.$objp->ref_fourn.') ';
$outvallabel = $objRef;
- if (! empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))
- $outvallabel.=' ('.$objRefFourn.')';
+ if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))
+ $outvallabel .= ' ('.$objRefFourn.')';
// Units
$optlabel .= $outvalUnits;
$outvallabel .= $outvalUnits;
- if (! empty($objp->idprodfournprice))
+ if (!empty($objp->idprodfournprice))
{
- $outqty=$objp->quantity;
- $outdiscount=$objp->remise_percent;
+ $outqty = $objp->quantity;
+ $outdiscount = $objp->remise_percent;
if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_supplier_price_expression)) {
$prod_supplier = new ProductFournisseur($this->db);
$prod_supplier->product_fourn_price_id = $objp->idprodfournprice;
@@ -2875,80 +2875,80 @@ class Form
}
if ($objp->quantity == 1)
{
- $optlabel.= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE)?(1 - $objp->remise_percent / 100):1), 1, $langs, 0, 0, -1, $conf->currency)."/";
- $outvallabel.= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE)?(1 - $objp->remise_percent / 100):1), 0, $langs, 0, 0, -1, $conf->currency)."/";
- $optlabel.= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding
- $outvallabel.=$langs->transnoentities("Unit");
+ $optlabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/";
+ $outvallabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency)."/";
+ $optlabel .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding
+ $outvallabel .= $langs->transnoentities("Unit");
}
else
{
- $optlabel.= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE)?(1 - $objp->remise_percent / 100):1), 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
- $outvallabel.= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE)?(1 - $objp->remise_percent / 100):1), 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
- $optlabel.= ' '.$langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding
- $outvallabel.= ' '.$langs->transnoentities("Units");
+ $optlabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
+ $outvallabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
+ $optlabel .= ' '.$langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding
+ $outvallabel .= ' '.$langs->transnoentities("Units");
}
if ($objp->quantity > 1)
{
- $optlabel.=" (".price($objp->unitprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE)?(1 - $objp->remise_percent / 100):1), 1, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit").")"; // Do not use strtolower because it breaks utf8 encoding
- $outvallabel.=" (".price($objp->unitprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE)?(1 - $objp->remise_percent / 100):1), 0, $langs, 0, 0, -1, $conf->currency)."/".$langs->transnoentities("Unit").")"; // Do not use strtolower because it breaks utf8 encoding
+ $optlabel .= " (".price($objp->unitprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit").")"; // Do not use strtolower because it breaks utf8 encoding
+ $outvallabel .= " (".price($objp->unitprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency)."/".$langs->transnoentities("Unit").")"; // Do not use strtolower because it breaks utf8 encoding
}
if ($objp->remise_percent >= 1)
{
- $optlabel.=" - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';
- $outvallabel.=" - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';
+ $optlabel .= " - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';
+ $outvallabel .= " - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';
}
if ($objp->duration)
{
$optlabel .= " - ".$objp->duration;
- $outvallabel.=" - ".$objp->duration;
+ $outvallabel .= " - ".$objp->duration;
}
- if (! $socid)
+ if (!$socid)
{
$optlabel .= " - ".dol_trunc($objp->name, 8);
- $outvallabel.=" - ".dol_trunc($objp->name, 8);
+ $outvallabel .= " - ".dol_trunc($objp->name, 8);
}
- if (! empty($conf->barcode->enabled) && !empty($objp->barcode))
+ if (!empty($conf->barcode->enabled) && !empty($objp->barcode))
{
//$optlabel .= " - ".$langs->trans("NoPriceDefinedForThisSupplier").' ';
- $outvallabel.=' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");
+ $optlabel .= " - ".$langs->trans("NoPriceDefinedForThisSupplier").' ';
+ $outvallabel .= ' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");
}
else // No supplier price defined for product, even on other suppliers
{
- $optlabel.= " - ".$langs->trans("NoPriceDefinedForThisSupplier").' ';
- $outvallabel.=' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");
+ $optlabel .= " - ".$langs->trans("NoPriceDefinedForThisSupplier").' ';
+ $outvallabel .= ' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");
}
}
$opt = 'idprodfournprice) $opt.= ' selected';
- if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) $opt.=' disabled';
+ if ($selected && $selected == $objp->idprodfournprice) $opt .= ' selected';
+ if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) $opt .= ' disabled';
if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0)
{
- $opt.= ' pbq="'.$objp->idprodfournprice.'" data-pbq="'.$objp->idprodfournprice.'" data-pbqqty="'.$objp->quantity.'" data-pbqpercent="'.$objp->remise_percent.'"';
+ $opt .= ' pbq="'.$objp->idprodfournprice.'" data-pbq="'.$objp->idprodfournprice.'" data-pbqqty="'.$objp->quantity.'" data-pbqpercent="'.$objp->remise_percent.'"';
}
- $opt.= ' data-html="'.dol_escape_htmltag($optlabel).'"';
- $opt.= '>';
+ $opt .= ' data-html="'.dol_escape_htmltag($optlabel).'"';
+ $opt .= '>';
- $opt.=$optlabel;
- $outval.=$outvallabel;
+ $opt .= $optlabel;
+ $outval .= $outvallabel;
$opt .= " \n";
@@ -2956,8 +2956,8 @@ class Form
// Add new entry
// "key" value of json key array is used by jQuery automatically as selected value
// "label" value of json key array is used by jQuery automatically as text for combo box
- $out.=$opt;
- array_push($outarray, array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'qty'=>$outqty, 'discount'=>$outdiscount, 'type'=>$outtype, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit, 'disabled'=>(empty($objp->idprodfournprice)?true:false)));
+ $out .= $opt;
+ array_push($outarray, array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'qty'=>$outqty, 'discount'=>$outdiscount, 'type'=>$outtype, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit, 'disabled'=>(empty($objp->idprodfournprice) ?true:false)));
// Exemple of var_dump $outarray
// array(1) {[0]=>array(6) {[key"]=>string(1) "2" ["value"]=>string(3) "ppp"
// ["label"]=>string(76) "ppp (f ff2) - ppp - 20,00 Euros/1unité (20,00 Euros/unité)"
@@ -2969,12 +2969,12 @@ class Form
$i++;
}
- $out.=' ';
+ $out .= ' ';
$this->db->free($result);
- include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
- $out.=ajax_combobox($htmlname);
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+ $out .= ajax_combobox($htmlname);
if (empty($outputmode)) return $out;
return $outarray;
@@ -2997,24 +2997,24 @@ class Form
public function select_product_fourn_price($productid, $htmlname = 'productfournpriceid', $selected_supplier = '')
{
// phpcs:enable
- global $langs,$conf;
+ global $langs, $conf;
$langs->load('stocks');
$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration, pfp.fk_soc,";
- $sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.remise_percent, pfp.quantity, pfp.unitprice,";
- $sql.= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, s.nom as name";
- $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
- $sql.= " WHERE pfp.entity IN (".getEntity('productsupplierprice').")";
- $sql.= " AND p.tobuy = 1";
- $sql.= " AND s.fournisseur = 1";
- $sql.= " AND p.rowid = ".$productid;
- $sql.= " ORDER BY s.nom, pfp.ref_fourn DESC";
+ $sql .= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.remise_percent, pfp.quantity, pfp.unitprice,";
+ $sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, s.nom as name";
+ $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
+ $sql .= " WHERE pfp.entity IN (".getEntity('productsupplierprice').")";
+ $sql .= " AND p.tobuy = 1";
+ $sql .= " AND s.fournisseur = 1";
+ $sql .= " AND p.rowid = ".$productid;
+ $sql .= " ORDER BY s.nom, pfp.ref_fourn DESC";
dol_syslog(get_class($this)."::select_product_fourn_price", LOG_DEBUG);
- $result=$this->db->query($sql);
+ $result = $this->db->query($sql);
if ($result)
{
@@ -3022,14 +3022,14 @@ class Form
$form = '';
- if (! $num)
+ if (!$num)
{
- $form.= '-- '.$langs->trans("NoSupplierPriceDefinedForThisProduct").' -- ';
+ $form .= '-- '.$langs->trans("NoSupplierPriceDefinedForThisProduct").' -- ';
}
else
{
require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
- $form.= ' ';
+ $form .= ' ';
$i = 0;
while ($i < $num)
@@ -3038,10 +3038,10 @@ class Form
$opt = ' 0 && $objp->fk_soc == $selected_supplier)) {
+ if ($num == 1 || ($selected_supplier > 0 && $objp->fk_soc == $selected_supplier)) {
$opt .= ' selected';
}
- $opt.= '>'.$objp->name.' - '.$objp->ref_fourn.' - ';
+ $opt .= '>'.$objp->name.' - '.$objp->ref_fourn.' - ';
if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_supplier_price_expression)) {
$prod_supplier = new ProductFournisseur($this->db);
@@ -3062,33 +3062,33 @@ class Form
}
if ($objp->quantity == 1)
{
- $opt.= price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE)?(1 - $objp->remise_percent / 100):1), 1, $langs, 0, 0, -1, $conf->currency)."/";
+ $opt .= price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/";
}
- $opt.= $objp->quantity.' ';
+ $opt .= $objp->quantity.' ';
if ($objp->quantity == 1)
{
- $opt.= $langs->trans("Unit");
+ $opt .= $langs->trans("Unit");
}
else
{
- $opt.= $langs->trans("Units");
+ $opt .= $langs->trans("Units");
}
if ($objp->quantity > 1)
{
- $opt.=" - ";
- $opt.= price($objp->unitprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE)?(1 - $objp->remise_percent / 100):1), 1, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit");
+ $opt .= " - ";
+ $opt .= price($objp->unitprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit");
}
if ($objp->duration) $opt .= " - ".$objp->duration;
$opt .= " \n";
- $form.= $opt;
+ $form .= $opt;
$i++;
}
}
- $form.= ' ';
+ $form .= ' ';
$this->db->free($result);
return $form;
}
@@ -3113,12 +3113,12 @@ class Form
// phpcs:enable
// looking for users
$sql = "SELECT a.rowid, a.label";
- $sql .= " FROM ".MAIN_DB_PREFIX ."societe_address as a";
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe_address as a";
$sql .= " WHERE a.fk_soc = ".$socid;
$sql .= " ORDER BY a.label ASC";
dol_syslog(get_class($this)."::select_address", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
print '
';
@@ -3164,15 +3164,15 @@ class Form
global $langs;
$num = count($this->cache_conditions_paiements);
- if ($num > 0) return 0; // Cache already loaded
+ if ($num > 0) return 0; // Cache already loaded
dol_syslog(__METHOD__, LOG_DEBUG);
$sql = "SELECT rowid, code, libelle as label";
- $sql.= " FROM ".MAIN_DB_PREFIX.'c_payment_term';
- $sql.= " WHERE entity IN (".getEntity('c_payment_term').")";
- $sql.= " AND active > 0";
- $sql.= " ORDER BY sortorder";
+ $sql .= " FROM ".MAIN_DB_PREFIX.'c_payment_term';
+ $sql .= " WHERE entity IN (".getEntity('c_payment_term').")";
+ $sql .= " AND active > 0";
+ $sql .= " ORDER BY sortorder";
$resql = $this->db->query($sql);
if ($resql)
@@ -3184,9 +3184,9 @@ class Form
$obj = $this->db->fetch_object($resql);
// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
- $label=($langs->trans("PaymentConditionShort".$obj->code)!=("PaymentConditionShort".$obj->code)?$langs->trans("PaymentConditionShort".$obj->code):($obj->label!='-'?$obj->label:''));
- $this->cache_conditions_paiements[$obj->rowid]['code'] =$obj->code;
- $this->cache_conditions_paiements[$obj->rowid]['label']=$label;
+ $label = ($langs->trans("PaymentConditionShort".$obj->code) != ("PaymentConditionShort".$obj->code) ? $langs->trans("PaymentConditionShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
+ $this->cache_conditions_paiements[$obj->rowid]['code'] = $obj->code;
+ $this->cache_conditions_paiements[$obj->rowid]['label'] = $label;
$i++;
}
@@ -3213,15 +3213,15 @@ class Form
global $langs;
$num = count($this->cache_availability);
- if ($num > 0) return 0; // Cache already loaded
+ if ($num > 0) return 0; // Cache already loaded
dol_syslog(__METHOD__, LOG_DEBUG);
$langs->load('propal');
$sql = "SELECT rowid, code, label";
- $sql.= " FROM ".MAIN_DB_PREFIX.'c_availability';
- $sql.= " WHERE active > 0";
+ $sql .= " FROM ".MAIN_DB_PREFIX.'c_availability';
+ $sql .= " WHERE active > 0";
$resql = $this->db->query($sql);
if ($resql)
@@ -3233,9 +3233,9 @@ class Form
$obj = $this->db->fetch_object($resql);
// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
- $label=($langs->trans("AvailabilityType".$obj->code)!=("AvailabilityType".$obj->code)?$langs->trans("AvailabilityType".$obj->code):($obj->label!='-'?$obj->label:''));
- $this->cache_availability[$obj->rowid]['code'] =$obj->code;
- $this->cache_availability[$obj->rowid]['label']=$label;
+ $label = ($langs->trans("AvailabilityType".$obj->code) != ("AvailabilityType".$obj->code) ? $langs->trans("AvailabilityType".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
+ $this->cache_availability[$obj->rowid]['code'] = $obj->code;
+ $this->cache_availability[$obj->rowid]['label'] = $label;
$i++;
}
@@ -3261,7 +3261,7 @@ class Form
*/
public function selectAvailabilityDelay($selected = '', $htmlname = 'availid', $filtertype = '', $addempty = 0)
{
- global $langs,$user;
+ global $langs, $user;
$this->load_cache_availability();
@@ -3269,7 +3269,7 @@ class Form
print '';
if ($addempty) print ' ';
- foreach($this->cache_availability as $id => $arrayavailability)
+ foreach ($this->cache_availability as $id => $arrayavailability)
{
if ($selected == $id)
{
@@ -3296,34 +3296,34 @@ class Form
global $langs;
$num = count($this->cache_demand_reason);
- if ($num > 0) return 0; // Cache already loaded
+ if ($num > 0) return 0; // Cache already loaded
$sql = "SELECT rowid, code, label";
- $sql.= " FROM ".MAIN_DB_PREFIX.'c_input_reason';
- $sql.= " WHERE active > 0";
+ $sql .= " FROM ".MAIN_DB_PREFIX.'c_input_reason';
+ $sql .= " WHERE active > 0";
$resql = $this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
$i = 0;
- $tmparray=array();
+ $tmparray = array();
while ($i < $num)
{
$obj = $this->db->fetch_object($resql);
// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
- $label=($obj->label!='-'?$obj->label:'');
+ $label = ($obj->label != '-' ? $obj->label : '');
if ($langs->trans("DemandReasonType".$obj->code) != ("DemandReasonType".$obj->code)) $label = $langs->trans("DemandReasonType".$obj->code); // So translation key DemandReasonTypeSRC_XXX will work
- if ($langs->trans($obj->code) != $obj->code) $label=$langs->trans($obj->code); // So translation key SRC_XXX will work
+ if ($langs->trans($obj->code) != $obj->code) $label = $langs->trans($obj->code); // So translation key SRC_XXX will work
- $tmparray[$obj->rowid]['id'] =$obj->rowid;
- $tmparray[$obj->rowid]['code'] =$obj->code;
- $tmparray[$obj->rowid]['label']=$label;
+ $tmparray[$obj->rowid]['id'] = $obj->rowid;
+ $tmparray[$obj->rowid]['code'] = $obj->code;
+ $tmparray[$obj->rowid]['label'] = $label;
$i++;
}
- $this->cache_demand_reason=dol_sort_array($tmparray, 'label', 'asc', 0, 0, 1);
+ $this->cache_demand_reason = dol_sort_array($tmparray, 'label', 'asc', 0, 0, 1);
unset($tmparray);
return $num;
@@ -3347,15 +3347,15 @@ class Form
*/
public function selectInputReason($selected = '', $htmlname = 'demandreasonid', $exclude = '', $addempty = 0)
{
- global $langs,$user;
+ global $langs, $user;
$this->loadCacheInputReason();
print '';
- if ($addempty) print ' ';
- foreach($this->cache_demand_reason as $id => $arraydemandreason)
+ if ($addempty) print ' ';
+ foreach ($this->cache_demand_reason as $id => $arraydemandreason)
{
- if ($arraydemandreason['code']==$exclude) continue;
+ if ($arraydemandreason['code'] == $exclude) continue;
if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code']))
{
@@ -3365,7 +3365,7 @@ class Form
{
print '';
}
- $label=$arraydemandreason['label']; // Translation of label was already done into the ->loadCacheInputReason
+ $label = $arraydemandreason['label']; // Translation of label was already done into the ->loadCacheInputReason
print $langs->trans($label);
print ' ';
}
@@ -3384,16 +3384,16 @@ class Form
// phpcs:enable
global $langs;
- $num=count($this->cache_types_paiements);
- if ($num > 0) return $num; // Cache already loaded
+ $num = count($this->cache_types_paiements);
+ if ($num > 0) return $num; // Cache already loaded
dol_syslog(__METHOD__, LOG_DEBUG);
$this->cache_types_paiements = array();
$sql = "SELECT id, code, libelle as label, type, active";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_paiement";
- $sql.= " WHERE entity IN (".getEntity('c_paiement').")";
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_paiement";
+ $sql .= " WHERE entity IN (".getEntity('c_paiement').")";
//if ($active >= 0) $sql.= " AND active = ".$active;
$resql = $this->db->query($sql);
@@ -3406,12 +3406,12 @@ class Form
$obj = $this->db->fetch_object($resql);
// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
- $label=($langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code)!=("PaymentTypeShort".$obj->code)?$langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code):($obj->label!='-'?$obj->label:''));
- $this->cache_types_paiements[$obj->id]['id'] =$obj->id;
- $this->cache_types_paiements[$obj->id]['code'] =$obj->code;
- $this->cache_types_paiements[$obj->id]['label']=$label;
- $this->cache_types_paiements[$obj->id]['type'] =$obj->type;
- $this->cache_types_paiements[$obj->id]['active'] =$obj->active;
+ $label = ($langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code) != ("PaymentTypeShort".$obj->code) ? $langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
+ $this->cache_types_paiements[$obj->id]['id'] = $obj->id;
+ $this->cache_types_paiements[$obj->id]['code'] = $obj->code;
+ $this->cache_types_paiements[$obj->id]['label'] = $label;
+ $this->cache_types_paiements[$obj->id]['type'] = $obj->type;
+ $this->cache_types_paiements[$obj->id]['active'] = $obj->active;
$i++;
}
@@ -3451,11 +3451,11 @@ class Form
$this->load_cache_conditions_paiements();
// Set default value if not already set by caller
- if (empty($selected) && ! empty($conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID)) $selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;
+ if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID)) $selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;
- print '';
+ print '';
if ($addempty) print ' ';
- foreach($this->cache_conditions_paiements as $id => $arrayconditions)
+ foreach ($this->cache_conditions_paiements as $id => $arrayconditions)
{
if ($selected == $id)
{
@@ -3491,26 +3491,26 @@ class Form
public function select_types_paiements($selected = '', $htmlname = 'paiementtype', $filtertype = '', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '')
{
// phpcs:enable
- global $langs,$user;
+ global $langs, $user;
dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
- $filterarray=array();
- if ($filtertype == 'CRDT') $filterarray=array(0,2,3);
- elseif ($filtertype == 'DBIT') $filterarray=array(1,2,3);
- elseif ($filtertype != '' && $filtertype != '-1') $filterarray=explode(',', $filtertype);
+ $filterarray = array();
+ if ($filtertype == 'CRDT') $filterarray = array(0, 2, 3);
+ elseif ($filtertype == 'DBIT') $filterarray = array(1, 2, 3);
+ elseif ($filtertype != '' && $filtertype != '-1') $filterarray = explode(',', $filtertype);
$this->load_cache_types_paiements();
- print '';
+ print '';
if ($empty) print ' ';
- foreach($this->cache_types_paiements as $id => $arraytypes)
+ foreach ($this->cache_types_paiements as $id => $arraytypes)
{
// If not good status
if ($active >= 0 && $arraytypes['active'] != $active) continue;
// On passe si on a demande de filtrer sur des modes de paiments particuliers
- if (count($filterarray) && ! in_array($arraytypes['type'], $filterarray)) continue;
+ if (count($filterarray) && !in_array($arraytypes['type'], $filterarray)) continue;
// We discard empty line if showempty is on because an empty line has already been output.
if ($empty && empty($arraytypes['code'])) continue;
@@ -3523,15 +3523,15 @@ class Form
if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected';
elseif ($selected == $id) print ' selected';
print '>';
- if ($format == 0) $value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
- elseif ($format == 1) $value=$arraytypes['code'];
- elseif ($format == 2) $value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
- elseif ($format == 3) $value=$arraytypes['code'];
- print $value?$value:' ';
+ if ($format == 0) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+ elseif ($format == 1) $value = $arraytypes['code'];
+ elseif ($format == 2) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+ elseif ($format == 3) $value = $arraytypes['code'];
+ print $value ? $value : ' ';
print '';
}
print ' ';
- if ($user->admin && ! $noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+ if ($user->admin && !$noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
}
@@ -3546,26 +3546,26 @@ class Form
{
global $langs;
- $return='';
+ $return = '';
- $return.= '';
+ $return .= '';
$options = array(
'HT'=>$langs->trans("HT"),
'TTC'=>$langs->trans("TTC")
);
- foreach($options as $id => $value)
+ foreach ($options as $id => $value)
{
if ($selected == $id)
{
- $return.= ''.$value;
+ $return .= ' '.$value;
}
else
{
- $return.= ' '.$value;
+ $return .= ' '.$value;
}
- $return.= ' ';
+ $return .= '';
}
- $return.= ' ';
+ $return .= ' ';
return $return;
}
@@ -3588,10 +3588,10 @@ class Form
$langs->load("deliveries");
$sql = "SELECT rowid, code, libelle as label";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode";
- $sql.= " WHERE active > 0";
- if ($filtre) $sql.=" AND ".$filtre;
- $sql.= " ORDER BY libelle ASC";
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode";
+ $sql .= " WHERE active > 0";
+ if ($filtre) $sql .= " AND ".$filtre;
+ $sql .= " ORDER BY libelle ASC";
dol_syslog(get_class($this)."::selectShippingMode", LOG_DEBUG);
$result = $this->db->query($sql);
@@ -3599,7 +3599,7 @@ class Form
$num = $this->db->num_rows($result);
$i = 0;
if ($num) {
- print '';
+ print '';
if ($useempty == 1 || ($useempty == 2 && $num > 1)) {
print ' ';
}
@@ -3648,7 +3648,7 @@ class Form
print '';
} else {
if ($selected) {
- $code=$langs->getLabelFromKey($db, $selected, 'c_shipment_mode', 'rowid', 'code');
+ $code = $langs->getLabelFromKey($db, $selected, 'c_shipment_mode', 'rowid', 'code');
print $langs->trans("SendingMethod".strtoupper($code));
} else {
print " ";
@@ -3672,15 +3672,15 @@ class Form
$opt = '' . $obj->ref . ' ';
+ $opt .= ''.$obj->ref.' ';
} else {
- $opt .= '' . $obj->ref . ' ';
+ $opt .= ''.$obj->ref.' ';
}
}
}
@@ -3704,11 +3704,11 @@ class Form
}
else
{
- dol_syslog("Error sql=" . $sql . ", error=" . $this->error, LOG_ERR);
+ dol_syslog("Error sql=".$sql.", error=".$this->error, LOG_ERR);
}
if ($opt == '' . $langs->trans('NoSituations') . ' ';
+ $opt = ''.$langs->trans('NoSituations').' ';
}
return $opt;
}
@@ -3727,34 +3727,34 @@ class Form
$langs->load('products');
- $return= '';
+ $return = '';
$sql = 'SELECT rowid, label, code from '.MAIN_DB_PREFIX.'c_units';
- $sql.= ' WHERE active > 0';
+ $sql .= ' WHERE active > 0';
$resql = $this->db->query($sql);
- if($resql && $this->db->num_rows($resql) > 0)
+ if ($resql && $this->db->num_rows($resql) > 0)
{
if ($showempty) $return .= ''.$unitLabel.' ';
+ $return .= ''.$unitLabel.' ';
}
else
{
- $return.=''.$unitLabel.' ';
+ $return .= ''.$unitLabel.' ';
}
}
- $return.=' ';
+ $return .= ' ';
}
return $return;
}
@@ -3796,7 +3796,7 @@ class Form
$i = 0;
if ($num)
{
- print '';
+ print '';
if ($useempty == 1 || ($useempty == 2 && $num > 1))
{
print ' ';
@@ -3868,7 +3868,7 @@ class Form
$i = 0;
if ($num)
{
- print '';
+ print '';
if ($useempty == 1 || ($useempty == 2 && $num > 1))
{
print ' ';
@@ -3926,8 +3926,8 @@ class Form
$langs->load('banks');
if ($selected) {
- require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php';
- $bankstatic=new Account($this->db);
+ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+ $bankstatic = new Account($this->db);
$result = $bankstatic->fetch($selected);
if ($result) print $bankstatic->getNomUrl(1);
} else {
@@ -3965,17 +3965,17 @@ class Form
// For backward compatibility
if (is_numeric($type))
{
- dol_syslog(__METHOD__ . ': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
+ dol_syslog(__METHOD__.': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
}
if ($type === Categorie::TYPE_BANK_LINE)
{
// TODO Move this into common category feature
- $categids=array();
+ $categids = array();
$sql = "SELECT c.label, c.rowid";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank_categ as c";
- $sql.= " WHERE entity = ".$conf->entity;
- $sql.= " ORDER BY c.label";
+ $sql .= " FROM ".MAIN_DB_PREFIX."bank_categ as c";
+ $sql .= " WHERE entity = ".$conf->entity;
+ $sql .= " ORDER BY c.label";
$result = $this->db->query($sql);
if ($result)
{
@@ -3984,7 +3984,7 @@ class Form
while ($i < $num)
{
$objp = $this->db->fetch_object($result);
- if ($objp) $cate_arbo[$objp->rowid]=array('id'=>$objp->rowid, 'fulllabel'=>$objp->label);
+ if ($objp) $cate_arbo[$objp->rowid] = array('id'=>$objp->rowid, 'fulllabel'=>$objp->label);
$i++;
}
$this->db->free($result);
@@ -3998,14 +3998,14 @@ class Form
}
$output = '';
- $outarray=array();
+ $outarray = array();
if (is_array($cate_arbo))
{
- if (! count($cate_arbo)) $output.= ''.$langs->trans("NoCategoriesDefined").' ';
+ if (!count($cate_arbo)) $output .= ''.$langs->trans("NoCategoriesDefined").' ';
else
{
- $output.= ' ';
- foreach($cate_arbo as $key => $value)
+ $output .= ' ';
+ foreach ($cate_arbo as $key => $value)
{
if ($cate_arbo[$key]['id'] == $selected || ($selected == 'auto' && count($cate_arbo) == 1))
{
@@ -4015,14 +4015,14 @@ class Form
{
$add = '';
}
- $output.= ''.dol_trunc($cate_arbo[$key]['fulllabel'], $maxlength, 'middle').' ';
+ $output .= ''.dol_trunc($cate_arbo[$key]['fulllabel'], $maxlength, 'middle').' ';
$outarray[$cate_arbo[$key]['id']] = $cate_arbo[$key]['fulllabel'];
}
}
}
- $output.= ' ';
- $output.= "\n";
+ $output .= ' ';
+ $output .= "\n";
if ($outputmode) return $outarray;
return $output;
@@ -4048,7 +4048,7 @@ class Form
public function form_confirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = "", $useajax = 0, $height = 170, $width = 500)
{
// phpcs:enable
- dol_syslog(__METHOD__ . ': using form_confirm is deprecated. Use formconfim instead.', LOG_WARNING);
+ dol_syslog(__METHOD__.': using form_confirm is deprecated. Use formconfim instead.', LOG_WARNING);
print $this->formconfirm($page, $title, $question, $action, $formquestion, $selectedchoice, $useajax, $height, $width);
}
@@ -4078,17 +4078,17 @@ class Form
*/
public function formconfirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = '', $useajax = 0, $height = 0, $width = 500, $disableformtag = 0)
{
- global $langs,$conf;
+ global $langs, $conf;
global $useglobalvars;
- $more='';
- $formconfirm='';
- $inputok=array();
- $inputko=array();
+ $more = '';
+ $formconfirm = '';
+ $inputok = array();
+ $inputko = array();
// Clean parameters
- $newselectedchoice=empty($selectedchoice)?"no":$selectedchoice;
- if ($conf->browser->layout == 'phone') $width='95%';
+ $newselectedchoice = empty($selectedchoice) ? "no" : $selectedchoice;
+ if ($conf->browser->layout == 'phone') $width = '95%';
// Set height automatically if not defined
if (empty($height)) {
@@ -4098,79 +4098,79 @@ class Form
}
}
- if (is_array($formquestion) && ! empty($formquestion))
+ if (is_array($formquestion) && !empty($formquestion))
{
// First add hidden fields and value
foreach ($formquestion as $key => $input)
{
- if (is_array($input) && ! empty($input))
+ if (is_array($input) && !empty($input))
{
if ($input['type'] == 'hidden')
{
- $more.=''."\n";
- if (! empty($formquestion['text'])) $more.='
'.$formquestion['text'].' '."\n";
+ $more .= '
'."\n";
+ if (!empty($formquestion['text'])) $more .= '
'.$formquestion['text'].' '."\n";
foreach ($formquestion as $key => $input)
{
- if (is_array($input) && ! empty($input))
+ if (is_array($input) && !empty($input))
{
- $size=(! empty($input['size'])?' size="'.$input['size'].'"':'');
- $moreattr=(! empty($input['moreattr'])?' '.$input['moreattr']:'');
- $morecss=(! empty($input['morecss'])?' '.$input['morecss']:'');
+ $size = (!empty($input['size']) ? ' size="'.$input['size'].'"' : '');
+ $moreattr = (!empty($input['moreattr']) ? ' '.$input['moreattr'] : '');
+ $morecss = (!empty($input['morecss']) ? ' '.$input['morecss'] : '');
if ($input['type'] == 'text')
{
- $more.='
'."\n";
+ $more .= '
'."\n";
}
elseif ($input['type'] == 'password')
{
- $more.='
'."\n";
+ $more .= '
'."\n";
}
elseif ($input['type'] == 'select')
{
- $more.='
';
- if (! empty($input['label'])) $more.=$input['label'].'
';
- $more.=$this->selectarray($input['name'], $input['values'], $input['default'], 1, 0, 0, $moreattr, 0, 0, 0, '', $morecss);
- $more.='
'."\n";
+ $more .= '
';
+ if (!empty($input['label'])) $more .= $input['label'].'
';
+ $more .= $this->selectarray($input['name'], $input['values'], $input['default'], 1, 0, 0, $moreattr, 0, 0, 0, '', $morecss);
+ $more .= '
'."\n";
}
elseif ($input['type'] == 'checkbox')
{
- $more.='
';
- $more.='
'.$input['label'].'
';
- $more.='
';
+ $more .= '
$selval)
+ $i = 0;
+ foreach ($input['values'] as $selkey => $selval)
{
- $more.='
';
- if ($i==0) $more.='
'.$input['label'].'
';
- else $more.='
';
- $more.='
';
+ else $more .= '
';
+ $more .= '
';
- $more.='
';
- $more.=$this->selectDate($input['value'], $input['name'], 0, 0, 0, '', 1, 0);
- $more.='
'."\n";
+ $more .= '
'.$input['label'].'
';
+ $more .= '
';
+ $more .= $this->selectDate($input['value'], $input['name'], 0, 0, 0, '', 1, 0);
+ $more .= '
'."\n";
$formquestion[] = array('name'=>$input['name'].'day');
$formquestion[] = array('name'=>$input['name'].'month');
$formquestion[] = array('name'=>$input['name'].'year');
@@ -4179,43 +4179,43 @@ class Form
}
elseif ($input['type'] == 'other')
{
- $more.='
';
- if (! empty($input['label'])) $more.=$input['label'].'
';
- $more.=$input['value'];
- $more.='
'."\n";
+ $more .= '
';
+ if (!empty($input['label'])) $more .= $input['label'].'
';
+ $more .= $input['value'];
+ $more .= '
'."\n";
}
elseif ($input['type'] == 'onecolumn')
{
- $more.='
';
- $more.=$input['value'];
- $more.='
'."\n";
+ $more .= '
';
+ $more .= $input['value'];
+ $more .= '
'."\n";
}
}
}
- $more.='
'."\n";
+ $more .= '
'."\n";
}
// JQUI method dialog is broken with jmobile, we use standard HTML.
// Note: When using dol_use_jmobile or no js, you must also check code for button use a GET url with action=xxx and check that you also output the confirm code when action=xxx
// See page product/card.php for example
- if (! empty($conf->dol_use_jmobile)) $useajax=0;
- if (empty($conf->use_javascript_ajax)) $useajax=0;
+ if (!empty($conf->dol_use_jmobile)) $useajax = 0;
+ if (empty($conf->use_javascript_ajax)) $useajax = 0;
if ($useajax)
{
- $autoOpen=true;
- $dialogconfirm='dialog-confirm';
- $button='';
- if (! is_numeric($useajax))
+ $autoOpen = true;
+ $dialogconfirm = 'dialog-confirm';
+ $button = '';
+ if (!is_numeric($useajax))
{
- $button=$useajax;
- $useajax=1;
- $autoOpen=false;
- $dialogconfirm.='-'.$button;
+ $button = $useajax;
+ $useajax = 1;
+ $autoOpen = false;
+ $dialogconfirm .= '-'.$button;
}
- $pageyes=$page.(preg_match('/\?/', $page)?'&':'?').'action='.$action.'&confirm=yes';
- $pageno=($useajax == 2 ? $page.(preg_match('/\?/', $page)?'&':'?').'confirm=no':'');
+ $pageyes = $page.(preg_match('/\?/', $page) ? '&' : '?').'action='.$action.'&confirm=yes';
+ $pageno = ($useajax == 2 ? $page.(preg_match('/\?/', $page) ? '&' : '?').'confirm=no' : '');
// Add input fields into list of fields to read during submit (inputok and inputko)
if (is_array($formquestion))
{
@@ -4227,28 +4227,28 @@ class Form
}
}
// Show JQuery confirm box. Note that global var $useglobalvars is used inside this template
- $formconfirm.= '
';
- if (! empty($more)) {
- $formconfirm.= '
'.$more.'
';
+ $formconfirm .= '
';
+ if (!empty($more)) {
+ $formconfirm .= '
'.$more.'
';
}
- $formconfirm.= ($question ? '
'.img_help('', '').' '.$question . '
': '');
- $formconfirm.= '
'."\n";
+ $formconfirm .= ($question ? '
'.img_help('', '').' '.$question.'
' : '');
+ $formconfirm .= '
'."\n";
- $formconfirm.= "\n\n";
- $formconfirm.= '';
- $formconfirm.= "\n";
+ $formconfirm .= "\n";
}
else
{
- $formconfirm.= "\n\n";
+ $formconfirm .= "\n\n";
- if (empty($disableformtag)) $formconfirm.= '
\n";
- $formconfirm.= '
';
+ if (empty($disableformtag)) $formconfirm .= "\n";
+ $formconfirm .= '
';
- $formconfirm.= "\n";
+ $formconfirm .= "\n";
}
return $formconfirm;
@@ -4372,20 +4372,20 @@ class Form
require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
- $out='';
+ $out = '';
- $formproject=new FormProjets($this->db);
+ $formproject = new FormProjets($this->db);
$langs->load("project");
if ($htmlname != "none")
{
- $out.="\n";
- $out.='
';
+ $out .= "\n";
+ $out .= '
';
}
else
{
@@ -4394,11 +4394,11 @@ class Form
$projet = new Project($this->db);
$projet->fetch($selected);
//print '
'.$projet->title.' ';
- $out.=$projet->getNomUrl(0, '', 1);
+ $out .= $projet->getNomUrl(0, '', 1);
}
else
{
- $out.=" ";
+ $out .= " ";
}
}
@@ -4539,24 +4539,24 @@ class Form
// phpcs:enable
global $langs;
- $ret='';
+ $ret = '';
if ($htmlname != "none")
{
- $ret.='
';
+ $ret .= '
';
}
else
{
- if ($displayhour) $ret.=dol_print_date($selected, 'dayhour');
- else $ret.=dol_print_date($selected, 'day');
+ if ($displayhour) $ret .= dol_print_date($selected, 'dayhour');
+ else $ret .= dol_print_date($selected, 'day');
}
if (empty($nooutput)) print $ret;
@@ -4593,8 +4593,8 @@ class Form
{
if ($selected)
{
- require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';
- $theuser=new User($this->db);
+ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+ $theuser = new User($this->db);
$theuser->fetch($selected);
print $theuser->getNomUrl(1);
} else {
@@ -4700,7 +4700,7 @@ class Form
}
else
{
- if (! empty($rate))
+ if (!empty($rate))
{
print price($rate, 1, $langs, 1, 0);
if ($currency && $rate != 1) print ' ('.price($rate, 1, $langs, 1, 0).' '.$currency.' = 1 '.$conf->currency.')';
@@ -4732,33 +4732,33 @@ class Form
public function form_remise_dispo($page, $selected, $htmlname, $socid, $amount, $filter = '', $maxvalue = 0, $more = '', $hidelist = 0, $discount_type = 0)
{
// phpcs:enable
- global $conf,$langs;
+ global $conf, $langs;
if ($htmlname != "none")
{
print '