';
$label .= Form::showphoto('societe', $this, 0, 40, 0, '', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
$label .= '
';
$label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
$label.= '
';
- if ($option == 'customer' || $option == 'compta' || $option == 'category')
- {
+ if ($option == 'customer' || $option == 'compta' || $option == 'category') {
$label .= img_picto('', $this->picto).'
'.$langs->trans("Customer").'';
$linkstart = '
'.$langs->trans("Prospect").'';
$linkstart = ''.$langs->trans("Supplier").'';
$linkstart = ''.$langs->trans("ThirdParty").'';
$linkstart = ''.$langs->trans("ThirdParty").'';
$linkstart = ''.$langs->trans("ThirdParty").'';
$linkstart = ''.$langs->trans("ThirdParty").'';
$linkstart = ''.$langs->trans("ThirdParty").'';
$linkstart = ''.$langs->trans("ThirdParty").'';
$linkstart = 'global->MAIN_OPTIMIZEFORTEXTBROWSER))
- {
+ if (empty($notooltip)) {
+ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
$label = $langs->trans("ShowCompany");
$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
}
$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
$linkclose .= ' class="classfortooltip refurl"';
- /*
+ /*
$hookmanager->initHooks(array('thirdpartydao'));
$parameters=array('id'=>$this->id);
$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
@@ -2478,15 +2466,18 @@ class Societe extends CommonObject
$linkend = '';
global $user;
- if (!$user->rights->societe->client->voir && $user->socid > 0 && $this->id != $user->socid)
- {
+ if (!$user->rights->societe->client->voir && $user->socid > 0 && $this->id != $user->socid) {
$linkstart = '';
$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"'), 0, 0, $notooltip ? 0 : 1);
- if ($withpicto != 2) $result .= dol_escape_htmltag($maxlen ? dol_trunc($name, $maxlen) : $name);
+ if ($withpicto) {
+ $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+ }
+ if ($withpicto != 2) {
+ $result .= dol_escape_htmltag($maxlen ? dol_trunc($name, $maxlen) : $name);
+ }
$result .= $linkend;
global $action;
@@ -2501,8 +2492,11 @@ class Societe extends CommonObject
'save_lastsearch_value'=> $save_lastsearch_value
);
$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;
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
@@ -2533,10 +2527,11 @@ class Societe extends CommonObject
$langs->load('companies');
$statusType = 'status4';
- if ($status == 0) $statusType = 'status6';
+ if ($status == 0) {
+ $statusType = 'status6';
+ }
- if (empty($this->labelStatus) || empty($this->labelStatusShort))
- {
+ if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
$this->labelStatus[0] = $langs->trans("ActivityCeased");
$this->labelStatus[1] = $langs->trans("InActivity");
$this->labelStatusShort[0] = $langs->trans("ActivityCeased");
@@ -2559,9 +2554,10 @@ class Societe extends CommonObject
global $langs;
$contact_emails = $this->contact_property_array('email', 1);
- if ($this->email && $addthirdparty)
- {
- if (empty($this->name)) $this->name = $this->nom;
+ if ($this->email && $addthirdparty) {
+ if (empty($this->name)) {
+ $this->name = $this->nom;
+ }
$contact_emails['thirdparty'] = $langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name, 16)." <".$this->email.">";
}
//var_dump($contact_emails)
@@ -2581,9 +2577,10 @@ class Societe extends CommonObject
$contact_phone = $this->contact_property_array('mobile');
- if (!empty($this->phone)) // If a phone of thirdparty is defined, we add it ot mobile of contacts
- {
- if (empty($this->name)) $this->name = $this->nom;
+ if (!empty($this->phone)) { // If a phone of thirdparty is defined, we add it ot mobile of contacts
+ if (empty($this->name)) {
+ $this->name = $this->nom;
+ }
// TODO: Tester si tel non deja present dans tableau contact
$contact_phone['thirdparty'] = $langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name, 16)." <".$this->phone.">";
}
@@ -2612,36 +2609,36 @@ class Societe extends CommonObject
$sql .= " ORDER BY lastname, firstname";
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$nump = $this->db->num_rows($resql);
- if ($nump)
- {
+ if ($nump) {
$sepa = "("; $sepb = ")";
- if ($mode == 'email')
- {
+ if ($mode == 'email') {
//$sepa="<"; $sepb=">";
$sepa = "<"; $sepb = ">";
}
$i = 0;
- while ($i < $nump)
- {
+ while ($i < $nump) {
$obj = $this->db->fetch_object($resql);
- if ($mode == 'email') $property = $obj->email;
- elseif ($mode == 'mobile') $property = $obj->phone_mobile;
- else $property = $obj->$mode;
+ if ($mode == 'email') {
+ $property = $obj->email;
+ } elseif ($mode == 'mobile') {
+ $property = $obj->phone_mobile;
+ } else {
+ $property = $obj->$mode;
+ }
// Show all contact. If hidedisabled is 1, showonly contacts with status = 1
- if ($obj->status == 1 || empty($hidedisabled))
- {
- if (empty($property))
- {
- if ($mode == 'email') $property = $langs->transnoentitiesnoconv("NoEMail");
- elseif ($mode == 'mobile') $property = $langs->transnoentitiesnoconv("NoMobilePhone");
+ if ($obj->status == 1 || empty($hidedisabled)) {
+ if (empty($property)) {
+ if ($mode == 'email') {
+ $property = $langs->transnoentitiesnoconv("NoEMail");
+ } elseif ($mode == 'mobile') {
+ $property = $langs->transnoentitiesnoconv("NoMobilePhone");
+ }
}
- if (!empty($obj->poste))
- {
+ if (!empty($obj->poste)) {
$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).($obj->poste ? " - ".$obj->poste : "").(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
} else {
$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
@@ -2670,14 +2667,11 @@ class Societe extends CommonObject
$sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$nump = $this->db->num_rows($resql);
- if ($nump)
- {
+ if ($nump) {
$i = 0;
- while ($i < $nump)
- {
+ while ($i < $nump) {
$obj = $this->db->fetch_object($resql);
$contacts[$obj->rowid] = dolGetFirstLastname($obj->firstname, $obj->lastname);
$i++;
@@ -2703,14 +2697,11 @@ class Societe extends CommonObject
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$nump = $this->db->num_rows($resql);
- if ($nump)
- {
+ if ($nump) {
$i = 0;
- while ($i < $nump)
- {
+ while ($i < $nump) {
$obj = $this->db->fetch_object($resql);
$contact = new Contact($this->db);
$contact->fetch($obj->rowid);
@@ -2737,23 +2728,26 @@ class Societe extends CommonObject
// phpcs:enable
$contact_property = '';
- if (empty($rowid)) return '';
+ if (empty($rowid)) {
+ return '';
+ }
$sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
$sql .= " FROM ".MAIN_DB_PREFIX."socpeople";
$sql .= " WHERE rowid = ".((int) $rowid);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$nump = $this->db->num_rows($resql);
- if ($nump)
- {
+ if ($nump) {
$obj = $this->db->fetch_object($resql);
- if ($mode == 'email') $contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(","))." <".$obj->email.">";
- elseif ($mode == 'mobile') $contact_property = $obj->phone_mobile;
+ if ($mode == 'email') {
+ $contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(","))." <".$obj->email.">";
+ } elseif ($mode == 'mobile') {
+ $contact_property = $obj->phone_mobile;
+ }
}
return $contact_property;
} else {
@@ -2841,15 +2835,15 @@ class Societe extends CommonObject
{
// phpcs:enable
global $conf;
- if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
- {
+ if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
- foreach ($dirsociete as $dirroot)
- {
+ foreach ($dirsociete as $dirroot) {
$res = dol_include_once($dirroot.$module.'.php');
- if ($res) break;
+ if ($res) {
+ break;
+ }
}
$mod = new $module();
@@ -2873,15 +2867,15 @@ class Societe extends CommonObject
{
// phpcs:enable
global $conf;
- if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
- {
+ if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
- foreach ($dirsociete as $dirroot)
- {
+ foreach ($dirsociete as $dirroot) {
$res = dol_include_once($dirroot.$module.'.php');
- if ($res) break;
+ if ($res) {
+ break;
+ }
}
$mod = new $module();
@@ -2902,23 +2896,29 @@ class Societe extends CommonObject
{
// phpcs:enable
global $conf;
- if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
- {
+ if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
- foreach ($dirsociete as $dirroot)
- {
+ foreach ($dirsociete as $dirroot) {
$res = dol_include_once($dirroot.$module.'.php');
- if ($res) break;
+ if ($res) {
+ break;
+ }
}
$mod = new $module();
dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
- if ($mod->code_modifiable_null && !$this->code_client) return 1;
- if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
- if ($mod->code_modifiable) return 1; // A mettre en dernier
+ if ($mod->code_modifiable_null && !$this->code_client) {
+ return 1;
+ }
+ if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) {
+ return 1;
+ }
+ if ($mod->code_modifiable) {
+ return 1; // A mettre en dernier
+ }
return 0;
} else {
return 0;
@@ -2936,23 +2936,29 @@ class Societe extends CommonObject
{
// phpcs:enable
global $conf;
- if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
- {
+ if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
- foreach ($dirsociete as $dirroot)
- {
+ foreach ($dirsociete as $dirroot) {
$res = dol_include_once($dirroot.$module.'.php');
- if ($res) break;
+ if ($res) {
+ break;
+ }
}
$mod = new $module();
dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
- if ($mod->code_modifiable_null && !$this->code_fournisseur) return 1;
- if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
- if ($mod->code_modifiable) return 1; // A mettre en dernier
+ if ($mod->code_modifiable_null && !$this->code_fournisseur) {
+ return 1;
+ }
+ if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) {
+ return 1;
+ }
+ if ($mod->code_modifiable) {
+ return 1; // A mettre en dernier
+ }
return 0;
} else {
return 0;
@@ -2976,25 +2982,25 @@ class Societe extends CommonObject
{
// phpcs:enable
global $conf;
- if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
- {
+ if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
- foreach ($dirsociete as $dirroot)
- {
+ foreach ($dirsociete as $dirroot) {
$res = dol_include_once($dirroot.$module.'.php');
- if ($res) break;
+ if ($res) {
+ break;
+ }
}
$mod = new $module();
- dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
- $result = $mod->verif($this->db, $this->code_client, $this, 0);
- if ($result) { // If error
- $this->error = $mod->error;
- $this->errors = $mod->errors;
- }
+ dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
+ $result = $mod->verif($this->db, $this->code_client, $this, 0);
+ if ($result) { // If error
+ $this->error = $mod->error;
+ $this->errors = $mod->errors;
+ }
return $result;
} else {
return 0;
@@ -3010,20 +3016,22 @@ class Societe extends CommonObject
* -2 ErrorCustomerCodeRequired
* -3 ErrorCustomerCodeAlreadyUsed
* -4 ErrorPrefixRequired
+ * -5 NotConfigured - Setup empty so any value may be ok or not
+ * -6 Other (see this->error)
*/
public function check_codefournisseur()
{
// phpcs:enable
global $conf;
- if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
- {
+ if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
- foreach ($dirsociete as $dirroot)
- {
+ foreach ($dirsociete as $dirroot) {
$res = dol_include_once($dirroot.$module.'.php');
- if ($res) break;
+ if ($res) {
+ break;
+ }
}
$mod = new $module();
@@ -3054,26 +3062,28 @@ class Societe extends CommonObject
// phpcs:enable
global $conf;
- if (!empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
- {
+ if (!empty($conf->global->SOCIETE_CODECOMPTA_ADDON)) {
$res = false;
$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
- foreach ($dirsociete as $dirroot)
- {
+ foreach ($dirsociete as $dirroot) {
$res = dol_include_once($dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.'.php');
- if ($res) break;
+ if ($res) {
+ break;
+ }
}
- if ($res)
- {
+ if ($res) {
$classname = $conf->global->SOCIETE_CODECOMPTA_ADDON;
$mod = new $classname;
// Set code count in $mod->code
$result = $mod->get_code($this->db, $this, $type);
- if ($type == 'customer') $this->code_compta = $mod->code;
- elseif ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
+ if ($type == 'customer') {
+ $this->code_compta = $mod->code;
+ } elseif ($type == 'supplier') {
+ $this->code_compta_fournisseur = $mod->code;
+ }
return $result;
} else {
@@ -3081,8 +3091,11 @@ class Societe extends CommonObject
return -1;
}
} else {
- if ($type == 'customer') $this->code_compta = '';
- elseif ($type == 'supplier') $this->code_compta_fournisseur = '';
+ if ($type == 'customer') {
+ $this->code_compta = '';
+ } elseif ($type == 'supplier') {
+ $this->code_compta_fournisseur = '';
+ }
return 0;
}
@@ -3098,21 +3111,21 @@ class Societe extends CommonObject
public function set_parent($id)
{
// phpcs:enable
- if ($this->id)
- {
+ if ($this->id) {
$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
$sql .= " SET parent = ".($id > 0 ? $id : "null");
$sql .= " WHERE rowid = ".$this->id;
dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$this->parent = $id;
return 1;
} else {
return -1;
}
- } else return -1;
+ } else {
+ return -1;
+ }
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3127,8 +3140,7 @@ class Societe extends CommonObject
// phpcs:enable
global $conf;
- switch ($idprof)
- {
+ switch ($idprof) {
case 1:
$ret = (empty($conf->global->SOCIETE_IDPROF1_UNIQUE) ? false : true);
break;
@@ -3168,8 +3180,7 @@ class Societe extends CommonObject
// phpcs:enable
$field = $idprof;
- switch ($idprof) // For backward compatibility
- {
+ switch ($idprof) { // For backward compatibility
case '1':
case 'idprof1':
$field = "siren";
@@ -3192,14 +3203,15 @@ class Societe extends CommonObject
case '6':
$field = "idprof6";
break;
- }
+ }
//Verify duplicate entries
$sql = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$this->db->escape($value)."' AND entity IN (".getEntity('societe').")";
- if ($socid) $sql .= " AND rowid <> ".$socid;
+ if ($socid) {
+ $sql .= " AND rowid <> ".$socid;
+ }
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$obj = $this->db->fetch_object($resql);
$count = $obj->idprof;
} else {
@@ -3208,8 +3220,11 @@ class Societe extends CommonObject
}
$this->db->free($resql);
- if ($count > 0) return true;
- else return false;
+ if ($count > 0) {
+ return true;
+ } else {
+ return false;
+ }
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3228,111 +3243,144 @@ class Societe extends CommonObject
$ok = 1;
- if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
+ if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+ return 1;
+ }
// Check SIREN if country FR
- if ($idprof == 1 && $soc->country_code == 'FR')
- {
+ if ($idprof == 1 && $soc->country_code == 'FR') {
$chaine = trim($this->idprof1);
$chaine = preg_replace('/(\s)/', '', $chaine);
- if (!is_numeric($chaine)) return -1;
- if (dol_strlen($chaine) != 9) return -1;
+ if (!is_numeric($chaine)) {
+ return -1;
+ }
+ if (dol_strlen($chaine) != 9) {
+ return -1;
+ }
// on prend chaque chiffre un par un
// si son index (position dans la chaîne en commence à 0 au premier caractère) est impair
// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
// on ajoute cette valeur à la somme totale
$sum = 0;
- for ($index = 0; $index < 9; $index++)
- {
+ for ($index = 0; $index < 9; $index++) {
$number = (int) $chaine[$index];
- if (($index % 2) != 0) { if (($number *= 2) > 9) $number -= 9; }
+ if (($index % 2) != 0) {
+ if (($number *= 2) > 9) {
+ $number -= 9;
+ }
+ }
$sum += $number;
}
// le numéro est valide si la somme des chiffres est multiple de 10
- if (($sum % 10) != 0) return -1;
+ if (($sum % 10) != 0) {
+ return -1;
+ }
}
// Verifie SIRET si pays FR
- if ($idprof == 2 && $soc->country_code == 'FR')
- {
+ if ($idprof == 2 && $soc->country_code == 'FR') {
$chaine = trim($this->idprof2);
$chaine = preg_replace('/(\s)/', '', $chaine);
- if (!is_numeric($chaine)) return -1;
- if (dol_strlen($chaine) != 14) return -1;
+ if (!is_numeric($chaine)) {
+ return -1;
+ }
+ if (dol_strlen($chaine) != 14) {
+ return -1;
+ }
// on prend chaque chiffre un par un
// si son index (position dans la chaîne en commence à 0 au premier caractère) est pair
// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
// on ajoute cette valeur à la somme totale
$sum = 0;
- for ($index = 0; $index < 14; $index++)
- {
+ for ($index = 0; $index < 14; $index++) {
$number = (int) $chaine[$index];
- if (($index % 2) == 0) { if (($number *= 2) > 9) $number -= 9; }
+ if (($index % 2) == 0) {
+ if (($number *= 2) > 9) {
+ $number -= 9;
+ }
+ }
$sum += $number;
}
// le numéro est valide si la somme des chiffres est multiple de 10
- if (($sum % 10) != 0) return -1;
+ if (($sum % 10) != 0) {
+ return -1;
+ }
}
//Verify CIF/NIF/NIE if pays ES
//Returns: 1 if NIF ok, 2 if CIF ok, 3 if NIE ok, -1 if NIF bad, -2 if CIF bad, -3 if NIE bad, 0 if unexpected bad
- if ($idprof == 1 && $soc->country_code == 'ES')
- {
+ if ($idprof == 1 && $soc->country_code == 'ES') {
$string = trim($this->idprof1);
$string = preg_replace('/(\s)/', '', $string);
$string = strtoupper($string);
//Check format
- if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string))
- return 0;
+ if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string)) {
+ return 0;
+ }
$num = array();
- for ($i = 0; $i < 9; $i++)
- {
+ for ($i = 0; $i < 9; $i++) {
$num[$i] = substr($string, $i, 1);
}
//Check NIF
- if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
- if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
+ if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string)) {
+ if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1)) {
return 1;
- else return -1;
+ } else {
+ return -1;
+ }
+ }
//algorithm checking type code CIF
$sum = $num[2] + $num[4] + $num[6];
- for ($i = 1; $i < 8; $i += 2)
- $sum += intval(substr((2 * $num[$i]), 0, 1)) + intval(substr((2 * $num[$i]), 1, 1));
+ for ($i = 1; $i < 8; $i += 2) {
+ $sum += intval(substr((2 * $num[$i]), 0, 1)) + intval(substr((2 * $num[$i]), 1, 1));
+ }
$n = 10 - substr($sum, strlen($sum) - 1, 1);
//Chek special NIF
- if (preg_match('/^[KLM]{1}/', $string))
- if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
+ if (preg_match('/^[KLM]{1}/', $string)) {
+ if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1)) {
return 1;
- else return -1;
+ } else {
+ return -1;
+ }
+ }
//Check CIF
- if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
- if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
+ if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string)) {
+ if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1)) {
return 2;
- else return -2;
+ } else {
+ return -2;
+ }
+ }
//Check NIE T
- if (preg_match('/^[T]{1}/', $string))
- if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
+ if (preg_match('/^[T]{1}/', $string)) {
+ if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string)) {
return 3;
- else return -3;
+ } else {
+ return -3;
+ }
+ }
//Check NIE XYZ
- if (preg_match('/^[XYZ]{1}/', $string))
- if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X', 'Y', 'Z'), array('0', '1', '2'), $string), 0, 8) % 23, 1))
+ if (preg_match('/^[XYZ]{1}/', $string)) {
+ if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X', 'Y', 'Z'), array('0', '1', '2'), $string), 0, 8) % 23, 1)) {
return 3;
- else return -3;
+ } else {
+ return -3;
+ }
+ }
//Can not be verified
return -4;
@@ -3340,8 +3388,7 @@ class Societe extends CommonObject
//Verify NIF if country is PT
//Returns: 1 if NIF ok, -1 if NIF bad, 0 if unexpected bad
- if ($idprof == 1 && $soc->country_code == 'PT')
- {
+ if ($idprof == 1 && $soc->country_code == 'PT') {
$string = trim($this->idprof1);
$string = preg_replace('/(\s)/', '', $string);
@@ -3420,8 +3467,7 @@ class Societe extends CommonObject
// phpcs:enable
$sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = '.$this->id;
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$obj = $this->db->fetch_object($resql);
$count = $obj->numproj;
} else {
@@ -3447,10 +3493,8 @@ class Societe extends CommonObject
$sql .= " WHERE s.rowid = ".$id;
$result = $this->db->query($sql);
- if ($result)
- {
- if ($this->db->num_rows($result))
- {
+ if ($result) {
+ if ($this->db->num_rows($result)) {
$obj = $this->db->fetch_object($result);
$this->id = $obj->rowid;
@@ -3493,11 +3537,13 @@ class Societe extends CommonObject
$isacompany = 1;
} elseif (!empty($this->idprof1) || !empty($this->idprof2) || !empty($this->idprof3) || !empty($this->idprof4) || !empty($this->idprof5) || !empty($this->idprof6)) {
$isacompany = 1;
- } elseif (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
- {
+ } elseif (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN') {
// TODO Add a field is_a_company into dictionary
- if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany = 0;
- else $isacompany = 1;
+ if (preg_match('/^TE_PRIVATE/', $this->typent_code)) {
+ $isacompany = 0;
+ } else {
+ $isacompany = 1;
+ }
}
return $isacompany;
@@ -3529,10 +3575,8 @@ class Societe extends CommonObject
$sql .= " WHERE type = ".Categorie::TYPE_SUPPLIER;
$resql = $this->db->query($sql);
- if ($resql)
- {
- while ($obj = $this->db->fetch_object($resql))
- {
+ if ($resql) {
+ while ($obj = $this->db->fetch_object($resql)) {
$this->SupplierCategories[$obj->rowid] = $obj->label;
}
return 0;
@@ -3551,12 +3595,13 @@ class Societe extends CommonObject
public function AddFournisseurInCategory($categorie_id)
{
// phpcs:enable
- if ($categorie_id > 0 && $this->id > 0)
- {
+ if ($categorie_id > 0 && $this->id > 0) {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
$sql .= " VALUES (".$categorie_id.", ".$this->id.")";
- if ($resql = $this->db->query($sql)) return 0;
+ if ($resql = $this->db->query($sql)) {
+ return 0;
+ }
} else {
return 0;
}
@@ -3582,7 +3627,9 @@ class Societe extends CommonObject
dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
$name = $socname ? $socname : $member->societe;
- if (empty($name)) $name = $member->getFullName($langs);
+ if (empty($name)) {
+ $name = $member->getFullName($langs);
+ }
$alias = $socalias ? $socalias : '';
@@ -3608,15 +3655,13 @@ class Societe extends CommonObject
// Cree et positionne $this->id
$result = $this->create($user);
- if ($result >= 0)
- {
+ if ($result >= 0) {
$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
$sql .= " SET fk_soc=".$this->id;
$sql .= " WHERE rowid=".$member->id;
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$this->db->commit();
return $this->id;
} else {
@@ -3658,12 +3703,10 @@ class Societe extends CommonObject
// We define country_id, country_code and country
$country_id = $country_code = $country_label = '';
- if (!empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
- {
+ if (!empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) {
$tmp = explode(':', $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
$country_id = $tmp[0];
- if (!empty($tmp[1])) // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
- {
+ if (!empty($tmp[1])) { // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
$country_code = $tmp[1];
$country_label = $tmp[2];
} else // For backward compatibility
@@ -3677,17 +3720,17 @@ class Societe extends CommonObject
$this->country_id = $country_id;
$this->country_code = $country_code;
$this->country = $country_label;
- if (is_object($langs)) $this->country = ($langs->trans('Country'.$country_code) != 'Country'.$country_code) ? $langs->trans('Country'.$country_code) : $country_label;
+ if (is_object($langs)) {
+ $this->country = ($langs->trans('Country'.$country_code) != 'Country'.$country_code) ? $langs->trans('Country'.$country_code) : $country_label;
+ }
//TODO This could be replicated for region but function `getRegion` didn't exist, so I didn't added it.
// We define state_id, state_code and state
$state_id = 0; $state_code = $state_label = '';
- if (!empty($conf->global->MAIN_INFO_SOCIETE_STATE))
- {
+ if (!empty($conf->global->MAIN_INFO_SOCIETE_STATE)) {
$tmp = explode(':', $conf->global->MAIN_INFO_SOCIETE_STATE);
$state_id = $tmp[0];
- if (!empty($tmp[1])) // If $conf->global->MAIN_INFO_SOCIETE_STATE is "id:code:label"
- {
+ if (!empty($tmp[1])) { // If $conf->global->MAIN_INFO_SOCIETE_STATE is "id:code:label"
$state_code = $tmp[1];
$state_label = $tmp[2];
} else // For backward compatibility
@@ -3701,7 +3744,9 @@ class Societe extends CommonObject
$this->state_id = $state_id;
$this->state_code = $state_code;
$this->state = $state_label;
- if (is_object($langs)) $this->state = ($langs->trans('State'.$state_code) != 'State'.$state_code) ? $langs->trans('State'.$state_code) : $state_label;
+ if (is_object($langs)) {
+ $this->state = ($langs->trans('State'.$state_code) != 'State'.$state_code) ? $langs->trans('State'.$state_code) : $state_label;
+ }
$this->phone = empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? '' : $conf->global->MAIN_INFO_SOCIETE_TEL;
$this->fax = empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? '' : $conf->global->MAIN_INFO_SOCIETE_FAX;
@@ -3715,12 +3760,24 @@ class Societe extends CommonObject
$this->youtube_url = empty($conf->global->MAIN_INFO_SOCIETE_YOUTUBE_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_YOUTUBE_URL;
$this->github_url = empty($conf->global->MAIN_INFO_SOCIETE_GITHUB_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_GITHUB_URL;
$this->socialnetworks = array();
- if (!empty($this->facebook_url)) $this->socialnetworks['facebook'] = $this->facebook_url;
- if (!empty($this->twitter_url)) $this->socialnetworks['twitter'] = $this->twitter_url;
- if (!empty($this->linkedin_url)) $this->socialnetworks['linkedin'] = $this->linkedin_url;
- if (!empty($this->instagram_url)) $this->socialnetworks['instagram'] = $this->instagram_url;
- if (!empty($this->youtube_url)) $this->socialnetworks['youtube'] = $this->youtube_url;
- if (!empty($this->github_url)) $this->socialnetworks['github'] = $this->github_url;
+ if (!empty($this->facebook_url)) {
+ $this->socialnetworks['facebook'] = $this->facebook_url;
+ }
+ if (!empty($this->twitter_url)) {
+ $this->socialnetworks['twitter'] = $this->twitter_url;
+ }
+ if (!empty($this->linkedin_url)) {
+ $this->socialnetworks['linkedin'] = $this->linkedin_url;
+ }
+ if (!empty($this->instagram_url)) {
+ $this->socialnetworks['instagram'] = $this->instagram_url;
+ }
+ if (!empty($this->youtube_url)) {
+ $this->socialnetworks['youtube'] = $this->youtube_url;
+ }
+ if (!empty($this->github_url)) {
+ $this->socialnetworks['github'] = $this->github_url;
+ }
// Id prof generiques
$this->idprof1 = empty($conf->global->MAIN_INFO_SIREN) ? '' : $conf->global->MAIN_INFO_SIREN;
@@ -3820,15 +3877,20 @@ class Societe extends CommonObject
$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
$sql .= " AND t.active = 1";
- if (empty($localTaxNum)) $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
- elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
- elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
+ if (empty($localTaxNum)) {
+ $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
+ } elseif ($localTaxNum == 1) {
+ $sql .= " AND t.localtax1_type <> '0'";
+ } elseif ($localTaxNum == 2) {
+ $sql .= " AND t.localtax2_type <> '0'";
+ }
$resql = $this->db->query($sql);
- if ($resql)
- {
- return ($this->db->num_rows($resql) > 0);
- } else return false;
+ if ($resql) {
+ return ($this->db->num_rows($resql) > 0);
+ } else {
+ return false;
+ }
}
/**
@@ -3845,10 +3907,11 @@ class Societe extends CommonObject
dol_syslog("useNPR", LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
return ($this->db->num_rows($resql) > 0);
- } else return false;
+ } else {
+ return false;
+ }
}
/**
@@ -3866,10 +3929,9 @@ class Societe extends CommonObject
dol_syslog("useRevenueStamp", LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$obj = $this->db->fetch_object($resql);
- return (($obj->nb > 0) ?true:false);
+ return (($obj->nb > 0) ?true:false);
} else {
$this->error = $this->db->lasterror();
return false;
@@ -3900,8 +3962,7 @@ class Societe extends CommonObject
$lib = $langs->trans("ProspectLevel".$fk_prospectlevel);
// If lib not found in language file, we get label from cache/databse
- if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel))
- {
+ if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel)) {
$lib = $langs->getLabelFromKey($this->db, $fk_prospectlevel, 'c_prospectlevel', 'code', 'label');
}
return $lib;
@@ -3955,30 +4016,45 @@ class Societe extends CommonObject
$langs->load('customers');
if ($mode == 2) {
- if ($status == '-1' || $status == 'ST_NO') return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
- elseif ($status == '0' || $status == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
- elseif ($status == '1' || $status == 'ST_TODO') return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
- elseif ($status == '2' || $status == 'ST_PEND') return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
- elseif ($status == '3' || $status == 'ST_DONE') return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
- else {
+ if ($status == '-1' || $status == 'ST_NO') {
+ return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
+ } elseif ($status == '0' || $status == 'ST_NEVER') {
+ return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
+ } elseif ($status == '1' || $status == 'ST_TODO') {
+ return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
+ } elseif ($status == '2' || $status == 'ST_PEND') {
+ return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
+ } elseif ($status == '3' || $status == 'ST_DONE') {
+ return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
+ } else {
return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto).' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
}
} elseif ($mode == 3) {
- if ($status == '-1' || $status == 'ST_NO') return img_action($langs->trans("StatusProspect-1"), -1, $picto);
- elseif ($status == '0' || $status == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto);
- elseif ($status == '1' || $status == 'ST_TODO') return img_action($langs->trans("StatusProspect1"), 1, $picto);
- elseif ($status == '2' || $status == 'ST_PEND') return img_action($langs->trans("StatusProspect2"), 2, $picto);
- elseif ($status == '3' || $status == 'ST_DONE') return img_action($langs->trans("StatusProspect3"), 3, $picto);
- else {
+ if ($status == '-1' || $status == 'ST_NO') {
+ return img_action($langs->trans("StatusProspect-1"), -1, $picto);
+ } elseif ($status == '0' || $status == 'ST_NEVER') {
+ return img_action($langs->trans("StatusProspect0"), 0, $picto);
+ } elseif ($status == '1' || $status == 'ST_TODO') {
+ return img_action($langs->trans("StatusProspect1"), 1, $picto);
+ } elseif ($status == '2' || $status == 'ST_PEND') {
+ return img_action($langs->trans("StatusProspect2"), 2, $picto);
+ } elseif ($status == '3' || $status == 'ST_DONE') {
+ return img_action($langs->trans("StatusProspect3"), 3, $picto);
+ } else {
return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto);
}
} elseif ($mode == 4) {
- if ($status == '-1' || $status == 'ST_NO') return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
- elseif ($status == '0' || $status == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
- elseif ($status == '1' || $status == 'ST_TODO') return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
- elseif ($status == '2' || $status == 'ST_PEND') return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
- elseif ($status == '3' || $status == 'ST_DONE') return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
- else {
+ if ($status == '-1' || $status == 'ST_NO') {
+ return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
+ } elseif ($status == '0' || $status == 'ST_NEVER') {
+ return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
+ } elseif ($status == '1' || $status == 'ST_TODO') {
+ return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
+ } elseif ($status == '2' || $status == 'ST_PEND') {
+ return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
+ } elseif ($status == '3' || $status == 'ST_DONE') {
+ return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
+ } else {
return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto).' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
}
}
@@ -4009,7 +4085,9 @@ class Societe extends CommonObject
public function getOutstandingProposals($mode = 'customer')
{
$table = 'propal';
- if ($mode == 'supplier') $table = 'supplier_proposal';
+ if ($mode == 'supplier') {
+ $table = 'supplier_proposal';
+ }
$sql = "SELECT rowid, total_ht, total as total_ttc, fk_statut as status FROM ".MAIN_DB_PREFIX.$table." as f";
$sql .= " WHERE fk_soc = ".$this->id;
@@ -4021,21 +4099,22 @@ class Societe extends CommonObject
dol_syslog("getOutstandingProposals", LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$outstandingOpened = 0;
$outstandingTotal = 0;
$outstandingTotalIncTax = 0;
while ($obj = $this->db->fetch_object($resql)) {
$outstandingTotal += $obj->total_ht;
$outstandingTotalIncTax += $obj->total_ttc;
- if ($obj->status != 0) // Not a draft
- {
+ if ($obj->status != 0) {
+ // Not a draft
$outstandingOpened += $obj->total_ttc;
}
}
return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
- } else return array();
+ } else {
+ return array();
+ }
}
/**
@@ -4047,7 +4126,9 @@ class Societe extends CommonObject
public function getOutstandingOrders($mode = 'customer')
{
$table = 'commande';
- if ($mode == 'supplier') $table = 'commande_fournisseur';
+ if ($mode == 'supplier') {
+ $table = 'commande_fournisseur';
+ }
$sql = "SELECT rowid, total_ht, total_ttc, fk_statut as status FROM ".MAIN_DB_PREFIX.$table." as f";
$sql .= " WHERE fk_soc = ".$this->id;
@@ -4059,21 +4140,22 @@ class Societe extends CommonObject
dol_syslog("getOutstandingOrders", LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$outstandingOpened = 0;
$outstandingTotal = 0;
$outstandingTotalIncTax = 0;
while ($obj = $this->db->fetch_object($resql)) {
$outstandingTotal += $obj->total_ht;
$outstandingTotalIncTax += $obj->total_ttc;
- if ($obj->status != 0) // Not a draft
- {
+ if ($obj->status != 0) {
+ // Not a draft
$outstandingOpened += $obj->total_ttc;
}
}
return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
- } else return array();
+ } else {
+ return array();
+ }
}
/**
@@ -4086,7 +4168,9 @@ class Societe extends CommonObject
public function getOutstandingBills($mode = 'customer', $late = 0)
{
$table = 'facture';
- if ($mode == 'supplier') $table = 'facture_fourn';
+ if ($mode == 'supplier') {
+ $table = 'facture_fourn';
+ }
/* Accurate value of remain to pay is to sum remaintopay for each invoice
$paiement = $invoice->getSommePaiement();
@@ -4095,8 +4179,11 @@ class Societe extends CommonObject
$alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
$remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
*/
- if ($mode == 'supplier') $sql = "SELECT rowid, total_ht as total_ht, total_ttc, paye, type, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
- else $sql = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+ if ($mode == 'supplier') {
+ $sql = "SELECT rowid, total_ht as total_ht, total_ttc, paye, type, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+ } else {
+ $sql = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+ }
$sql .= " WHERE fk_soc = ".$this->id;
if (!empty($late)) {
$sql .= " AND date_lim_reglement < '".$this->db->idate(dol_now())."'";
@@ -4109,13 +4196,11 @@ class Societe extends CommonObject
dol_syslog("getOutstandingBills", LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$outstandingOpened = 0;
$outstandingTotal = 0;
$outstandingTotalIncTax = 0;
- if ($mode == 'supplier')
- {
+ if ($mode == 'supplier') {
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
$tmpobject = new FactureFournisseur($this->db);
} else {
@@ -4127,17 +4212,15 @@ class Societe extends CommonObject
if ($obj->status != $tmpobject::STATUS_DRAFT // Not a draft
&& !($obj->status == $tmpobject::STATUS_ABANDONED && $obj->close_code == 'replaced') // Not a replaced invoice
- )
- {
+ ) {
$outstandingTotal += $obj->total_ht;
$outstandingTotalIncTax += $obj->total_ttc;
}
if ($obj->paye == 0
&& $obj->status != $tmpobject::STATUS_DRAFT // Not a draft
&& $obj->status != $tmpobject::STATUS_ABANDONED // Not abandonned
- && $obj->status != $tmpobject::STATUS_CLOSED) // Not classified as paid
- //$sql .= " AND (status <> 3 OR close_code <> 'abandon')"; // Not abandonned for undefined reason
- {
+ && $obj->status != $tmpobject::STATUS_CLOSED) { // Not classified as paid
+ //$sql .= " AND (status <> 3 OR close_code <> 'abandon')"; // Not abandonned for undefined reason
$paiement = $tmpobject->getSommePaiement();
$creditnotes = $tmpobject->getSumCreditNotesUsed();
$deposits = $tmpobject->getSumDepositsUsed();
@@ -4147,8 +4230,7 @@ class Societe extends CommonObject
//if credit note is converted but not used
// TODO Do this also for customer ?
- if ($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE && $tmpobject->isCreditNoteUsed())
- {
+ if ($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE && $tmpobject->isCreditNoteUsed()) {
$outstandingOpened -= $tmpobject->getSumFromThisCreditNotesNotUsed();
}
}
@@ -4181,10 +4263,15 @@ class Societe extends CommonObject
global $langs;
$langs->load('companies');
- if ($status == 0) return $langs->trans("NorProspectNorCustomer");
- elseif ($status == 1) return $langs->trans("Customer");
- elseif ($status == 2) return $langs->trans("Prospect");
- elseif ($status == 3) return $langs->trans("ProspectCustomer");
+ if ($status == 0) {
+ return $langs->trans("NorProspectNorCustomer");
+ } elseif ($status == 1) {
+ return $langs->trans("Customer");
+ } elseif ($status == 2) {
+ return $langs->trans("Prospect");
+ } elseif ($status == 3) {
+ return $langs->trans("ProspectCustomer");
+ }
}
@@ -4203,21 +4290,20 @@ class Societe extends CommonObject
{
global $conf, $user, $langs;
- if (!empty($moreparams) && !empty($moreparams['use_companybankid']))
- {
+ if (!empty($moreparams) && !empty($moreparams['use_companybankid'])) {
$modelpath = "core/modules/bank/doc/";
include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
$companybankaccount = new CompanyBankAccount($this->db);
$result = $companybankaccount->fetch($moreparams['use_companybankid']);
- if (!$result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+ if (!$result) {
+ dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+ }
$result = $companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
} else {
// Positionne le modele sur le nom du modele a utiliser
- if (!dol_strlen($modele))
- {
- if (!empty($conf->global->COMPANY_ADDON_PDF))
- {
+ if (!dol_strlen($modele)) {
+ if (!empty($conf->global->COMPANY_ADDON_PDF)) {
$modele = $conf->global->COMPANY_ADDON_PDF;
} else {
print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
@@ -4293,11 +4379,9 @@ class Societe extends CommonObject
}
}
foreach ($to_add as $add) {
- if ($c->fetch($add) > 0)
- {
+ if ($c->fetch($add) > 0) {
$result = $c->add_type($this, $type_categ);
- if ($result < 0)
- {
+ if ($result < 0) {
$error++;
$this->error = $c->error;
$this->errors = $c->errors;
@@ -4325,7 +4409,6 @@ class Societe extends CommonObject
$salesrep = array($salesrep);
}
-
$to_del = array(); // Nothing to delete
$to_add = $salesrep;
if ($onlyAdd === false) {
@@ -4347,8 +4430,7 @@ class Societe extends CommonObject
}
foreach ($to_add as $add) {
$result = $this->add_commercial($user, $add);
- if ($result < 0)
- {
+ if ($result < 0) {
$error++;
break;
}
@@ -4365,22 +4447,22 @@ class Societe extends CommonObject
*/
public function setThirdpartyType($typent_id)
{
- if ($this->id)
- {
+ if ($this->id) {
$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
$sql .= " SET fk_typent = ".($typent_id > 0 ? $typent_id : "null");
$sql .= " WHERE rowid = ".$this->id;
dol_syslog(get_class($this).'::setThirdpartyType', LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$this->typent_id = $typent_id;
- $this->typent_code = dol_getIdFromCode($db, $this->$typent_id, 'c_typent', 'id', 'code');
+ $this->typent_code = dol_getIdFromCode($this->db, $this->$typent_id, 'c_typent', 'id', 'code');
return 1;
} else {
return -1;
}
- } else return -1;
+ } else {
+ return -1;
+ }
}
/**
@@ -4394,8 +4476,7 @@ class Societe extends CommonObject
*/
public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
{
- if ($origin_id == $dest_id)
- {
+ if ($origin_id == $dest_id) {
dol_syslog('Error: Try to merge a thirdparty into itself');
return false;
}
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index ae40784aa68..a571a207bc5 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -540,24 +540,24 @@ if (empty($reshook))
// Set if we used free entry or predefined product
$predef = '';
- $product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
+ $product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
$ref_supplier = GETPOST('fourn_ref', 'alpha');
$prod_entry_mode = GETPOST('prod_entry_mode');
if ($prod_entry_mode == 'free') {
$idprod = 0;
- $price_ht = GETPOST('price_ht');
+ $price_ht = price2num(GETPOST('price_ht'), 'MU');
$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
} else {
$idprod = GETPOST('idprod', 'int');
- $price_ht = GETPOST('price_ht');
+ $price_ht = price2num(GETPOST('price_ht'), 'MU');
$tva_tx = '';
}
- $qty = GETPOST('qty'.$predef);
+ $qty = price2num(GETPOST('qty'.$predef), 'alpha');
$remise_percent = GETPOST('remise_percent'.$predef);
- $price_ht_devise = GETPOST('multicurrency_price_ht');
+ $price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CR');
// Extrafields
$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 8a74b14095b..a939b95ffca 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -416,10 +416,12 @@ class SupplierProposal extends CommonObject
$qty = price2num($qty);
$pu_ht = price2num($pu_ht);
$pu_ttc = price2num($pu_ttc);
- $txtva = price2num($txtva);
+ if (!preg_match('/\((.*)\)/', $txtva)) {
+ $txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+ }
$txlocaltax1 = price2num($txlocaltax1);
$txlocaltax2 = price2num($txlocaltax2);
- $pa_ht = price2num($pa_ht);
+ $pa_ht = price2num($pa_ht);
if ($price_base_type == 'HT')
{
$pu = $pu_ht;
@@ -673,7 +675,9 @@ class SupplierProposal extends CommonObject
$remise_percent = price2num($remise_percent);
$qty = price2num($qty);
$pu = price2num($pu);
- $txtva = price2num($txtva);
+ if (!preg_match('/\((.*)\)/', $txtva)) {
+ $txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+ }
$txlocaltax1 = price2num($txlocaltax1);
$txlocaltax2 = price2num($txlocaltax2);
$pa_ht = price2num($pa_ht);
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 961168221f6..ec012a8ddcd 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -167,6 +167,7 @@ var pageactions=0;
var place="";
var editaction="qty";
var editnumber="";
+var invoiceid=0;
/*
var app = this;
@@ -483,17 +484,18 @@ function TakeposOrderNotes() {
}
function Refresh() {
- console.log("Refresh");
- $("#poslines").load("invoice.php?place="+place, function() {
+ console.log("Refresh by reloading place="+place+" invoiceid="+invoiceid);
+ $("#poslines").load("invoice.php?place="+place+"&invoiceid="+invoiceid, function() {
//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
});
}
function New() {
// If we go here,it means $conf->global->TAKEPOS_BAR_RESTAURANT is not defined
- console.log("New with place = , js place="+place);
-
invoiceid = $("#invoiceid").val();
+
+ console.log("New with place = , js place="+place+", invoiceid="+invoiceid);
+
$.getJSON('/takepos/ajax/ajax.php?action=getInvoice&id='+invoiceid, function(data) {
var r;
@@ -831,7 +833,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {