Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

dev/vagrant/dolibarrdev/Vagrantfile

@@ -5,6 +5,10 @@ dir = File.dirname(File.expand_path(__FILE__))
 configValues = YAML.load_file("#{dir}/puphpet/config.yaml")
 data = configValues['vagrantfile-local']
 
+if !data['vm']['provider']['virtualbox'].empty?
+  ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
+end
+
 Vagrant.configure("2") do |config|
   config.vm.box = "#{data['vm']['box']}"
   config.vm.box_url = "#{data['vm']['box_url']}"
@@ -26,7 +30,7 @@ Vagrant.configure("2") do |config|
   data['vm']['synced_folder'].each do |i, folder|
     if folder['source'] != '' && folder['target'] != '' && folder['id'] != ''
       nfs = (folder['nfs'] == "true") ? "nfs" : nil
-      config.vm.synced_folder "#{folder['source']}", "#{folder['target']}", id: "#{folder['id']}", type: nfs
+      config.vm.synced_folder "#{folder['source']}", "#{folder['target']}", id: "#{folder['id']}", type: nfs, :mount_options => ["dmode=777","fmode=666"]
     end
   end
 
@@ -48,12 +52,14 @@ Vagrant.configure("2") do |config|
     s.args = "/vagrant/puphpet"
   end
   config.vm.provision :shell, :path => "puphpet/shell/update-puppet.sh"
-  config.vm.provision :shell, :path => "puphpet/shell/librarian-puppet-vagrant.sh"
+  config.vm.provision :shell, :path => "puphpet/shell/r10k.sh"
 
   config.vm.provision :puppet do |puppet|
     ssh_username = !data['ssh']['username'].nil? ? data['ssh']['username'] : "vagrant"
     puppet.facter = {
-      "ssh_username" => "#{ssh_username}"
+      "ssh_username"     => "#{ssh_username}",
+      "provisioner_type" => ENV['VAGRANT_DEFAULT_PROVIDER'],
+      "vm_target_key"    => 'vagrantfile-local',
     }
     puppet.manifests_path = "#{data['vm']['provision']['puppet']['manifests_path']}"
     puppet.manifest_file = "#{data['vm']['provision']['puppet']['manifest_file']}"
@@ -63,6 +69,20 @@ Vagrant.configure("2") do |config|
     end
   end
 
+  if File.file?("#{dir}/puphpet/files/dot/ssh/id_rsa")
+    config.ssh.private_key_path = [
+      "#{dir}/puphpet/files/dot/ssh/id_rsa",
+      "#{dir}/puphpet/files/dot/ssh/insecure_private_key"
+    ]
+  end
+
+  ssh_username = !data['ssh']['username'].nil? ? data['ssh']['username'] : "vagrant"
+
+  config.vm.provision "shell" do |kg|
+    kg.path = "puphpet/shell/ssh-keygen.sh"
+    kg.args = "#{ssh_username}"
+  end
+
   config.vm.provision :shell, :path => "puphpet/shell/execute-files.sh"
 
   if !data['ssh']['host'].nil?
@@ -71,9 +91,6 @@ Vagrant.configure("2") do |config|
   if !data['ssh']['port'].nil?
     config.ssh.port = "#{data['ssh']['port']}"
   end
-  if !data['ssh']['private_key_path'].nil?
-    config.ssh.private_key_path = "#{data['ssh']['private_key_path']}"
-  end
   if !data['ssh']['username'].nil?
     config.ssh.username = "#{data['ssh']['username']}"
   end

dev/vagrant/dolibarrdev/puphpet/.gitattributes

@@ -0,0 +1,10 @@
+# Autodetect text files
+* text=auto
+
+# Force the following filetypes to have unix eols, so Windows does not break them
+*.pp text eol=lf
+*.sh text eol=lf
+*.yaml text eol=lf
+Puppetfile text eol=lf
+.bash_aliases text eol=lf
+.vimrc text eol=lf

dev/vagrant/dolibarrdev/puphpet/config.yaml

@@ -7,7 +7,7 @@ vagrantfile-local:
         network:
             private_network: 192.168.42.101
             forwarded_port:
-                jHkzZVuBoVtG:
+                XnCD0YcW5aic:
                     host: '9252'
                     guest: '22'
         provider:
@@ -26,8 +26,7 @@ vagrantfile-local:
                     - '--hiera_config /vagrant/puphpet/puppet/hiera.yaml'
                     - '--parser future'
         synced_folder:
-            vMRGvEXBrASV:
+            bH8PX003LLNi:
-                id: vagrant-root
                 source: ../../../
                 target: /var/www
                 nfs: 'false'
@@ -59,14 +58,22 @@ mailcatcher:
         smtp_port: 1025
         http_ip: 0.0.0.0
         http_port: '1080'
-        path: /usr/local/bin
+        mailcatcher_path: /usr/local/bin
-        log: /var/log/mailcatcher/mailcatcher.log
+        log_path: /var/log/mailcatcher/mailcatcher.log
 apache:
+    install: '1'
+    settings:
+        user: www-data
+        group: www-data
+        default_vhost: true
+        manage_user: false
+        manage_group: false
+        sendfile: 0
     modules:
         - php
         - rewrite
     vhosts:
-        fIrYPRDORtSV:
+        2iyFAvXD9OZU:
             servername: dev.dolibarr.org
             docroot: /var/www/htdocs
             port: '80'
@@ -74,11 +81,28 @@ apache:
                 - 'APP_ENV dev'
             override:
                 - All
-    user: www-data
+            custom_fragment: ''
-    group: www-data
+            ssl_cert: ''
-    default_vhost: true
+            ssl_key: ''
+            ssl_chain: ''
+            ssl_certs_dir: ''
     mod_pagespeed: 0
     mod_spdy: 0
+nginx:
+    install: 0
+    vhosts:
+        N7iqVXFhLCgi:
+            server_name: awesome.dev
+            server_aliases:
+                - www.awesome.dev
+            www_root: /var/www/awesome.dev
+            listen_port: '80'
+            index_files:
+                - index.html
+                - index.htm
+                - index.php
+            envvars:
+                - 'APP_ENV dev'
 php:
     install: '1'
     version: '55'
@@ -115,11 +139,12 @@ drush:
     settings:
         drush.tag_branch: 6.x
 mysql:
+    install: '1'
     root_password: root
     phpmyadmin: '1'
     adminer: 0
     databases:
-        K7xpd6KqfK3E:
+        8oNQ7e6GCpdw:
             grant:
                 - ALTER
                 - CREATE
@@ -134,11 +159,32 @@ mysql:
             user: user
             password: user
             sql_file: /var/www/dev/initdata/mysqldump_dolibarr_3.5.0.sql
+postgresql:
+    install: 0
+    settings:
+        root_password: '123'
+        user_group: postgres
+        encoding: UTF8
+        version: '9.3'
+    databases: {  }
+    adminer: 0
+mariadb:
+    install: 0
+    root_password: '123'
+    phpmyadmin: 0
+    adminer: 0
+    databases: {  }
+    version: '10.0'
 mongodb:
     install: 0
-    auth: 1
+    settings:
-    port: '27017'
+        auth: 1
+        port: '27017'
     databases: {  }
+redis:
+    install: 0
+    settings:
+        conf_port: '6379'
 beanstalkd:
     install: 0
     settings:
@@ -153,5 +199,6 @@ beanstalkd:
     binlogdir: /var/lib/beanstalkd/binlog
 rabbitmq:
     install: 0
-    port: '5672'
+    settings:
+        port: '5672'
 

dev/vagrant/dolibarrdev/puphpet/files/dot/.gitignore

@@ -0,0 +1,3 @@
+ssh/id_rsa
+ssh/id_rsa.pub
+ssh/insecure_private_key

dev/vagrant/dolibarrdev/puphpet/files/dot/ssh/insecure_private_key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI
+w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP
+kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2
+hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO
+Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW
+yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd
+ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1
+Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf
+TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK
+iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A
+sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf
+4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP
+cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk
+EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN
+CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX
+3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG
+YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj
+3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+
+dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz
+6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC
+P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF
+llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ
+kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH
++vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ
+NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=
+-----END RSA PRIVATE KEY-----

dev/vagrant/dolibarrdev/puphpet/puppet/Puppetfile

@@ -6,14 +6,20 @@ mod 'yum', :git => 'https://github.com/puphpet/puppet-yum.git'
 mod 'vcsrepo', :git => 'https://github.com/puphpet/puppetlabs-vcsrepo.git'
 mod 'ntp', :git => 'https://github.com/puphpet/puppetlabs-ntp.git'
 mod 'iptables', :git => 'https://github.com/puphpet/puppet-iptables.git'
+mod 'git', :git => 'https://github.com/puphpet/puppetlabs-git.git'
 mod 'mailcatcher', :git => 'https://github.com/puphpet/puppet-mailcatcher.git'
 mod 'supervisord', :git => 'https://github.com/puphpet/puppet-supervisord.git'
 mod 'apache', :git => 'https://github.com/puphpet/puppetlabs-apache.git'
+mod 'nginx', :git => 'https://github.com/puphpet/puppet-nginx.git'
 mod 'php', :git => 'https://github.com/puphpet/puppet-php.git'
 mod 'composer', :git => 'https://github.com/puphpet/puppet-composer.git'
 mod 'puphpet', :git => 'https://github.com/puphpet/puppet-puphpet.git'
+mod 'puppi', :git => 'https://github.com/puphpet/puppi.git'
 mod 'drush', :git => 'https://github.com/puphpet/puppet-drush.git', :ref => 'new'
 mod 'mysql', :git => 'https://github.com/puphpet/puppetlabs-mysql.git'
+mod 'postgresql', :git => 'https://github.com/puphpet/puppetlabs-postgresql.git'
 mod 'mongodb', :git => 'https://github.com/puphpet/puppetlabs-mongodb.git'
+mod 'redis', :git => 'https://github.com/puphpet/puppet-redis.git'
 mod 'beanstalkd', :git => 'https://github.com/puphpet/puppet-beanstalkd.git'
 mod 'rabbitmq', :git => 'https://github.com/puphpet/puppetlabs-rabbitmq.git'
+mod 'staging', :git => 'https://github.com/puphpet/puppet-staging.git'

dev/vagrant/dolibarrdev/puphpet/shell/execute-files.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export DEBIAN_FRONTEND=noninteractive
+
 VAGRANT_CORE_FOLDER=$(cat "/.puphpet-stuff/vagrant-core-folder.txt")
 
 shopt -s nullglob
@@ -7,12 +9,12 @@ files=("${VAGRANT_CORE_FOLDER}"/files/exec-once/*)
 
 if [[ ! -f /.puphpet-stuff/exec-once-ran && (${#files[@]} -gt 0) ]]; then
     echo 'Running files in files/exec-once'
-    find "${VAGRANT_CORE_FOLDER}/files/exec-once" -maxdepth 1 -type f \( ! -iname "empty" \) -exec chmod +x '{}' \; -exec {} \;
+    find "${VAGRANT_CORE_FOLDER}/files/exec-once" -maxdepth 1 -not -path '*/\.*' -type f \( ! -iname "empty" \) -exec chmod +x '{}' \; -exec {} \;
     echo 'Finished running files in files/exec-once'
     echo 'To run again, delete file /.puphpet-stuff/exec-once-ran'
     touch /.puphpet-stuff/exec-once-ran
 fi
 
 echo 'Running files in files/exec-always'
-find "${VAGRANT_CORE_FOLDER}/files/exec-always" -maxdepth 1 -type f \( ! -iname "empty" \) -exec chmod +x '{}' \; -exec {} \;
+find "${VAGRANT_CORE_FOLDER}/files/exec-always" -maxdepth 1 -not -path '*/\.*' -type f \( ! -iname "empty" \) -exec chmod +x '{}' \; -exec {} \;
 echo 'Finished running files in files/exec-always'

dev/vagrant/dolibarrdev/puphpet/shell/initial-setup.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export DEBIAN_FRONTEND=noninteractive
+
 VAGRANT_CORE_FOLDER=$(echo "$1")
 
 OS=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" ID)
@@ -22,16 +24,26 @@ if [[ ! -f /.puphpet-stuff/initial-setup-repo-update ]]; then
         echo "Finished running initial-setup apt-get update"
     elif [[ "${OS}" == 'centos' ]]; then
         echo "Running initial-setup yum update"
-        yum install yum-plugin-fastestmirror -y >/dev/null
+        yum -y --nogpgcheck install "http://www.elrepo.org/elrepo-release-6-6.el6.elrepo.noarch.rpm" >/dev/null
-        yum check-update -y >/dev/null
+        yum -y --nogpgcheck install "https://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm" >/dev/null
+        yum -y install centos-release-SCL yum-plugin-fastestmirror >/dev/null
+        yum -y check-update >/dev/null
         echo "Finished running initial-setup yum update"
 
         echo "Updating to Ruby 1.9.3"
-        yum install centos-release-SCL >/dev/null
+        yum -y install centos-release-SCL >/dev/null
         yum remove ruby >/dev/null
-        yum install ruby193 facter hiera ruby193-ruby-irb ruby193-ruby-doc ruby193-rubygem-json ruby193-libyaml >/dev/null
+        yum -y install ruby193 ruby193-ruby-irb ruby193-ruby-doc ruby193-libyaml rubygems >/dev/null
+        yum -y --nogpgcheck install "https://yum.puppetlabs.com/el/6/dependencies/x86_64/ruby-rgen-0.6.5-2.el6.noarch.rpm" >/dev/null
         gem update --system >/dev/null
         gem install haml >/dev/null
+
+        yum -y --nogpgcheck install "https://yum.puppetlabs.com/el/6/products/x86_64/hiera-1.3.2-1.el6.noarch.rpm" >/dev/null
+        yum -y --nogpgcheck install "https://yum.puppetlabs.com/el/6/products/x86_64/facter-1.7.5-1.el6.x86_64.rpm" >/dev/null
+        yum -y --nogpgcheck install "https://yum.puppetlabs.com/el/6/dependencies/x86_64/rubygem-json-1.5.5-1.el6.x86_64.rpm" >/dev/null
+        yum -y --nogpgcheck install "https://yum.puppetlabs.com/el/6/dependencies/x86_64/ruby-json-1.5.5-1.el6.x86_64.rpm" >/dev/null
+        yum -y --nogpgcheck install "https://yum.puppetlabs.com/el/6/dependencies/x86_64/ruby-shadow-2.2.0-2.el6.x86_64.rpm" >/dev/null
+        yum -y --nogpgcheck install "https://yum.puppetlabs.com/el/6/dependencies/x86_64/ruby-augeas-0.4.1-3.el6.x86_64.rpm" >/dev/null
         echo "Finished updating to Ruby 1.9.3"
 
         echo "Installing basic development tools (CentOS)"

dev/vagrant/dolibarrdev/puphpet/shell/os-detect.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
- 
+
 # Try and get debian operating system
 # id, codename, and release
 
@@ -40,9 +40,9 @@ info[id]=$(echo "${ID}" | tr '[A-Z]' '[a-z]')
 info[codename]=$(echo "${CODENAME}" | tr '[A-Z]' '[a-z]')
 info[release]=$(echo "${RELEASE}" | tr '[A-Z]' '[a-z]')
 
-if [ "$TYPE" ] ; then 
+if [ "$TYPE" ] ; then
     echo "${info[${TYPE}]}"
-else 
+else
     echo -e "ID\t${info[id]}"
     echo -e "CODENAME\t${info[codename]}"
     echo -e "RELEASE\t${info[release]}"

dev/vagrant/dolibarrdev/puphpet/shell/r10k.sh

@@ -1,17 +1,19 @@
 #!/bin/bash
 
+export DEBIAN_FRONTEND=noninteractive
+
 VAGRANT_CORE_FOLDER=$(cat "/.puphpet-stuff/vagrant-core-folder.txt")
 
 OS=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" ID)
 CODENAME=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" CODENAME)
 
-# Directory in which librarian-puppet should manage its modules directory
+# Directory in which r10k should manage its modules directory
 PUPPET_DIR=/etc/puppet/
 
 $(which git > /dev/null 2>&1)
 FOUND_GIT=$?
 
-if [ "${FOUND_GIT}" -ne '0' ] && [ ! -f /.puphpet-stuff/librarian-puppet-installed ]; then
+if [ "${FOUND_GIT}" -ne '0' ] && [ ! -f /.puphpet-stuff/r10k-installed ]; then
     $(which apt-get > /dev/null 2>&1)
     FOUND_APT=$?
     $(which yum > /dev/null 2>&1)
@@ -38,52 +40,48 @@ cp "${VAGRANT_CORE_FOLDER}/puppet/Puppetfile" "${PUPPET_DIR}"
 echo "Copied Puppetfile"
 
 if [ "${OS}" == 'debian' ] || [ "${OS}" == 'ubuntu' ]; then
-    if [[ ! -f /.puphpet-stuff/librarian-base-packages ]]; then
+    if [[ ! -f /.puphpet-stuff/r10k-base-packages ]]; then
-        echo 'Installing base packages for librarian'
+        echo 'Installing base packages for r10k'
         apt-get install -y build-essential ruby-dev >/dev/null
-        echo 'Finished installing base packages for librarian'
+        gem install json >/dev/null
+        echo 'Finished installing base packages for r10k'
 
-        touch /.puphpet-stuff/librarian-base-packages
+        touch /.puphpet-stuff/r10k-base-packages
     fi
 fi
 
 if [ "${OS}" == 'ubuntu' ]; then
-    if [[ ! -f /.puphpet-stuff/librarian-libgemplugin-ruby ]]; then
+    if [[ ! -f /.puphpet-stuff/r10k-libgemplugin-ruby ]]; then
         echo 'Updating libgemplugin-ruby (Ubuntu only)'
         apt-get install -y libgemplugin-ruby >/dev/null
         echo 'Finished updating libgemplugin-ruby (Ubuntu only)'
 
-        touch /.puphpet-stuff/librarian-libgemplugin-ruby
+        touch /.puphpet-stuff/r10k-libgemplugin-ruby
     fi
 
-    if [ "${CODENAME}" == 'lucid' ] && [ ! -f /.puphpet-stuff/librarian-rubygems-update ]; then
+    if [ "${CODENAME}" == 'lucid' ] && [ ! -f /.puphpet-stuff/r10k-rubygems-update ]; then
         echo 'Updating rubygems (Ubuntu Lucid only)'
         echo 'Ignore all "conflicting chdir" errors!'
         gem install rubygems-update >/dev/null
         /var/lib/gems/1.8/bin/update_rubygems >/dev/null
         echo 'Finished updating rubygems (Ubuntu Lucid only)'
 
-        touch /.puphpet-stuff/librarian-rubygems-update
+        touch /.puphpet-stuff/r10k-rubygems-update
     fi
 fi
 
-if [[ ! -f /.puphpet-stuff/librarian-puppet-installed ]]; then
+if [[ ! -f /.puphpet-stuff/r10k-puppet-installed ]]; then
-    echo 'Installing librarian-puppet'
+    echo 'Installing r10k'
-    gem install librarian-puppet >/dev/null
+    gem install r10k >/dev/null
-    echo 'Finished installing librarian-puppet'
+    echo 'Finished installing r10k'
 
-    echo 'Running initial librarian-puppet'
+    echo 'Running initial r10k'
-    cd "${PUPPET_DIR}" && librarian-puppet install --clean >/dev/null
+    cd "${PUPPET_DIR}" && r10k puppetfile install >/dev/null
-    echo 'Finished running initial librarian-puppet'
+    echo 'Finished running initial r10k'
 
-    touch /.puphpet-stuff/librarian-puppet-installed
+    touch /.puphpet-stuff/r10k-puppet-installed
 else
-    echo 'Running update librarian-puppet'
+    echo 'Running update r10k'
-    cd "${PUPPET_DIR}" && librarian-puppet update >/dev/null
+    cd "${PUPPET_DIR}" && r10k puppetfile install >/dev/null
-    echo 'Finished running update librarian-puppet'
+    echo 'Finished running update r10k'
 fi
-
-echo "Replacing puppetlabs-git module with custom"
-rm -rf /etc/puppet/modules/git
-git clone https://github.com/puphpet/puppetlabs-git.git /etc/puppet/modules/git
-echo "Finished replacing puppetlabs-git module with custom"

dev/vagrant/dolibarrdev/puphpet/shell/ssh-keygen.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+VAGRANT_CORE_FOLDER=$(cat "/.puphpet-stuff/vagrant-core-folder.txt")
+
+VAGRANT_SSH_USERNAME=$(echo "$1")
+
+if [[ ! -f "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa" ]]; then
+    echo "Creating new SSH key at ${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa"
+    ssh-keygen -f "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa" -P ""
+fi
+
+echo "Adding generated key to /root/.ssh/authorized_keys"
+mkdir -p /root/.ssh
+cat "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa.pub" > "/root/.ssh/authorized_keys"
+chmod 600 "/root/.ssh/authorized_keys"
+
+if [ "${VAGRANT_SSH_USERNAME}" != 'root' ]; then
+    VAGRANT_SSH_FOLDER="/home/${VAGRANT_SSH_USERNAME}/.ssh";
+
+    echo "Adding generated key to ${VAGRANT_SSH_FOLDER}/authorized_keys"
+    cat "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa.pub" > "${VAGRANT_SSH_FOLDER}/authorized_keys"
+    chown "${VAGRANT_SSH_USERNAME}" "${VAGRANT_SSH_FOLDER}/authorized_keys"
+    chgrp "${VAGRANT_SSH_USERNAME}" "${VAGRANT_SSH_FOLDER}/authorized_keys"
+    chmod 600 "${VAGRANT_SSH_FOLDER}/authorized_keys"
+fi
+
+passwd -d vagrant >/dev/null

dev/vagrant/dolibarrdev/puphpet/shell/update-puppet.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export DEBIAN_FRONTEND=noninteractive
+
 VAGRANT_CORE_FOLDER=$(cat "/.puphpet-stuff/vagrant-core-folder.txt")
 
 OS=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" ID)
@@ -18,26 +20,22 @@ if [[ ! -f /.puphpet-stuff/update-puppet ]]; then
         apt-get update >/dev/null
         echo "Finished running update-puppet apt-get update"
 
-        echo "Updating Puppet to latest version"
+        echo "Updating Puppet to version 3.4.x"
-        apt-get -y install puppet >/dev/null
+        apt-get install -y puppet=3.4.3-1puppetlabs1 puppet-common=3.4.3-1puppetlabs1 >/dev/null
         PUPPET_VERSION=$(puppet help | grep 'Puppet v')
         echo "Finished updating puppet to latest version: ${PUPPET_VERSION}"
 
         touch /.puphpet-stuff/update-puppet
         echo "Created empty file /.puphpet-stuff/update-puppet"
     elif [ "${OS}" == 'centos' ]; then
-        echo "Downloading http://yum.puppetlabs.com/el/${RELEASE}/products/x86_64/puppetlabs-release-6-7.noarch.rpm"
+        echo "Downloading http://yum.puppetlabs.com/el/${RELEASE}/products/x86_64/puppet-3.4.3-1.el6.noarch.rpm"
-        yum -y --nogpgcheck install "http://yum.puppetlabs.com/el/${RELEASE}/products/x86_64/puppetlabs-release-6-7.noarch.rpm" >/dev/null
+        yum -y --nogpgcheck install "http://yum.puppetlabs.com/el/${RELEASE}/products/x86_64/puppet-3.4.3-1.el6.noarch.rpm" >/dev/null
-        echo "Finished downloading http://yum.puppetlabs.com/el/${RELEASE}/products/x86_64/puppetlabs-release-6-7.noarch.rpm"
+        echo "Finished downloading http://yum.puppetlabs.com/el/${RELEASE}/products/x86_64/puppet-3.4.3-1.el6.noarch.rpm"
 
-        echo "Running update-puppet yum update"
+        echo "Installing/Updating Puppet to version 3.4.x"
-        yum -y update >/dev/null
-        echo "Finished running update-puppet yum update"
-
-        echo "Installing/Updating Puppet to latest version"
         yum -y install puppet >/dev/null
         PUPPET_VERSION=$(puppet help | grep 'Puppet v')
-        echo "Finished installing/updating puppet to latest version: ${PUPPET_VERSION}"
+        echo "Finished installing/updating puppet to version: ${PUPPET_VERSION}"
 
         touch /.puphpet-stuff/update-puppet
         echo "Created empty file /.puphpet-stuff/update-puppet"

htdocs/admin/system/modules.php

@@ -106,8 +106,8 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Modules").'</td>';
 print '<td>'.$langs->trans("Version").'</td>';
-print '<td align="center">'.$langs->trans("Id Module").'</td>';
+print '<td align="center">'.$langs->trans("IdModule").'</td>';
-print '<td>'.$langs->trans("Id Permissions").'</td>';
+print '<td>'.$langs->trans("IdPermissions").'</td>';
 print '</tr>';
 $var=false;
 $sortorder=$modules_names;

htdocs/compta/bank/releve.php

@@ -310,7 +310,12 @@ else
 			print "</td>\n";
 
 			// Type and num
-			print '<td class="nowrap">'.$objp->fk_type.' '.($objp->num_chq?$objp->num_chq:'').'</td>';
+            if ($objp->fk_type == 'SOLD') {
+                $type_label='&nbsp;';
+            } else {
+                $type_label=($langs->trans("PaymentTypeShort".$objp->fk_type)!="PaymentTypeShort".$objp->fk_type)?$langs->trans("PaymentTypeShort".$objp->fk_type):$objp->fk_type;
+            }
+			print '<td class="nowrap">'.$type_label.' '.($objp->num_chq?$objp->num_chq:'').'</td>';
 
 			// Description
 			print '<td valign="center"><a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&amp;account='.$acct->id.'">';

htdocs/langs/en_US/admin.lang

@@ -49,9 +49,11 @@ ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is re
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions
 ConfirmAjax=Use Ajax confirmation popups
-UseSearchToSelectCompany=Use autocompletion fields to choose third parties (instead of using a list box).<br><br>Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box.
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
-UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).<br><br>Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -100,6 +102,9 @@ OtherOptions=Other options
 OtherSetup=Other setup
 CurrentValueSeparatorDecimal=Decimal separator
 CurrentValueSeparatorThousand=Thousand separator
+Destination=Destination
+IdModule=Module ID
+IdPermissions=Permissions ID
 Modules=Modules
 ModulesCommon=Main modules
 ModulesOther=Other modules
@@ -1304,7 +1309,8 @@ ConfirmDeleteProductLineAbility=Confirmation when removing product lines in form
 ModifyProductDescAbility=Personalization of product descriptions in forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
-UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).<br>Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
@@ -1491,3 +1497,6 @@ TaskModelModule=Tasks reports document model
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document  
+
+
+Format=Format

htdocs/langs/en_US/banks.lang

@@ -133,6 +133,7 @@ CashBudget=Cash budget
 PlannedTransactions=Planned transactions
 Graph=Graphics
 ExportDataset_banque_1=Bank transactions and account statement
+ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
 TransactionWithOtherAccount=Account transfer
 PaymentNumberUpdateSucceeded=Payment number updated succesfully

htdocs/langs/en_US/other.lang

@@ -45,6 +45,9 @@ Notify_MEMBER_SUBSCRIPTION=Member subscribed
 Notify_MEMBER_RESILIATE=Member resiliated
 Notify_MEMBER_DELETE=Member deleted
 Notify_PROJECT_CREATE=Project creation
+Notify_TASK_CREATE=Task created
+Notify_TASK_MODIFY=Task modified
+Notify_TASK_DELETE=Task deleted
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size

htdocs/product/admin/product.php

@@ -372,7 +372,7 @@ print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="usesearchtoselectproduct">';
 print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("UseSearchToSelectProduct").'</td>';
+print '<td>'.$form->textwithpicto($langs->trans("UseSearchToSelectProduct"),$langs->trans('UseSearchToSelectProductTooltip'),1).'</td>';
 if (empty($conf->use_javascript_ajax))
 {
 	print '<td class="nowrap" align="right" colspan="2">';

htdocs/societe/admin/societe.php

@@ -715,7 +715,7 @@ print '<td width="80">&nbsp;</td></tr>'."\n";
 // Utilisation formulaire Ajax sur choix societe
 $var=!$var;
 print "<tr ".$bc[$var].">";
-print '<td width="80%">'.$langs->trans("UseSearchToSelectCompany").'</td>';
+print '<td width="80%">'.$form->textwithpicto($langs->trans("UseSearchToSelectCompany"),$langs->trans('UseSearchToSelectCompanyTooltip'),1).' </td>';
 if (! $conf->use_javascript_ajax)
 {
 	print '<td class="nowrap" align="right" colspan="2">';
@@ -739,7 +739,7 @@ print '</tr>';
 
 $var=!$var;
 print "<tr ".$bc[$var].">";
-print '<td width="80%">'.$langs->trans("UseSearchToSelectContact").'</td>';
+print '<td width="80%">'.$form->textwithpicto($langs->trans("UseSearchToSelectContact"),$langs->trans('UseSearchToSelectContactTooltip'),1).'</td>';
 if (! $conf->use_javascript_ajax)
 {
 	print '<td class="nowrap" align="right" colspan="2">';