diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 7cf5788f53d..fa72439b831 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -219,7 +219,7 @@ Nouveauté=Novelty AchatTelechargement=Buy / Download GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: %s. DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules -DoliPartnersDesc=List of companies providing custom-developed modules or features.
Note: since Dolibarr is an open source application, anyone experienced in PHP programming may develop a module. +DoliPartnersDesc=List of companies providing custom-developed modules or features.
Note: since Dolibarr is an open source application, anyone experienced in PHP programming should be able to develop a module. WebSiteDesc=External websites for more add-on (non-core) modules... DevelopYourModuleDesc=Some solutions to develop your own module... URL=URL diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php index 782730b81f3..e4e7fc10dbd 100644 --- a/htdocs/website/class/website.class.php +++ b/htdocs/website/class/website.class.php @@ -111,6 +111,11 @@ class Website extends CommonObject */ public $use_manifest; + /** + * @var int + */ + public $position; + /** * List of containers * @@ -201,6 +206,7 @@ class Website extends CommonObject $sql .= 'virtualhost,'; $sql .= 'fk_user_creat,'; $sql .= 'date_creation,'; + $sql .= 'position,'; $sql .= 'tms'; $sql .= ') VALUES ('; $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->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 .= ' '.((int) $this->position).","; $sql .= ' '.(!isset($this->date_modification) || dol_strlen($this->date_modification) == 0 ? 'NULL' : "'".$this->db->idate($this->date_modification)."'"); $sql .= ')';