lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into entrepotlibelle

Browse Source
This commit is contained in:
Frédéric FRANCE 2020-04-23 14:10:39 +02:00
commit 2098021010
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
50 changed files with 204 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/adherents/class/adherent.class.php
View File

@ -657,7 +657,7 @@ class Adherent extends CommonObject
$action = 'update';
// Actions on extra fields
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0) {
@ -927,14 +927,11 @@ class Adherent extends CommonObject
// Removed extrafields
if (!$error) {
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
$result = $this->deleteExtraFields();
if ($result < 0) {
$error++;
$errorflag = -4;
dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
}
$result = $this->deleteExtraFields();
if ($result < 0) {
$error++;
$errorflag = -4;
dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
}
}

2
htdocs/adherents/class/adherent_type.class.php
View File

@ -409,7 +409,7 @@ class AdherentType extends CommonObject
$action = 'update';
// Actions on extra fields
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)

2
htdocs/asset/class/asset_type.class.php
View File

@ -202,7 +202,7 @@ class AssetType extends CommonObject
$action = 'update';
// Actions on extra fields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (! $error)
{
$result = $this->insertExtraFields();
if ($result < 0)

6
htdocs/categories/class/categorie.class.php
View File

@ -461,7 +461,7 @@ class Categorie extends CommonObject
$action = 'create';
// Actions on extra fields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -553,7 +553,7 @@ class Categorie extends CommonObject
$action = 'update';
// Actions on extra fields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -646,7 +646,7 @@ class Categorie extends CommonObject
}
// Removed extrafields
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->deleteExtraFields();
if ($result < 0)

15
htdocs/comm/action/class/actioncomm.class.php
View File

@ -567,14 +567,11 @@ class ActionComm extends CommonObject
if (!$error)
{
// Actions on extra fields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
$result = $this->insertExtraFields();
if ($result < 0)
{
$error++;
}
}
$result = $this->insertExtraFields();
if ($result < 0)
{
$error++;
}
}
if (!$error && !$notrigger)
@ -1048,7 +1045,7 @@ class ActionComm extends CommonObject
$action = 'update';
// Actions on extra fields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)

2
htdocs/comm/propal/card.php
View File

@ -511,7 +511,7 @@ if (empty($reshook))
}
// Extrafields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
if (method_exists($lines[$i], 'fetch_optionals')) {
$lines[$i]->fetch_optionals();
$array_options = $lines[$i]->array_options;
}

30
htdocs/comm/propal/class/propal.class.php
View File

@ -1253,13 +1253,10 @@ class Propal extends CommonObject
// Actions on extra fields
if (!$error)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
$result = $this->insertExtraFields();
if ($result < 0)
{
$result = $this->insertExtraFields();
if ($result < 0)
{
$error++;
}
$error++;
}
}
@ -1683,7 +1680,7 @@ class Propal extends CommonObject
$error++; $this->errors[] = "Error ".$this->db->lasterror();
}
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0)
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -3053,15 +3050,12 @@ class Propal extends CommonObject
// Removed extrafields
if (!$error)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
$result = $this->deleteExtraFields();
if ($result < 0)
{
$result = $this->deleteExtraFields();
if ($result < 0)
{
$error++;
$errorflag = -4;
dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
}
$error++;
$errorflag = -4;
dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
}
}
@ -4152,7 +4146,7 @@ class PropaleLigne extends CommonObjectLine
{
$this->rowid = $this->db->last_insert_id(MAIN_DB_PREFIX.'propaldet');
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$this->id = $this->rowid;
$result = $this->insertExtraFields();
@ -4204,7 +4198,7 @@ class PropaleLigne extends CommonObjectLine
if ($this->db->query($sql))
{
// Remove extrafields
if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
if (!$error)
{
$this->id = $this->rowid;
$result = $this->deleteExtraFields();
@ -4334,7 +4328,7 @@ class PropaleLigne extends CommonObjectLine
$resql = $this->db->query($sql);
if ($resql)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$this->id = $this->rowid;
$result = $this->insertExtraFields();

2
htdocs/commande/card.php
View File

@ -384,7 +384,7 @@ if (empty($reshook))
}
// Extrafields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) // For avoid conflicts if trigger used
if (method_exists($lines[$i], 'fetch_optionals')) // For avoid conflicts if trigger used
{
$lines[$i]->fetch_optionals();
$array_options = $lines[$i]->array_options;

19
htdocs/commande/class/commande.class.php
View File

@ -3342,7 +3342,7 @@ class Commande extends CommonOrder
$error++; $this->errors[] = "Error ".$this->db->lasterror();
}
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0)
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -3437,14 +3437,11 @@ class Commande extends CommonOrder
if (!$error)
{
// Remove extrafields
if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
$result = $this->deleteExtraFields();
if ($result < 0)
{
$result = $this->deleteExtraFields();
if ($result < 0)
{
$error++;
dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
}
$error++;
dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
}
}
@ -4255,7 +4252,7 @@ class OrderLine extends CommonOrderLine
if ($resql)
{
// Remove extrafields
if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
if (!$error)
{
$this->id = $this->rowid;
$result = $this->deleteExtraFields();
@ -4401,7 +4398,7 @@ class OrderLine extends CommonOrderLine
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'commandedet');
$this->rowid = $this->id;
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -4534,7 +4531,7 @@ class OrderLine extends CommonOrderLine
$resql = $this->db->query($sql);
if ($resql)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$this->id = $this->rowid;
$result = $this->insertExtraFields();

2
htdocs/commande/orderstoinvoice.php
View File

@ -285,7 +285,7 @@ if (($action == 'create' || $action == 'add') && !$error)
}
// Extrafields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
if (method_exists($lines[$i], 'fetch_optionals')) {
$lines[$i]->fetch_optionals();
$array_options = $lines[$i]->array_options;
}

11
htdocs/compta/bank/class/account.class.php
View File

@ -823,13 +823,10 @@ class Account extends CommonObject
if ($result)
{
// Actions on extra fields (by external module or standard code)
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0) $error++;
}
$result = $this->insertExtraFields();
if ($result < 0) $error++;
}
if (!$error && !$notrigger)
@ -1107,7 +1104,7 @@ class Account extends CommonObject
if ($result)
{
// Remove extrafields
if ((empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->deleteExtraFields();
if ($result < 0)

4
htdocs/compta/facture/card.php
View File

@ -1146,7 +1146,7 @@ if (empty($reshook))
foreach ($facture_source->lines as $line)
{
// Extrafields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($line, 'fetch_optionals')) {
if (method_exists($line, 'fetch_optionals')) {
// load extrafields
$line->fetch_optionals();
}
@ -1644,7 +1644,7 @@ if (empty($reshook))
}
// Extrafields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
if (method_exists($lines[$i], 'fetch_optionals')) {
$lines[$i]->fetch_optionals();
$array_options = $lines[$i]->array_options;
}

6
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -342,7 +342,7 @@ class FactureRec extends CommonInvoice
if ($objectline->fetch($result_insert))
{
// Extrafields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($facsrc->lines[$i], 'fetch_optionals')) {
if (method_exists($facsrc->lines[$i], 'fetch_optionals')) {
$facsrc->lines[$i]->fetch_optionals($facsrc->lines[$i]->rowid);
$objectline->array_options = $facsrc->lines[$i]->array_options;
}
@ -438,7 +438,7 @@ class FactureRec extends CommonInvoice
$resql = $this->db->query($sql);
if ($resql)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -2112,7 +2112,7 @@ class FactureLigneRec extends CommonInvoiceLine
$resql = $this->db->query($sql);
if ($resql)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)

6
htdocs/compta/facture/class/facture.class.php
View File

@ -1881,7 +1881,7 @@ class Facture extends CommonInvoice
$error++; $this->errors[] = "Error ".$this->db->lasterror();
}
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0)
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -5237,7 +5237,7 @@ class FactureLigne extends CommonInvoiceLine
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'facturedet');
$this->rowid = $this->id; // For backward compatibility
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -5423,7 +5423,7 @@ class FactureLigne extends CommonInvoiceLine
$resql = $this->db->query($sql);
if ($resql)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$this->id = $this->rowid;
$result = $this->insertExtraFields();

4
htdocs/contact/class/contact.class.php
View File

@ -489,7 +489,7 @@ class Contact extends CommonObject
$action = 'update';
// Actions on extra fields
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -1168,7 +1168,7 @@ class Contact extends CommonObject
}
// Removed extrafields
if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) {
if (!$error) {
// For avoid conflicts if trigger used
$result = $this->deleteExtraFields();
if ($result < 0) $error++;

2
htdocs/contrat/card.php
View File

@ -316,7 +316,7 @@ if (empty($reshook))
// Extrafields
$array_options = array();
// For avoid conflicts if trigger used
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
if (method_exists($lines[$i], 'fetch_optionals')) {
$lines[$i]->fetch_optionals();
$array_options = $lines[$i]->array_options;
}

31
htdocs/contrat/class/contrat.class.php
View File

@ -1035,7 +1035,7 @@ class Contrat extends CommonObject
}
}
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -1383,7 +1383,7 @@ class Contrat extends CommonObject
$resql = $this->db->query($sql);
if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0)
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -1588,7 +1588,7 @@ class Contrat extends CommonObject
{
$contractlineid = $this->db->last_insert_id(MAIN_DB_PREFIX."contratdet");
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
if (!$error)
{
$contractline = new ContratLigne($this->db);
$contractline->array_options = $array_options;
@ -1777,7 +1777,7 @@ class Contrat extends CommonObject
$result = $this->update_statut($user);
if ($result >= 0)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
if (is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
{
$contractline = new ContratLigne($this->db);
$contractline->fetch($rowid);
@ -1859,18 +1859,15 @@ class Contrat extends CommonObject
$error++;
}
if (empty($error)) {
if (!$error) {
// Remove extrafields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
$contractline = new ContratLigne($this->db);
$contractline->id = $idline;
$result = $contractline->deleteExtraFields();
if ($result < 0)
{
$contractline = new ContratLigne($this->db);
$contractline->id = $idline;
$result = $contractline->deleteExtraFields();
if ($result < 0)
{
$error++;
$this->error = "Error ".get_class($this)."::deleteline deleteExtraFields error -4 ".$contractline->error;
}
$error++;
$this->error = "Error ".get_class($this)."::deleteline deleteExtraFields error -4 ".$contractline->error;
}
}
@ -3092,7 +3089,7 @@ class ContratLigne extends CommonObjectLine
$error++;
}
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0) // For avoid conflicts if trigger used
if (!$error) // For avoid conflicts if trigger used
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -3202,6 +3199,8 @@ class ContratLigne extends CommonObjectLine
{
global $conf, $user;
$error = 0;
// Insertion dans la base
$sql = "INSERT INTO ".MAIN_DB_PREFIX."contratdet";
$sql .= " (fk_contrat, label, description, fk_product, qty, vat_src_code, tva_tx,";
@ -3240,7 +3239,7 @@ class ContratLigne extends CommonObjectLine
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'contratdet');
// Insert of extrafields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)

2
htdocs/core/actions_massactions.inc.php
View File

@ -751,7 +751,7 @@ if ($massaction == 'confirm_createbills') // Create bills from orders
}
// Extrafields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
if (method_exists($lines[$i], 'fetch_optionals')) {
$lines[$i]->fetch_optionals();
$array_options = $lines[$i]->array_options;
}

21
htdocs/core/class/commonobject.class.php
View File

@ -5351,9 +5351,14 @@ abstract class CommonObject
* Delete all extra fields values for the current object.
*
* @return int <0 if KO, >0 if OK
* @see deleteExtraLanguages(), insertExtraField(), updateExtraField(), setValueFrom()
*/
public function deleteExtraFields()
{
global $conf;
if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;
$this->db->begin();
$table_element = $this->table_element;
@ -5383,18 +5388,18 @@ abstract class CommonObject
* @param string $trigger If defined, call also the trigger (for example COMPANY_MODIFY)
* @param User $userused Object user
* @return int -1=error, O=did nothing, 1=OK
* @see insertExtraLanguages(), updateExtraField(), setValueFrom()
* @see insertExtraLanguages(), updateExtraField(), deleteExtraField(), setValueFrom()
*/
public function insertExtraFields($trigger = '', $userused = null)
{
global $conf, $langs, $user;
if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;
if (empty($userused)) $userused = $user;
$error = 0;
if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0; // For avoid conflicts if trigger used
if (!empty($this->array_options))
{
// Check parameters
@ -5792,18 +5797,18 @@ abstract class CommonObject
* @param string $trigger If defined, call also the trigger (for example COMPANY_MODIFY)
* @param User $userused Object user
* @return int -1=error, O=did nothing, 1=OK
* @see updateExtraLanguages(), setValueFrom(), insertExtraFields()
* @see updateExtraLanguages(), insertExtraFields(), deleteExtraFields(), setValueFrom()
*/
public function updateExtraField($key, $trigger = null, $userused = null)
{
global $conf, $langs, $user;
if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;
if (empty($userused)) $userused = $user;
$error = 0;
if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0; // For avoid conflicts if trigger used
if (!empty($this->array_options) && isset($this->array_options["options_".$key]))
{
// Check parameters
@ -8174,7 +8179,7 @@ abstract class CommonObject
}
// Update extrafield
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0)
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -8335,7 +8340,7 @@ abstract class CommonObject
if (empty($error)) {
// Remove extrafields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$tmpobjectline = new $tmpforobjectlineclass($this->db);
$tmpobjectline->id = $idline;

1
htdocs/core/class/html.formfile.class.php
View File

@ -971,6 +971,7 @@ class FormFile
// Get object entity
if (!empty($conf->multicompany->enabled))
{
$regs = array();
preg_match('/\/([0-9]+)\/[^\/]+\/'.preg_quote($modulesubdir, '/').'$/', $filedir, $regs);
$entity = ((!empty($regs[1]) && $regs[1] > 1) ? $regs[1] : 1); // If entity id not found in $filedir this is entity 1 by default
}

4
htdocs/don/class/don.class.php
View File

@ -432,7 +432,7 @@ class Don extends CommonObject
// Update extrafield
if (!$error) {
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -519,7 +519,7 @@ class Don extends CommonObject
// Update extrafield
if (!$error)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)

11
htdocs/expedition/class/expedition.class.php
View File

@ -380,7 +380,7 @@ class Expedition extends CommonObject
}
// Actions on extra fields
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -1046,7 +1046,8 @@ class Expedition extends CommonObject
}
}
$line->entrepot_id = $linebatch->entrepot_id;
$line->origin_line_id = $dbatch['ix_l'];
$line->origin_line_id = $dbatch['ix_l']; // deprecated
$line->fk_origin_line = $dbatch['ix_l'];
$line->qty = $dbatch['qty'];
$line->detail_batch = $tab;
@ -2617,7 +2618,7 @@ class ExpeditionLigne extends CommonObjectLine
{
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."expeditiondet");
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -2691,7 +2692,7 @@ class ExpeditionLigne extends CommonObjectLine
if (!$error && $this->db->query($sql))
{
// Remove extrafields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->deleteExtraFields();
if ($result < 0)
@ -2895,7 +2896,7 @@ class ExpeditionLigne extends CommonObjectLine
if (!$error)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)

10
htdocs/fichinter/class/fichinter.class.php
View File

@ -305,7 +305,7 @@ class Fichinter extends CommonObject
if (!$resql) $error++;
}
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -385,7 +385,7 @@ class Fichinter extends CommonObject
dol_syslog(get_class($this)."::update", LOG_DEBUG);
if ($this->db->query($sql))
{
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -1001,7 +1001,7 @@ class Fichinter extends CommonObject
if (!$resql) $error++;
}
if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
if (!$error)
{
// Remove extrafields
$res = $this->deleteExtraFields();
@ -1552,7 +1552,7 @@ class FichinterLigne extends CommonObjectLine
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'fichinterdet');
$this->rowid = $this->id;
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -1623,7 +1623,7 @@ class FichinterLigne extends CommonObjectLine
$resql = $this->db->query($sql);
if ($resql)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)

6
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -2063,7 +2063,7 @@ class CommandeFournisseur extends CommonOrder
}
// Remove extrafields
if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->deleteExtraFields();
if ($result < 0)
@ -3626,7 +3626,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
$this->rowid = $this->id;
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -3716,7 +3716,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
$result = $this->db->query($sql);
if ($result > 0)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)

23
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
View File

@ -210,22 +210,11 @@ class CommandeFournisseurDispatch extends CommonObject
}
}
// Actions on extra fields (by external module or standard code)
// TODO le hook fait double emploi avec le trigger !!
$hookmanager->initHooks(array('commandefournisseurdispatchdao'));
$parameters = array('id'=>$this->id);
$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if (empty($reshook))
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
$result = $this->insertExtraFields();
if ($result < 0)
{
$error++;
}
}
// Create extrafields
if (! $error)
{
$result=$this->insertExtraFields();
if ($result < 0) $error++;
}
// Commit or rollback
@ -373,7 +362,7 @@ class CommandeFournisseurDispatch extends CommonObject
if (!$error)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
if (empty($this->id) && !empty($this->rowid))$this->id = $this->rowid;
$result = $this->insertExtraFields();

12
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -558,7 +558,7 @@ class FactureFournisseur extends CommonInvoice
if ($result > 0)
{
// Actions on extra fields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields(); // This also set $this->error or $this->errors if errors are found
if ($result < 0)
@ -977,7 +977,7 @@ class FactureFournisseur extends CommonInvoice
}
}
if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0)
if (! $error)
{
$result=$this->insertExtraFields();
if ($result < 0)
@ -1243,7 +1243,7 @@ class FactureFournisseur extends CommonInvoice
}
// Remove extrafields
if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->deleteExtraFields();
if ($result < 0)
@ -3145,7 +3145,7 @@ class SupplierInvoiceLine extends CommonObjectLine
$this->deleteObjectLinked();
// Remove extrafields
if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
if (! $error)
{
$result=$this->deleteExtraFields();
if ($result < 0)
@ -3265,7 +3265,7 @@ class SupplierInvoiceLine extends CommonObjectLine
$this->rowid = $this->id;
$error = 0;
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -3406,7 +3406,7 @@ class SupplierInvoiceLine extends CommonObjectLine
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
$this->rowid = $this->id; // backward compatibility
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)

4
htdocs/fourn/commande/card.php
View File

@ -1064,7 +1064,7 @@ if (empty($reshook))
if (!$error)
{
// Actions on extra fields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $object->insertExtraFields('ORDER_SUPPLIER_MODIFY');
if ($result < 0)
@ -1190,7 +1190,7 @@ if (empty($reshook))
}
// Extrafields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) // For avoid conflicts if
if (method_exists($lines[$i], 'fetch_optionals')) // For avoid conflicts if
{
$lines[$i]->fetch_optionals();
$array_option = $lines[$i]->array_options;

4
htdocs/fourn/facture/card.php
View File

@ -951,7 +951,7 @@ if (empty($reshook))
$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
// Extrafields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
if (method_exists($lines[$i], 'fetch_optionals')) {
$lines[$i]->fetch_optionals();
}
@ -1597,7 +1597,7 @@ if (empty($reshook))
if (!$error)
{
// Actions on extra fields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $object->insertExtraFields('BILL_SUPPLIER_MODIFY');
if ($result < 0)

2
htdocs/install/mysql/tables/llx_commande.sql
View File

@ -58,7 +58,7 @@ create table llx_commande
last_main_doc varchar(255), -- relative filepath+filename of last main generated document
module_source varchar(32), -- name of module when order generated by a dedicated module (POS, ...)
pos_source varchar(32), -- name of POS station when order is generated by a POS module
pos_source varchar(32), -- numero of POS terminal when order is generated by a POS module, IDsession@IDwebsite when order is generated for a website basket.
facture tinyint default 0,
fk_account integer, -- bank account
fk_currency varchar(3), -- currency code

2
htdocs/install/mysql/tables/llx_facture.sql
View File

@ -65,7 +65,7 @@ create table llx_facture
fk_user_closing integer, -- user closing
module_source varchar(32), -- name of module when invoice generated by a dedicated module (POS, ...)
pos_source varchar(32), -- name of POS station when invoice is generated by a POS module
pos_source varchar(32), -- numero of POS terminal when order is generated by a POS module, IDsession@IDwebsite when order is generated for a website basket.
fk_fac_rec_source integer, -- facture rec source
fk_facture_source integer, -- facture origin if credit notes or replacement invoice
fk_projet integer DEFAULT NULL, -- project invoice is linked to

4
htdocs/install/mysql/tables/llx_societe_account.sql
View File

@ -20,15 +20,15 @@ CREATE TABLE llx_societe_account(
-- BEGIN MODULEBUILDER FIELDS
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
entity integer DEFAULT 1,
key_account varchar(128), -- the id of third party in external web site (for site_account if site_account defined)
login varchar(128) NOT NULL,
pass_encoding varchar(24),
pass_crypted varchar(128),
pass_temp varchar(128), -- temporary password when asked for forget password
fk_soc integer,
fk_website integer, -- id of local web site
site varchar(128), -- name of external web site
site_account varchar(128), -- a key to identify the account on external web site
fk_website integer, -- id of local web site
key_account varchar(128), -- the id of third party in external web site (for site_account if site_account defined)
note_private text,
date_last_login datetime,
date_previous_login datetime,

2
htdocs/langs/en_US/website.lang
View File

@ -77,7 +77,7 @@ BlogPost=Blog post
WebsiteAccount=Website account
WebsiteAccounts=Website accounts
AddWebsiteAccount=Create web site account
BackToListOfThirdParty=Back to list for Third Party
BackToListForThirdParty=Back to list for the third-party
DisableSiteFirst=Disable website first
MyContainerTitle=My web site title
AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)

4
htdocs/product/class/product.class.php
View File

@ -1052,7 +1052,7 @@ class Product extends CommonObject
$action = 'update';
// Actions on extra fields
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
if (!$error) {
$result = $this->insertExtraFields();
if ($result < 0) {
$error++;
@ -1265,7 +1265,7 @@ class Product extends CommonObject
}
// Remove extrafields
if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->deleteExtraFields();
if ($result < 0) {

8
htdocs/product/stock/class/entrepot.class.php
View File

@ -188,7 +188,7 @@ class Entrepot extends CommonObject
$error = 0;
$this->label = !empty($this->label) ? trim($this->label) : trim($this->libelle);
$this->label = trim(!empty($this->label) ? $this->label : $this->libelle);
// Error if label not defined
if ($this->label == '') {
@ -224,7 +224,7 @@ class Entrepot extends CommonObject
// Actions on extra fields
if (!$error)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -322,7 +322,7 @@ class Entrepot extends CommonObject
$this->errors[] = "Error ".$this->db->lasterror();
}
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0) {
if (!$error) {
$result = $this->insertExtraFields();
if ($result < 0)
{
@ -386,7 +386,7 @@ class Entrepot extends CommonObject
// Removed extrafields
if (!$error)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->deleteExtraFields();
if ($result < 0)

4
htdocs/product/stock/class/productlot.class.php
View File

@ -185,7 +185,7 @@ class Productlot extends CommonObject
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
// Actions on extra fields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -359,7 +359,7 @@ class Productlot extends CommonObject
}
// Actions on extra fields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)

4
htdocs/projet/class/project.class.php
View File

@ -316,7 +316,7 @@ class Project extends CommonObject
// Update extrafield
if (!$error) {
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -405,7 +405,7 @@ class Project extends CommonObject
// Update extrafield
if (!$error)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)

4
htdocs/projet/class/task.class.php
View File

@ -205,7 +205,7 @@ class Task extends CommonObject
// Update extrafield
if (!$error)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -384,7 +384,7 @@ class Task extends CommonObject
// Update extrafield
if (!$error) {
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)

39
htdocs/reception/card.php
View File

@ -186,30 +186,25 @@ if (empty($reshook))
if ($action == 'update_extras')
{
// Fill array 'array_options' with data from update form
$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute'));
if ($ret < 0) $error++;
$object->oldcopy = dol_clone($object);
if (!$error)
{
// Actions on extra fields (by external module or standard code)
// TODO le hook fait double emploi avec le trigger !!
$hookmanager->initHooks(array('receptiondao'));
$parameters = array('id' => $object->id);
$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if (empty($reshook)) {
$result = $object->insertExtraFields();
if ($result < 0)
{
setEventMessages($object->error, $object->errors, 'errors');
$error++;
}
} elseif ($reshook < 0)
$error++;
}
// Fill array 'array_options' with data from update form
$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
if ($ret < 0) $error++;
if ($error)
$action = 'edit_extras';
if (!$error)
{
// Actions on extra fields
$result = $object->insertExtraFields('RECEPTION_MODIFY');
if ($result < 0)
{
setEventMessages($object->error, $object->errors, 'errors');
$error++;
}
}
if ($error)
$action = 'edit_extras';
}
// Create reception

51
htdocs/reception/class/reception.class.php
View File

@ -305,24 +305,12 @@ class Reception extends CommonObject
}
}
// Actions on extra fields (by external module or standard code)
// TODO le hook fait double emploi avec le trigger !!
$action = 'add';
$hookmanager->initHooks(array('receptiondao'));
$parameters = array('socid'=>$this->id);
$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if (empty($reshook))
// Create extrafields
if (! $error)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
$result = $this->insertExtraFields();
if ($result < 0)
{
$error++;
}
}
$result=$this->insertExtraFields();
if ($result < 0) $error++;
}
elseif ($reshook < 0) $error++;
if (!$error && !$notrigger)
{
@ -330,29 +318,22 @@ class Reception extends CommonObject
$result = $this->call_trigger('RECEPTION_CREATE', $user);
if ($result < 0) { $error++; }
// End call triggers
}
if (!$error)
{
$this->db->commit();
return $this->id;
}
else
{
foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
}
$this->db->rollback();
return -1 * $error;
}
if (!$error)
{
$this->db->commit();
return $this->id;
}
else
{
$error++;
$this->error = $this->db->lasterror()." - sql=$sql";
foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
}
$this->db->rollback();
return -3;
return -1 * $error;
}
}
else
@ -769,7 +750,7 @@ class Reception extends CommonObject
}
// extrafields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0)
$line->array_options = $array_options;
$line->fk_product = $fk_product;

4
htdocs/resource/class/dolresource.class.php
View File

@ -136,7 +136,7 @@ class Dolresource extends CommonObject
$action = 'create';
// Actions on extra fields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -309,7 +309,7 @@ class Dolresource extends CommonObject
$action = 'update';
// Actions on extra fields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)

4
htdocs/salaries/class/paymentsalary.class.php
View File

@ -160,7 +160,7 @@ class PaymentSalary extends CommonObject
// Update extrafield
if (!$error)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -449,7 +449,7 @@ class PaymentSalary extends CommonObject
// Update extrafield
if (!$error) {
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)

4
htdocs/societe/class/societe.class.php
View File

@ -1393,7 +1393,7 @@ class Societe extends CommonObject
$action = 'update';
// Actions on extra fields
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -1771,7 +1771,7 @@ class Societe extends CommonObject
}
// Removed extrafields
if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->deleteExtraFields();
if ($result < 0)

15
htdocs/societe/class/societeaccount.class.php
View File

@ -79,15 +79,15 @@ class SocieteAccount extends CommonObject
public $fields = array(
'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>5, 'default'=>1),
'key_account' => array('type'=>'varchar(128)', 'label'=>'KeyAccount', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>'Key account',),
'login' => array('type'=>'varchar(64)', 'label'=>'Login', 'visible'=>1, 'enabled'=>1, 'position'=>10),
'login' => array('type'=>'varchar(64)', 'label'=>'Login', 'visible'=>1, 'enabled'=>1, 'notnull'=>1, 'position'=>10, 'showoncombobox'=>1),
'pass_encoding' => array('type'=>'varchar(24)', 'label'=>'PassEncoding', 'visible'=>0, 'enabled'=>1, 'position'=>30),
'pass_crypted' => array('type'=>'varchar(128)', 'label'=>'Password', 'visible'=>1, 'enabled'=>1, 'position'=>31, 'notnull'=>1),
'pass_temp' => array('type'=>'varchar(128)', 'label'=>'Temp', 'visible'=>0, 'enabled'=>0, 'position'=>32, 'notnull'=>-1,),
'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1, 'index'=>1),
'site' => array('type'=>'varchar(128)', 'label'=>'Site', 'visible'=>-1, 'enabled'=>1, 'position'=>41),
'site_account' => array('type'=>'varchar(128)', 'label'=>'SiteAccount', 'visible'=>-1, 'enabled'=>1, 'position'=>42, 'help'=>'A key to identify the account on external web site'),
'fk_website' => array('type'=>'integer:Website:website/class/website.class.php', 'label'=>'WebSite', 'visible'=>1, 'enabled'=>1, 'position'=>43, 'notnull'=>-1, 'index'=>1),
'fk_website' => array('type'=>'integer:Website:website/class/website.class.php', 'label'=>'WebSite', 'visible'=>1, 'enabled'=>1, 'position'=>42, 'notnull'=>-1, 'index'=>1),
'site' => array('type'=>'varchar(128)', 'label'=>'ExternalSite', 'visible'=>0, 'enabled'=>1, 'position'=>43, 'help'=>'Name of the website or service if this is account on an external website or service'),
'site_account' => array('type'=>'varchar(128)', 'label'=>'ExternalSiteAccount', 'visible'=>0, 'enabled'=>1, 'position'=>44, 'help'=>'A key to identify the account on external web site if this is an account on an external website'),
'key_account' => array('type'=>'varchar(128)', 'label'=>'KeyAccount', 'visible'=>0, 'enabled'=>1, 'position'=>48, 'notnull'=>0, 'index'=>1, 'searchall'=>1, 'comment'=>'The id of third party in the external web site (for site_account if site_account defined)',),
'date_last_login' => array('type'=>'datetime', 'label'=>'LastConnexion', 'visible'=>2, 'enabled'=>1, 'position'=>50, 'notnull'=>0,),
'date_previous_login' => array('type'=>'datetime', 'label'=>'PreviousConnexion', 'visible'=>2, 'enabled'=>1, 'position'=>51, 'notnull'=>0,),
//'note_public' => array('type'=>'text', 'label'=>'NotePublic', 'visible'=>-1, 'enabled'=>1, 'position'=>45, 'notnull'=>-1,),
@ -405,11 +405,10 @@ class SocieteAccount extends CommonObject
if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
$result = '';
$companylink = '';
$this->ref = $this->login;
$label = '<u>'.$langs->trans("SocieteAccount").'</u>';
$label = '<u>'.$langs->trans("WebsiteAccount").'</u>';
$label .= '<br>';
$label .= '<b>'.$langs->trans('Login').':</b> '.$this->ref;
//$label.= '<b>' . $langs->trans('WebSite') . ':</b> ' . $this->ref;
@ -429,7 +428,7 @@ class SocieteAccount extends CommonObject
{
if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
{
$label = $langs->trans("ShowsocieteAccount");
$label = $langs->trans("WebsiteAccount");
$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
}
$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';

2
htdocs/societe/website.php
View File

@ -449,6 +449,8 @@ while ($i < min($num, $limit))
// Store properties in $object
$objectwebsiteaccount->id = $obj->rowid;
$objectwebsiteaccount->login = $obj->login;
$objectwebsiteaccount->ref = $obj->login;
foreach ($objectwebsiteaccount->fields as $key => $val)
{
if (property_exists($obj, $key)) $object->$key = $obj->$key;

2
htdocs/supplier_proposal/card.php
View File

@ -353,7 +353,7 @@ if (empty($reshook))
}
// Extrafields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
if (method_exists($lines[$i], 'fetch_optionals')) {
$lines[$i]->fetch_optionals();
$array_options = $lines[$i]->array_options;
}

25
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -1063,7 +1063,7 @@ class SupplierProposal extends CommonObject
$action = 'update';
// Actions on extra fields
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -2116,16 +2116,13 @@ class SupplierProposal extends CommonObject
// Removed extrafields
if (!$error)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
$result = $this->deleteExtraFields();
if ($result < 0)
{
$error++;
$errorflag = -4;
dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
}
}
$result = $this->deleteExtraFields();
if ($result < 0)
{
$error++;
$errorflag = -4;
dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
}
}
if (!$error)
@ -3106,7 +3103,7 @@ class SupplierProposalLine extends CommonObjectLine
{
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'supplier_proposaldet');
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@ -3155,7 +3152,7 @@ class SupplierProposalLine extends CommonObjectLine
if ($this->db->query($sql))
{
// Remove extrafields
if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->deleteExtraFields();
if ($result < 0)
@ -3277,7 +3274,7 @@ class SupplierProposalLine extends CommonObjectLine
$resql = $this->db->query($sql);
if ($resql)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)

16
htdocs/ticket/class/ticket.class.php
View File

@ -408,11 +408,9 @@ class Ticket extends CommonObject
//Update extrafield
if (!$error) {
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) { // For avoid conflicts if trigger used
$result = $this->insertExtraFields();
if ($result < 0) {
$error++;
}
$result = $this->insertExtraFields();
if ($result < 0) {
$error++;
}
}
@ -838,11 +836,9 @@ class Ticket extends CommonObject
if (!$error) {
// Update extrafields
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) { // For avoid conflicts if trigger used
$result = $this->insertExtraFields();
if ($result < 0) {
$error++;
}
$result = $this->insertExtraFields();
if ($result < 0) {
$error++;
}
}

4
htdocs/user/class/user.class.php
View File

@ -1094,7 +1094,7 @@ class User extends CommonObject
}
// Remove extrafields
if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
if (!$error)
{
$result = $this->deleteExtraFields();
if ($result < 0)
@ -1762,7 +1762,7 @@ class User extends CommonObject
$action = 'update';
// Actions on extra fields
if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)

2
htdocs/website/websiteaccount_card.php
View File

@ -223,7 +223,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Object card
// ------------------------------------------------------------
$linkback = '';
if ($socid) $linkback = '<a href="'.DOL_URL_ROOT.'/societe/website.php?socid='.$socid.'&restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToListOfThirdParty").'</a>';
if ($socid) $linkback = '<a href="'.DOL_URL_ROOT.'/societe/website.php?socid='.$socid.'&restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToListForThirdParty").'</a>';
if ($fk_website) $linkback = '<a href="'.DOL_URL_ROOT.'/website/website_card.php?fk_website='.$fk_website.'&restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
$morehtmlref = '<div class="refidno">';

22
test/phpunit/EntrepotTest.php
View File

@ -139,7 +139,7 @@ class EntrepotTest extends PHPUnit\Framework\TestCase
$result=$localobject->create($user);
print __METHOD__." result=".$result."\n";
$this->assertLessThanOrEqual($result, 0);
$this->assertGreaterThan(0, $result);
return $result;
}
@ -242,24 +242,4 @@ class EntrepotTest extends PHPUnit\Framework\TestCase
return $result;
}
/**
* testEntrepotStatic
*
* @return void
*/
public function testEntrepotStatic()
{
global $conf,$user,$langs,$db;
$conf=$this->savconf;
$user=$this->savuser;
$langs=$this->savlangs;
$db=$this->savdb;
$localobject=new Entrepot($db);
//$this->assertLessThan(1, 0);
return;
}
}