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

develop

Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/element.php

.dockerignore

@@ -0,0 +1,16 @@
+build
+build.xml
+ChangeLog
+composer.json
+CONTRIBUTING.md
+COPYING
+COPYRIGHT
+dev
+doc
+Dockerfile
+INSTALL
+README-FR.md
+README.md
+robots.txt
+scripts
+test

COPYRIGHT

@@ -24,6 +24,7 @@ odtPHP                 1.0.1         GPL-2+  b                   Yes
 PHPExcel               1.8.0         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 php-iban               1.4.6         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
+Restler                3.0           LGPL-3+                     Yes             Library to develop REST Web services
 TCPDF                  6.2.6         LGPL-3+                     Yes             PDF generation
 
 JS libraries:
@@ -47,6 +48,7 @@ jQuery TableDnD        0.6           GPL and MIT License         Yes
 jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
 jQuery Tiptip          1.3           GPL and MIT License         Yes             JS library for tooltips
 jsGantt                1.2           BSD License                 Yes             JS library (to build Gantt reports)
+JsTimezoneDetect      1.0.4     MIT Licence                 Yes             JS library to detect user timezone
 
 For licenses compatibility informations:
 http://www.fsf.org/licensing/licenses/index_html

ChangeLog

@@ -25,6 +25,7 @@ For users:
 - [ task #1793 ] Create new permission to restrict commercial agent margin to logged user.
 - Add experimental module ask supplier price to request supplier quotation.
 - Add experimental module batch management.
+- Fix: Corrected user timezone detection
 
 For translators:
 - Update language files.
@@ -43,6 +44,12 @@ Dolibarr better:
 - All fields "fk_societe" were renamed into "fk_soc".
 - Method select_PriceBaseType and load_PriceBaseType were merged into selectPriceBaseType
 
+
+***** ChangeLog for 3.7.2 compared to 3.7.1 *****
+FIX [ bug #2855 ] Wrong translation key in localtax report page
+FIX [ bug #1852 ] JS error when editing a customer order line
+FIX [ bug #2900 ] Courtesy title is not stored in create thirdparty form
+
 ***** ChangeLog for 3.7.1 compared to 3.7.* *****
 FIX Bug in the new photo system
 FIX Error management
@@ -297,6 +304,7 @@ Dolibarr better:
 - Fix: [ bug #2545 ] Missing object_margin.png in Amarok theme
 - Fix: [ bug #2542 ] Contracts store localtax preferences
 - Fix: Bad permission assignments for stock movements actions
+- Fix: [ bug #2891 ] Category hooks do not work
 
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
@@ -471,6 +479,11 @@ Fix: [ bug #2577 ] Incorrect invoice status in "Linked objects" page of a projec
 Fix: [ bug #2576 ] Unable to edit a dictionary entry that has # in its ref
 Fix: [ bug #2758 ] Product::update sets product note to "null" when $prod->note is null
 Fix: [ bug #2757 ] Deleting product category photo gives "Forbidden access" error
+Fix: [ bug #2976 ] "Report" tab is the current tab but it is not marked as selected by the UI
+Fix: [ bug #2861 ] Undefined variable $res when migrating
+Fix: [ bug #2837 ] Product list table column header does not match column body
+Fix: [ bug #2835 ] Customer prices of a product shows incorrect history order
+Fix: [ bug #2814 ] JPEG photos are not displayed in Product photos page
 
 ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
 Fix: Avoid missing class error for fetch_thirdparty method #1973

Dockerfile

@@ -0,0 +1,14 @@
+FROM php:5.6-apache
+
+RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+	&& docker-php-ext-install gd
+
+RUN docker-php-ext-install mysqli
+
+COPY htdocs/ /var/www/html/
+
+RUN chown -hR www-data:www-data /var/www/html
+
+EXPOSE 80

build/makepack-dolibarr.pl

@@ -489,6 +489,7 @@
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/php-iban/docs`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`;

dev/multitail/.multitailrc

@@ -0,0 +1,12 @@
+# This is an example of multitail setup file you can use to analyze dolibarr log files.
+# Usage: multitail -cS dolibarr documents/dolibarr.log
+colorscheme:dolibarr
+bright:1
+cs_re:yellow,red:.*EMERG.*
+cs_re:white,red:.*ALERT.*
+cs_re:green,red:.*CRIT.*
+cs_re:red:.*ERR.*
+cs_re:white,yellow:.*WARNING.*
+cs_re:green,yellow:.*NOTICE.*
+cs_re:green:.*INFO.*
+cs_re:white:.*DEBUG.*