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

Fix position of clone

Browse Source
This commit is contained in:
Laurent Destailleur 2020-06-08 23:42:48 +02:00
parent 738fa35471
commit 0f1447cf05
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,7 +219,7 @@ Nouveauté=Novelty
AchatTelechargement=Buy / Download AchatTelechargement=Buy / Download
GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>. GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming may develop a module. DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
WebSiteDesc=External websites for more add-on (non-core) modules... WebSiteDesc=External websites for more add-on (non-core) modules...
DevelopYourModuleDesc=Some solutions to develop your own module... DevelopYourModuleDesc=Some solutions to develop your own module...
URL=URL URL=URL

7
htdocs/website/class/website.class.php
View File

@ -111,6 +111,11 @@ class Website extends CommonObject
*/ */
public $use_manifest; public $use_manifest;
/**
* @var int
*/
public $position;
/** /**
* List of containers * List of containers
* *
@ -201,6 +206,7 @@ class Website extends CommonObject
$sql .= 'virtualhost,'; $sql .= 'virtualhost,';
$sql .= 'fk_user_creat,'; $sql .= 'fk_user_creat,';
$sql .= 'date_creation,'; $sql .= 'date_creation,';
$sql .= 'position,';
$sql .= 'tms'; $sql .= 'tms';
$sql .= ') VALUES ('; $sql .= ') VALUES (';
$sql .= ' '.((empty($this->entity) && $this->entity != '0') ? 'NULL' : $this->entity).','; $sql .= ' '.((empty($this->entity) && $this->entity != '0') ? 'NULL' : $this->entity).',';
@ -213,6 +219,7 @@ class Website extends CommonObject
$sql .= ' '.(!isset($this->virtualhost) ? 'NULL' : "'".$this->db->escape($this->virtualhost)."'").","; $sql .= ' '.(!isset($this->virtualhost) ? 'NULL' : "'".$this->db->escape($this->virtualhost)."'").",";
$sql .= ' '.(!isset($this->fk_user_creat) ? $user->id : $this->fk_user_creat).','; $sql .= ' '.(!isset($this->fk_user_creat) ? $user->id : $this->fk_user_creat).',';
$sql .= ' '.(!isset($this->date_creation) || dol_strlen($this->date_creation) == 0 ? 'NULL' : "'".$this->db->idate($this->date_creation)."'").","; $sql .= ' '.(!isset($this->date_creation) || dol_strlen($this->date_creation) == 0 ? 'NULL' : "'".$this->db->idate($this->date_creation)."'").",";
$sql .= ' '.((int) $this->position).",";
$sql .= ' '.(!isset($this->date_modification) || dol_strlen($this->date_modification) == 0 ? 'NULL' : "'".$this->db->idate($this->date_modification)."'"); $sql .= ' '.(!isset($this->date_modification) || dol_strlen($this->date_modification) == 0 ? 'NULL' : "'".$this->db->idate($this->date_modification)."'");
$sql .= ')'; $sql .= ')';