diff --git a/build/debian/README.howto b/build/debian/README.howto index 1889c7b633eb1468053b256f44a38642f2d258a7..28f5ed6e2b112c395a988fb23f9f8a37dd2c61ae 100644 --- a/build/debian/README.howto +++ b/build/debian/README.howto @@ -29,6 +29,9 @@ Files are saved int .gnupg directory [DEFAULT] pristine-tar = True +[buildpackage] +ignore-branch = True + [git-buildpackage] sign-tags = True export-dir = ../build-area/ diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php index 6cd3eb6669f7a48962cfa95d878c824b41f7588f..19ef73f37bc8d4e829c58fc522456353cdd061be 100644 --- a/htdocs/core/modules/modDeplacement.class.php +++ b/htdocs/core/modules/modDeplacement.class.php @@ -45,11 +45,12 @@ class modDeplacement extends DolibarrModules $this->numero = 75 ; $this->family = "hr"; + $this->module_position = 41; // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) $this->name = preg_replace('/^mod/i','',get_class($this)); $this->description = "Gestion des notes de frais et deplacements"; // Si traduction Module75Desc non trouvee - // Possible values for version are: 'development', 'experimental', 'dolibarr' or version + // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version $this->version = 'dolibarr_deprecated'; $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 0ee9aff707ff90d90b0cbd0fef779d044d9b9feb..b497bb45fc78bb010072849e2144b2e80e00a8b0 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1570,7 +1570,7 @@ AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu ##### ClickToDial ##### ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example. ClickToDialUseTelLink=Use just a link "tel:" on phone numbers -ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or an interface install on same computer than the browser, and called when you click on a link in your browser that start with "tel:". If you need a full server solution, you must set this to "No" and fill next field. +ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field. ##### Point Of Sales (CashDesk) ##### CashDesk=Point of sales CashDeskSetup=Point of sales module setup