[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] c71d57: Fix: for avoid division by 0
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] c71d57: Fix: for avoid division by 0 |
|
Date: |
Thu, 10 Mar 2016 05:53:37 -0800 |
Branch: refs/heads/3.8_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: c71d578931ed9126937fdcb3dda0e8e5a332f0c8
https://github.com/Dolibarr/dolibarr/commit/c71d578931ed9126937fdcb3dda0e8e5a332f0c8
Author: Regis Houssin <address@hidden>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Fix: for avoid division by 0
Commit: c65babf3b5a7a525f4f7b5617b072f692ad24564
https://github.com/Dolibarr/dolibarr/commit/c65babf3b5a7a525f4f7b5617b072f692ad24564
Author: Regis Houssin <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M .travis.yml
A build/travis-ci/apache.conf
M composer.json
M htdocs/accountancy/admin/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/filefunc.inc.php
M htdocs/product/ajax/products.php
M htdocs/product/class/product.class.php
M test/phpunit/AllTests.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.7_bug
Commit: a2c820854106c2cb4e644b64ef393e0566a56a9b
https://github.com/Dolibarr/dolibarr/commit/a2c820854106c2cb4e644b64ef393e0566a56a9b
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Prepare 3.6.5
Commit: f13df0f952c286fbf3c9a5164930c9397acde26d
https://github.com/Dolibarr/dolibarr/commit/f13df0f952c286fbf3c9a5164930c9397acde26d
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Prepare 3.7.3
Commit: 5773171efc459e7ece3faa7eb7cc9fd03f1ec8f3
https://github.com/Dolibarr/dolibarr/commit/5773171efc459e7ece3faa7eb7cc9fd03f1ec8f3
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-12-28 (Mon, 28 Dec 2015)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
FIX #4155 Search Categories error
Commit: bec00e37e04ddeedd49d9c00df35c2a39a9adeaa
https://github.com/Dolibarr/dolibarr/commit/bec00e37e04ddeedd49d9c00df35c2a39a9adeaa
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-12-28 (Mon, 28 Dec 2015)
Changed paths:
M htdocs/societe/consumption.php
Log Message:
-----------
FIX #4272 Error when trying to print the page "Linked objects" of a Thirdparty
Commit: 039039bb0078007af2495f1655956afb51a4ac05
https://github.com/Dolibarr/dolibarr/commit/039039bb0078007af2495f1655956afb51a4ac05
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-12-28 (Mon, 28 Dec 2015)
Changed paths:
M htdocs/public/cron/cron_run_jobs.php
Log Message:
-----------
FIX #3798 #2519 Cron jobs would never be executed
Commit: f8e156ea3077eddbd9bfce237c947e5b7217b6c1
https://github.com/Dolibarr/dolibarr/commit/f8e156ea3077eddbd9bfce237c947e5b7217b6c1
Author: fmarcet <address@hidden>
Date: 2015-12-29 (Tue, 29 Dec 2015)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Commit: cebb996120064713c6a8975e0282883b7bfbacb7
https://github.com/Dolibarr/dolibarr/commit/cebb996120064713c6a8975e0282883b7bfbacb7
Author: fmarcet <address@hidden>
Date: 2015-12-29 (Tue, 29 Dec 2015)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Commit: 08b4903057f6ab7893f611827d0df5090283dab6
https://github.com/Dolibarr/dolibarr/commit/08b4903057f6ab7893f611827d0df5090283dab6
Author: Juanjo Menent <address@hidden>
Date: 2015-12-30 (Wed, 30 Dec 2015)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Merge pull request #4315 from marcosgdf/bug-4155
FIX #4155 Search Categories error
Commit: 3aba3eda3c1279a04f5256f3d147be1194e56a1c
https://github.com/Dolibarr/dolibarr/commit/3aba3eda3c1279a04f5256f3d147be1194e56a1c
Author: Juanjo Menent <address@hidden>
Date: 2015-12-30 (Wed, 30 Dec 2015)
Changed paths:
M htdocs/societe/consumption.php
Log Message:
-----------
Merge pull request #4316 from marcosgdf/bug-4272
FIX #4272 Error when trying to print the page "Linked objects" of a Thirdparty
Commit: c004342976ae1cf5fe9d3c994b6a7637ae603d81
https://github.com/Dolibarr/dolibarr/commit/c004342976ae1cf5fe9d3c994b6a7637ae603d81
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-31 (Thu, 31 Dec 2015)
Changed paths:
M htdocs/core/lib/company.lib.php
Log Message:
-----------
FIX #3694
Commit: a234482d085dfde843851941a7c8d27fa57d34e6
https://github.com/Dolibarr/dolibarr/commit/a234482d085dfde843851941a7c8d27fa57d34e6
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-31 (Thu, 31 Dec 2015)
Changed paths:
M htdocs/core/lib/company.lib.php
Log Message:
-----------
FIX #3694
Commit: fffc8a430dfebd51720143738d74ece8715a3f9a
https://github.com/Dolibarr/dolibarr/commit/fffc8a430dfebd51720143738d74ece8715a3f9a
Author: phf <address@hidden>
Date: 2015-12-31 (Thu, 31 Dec 2015)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
FIX call trigger LINEBILL_SUPPLIER_CREATE
Commit: 1a5dab11e0df0ff69ab2739d4dd0f3efc72acd6b
https://github.com/Dolibarr/dolibarr/commit/1a5dab11e0df0ff69ab2739d4dd0f3efc72acd6b
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-02 (Sat, 02 Jan 2016)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
Merge pull request #4323 from atm-ph/fix_3.8_trigger_addline_supplier_invoice
FIX call trigger LINEBILL_SUPPLIER_CREATE
Commit: 35ce670bf260f63ab8b3df391d7857f8144cb026
https://github.com/Dolibarr/dolibarr/commit/35ce670bf260f63ab8b3df391d7857f8144cb026
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-02 (Sat, 02 Jan 2016)
Changed paths:
M htdocs/install/upgrade.php
Log Message:
-----------
Fix to allow phpunit of migration process for 3.4 to 3.5
Commit: b46aec8e7e9eca19cb1739f94fe99267298b4a26
https://github.com/Dolibarr/dolibarr/commit/b46aec8e7e9eca19cb1739f94fe99267298b4a26
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-02 (Sat, 02 Jan 2016)
Changed paths:
M htdocs/install/upgrade.php
Log Message:
-----------
Fix to allow phpunit of migration process for 3.5 to 3.6
Commit: 0cad938e095358a08848e033accc6aab133daf01
https://github.com/Dolibarr/dolibarr/commit/0cad938e095358a08848e033accc6aab133daf01
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-02 (Sat, 02 Jan 2016)
Changed paths:
M htdocs/install/upgrade.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/install/upgrade.php
Commit: e4640ca4c361a06ab63dba0e681e027d459b3921
https://github.com/Dolibarr/dolibarr/commit/e4640ca4c361a06ab63dba0e681e027d459b3921
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-02 (Sat, 02 Jan 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/install/upgrade.php
Commit: 8f0a004a58a83c1d468487b739c22d10cac6162d
https://github.com/Dolibarr/dolibarr/commit/8f0a004a58a83c1d468487b739c22d10cac6162d
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-02 (Sat, 02 Jan 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Commit: ae2295d0192009a16b36da2fea847a20ecc34f69
https://github.com/Dolibarr/dolibarr/commit/ae2295d0192009a16b36da2fea847a20ecc34f69
Author: Marcos García de La Fuente <address@hidden>
Date: 2016-01-03 (Sun, 03 Jan 2016)
Changed paths:
M htdocs/public/cron/cron_run_jobs.php
Log Message:
-----------
Improvement suggested by @eldy
Commit: f6fead7403cd48f75f659e42885ef2003e0cb49a
https://github.com/Dolibarr/dolibarr/commit/f6fead7403cd48f75f659e42885ef2003e0cb49a
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-03 (Sun, 03 Jan 2016)
Changed paths:
M htdocs/public/cron/cron_run_jobs.php
Log Message:
-----------
Merge pull request #4317 from marcosgdf/bug-3798
FIX #3798 #2519 Cron jobs would never be executed
Commit: cafe148f7278be9e7ca0abec6ab6cf1e65ea0d36
https://github.com/Dolibarr/dolibarr/commit/cafe148f7278be9e7ca0abec6ab6cf1e65ea0d36
Author: fmarcet <address@hidden>
Date: 2016-01-04 (Mon, 04 Jan 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Commit: ffd7f4ea30fd2e09a05675a48c3445eb3f6e513e
https://github.com/Dolibarr/dolibarr/commit/ffd7f4ea30fd2e09a05675a48c3445eb3f6e513e
Author: Sergio Sanchis Climent <address@hidden>
Date: 2016-01-05 (Tue, 05 Jan 2016)
Changed paths:
M htdocs/core/lib/price.lib.php
Log Message:
-----------
Fix userlocaltax
Is posible userlocaltax1_rate or userlocaltax2_rate have value 0.0000 and no
enter in if, now check if diferent 0 and now enter
Commit: a0b3cdbd217051fde27d945d35fa761584cb9a9a
https://github.com/Dolibarr/dolibarr/commit/a0b3cdbd217051fde27d945d35fa761584cb9a9a
Author: Frédéric FRANCE <address@hidden>
Date: 2016-01-05 (Tue, 05 Jan 2016)
Changed paths:
M htdocs/holiday/list.php
Log Message:
-----------
Update list.php
Commit: 4dacf462db00df247665ee06a6bd52cf144fbd14
https://github.com/Dolibarr/dolibarr/commit/4dacf462db00df247665ee06a6bd52cf144fbd14
Author: Frédéric FRANCE <address@hidden>
Date: 2016-01-05 (Tue, 05 Jan 2016)
Changed paths:
M htdocs/holiday/card.php
Log Message:
-----------
Update card.php
Commit: 3ae5da1cd639fff8647a5cf338905cb6dcf4739d
https://github.com/Dolibarr/dolibarr/commit/3ae5da1cd639fff8647a5cf338905cb6dcf4739d
Author: Regis Houssin <address@hidden>
Date: 2016-01-06 (Wed, 06 Jan 2016)
Changed paths:
M htdocs/viewimage.php
Log Message:
-----------
Fix: disable main.inc.php hooks
Commit: 601284672a09741ff6b7a742cefce8ce8d5502e6
https://github.com/Dolibarr/dolibarr/commit/601284672a09741ff6b7a742cefce8ce8d5502e6
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-07 (Thu, 07 Jan 2016)
Changed paths:
M htdocs/holiday/list.php
Log Message:
-----------
Merge pull request #4337 from frederic34/patch-9
FIX: When viewing tab of leave request, remaining leave days must be nb of
edited user.
Commit: b4d9f1bece3f210bffa3a16666c73fe0c88e8c84
https://github.com/Dolibarr/dolibarr/commit/b4d9f1bece3f210bffa3a16666c73fe0c88e8c84
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-07 (Thu, 07 Jan 2016)
Changed paths:
M htdocs/holiday/card.php
Log Message:
-----------
Merge pull request #4338 from frederic34/patch-10
FIX: Missing leave request type when calling function
Commit: 9d3afe45d389ddf21b9e39efb0bdf7b6129a4fb8
https://github.com/Dolibarr/dolibarr/commit/9d3afe45d389ddf21b9e39efb0bdf7b6129a4fb8
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-07 (Thu, 07 Jan 2016)
Changed paths:
M htdocs/viewimage.php
Log Message:
-----------
Merge pull request #4340 from hregis/3.8_bug
Fix: disable main.inc.php hooks
Commit: d8360a2a0169886c3c9be771202be480db12b534
https://github.com/Dolibarr/dolibarr/commit/d8360a2a0169886c3c9be771202be480db12b534
Author: fmarcet <address@hidden>
Date: 2016-01-07 (Thu, 07 Jan 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Commit: dfdf58051e2c58a8a25e28886112384dca7e2111
https://github.com/Dolibarr/dolibarr/commit/dfdf58051e2c58a8a25e28886112384dca7e2111
Author: Sergio Sanchis Climent <address@hidden>
Date: 2016-01-07 (Thu, 07 Jan 2016)
Changed paths:
M htdocs/core/lib/price.lib.php
Log Message:
-----------
Edited correctly for check values
Commit: f2178f0369981dce326e4d67e44ae7493539d550
https://github.com/Dolibarr/dolibarr/commit/f2178f0369981dce326e4d67e44ae7493539d550
Author: Raphaël Doursenaud <address@hidden>
Date: 2016-01-08 (Fri, 08 Jan 2016)
Changed paths:
M htdocs/admin/agenda_extsites.php
Log Message:
-----------
FIX #4291 Correctly filter external calendar GETPOSTs
Commit: 36dc8b1ce79c972c867b804778c5b780caea8a56
https://github.com/Dolibarr/dolibarr/commit/36dc8b1ce79c972c867b804778c5b780caea8a56
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-08 (Fri, 08 Jan 2016)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
FIX #4341
Commit: c2b8be9aaf654193dc8afc9a296c744354552841
https://github.com/Dolibarr/dolibarr/commit/c2b8be9aaf654193dc8afc9a296c744354552841
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-08 (Fri, 08 Jan 2016)
Changed paths:
M htdocs/admin/agenda_extsites.php
Log Message:
-----------
Merge pull request #4355 from GPCsolutions/3.6-4291
FIX #4291 Correctly filter external calendar GETPOSTs
Commit: a26a6c2449f89e8e2a426864c9a2c77dd95873c9
https://github.com/Dolibarr/dolibarr/commit/a26a6c2449f89e8e2a426864c9a2c77dd95873c9
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-08 (Fri, 08 Jan 2016)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Fix sql injection even when code is on several lines
Commit: 5414cb6f12ce4bf1d804d22b4ac5fe72e6eaf25f
https://github.com/Dolibarr/dolibarr/commit/5414cb6f12ce4bf1d804d22b4ac5fe72e6eaf25f
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-08 (Fri, 08 Jan 2016)
Changed paths:
M htdocs/admin/agenda_extsites.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: e008922919b5ddff2a718e113566536177ffddc1
https://github.com/Dolibarr/dolibarr/commit/e008922919b5ddff2a718e113566536177ffddc1
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-08 (Fri, 08 Jan 2016)
Changed paths:
M htdocs/admin/agenda_extsites.php
M htdocs/main.inc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/admin/agenda_extsites.php
Commit: 8366310f0f098409d261841525659a85ff05d68f
https://github.com/Dolibarr/dolibarr/commit/8366310f0f098409d261841525659a85ff05d68f
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-08 (Fri, 08 Jan 2016)
Changed paths:
M htdocs/admin/agenda_extsites.php
M htdocs/main.inc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/admin/agenda_extsites.php
Commit: 40f0d0c9f2bfdab905adb5ee1a805a3945d37c22
https://github.com/Dolibarr/dolibarr/commit/40f0d0c9f2bfdab905adb5ee1a805a3945d37c22
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
Merge pull request #4321 from fmarcet/3.7
FIX: Email templates not compatible with Multicompany
Commit: 94814e58e50fdd90e6e24cd42f9589a5657fe3c2
https://github.com/Dolibarr/dolibarr/commit/94814e58e50fdd90e6e24cd42f9589a5657fe3c2
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/core/lib/price.lib.php
Log Message:
-----------
Merge pull request #4334 from olsesacl/patch-1
Fix check userlocaltax1_rate and userlocaltax2_rate
Commit: 6685502d5cd2cfde5e7726496a399dc1eef91d06
https://github.com/Dolibarr/dolibarr/commit/6685502d5cd2cfde5e7726496a399dc1eef91d06
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Fix add Croatia into list of country in EEC
Commit: 70b57322a251e68bd9fddc349b8d6fdd108d59ca
https://github.com/Dolibarr/dolibarr/commit/70b57322a251e68bd9fddc349b8d6fdd108d59ca
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/core/lib/price.lib.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: cdaccf7c4b00251ba50a9ed5a9d30437840a7fb1
https://github.com/Dolibarr/dolibarr/commit/cdaccf7c4b00251ba50a9ed5a9d30437840a7fb1
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Fix: markRate can be 100
Commit: 801e2bca4b4b844c419889b03b7eba0e1d34d3bf
https://github.com/Dolibarr/dolibarr/commit/801e2bca4b4b844c419889b03b7eba0e1d34d3bf
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Fix #4239
Commit: a9f0d6964a0d53de254a2fe6ccd191dffad96195
https://github.com/Dolibarr/dolibarr/commit/a9f0d6964a0d53de254a2fe6ccd191dffad96195
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M ChangeLog
M htdocs/admin/agenda_extsites.php
M htdocs/categories/class/categorie.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/price.lib.php
M htdocs/fourn/facture/card.php
M htdocs/holiday/card.php
M htdocs/holiday/list.php
M htdocs/main.inc.php
M htdocs/public/cron/cron_run_jobs.php
M htdocs/societe/consumption.php
M htdocs/viewimage.php
Log Message:
-----------
Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8
Commit: 861376e4613b9cf8d7e69203536314457330c1da
https://github.com/Dolibarr/dolibarr/commit/861376e4613b9cf8d7e69203536314457330c1da
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M ChangeLog
M htdocs/admin/agenda_extsites.php
M htdocs/admin/dict.php
M htdocs/main.inc.php
Log Message:
-----------
Merge branch '3.7' of github.com:Dolibarr/dolibarr into 3.7
Commit: 7281338f8d4c9cb937fabdfda4f435309cdd1b43
https://github.com/Dolibarr/dolibarr/commit/7281338f8d4c9cb937fabdfda4f435309cdd1b43
Author: Raphaël Doursenaud <address@hidden>
Date: 2016-01-11 (Mon, 11 Jan 2016)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
FIX #4291 Correctly filter bank card GETPOSTs
Commit: 7552fa20ebdfff06c0095a3fac04c2a0759186b6
https://github.com/Dolibarr/dolibarr/commit/7552fa20ebdfff06c0095a3fac04c2a0759186b6
Author: aspangaro <address@hidden>
Date: 2016-01-11 (Mon, 11 Jan 2016)
Changed paths:
M htdocs/expensereport/list.php
Log Message:
-----------
Fix: #4394 Untranslated label in list of expense reports
Commit: 92885065c6595a7fe4076c9568424915e3dd690a
https://github.com/Dolibarr/dolibarr/commit/92885065c6595a7fe4076c9568424915e3dd690a
Author: Frédéric FRANCE <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Update facture.php
Commit: f280061a903ccf4bd04d26900548d566fd3c3a4a
https://github.com/Dolibarr/dolibarr/commit/f280061a903ccf4bd04d26900548d566fd3c3a4a
Author: phf <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
FIX if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is
displayed on pdf
Commit: 79992b494793747a54a0cba8d26c5fc1f1599f55
https://github.com/Dolibarr/dolibarr/commit/79992b494793747a54a0cba8d26c5fc1f1599f55
Author: fmarcet <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/societe/index.php
Log Message:
-----------
FIX: The third dashboard don't consider user permissions
Commit: 5b26f456f42fd2d05602afad83bfc152ee1e5238
https://github.com/Dolibarr/dolibarr/commit/5b26f456f42fd2d05602afad83bfc152ee1e5238
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
Merge pull request #4356 from GPCsolutions/3.8-4291
FIX #4291 Correctly filter bank card GETPOSTs
Commit: 85747c73831bd5741121aa1e78e4110c41ddb510
https://github.com/Dolibarr/dolibarr/commit/85747c73831bd5741121aa1e78e4110c41ddb510
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/expensereport/list.php
Log Message:
-----------
Merge pull request #4400 from aspangaro/3.8-p1
Fix: #4394 Untranslated label in list of expense reports
Commit: 1b1bd73e6b6af8688ab79915059f63c94d534e9c
https://github.com/Dolibarr/dolibarr/commit/1b1bd73e6b6af8688ab79915059f63c94d534e9c
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #4404 from frederic34/patch-8
FIX When doing payment for money back, bank account was not set by default
Commit: 93ed7c098beee79f7365aa6cdf1180f8ef2be17b
https://github.com/Dolibarr/dolibarr/commit/93ed7c098beee79f7365aa6cdf1180f8ef2be17b
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge pull request #4407 from atm-ph/fix_3.8_pdf_muscadet_use_hour
FIX pdf_muscadet delivery hour
Commit: 947f718329b436a5190886984f1370fa9f47d25d
https://github.com/Dolibarr/dolibarr/commit/947f718329b436a5190886984f1370fa9f47d25d
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/societe/index.php
Log Message:
-----------
Merge pull request #4408 from fmarcet/3.7
FIX: The third dashboard don't consider user permissions
Commit: 9b682e095f02d78f937e1f2bf49b4d9400e19fbd
https://github.com/Dolibarr/dolibarr/commit/9b682e095f02d78f937e1f2bf49b4d9400e19fbd
Author: phf <address@hidden>
Date: 2016-01-13 (Wed, 13 Jan 2016)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
FIX can't clone event
Commit: 004285c6b4211cd090575a5e84a3f9b4b56fe25c
https://github.com/Dolibarr/dolibarr/commit/004285c6b4211cd090575a5e84a3f9b4b56fe25c
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-13 (Wed, 13 Jan 2016)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
Merge pull request #4412 from atm-ph/fix_3.8_clone_event
FIX can't clone event
Commit: 3a3ae90a0abc118427de0fa65ef03b6bfc5ac5aa
https://github.com/Dolibarr/dolibarr/commit/3a3ae90a0abc118427de0fa65ef03b6bfc5ac5aa
Author: Regis Houssin <address@hidden>
Date: 2016-01-13 (Wed, 13 Jan 2016)
Changed paths:
M htdocs/opensurvey/wizard/index.php
Log Message:
-----------
Fix: ajax error with multicompany module
Commit: d98415f9b568d5c8c1dd81a84d8cedaab3aca063
https://github.com/Dolibarr/dolibarr/commit/d98415f9b568d5c8c1dd81a84d8cedaab3aca063
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-14 (Thu, 14 Jan 2016)
Changed paths:
M htdocs/opensurvey/wizard/index.php
Log Message:
-----------
Merge pull request #4413 from hregis/3.8_bug
Fix: ajax error with multicompany module
Commit: 8b2541ebf92edff44999abd4a082d38870a2ab0e
https://github.com/Dolibarr/dolibarr/commit/8b2541ebf92edff44999abd4a082d38870a2ab0e
Author: arnaud <address@hidden>
Date: 2016-01-14 (Thu, 14 Jan 2016)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
FIX nblignes not calculated after hook and hook can't modify this value.
Usefull for modules
Commit: 905f9d78edbfe2089ed48dbbc17769ae06f6bb79
https://github.com/Dolibarr/dolibarr/commit/905f9d78edbfe2089ed48dbbc17769ae06f6bb79
Author: Regis Houssin <address@hidden>
Date: 2016-01-15 (Fri, 15 Jan 2016)
Changed paths:
M htdocs/fourn/commande/card.php
Log Message:
-----------
Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9)
Commit: 6aeb18ed7532aa534a3fc261145fd29f928238e6
https://github.com/Dolibarr/dolibarr/commit/6aeb18ed7532aa534a3fc261145fd29f928238e6
Author: Regis Houssin <address@hidden>
Date: 2016-01-15 (Fri, 15 Jan 2016)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Revert "Fix: for avoid division by 0"
This reverts commit c71d578931ed9126937fdcb3dda0e8e5a332f0c8.
Commit: 6e30d5e516095138e1b358ae39bf8f318e86d9b9
https://github.com/Dolibarr/dolibarr/commit/6e30d5e516095138e1b358ae39bf8f318e86d9b9
Author: Regis Houssin <address@hidden>
Date: 2016-01-15 (Fri, 15 Jan 2016)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
M htdocs/filefunc.inc.php
M htdocs/fourn/product/list.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.7_bug
Commit: d46c655fb4893a3fa3dbbd0b630edda068aea1ba
https://github.com/Dolibarr/dolibarr/commit/d46c655fb4893a3fa3dbbd0b630edda068aea1ba
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-16 (Sat, 16 Jan 2016)
Changed paths:
M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
Log Message:
-----------
FIX: Sql syntax error in doc_generic_task_odt
Commit: be4f9baac69c9a6fcc06a8099b17dbe22e1f7002
https://github.com/Dolibarr/dolibarr/commit/be4f9baac69c9a6fcc06a8099b17dbe22e1f7002
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-16 (Sat, 16 Jan 2016)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/compta/bank/card.php
M htdocs/compta/facture.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/expensereport/list.php
M htdocs/opensurvey/wizard/index.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: af4d57b461ad0634aeee85169df66623b36ed21a
https://github.com/Dolibarr/dolibarr/commit/af4d57b461ad0634aeee85169df66623b36ed21a
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-16 (Sat, 16 Jan 2016)
Changed paths:
A dev/initdata/img/applepieproduct.jpg
A dev/initdata/img/dolidroid_114x114.png
A dev/initdata/img/dolidroid_512x512_en.png
A dev/initdata/img/dolidroid_screenshot_home_720x1280.png
A dev/initdata/img/genericcustomer.png
A dev/initdata/img/indiancompany.png
A dev/initdata/img/logo_nltechno_94x100.png
A dev/initdata/img/nocountrycomp.png
A dev/initdata/img/pearpieproduct.jpg
A dev/initdata/img/pinkdressproduct.jpg
M dev/initdata/img/printcompany.png
A dev/initdata/img/rolluproduct.jpg
A dev/initdata/img/spanishcompany.png
A dev/initdata/img/swisstouch.png
A dev/initdata/img/teclibcompany.png
Log Message:
-----------
Complete demo samples
Commit: 4d2b5d71afee433b40bed2d2980dba3493efeacd
https://github.com/Dolibarr/dolibarr/commit/4d2b5d71afee433b40bed2d2980dba3493efeacd
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-17 (Sun, 17 Jan 2016)
Changed paths:
M htdocs/langs/en_US/sms.lang
Log Message:
-----------
Fix missing translation key
Commit: da637db162be2131c03366513796579e97280183
https://github.com/Dolibarr/dolibarr/commit/da637db162be2131c03366513796579e97280183
Author: Marcos García de La Fuente <address@hidden>
Date: 2016-01-18 (Mon, 18 Jan 2016)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays
Commit: 535d3bc0879c9726788dc1181021ed19b4230eec
https://github.com/Dolibarr/dolibarr/commit/535d3bc0879c9726788dc1181021ed19b4230eec
Author: Regis Houssin <address@hidden>
Date: 2016-01-18 (Mon, 18 Jan 2016)
Changed paths:
M htdocs/admin/agenda_extsites.php
M htdocs/admin/dict.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/main.inc.php
M htdocs/societe/index.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.7_bug
Commit: 2386b79dfc34cc24d0ddd85f21a480c4e343e9ac
https://github.com/Dolibarr/dolibarr/commit/2386b79dfc34cc24d0ddd85f21a480c4e343e9ac
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-18 (Mon, 18 Jan 2016)
Changed paths:
M htdocs/admin/delais.php
Log Message:
-----------
FIX Option to disable meteo was not set correctly in edit mode
Commit: 9ce6e2938cedc967026b68b5ce2cfb1cd291257e
https://github.com/Dolibarr/dolibarr/commit/9ce6e2938cedc967026b68b5ce2cfb1cd291257e
Author: arnaud <address@hidden>
Date: 2016-01-19 (Tue, 19 Jan 2016)
Changed paths:
M htdocs/bookmarks/card.php
Log Message:
-----------
FIX bookmark's user change after update if the user hasn't superadmin right
Commit: 219ce73ea2903292ed62fd705dd1b4fc69f12110
https://github.com/Dolibarr/dolibarr/commit/219ce73ea2903292ed62fd705dd1b4fc69f12110
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
Merge pull request #4417 from atm-arnaud/3.8_fix_factures_nblignes_after_hook
FIX nblignes not calculated after hook and hook can't modify this val...
Commit: 34c648b351169127324a4e95c1c9a4337e297521
https://github.com/Dolibarr/dolibarr/commit/34c648b351169127324a4e95c1c9a4337e297521
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
FIX #4418
Commit: 56a4466b5b976a3ab92ea707f28909dda19307f2
https://github.com/Dolibarr/dolibarr/commit/56a4466b5b976a3ab92ea707f28909dda19307f2
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: cbd01bae49eb05e927cde290d3e47dd0678780e3
https://github.com/Dolibarr/dolibarr/commit/cbd01bae49eb05e927cde290d3e47dd0678780e3
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/admin/dict.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/societe/index.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/admin/dict.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/societe/index.php
Commit: 9d63cb0156fb74bf5c54586a5b87a079bc3e2a97
https://github.com/Dolibarr/dolibarr/commit/9d63cb0156fb74bf5c54586a5b87a079bc3e2a97
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/fourn/commande/card.php
Log Message:
-----------
Merge pull request #4452 from hregis/3.7_bug
Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9)
Commit: 9fd56df03fd6485a40a0c1e5665b429e80455190
https://github.com/Dolibarr/dolibarr/commit/9fd56df03fd6485a40a0c1e5665b429e80455190
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
Merge pull request #4444 from marcosgdf/bug-4440-2
FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays
Commit: 50b0019ead204107919fec379b2dbf45c7aedea2
https://github.com/Dolibarr/dolibarr/commit/50b0019ead204107919fec379b2dbf45c7aedea2
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
A protection to avoid situation loosing all admin accounts
Commit: 2b7b7e014d5c7ae10985975d26284cca58d36995
https://github.com/Dolibarr/dolibarr/commit/2b7b7e014d5c7ae10985975d26284cca58d36995
Author: Regis Houssin <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/comm/mailing/cibles.php
Log Message:
-----------
Fix: for avoid conflict with "global $m" in memory.lib.php
Commit: fedf1f3288addbc32ad6b0de1492058ceaea9ee5
https://github.com/Dolibarr/dolibarr/commit/fedf1f3288addbc32ad6b0de1492058ceaea9ee5
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix view of product image when using old path
Fix size of image uploaded on user.
Commit: 49a325e7aecb2ba33bac0c7cf5fa74dcefd3ba31
https://github.com/Dolibarr/dolibarr/commit/49a325e7aecb2ba33bac0c7cf5fa74dcefd3ba31
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Fix: We must ue the "small" size of imge to show on card pages.
Commit: dadc24462a417038e9a7d22aaa640fca524fdfb0
https://github.com/Dolibarr/dolibarr/commit/dadc24462a417038e9a7d22aaa640fca524fdfb0
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Fix: We must ue the "small" size of imge to show on card pages.
Commit: 540bb04cac9196921ac383b0c3d886d49dc4e8c5
https://github.com/Dolibarr/dolibarr/commit/540bb04cac9196921ac383b0c3d886d49dc4e8c5
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M dev/initdata/img/mybigcompany.png
Log Message:
-----------
Update demo init data
Commit: fac38db2bfe0ff1a6d608056430fba3ebd6267fb
https://github.com/Dolibarr/dolibarr/commit/fac38db2bfe0ff1a6d608056430fba3ebd6267fb
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/bookmarks/card.php
Log Message:
-----------
Merge pull request #4457 from atm-arnaud/3.8_fix_bookmarks_user_update
FIX bookmark's user change after update if the user isn't superadmin
Commit: 4c3f9db2a1c47e38da374765e5162cb88d17155d
https://github.com/Dolibarr/dolibarr/commit/4c3f9db2a1c47e38da374765e5162cb88d17155d
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
A dev/initdata/img/comapnycorp1company.png
A dev/initdata/img/compxp4523product.jpg
A dev/initdata/img/ldestailleur_200x200.jpg
Log Message:
-----------
Add demo data
Commit: b09d3663d622f62de9cc56c2b8a3adb575e13940
https://github.com/Dolibarr/dolibarr/commit/b09d3663d622f62de9cc56c2b8a3adb575e13940
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/bookmarks/card.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 1012fb8be1792e21116697ba237371e42190921b
https://github.com/Dolibarr/dolibarr/commit/1012fb8be1792e21116697ba237371e42190921b
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
A dev/initdata/img/companycorp2company.png
A dev/initdata/img/magicfoodstorecompany.png
A dev/initdata/img/valeencompany.png
Log Message:
-----------
Update demo data
Commit: 2b96c8f2059af0e09823e390de53aa56162f7ed8
https://github.com/Dolibarr/dolibarr/commit/2b96c8f2059af0e09823e390de53aa56162f7ed8
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-23 (Sat, 23 Jan 2016)
Changed paths:
M htdocs/holiday/card.php
Log Message:
-----------
FIX Noway to validate a leave request for some uer even if they have
permission for.
Commit: 627f606c4db7519759127fdfe2596677cea3f801
https://github.com/Dolibarr/dolibarr/commit/627f606c4db7519759127fdfe2596677cea3f801
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-23 (Sat, 23 Jan 2016)
Changed paths:
M htdocs/holiday/list.php
Log Message:
-----------
Fix list of leave request was not showing label correctly.
Commit: 9be246baa5edb11fe67e22861502544adab879f5
https://github.com/Dolibarr/dolibarr/commit/9be246baa5edb11fe67e22861502544adab879f5
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-23 (Sat, 23 Jan 2016)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Commit: dc438792f4380145b56641c7a5a31169936873a9
https://github.com/Dolibarr/dolibarr/commit/dc438792f4380145b56641c7a5a31169936873a9
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-23 (Sat, 23 Jan 2016)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/fourn/commande/card.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/fourn/commande/card.php
Commit: f8cd4eb166c59d7df59a3916210c501f38a5bf59
https://github.com/Dolibarr/dolibarr/commit/f8cd4eb166c59d7df59a3916210c501f38a5bf59
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-23 (Sat, 23 Jan 2016)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.8.0.sql
Log Message:
-----------
Update demo
Commit: a3c273aec8d2ddf03841b650cf757f98002ef068
https://github.com/Dolibarr/dolibarr/commit/a3c273aec8d2ddf03841b650cf757f98002ef068
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-23 (Sat, 23 Jan 2016)
Changed paths:
R dev/initdata/img/alberteinstein.jpg
R dev/initdata/img/applepieproduct.jpg
R dev/initdata/img/bookkeepercompany.png
R dev/initdata/img/comapnycorp1company.png
R dev/initdata/img/companycorp2company.png
R dev/initdata/img/compxp4523product.jpg
R dev/initdata/img/dolidroid_114x114.png
R dev/initdata/img/dolidroid_512x512_en.png
R dev/initdata/img/dolidroid_screenshot_home_720x1280.png
R dev/initdata/img/genericcustomer.png
R dev/initdata/img/indiancompany.png
R dev/initdata/img/johndoe.png
R dev/initdata/img/ldestailleur_200x200.jpg
R dev/initdata/img/logo_nltechno_94x100.png
R dev/initdata/img/magicfoodstorecompany.png
R dev/initdata/img/mariecurie.jpg
R dev/initdata/img/mybigcompany.png
R dev/initdata/img/nocountrycomp.png
R dev/initdata/img/pearpieproduct.jpg
R dev/initdata/img/pierrecurie.jpg
R dev/initdata/img/pinkdressproduct.jpg
R dev/initdata/img/printcompany.png
R dev/initdata/img/rolluproduct.jpg
R dev/initdata/img/spanishcompany.png
R dev/initdata/img/swisstouch.png
R dev/initdata/img/teclibcompany.png
R dev/initdata/img/valeencompany.png
Log Message:
-----------
Update demo datas
Commit: a841db1eeb0dda68b6d8dddf5ad4d073f3b28f08
https://github.com/Dolibarr/dolibarr/commit/a841db1eeb0dda68b6d8dddf5ad4d073f3b28f08
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-23 (Sat, 23 Jan 2016)
Changed paths:
M htdocs/admin/tools/purge.php
Log Message:
-----------
FIX Purge of temp files was broken
Commit: 200a6d3c3b4a51a831383dd5a8cd54dea5c00f12
https://github.com/Dolibarr/dolibarr/commit/200a6d3c3b4a51a831383dd5a8cd54dea5c00f12
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-23 (Sat, 23 Jan 2016)
Changed paths:
A dev/initdata/documents_demo/.htaccess
A dev/initdata/documents_demo/commande/(PROV6)/(PROV6).pdf
A dev/initdata/documents_demo/commande/CO1107-0002/CO1107-0002.pdf
A dev/initdata/documents_demo/commande/CO1107-0003/CO1107-0003.pdf
A dev/initdata/documents_demo/commande/CO1107-0004/CO1107-0004.pdf
A dev/initdata/documents_demo/commande/CO1108-0001/CO1108-0001.pdf
A dev/initdata/documents_demo/custom/main.inc.php
A dev/initdata/documents_demo/custom/master.inc.php
A dev/initdata/documents_demo/doctemplates/invoices/template_invoice.odt
A dev/initdata/documents_demo/doctemplates/orders/template_order.odt
A dev/initdata/documents_demo/doctemplates/projects/template_project.odt
A dev/initdata/documents_demo/doctemplates/proposals/template_proposal.odt
A dev/initdata/documents_demo/doctemplates/tasks/template_task_summary.odt
A
dev/initdata/documents_demo/doctemplates/thirdparties/template_thirdparty.odt
A dev/initdata/documents_demo/expedition/sending/SH1302-0001/SH1302-0001.pdf
A dev/initdata/documents_demo/expensereport/(PROV2)/(PROV2).pdf
A
dev/initdata/documents_demo/expensereport/ADMIN-ER00001-150101/ADMIN-ER00001-150101.pdf
A
dev/initdata/documents_demo/expensereport/ADMIN-ER00002-150101/ADMIN-ER00002-150101.pdf
A dev/initdata/documents_demo/facture/(PROV149)/(PROV149).pdf
A dev/initdata/documents_demo/facture/AV1212-0001/AV1212-0001.pdf
A dev/initdata/documents_demo/facture/AV1212-0002/AV1212-0002.pdf
A dev/initdata/documents_demo/facture/AV1303-0003/AV1303-0003.pdf
A dev/initdata/documents_demo/facture/FA1007-0002/FA1007-0002.pdf
A dev/initdata/documents_demo/facture/FA1107-0006/FA1107-0006.pdf
A dev/initdata/documents_demo/facture/FA1107-0019/FA1107-0019_invoice.odt
A dev/initdata/documents_demo/facture/FA1108-0003/FA1108-0003.pdf
A dev/initdata/documents_demo/facture/FA1108-0004/FA1108-0004.pdf
A dev/initdata/documents_demo/facture/FA1108-0005/FA1108-0005.pdf
A dev/initdata/documents_demo/facture/FA1108-0007/FA1108-0007.pdf
A dev/initdata/documents_demo/facture/FA1212-0009/FA1212-0009.pdf
A dev/initdata/documents_demo/facture/FA1212-0009/FA1212-0009_invoice.odt
A dev/initdata/documents_demo/facture/FA1212-0011/FA1212-0011.pdf
A dev/initdata/documents_demo/facture/FA1212-0021/FA1212-0021.pdf
A dev/initdata/documents_demo/facture/FA1212-0023/FA1212-0023.pdf
A dev/initdata/documents_demo/facture/FA1507-0015/FA1507-0015.pdf
A dev/initdata/documents_demo/facture/FA1507-0015/FA1507-0015_invoice.odt
A dev/initdata/documents_demo/ficheinter/FI1007-0001/FI1007-0001.pdf
A dev/initdata/documents_demo/ficheinter/FI1511-0003/FI1511-0003.pdf
A
dev/initdata/documents_demo/fournisseur/commande/CF1007-0001/CF1007-0001.pdf
A
dev/initdata/documents_demo/fournisseur/commande/CF1007-0002/CF1007-0002.pdf
A
dev/initdata/documents_demo/fournisseur/commande/CF1303-0004/CF1303-0004.pdf
A dev/initdata/documents_demo/fournisseur/facture/6/1/16/16.pdf
A dev/initdata/documents_demo/fournisseur/facture/7/1/17/17.pdf
A dev/initdata/documents_demo/mycompany/logos/mybigcompany.png
A dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_mini.png
A dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_small.png
A dev/initdata/documents_demo/produit/APPLEPIE/applepieproduct.jpg
A
dev/initdata/documents_demo/produit/APPLEPIE/thumbs/applepieproduct_mini.jpg
A dev/initdata/documents_demo/produit/CAKECONTRIB/applepieproduct.jpg
A
dev/initdata/documents_demo/produit/CAKECONTRIB/thumbs/applepieproduct_mini.jpg
A dev/initdata/documents_demo/produit/COMP-XP4523/compxp4523product.jpg
A
dev/initdata/documents_demo/produit/COMP-XP4523/thumbs/compxp4523product_mini.jpg
A dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_114x114.png
A dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_512x512_en.png
A
dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_screenshot_home_720x1280.png
A
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_114x114_mini.png
A
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_512x512_en_mini.png
A
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_screenshot_home_720x1280_mini.png
A dev/initdata/documents_demo/produit/PEARPIE/pearpieproduct.jpg
A dev/initdata/documents_demo/produit/PEARPIE/thumbs/pearpieproduct_mini.jpg
A dev/initdata/documents_demo/produit/PINKDRESS/pinkdressproduct.jpg
A
dev/initdata/documents_demo/produit/PINKDRESS/thumbs/pinkdressproduct_mini.jpg
A dev/initdata/documents_demo/produit/ROLLUPABC/rolluproduct.jpg
A dev/initdata/documents_demo/produit/ROLLUPABC/thumbs/rolluproduct_mini.jpg
A dev/initdata/documents_demo/propale/PR1007-0001/PR1007-0001.pdf
A dev/initdata/documents_demo/propale/PR1007-0002/PR1007-0002.pdf
A dev/initdata/documents_demo/propale/PR1302-0005/PR1302-0005.pdf
A dev/initdata/documents_demo/propale/PR1302-0006/PR1302-0006.pdf
A dev/initdata/documents_demo/propale/PR1302-0007/PR1302-0007.pdf
A dev/initdata/documents_demo/societe/1/logos/indiancompany.png
A dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_mini.png
A dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_small.png
A dev/initdata/documents_demo/societe/10/logos/logo_nltechno_94x100.png
A
dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_mini.png
A
dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_small.png
A dev/initdata/documents_demo/societe/11/logos/comapnycorp1company.png
A
dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_mini.png
A
dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_small.png
A dev/initdata/documents_demo/societe/12/logos/pierrecurie.jpg
A dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_mini.jpg
A dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_small.jpg
A dev/initdata/documents_demo/societe/13/logos/companycorp2company.png
A
dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_mini.png
A
dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_small.png
A dev/initdata/documents_demo/societe/17/logos/bookkeepercompany.png
A
dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_mini.png
A
dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_small.png
A dev/initdata/documents_demo/societe/19/logos/magicfoodstore.png
A
dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_mini.png
A
dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_small.png
A dev/initdata/documents_demo/societe/2/logos/teclibcompany.png
A dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_mini.png
A dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_small.png
A dev/initdata/documents_demo/societe/25/logos/printcompany.png
A dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_mini.png
A dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_small.png
A dev/initdata/documents_demo/societe/3/logos/spanishcompany.png
A dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_mini.png
A
dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_small.png
A dev/initdata/documents_demo/societe/4/logos/thumbs/valeencompany_mini.png
A dev/initdata/documents_demo/societe/4/logos/thumbs/valeencompany_small.png
A dev/initdata/documents_demo/societe/4/logos/valeencompany.png
A dev/initdata/documents_demo/societe/5/logos/nocountrycomp.png
A dev/initdata/documents_demo/societe/5/logos/thumbs/nocountrycomp_mini.png
A dev/initdata/documents_demo/societe/5/logos/thumbs/nocountrycomp_small.png
A dev/initdata/documents_demo/societe/6/logos/swisstouch.png
A dev/initdata/documents_demo/societe/6/logos/thumbs/swisstouch_mini.png
A dev/initdata/documents_demo/societe/6/logos/thumbs/swisstouch_small.png
A dev/initdata/documents_demo/societe/7/logos/genericcustomer.png
A
dev/initdata/documents_demo/societe/7/logos/thumbs/genericcustomer_mini.png
A
dev/initdata/documents_demo/societe/7/logos/thumbs/genericcustomer_small.png
Log Message:
-----------
Update demo data
Commit: c0e5fdee0e0999a4e909515cb4071f06d958fa90
https://github.com/Dolibarr/dolibarr/commit/c0e5fdee0e0999a4e909515cb4071f06d958fa90
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-23 (Sat, 23 Jan 2016)
Changed paths:
A dev/initdata/documents_demo/users/0/1/mariecurie.jpg
A dev/initdata/documents_demo/users/0/1/thumbs/mariecurie_mini.jpg
A dev/initdata/documents_demo/users/0/1/thumbs/mariecurie_small.jpg
A dev/initdata/documents_demo/users/1/0/IMG_0013.jpg
A dev/initdata/documents_demo/users/1/0/alberteinstein.jpg
A dev/initdata/documents_demo/users/1/0/thumbs/IMG_0013_mini.jpg
A dev/initdata/documents_demo/users/1/0/thumbs/IMG_0013_small.jpg
A dev/initdata/documents_demo/users/1/0/thumbs/alberteinstein_mini.jpg
A dev/initdata/documents_demo/users/1/0/thumbs/alberteinstein_small.jpg
A dev/initdata/documents_demo/users/2/0/daviddoe.png
A dev/initdata/documents_demo/users/2/0/thumbs/daviddoe_mini.png
A dev/initdata/documents_demo/users/2/0/thumbs/daviddoe_small.png
A dev/initdata/documents_demo/users/3/0/pierrecurie.jpg
A dev/initdata/documents_demo/users/3/0/thumbs/pierrecurie_mini.jpg
A dev/initdata/documents_demo/users/3/0/thumbs/pierrecurie_small.jpg
A dev/initdata/documents_demo/users/8/1/ldestailleur_200x200.jpg
A dev/initdata/documents_demo/users/8/1/thumbs/ldestailleur_200x200_mini.jpg
A
dev/initdata/documents_demo/users/8/1/thumbs/ldestailleur_200x200_small.jpg
Log Message:
-----------
Update demo
Commit: 83263e242e72effdcd4038e59971f3780895ed0c
https://github.com/Dolibarr/dolibarr/commit/83263e242e72effdcd4038e59971f3780895ed0c
Author: Marcos García de La Fuente <address@hidden>
Date: 2016-01-23 (Sat, 23 Jan 2016)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
Corrected typo of PR #4444
Commit: 667651860d1417329488cf123069ca700e8acdae
https://github.com/Dolibarr/dolibarr/commit/667651860d1417329488cf123069ca700e8acdae
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-25 (Mon, 25 Jan 2016)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Fix sql injection #4341
Commit: 0814fa76f870b3afaa1559ca648769453e5fbb03
https://github.com/Dolibarr/dolibarr/commit/0814fa76f870b3afaa1559ca648769453e5fbb03
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-25 (Mon, 25 Jan 2016)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
FIX CVE CVE-2015-8685
Commit: ed16699de65f7c4799aa2c5cae1d035d92f3adc9
https://github.com/Dolibarr/dolibarr/commit/ed16699de65f7c4799aa2c5cae1d035d92f3adc9
Author: Raphaël Doursenaud <address@hidden>
Date: 2016-01-25 (Mon, 25 Jan 2016)
Changed paths:
M htdocs/admin/agenda_extsites.php
Log Message:
-----------
FIX #4291 Correctly filter external calendar GETPOSTs
Commit: c1b6630c16af823b94e4a95de425b98bef58412f
https://github.com/Dolibarr/dolibarr/commit/c1b6630c16af823b94e4a95de425b98bef58412f
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-25 (Mon, 25 Jan 2016)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/main.inc.php
Commit: feb114625dabb7f80cea24297b951ca97e12ea92
https://github.com/Dolibarr/dolibarr/commit/feb114625dabb7f80cea24297b951ca97e12ea92
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-25 (Mon, 25 Jan 2016)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Commit: b690a2a860b9e16b3096f6a3f8ac4d5c86b03b41
https://github.com/Dolibarr/dolibarr/commit/b690a2a860b9e16b3096f6a3f8ac4d5c86b03b41
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-25 (Mon, 25 Jan 2016)
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Commit: c2efee8a2923be093f159dbb87f4a3aed693cab2
https://github.com/Dolibarr/dolibarr/commit/c2efee8a2923be093f159dbb87f4a3aed693cab2
Author: fmarcet <address@hidden>
Date: 2016-01-26 (Tue, 26 Jan 2016)
Changed paths:
M htdocs/contrat/card.php
Log Message:
-----------
FIX: Contrat card don't consider user permissions to show active/unactive
service button
Commit: 33355c613a89d353a558ead78d944faa2290c65c
https://github.com/Dolibarr/dolibarr/commit/33355c613a89d353a558ead78d944faa2290c65c
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-26 (Tue, 26 Jan 2016)
Changed paths:
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
Log Message:
-----------
FIX When we make a direct assignement on a task to a user, we must check
he is also assigned to project (and if not assign it)
Commit: 25924f31ad5283a3af9db5a68a488048384e361a
https://github.com/Dolibarr/dolibarr/commit/25924f31ad5283a3af9db5a68a488048384e361a
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-26 (Tue, 26 Jan 2016)
Changed paths:
M htdocs/langs/en_US/projects.lang
M htdocs/projet/tasks/time.php
Log Message:
-----------
Bad translation
Commit: 5fd6057c6cb4a145b4b43acb4f52ccf284d702ff
https://github.com/Dolibarr/dolibarr/commit/5fd6057c6cb4a145b4b43acb4f52ccf284d702ff
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-26 (Tue, 26 Jan 2016)
Changed paths:
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
FIX Deadlock situation. Can't edit anymore contract.
FIX List of automatic events was not visible.
Commit: e0683681ffa16ce8d0cf9c7b699c4babf342c329
https://github.com/Dolibarr/dolibarr/commit/e0683681ffa16ce8d0cf9c7b699c4babf342c329
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-26 (Tue, 26 Jan 2016)
Log Message:
-----------
Merge
Commit: fccecc902dd239360ccbdc049697a100399e6cf3
https://github.com/Dolibarr/dolibarr/commit/fccecc902dd239360ccbdc049697a100399e6cf3
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-26 (Tue, 26 Jan 2016)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8
Commit: 45656c18e8391368b71e9063a007600f258e909c
https://github.com/Dolibarr/dolibarr/commit/45656c18e8391368b71e9063a007600f258e909c
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-27 (Wed, 27 Jan 2016)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix hover css
Commit: 20e110a882df243aeb219e92040bb133feeb4482
https://github.com/Dolibarr/dolibarr/commit/20e110a882df243aeb219e92040bb133feeb4482
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-27 (Wed, 27 Jan 2016)
Changed paths:
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/langs/en_US/projects.lang
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/tasks/time.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 8a80e065801686e3d9791cdd3c1f4cbbc737f4b1
https://github.com/Dolibarr/dolibarr/commit/8a80e065801686e3d9791cdd3c1f4cbbc737f4b1
Author: Regis Houssin <address@hidden>
Date: 2016-01-28 (Thu, 28 Jan 2016)
Changed paths:
M htdocs/commande/orderstoinvoice.php
Log Message:
-----------
Fix: missing field "label"
Commit: 6eecf2f29a15fa15cc427bd1c84aae567270792f
https://github.com/Dolibarr/dolibarr/commit/6eecf2f29a15fa15cc427bd1c84aae567270792f
Author: phf <address@hidden>
Date: 2016-01-28 (Thu, 28 Jan 2016)
Changed paths:
M htdocs/expedition/list.php
Log Message:
-----------
FIX filter by socid if from customer card
Commit: cd58c93de67446d912021b6cbbf02b959b335e00
https://github.com/Dolibarr/dolibarr/commit/cd58c93de67446d912021b6cbbf02b959b335e00
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-28 (Thu, 28 Jan 2016)
Changed paths:
M htdocs/core/modules/modECM.class.php
Log Message:
-----------
FIX If option to hide automatic ECM is on, dont show menu.
Commit: f5a4b9db310567be9a50ea2ff9e37842b076eb85
https://github.com/Dolibarr/dolibarr/commit/f5a4b9db310567be9a50ea2ff9e37842b076eb85
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-30 (Sat, 30 Jan 2016)
Changed paths:
M htdocs/expedition/list.php
Log Message:
-----------
Merge pull request #4520 from atm-ph/fix_3.8_show_all_shipping_by_socid
FIX filter by socid if from customer card
Commit: e574ebe34cdc894e63cfe96fa6a1b1e789ac7d9c
https://github.com/Dolibarr/dolibarr/commit/e574ebe34cdc894e63cfe96fa6a1b1e789ac7d9c
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-30 (Sat, 30 Jan 2016)
Changed paths:
M htdocs/commande/orderstoinvoice.php
Log Message:
-----------
Merge pull request #4514 from hregis/3.8_bug2
Fix: missing field "label"
Commit: 2e7d88dffb3042d58e42170426435edd42f56088
https://github.com/Dolibarr/dolibarr/commit/2e7d88dffb3042d58e42170426435edd42f56088
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-30 (Sat, 30 Jan 2016)
Changed paths:
M htdocs/contrat/card.php
Log Message:
-----------
Merge pull request #4499 from fmarcet/3.7
FIX: Contrat card don't consider user permissions to show active/unactive
service button
Commit: b27e31b3ae73d312781fd0390fb6853e7e80202f
https://github.com/Dolibarr/dolibarr/commit/b27e31b3ae73d312781fd0390fb6853e7e80202f
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-30 (Sat, 30 Jan 2016)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
Merge pull request #4483 from marcosgdf/bug-4440-3
Corrected typo of PR #4444
Commit: 3591f51918a0f092d02f7986d9411b3977becfc9
https://github.com/Dolibarr/dolibarr/commit/3591f51918a0f092d02f7986d9411b3977becfc9
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-30 (Sat, 30 Jan 2016)
Changed paths:
M htdocs/comm/mailing/cibles.php
Log Message:
-----------
Merge pull request #4480 from hregis/3.8_bug
Fix: for avoid conflict with "global $m" in memory.lib.php
Commit: c9661ee20e1c931a000c6dbe4d9806f76343fd57
https://github.com/Dolibarr/dolibarr/commit/c9661ee20e1c931a000c6dbe4d9806f76343fd57
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-30 (Sat, 30 Jan 2016)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Commit: dfd4d36bdffe7a82e68b8ca7d49a85ac73c02ded
https://github.com/Dolibarr/dolibarr/commit/dfd4d36bdffe7a82e68b8ca7d49a85ac73c02ded
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-30 (Sat, 30 Jan 2016)
Changed paths:
M htdocs/contrat/card.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Commit: d9e089256e3f4af66baefdff07e372d2c3b9c352
https://github.com/Dolibarr/dolibarr/commit/d9e089256e3f4af66baefdff07e372d2c3b9c352
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-31 (Sun, 31 Jan 2016)
Changed paths:
M build/debian/copyright
Log Message:
-----------
Fix path to copyrighted files
Commit: 2d0c823ffec39a6ba88f509e01ac9c9dca4384f2
https://github.com/Dolibarr/dolibarr/commit/2d0c823ffec39a6ba88f509e01ac9c9dca4384f2
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-31 (Sun, 31 Jan 2016)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
M test/phpunit/NumberingModulesTest.php
Log Message:
-----------
Fix bad transaction level due to code of situation invoices
Conflicts:
htdocs/compta/facture/class/facture.class.php
Commit: 1b23ede8576a2a9c92195e18636f664d59808842
https://github.com/Dolibarr/dolibarr/commit/1b23ede8576a2a9c92195e18636f664d59808842
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-31 (Sun, 31 Jan 2016)
Changed paths:
M build/debian/copyright
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: 0076512d5bfd25dc9283ce7e7abc930bda464a10
https://github.com/Dolibarr/dolibarr/commit/0076512d5bfd25dc9283ce7e7abc930bda464a10
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-31 (Sun, 31 Jan 2016)
Changed paths:
M build/debian/copyright
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Commit: b93170b34591009b6b2f0b0451e324840493c743
https://github.com/Dolibarr/dolibarr/commit/b93170b34591009b6b2f0b0451e324840493c743
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-31 (Sun, 31 Jan 2016)
Changed paths:
M build/debian/copyright
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Commit: 015f24e80abff9c2a44895b9825023d504cf470e
https://github.com/Dolibarr/dolibarr/commit/015f24e80abff9c2a44895b9825023d504cf470e
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-02 (Tue, 02 Feb 2016)
Changed paths:
M test/phpunit/FunctionsLibTest.php
Log Message:
-----------
Fix php unit to work both with old and new setup
Commit: e22664b8cfce36e9d173e57448190ce5f734d33e
https://github.com/Dolibarr/dolibarr/commit/e22664b8cfce36e9d173e57448190ce5f734d33e
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-03 (Wed, 03 Feb 2016)
Changed paths:
M htdocs/core/lib/admin.lib.php
Log Message:
-----------
FIX #4528
Commit: d1362951d71109f918a4af032038d08437ee7432
https://github.com/Dolibarr/dolibarr/commit/d1362951d71109f918a4af032038d08437ee7432
Author: fappels <address@hidden>
Date: 2016-02-03 (Wed, 03 Feb 2016)
Changed paths:
M .travis.yml
M ChangeLog
M build/.gitignore
M build/aps/APP-META-1.1.xml
M build/aps/APP-META-1.2.xml
M build/aps/README
M build/aps/install.forced.php.install
M build/debian/conf.php.install
M build/debian/copyright
M build/debian/dolibarr.install
M build/debian/dolibarr.lintian-overrides
M build/debian/dolibarr.templates.futur
M build/debian/install.forced.php.install
M build/debian/po/POTFILES.in
M build/debian/po/fr.po
M build/doxygen/doxygen_footer.html
M build/doxygen/doxygen_header.html
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
M build/rpm/conf.php
M build/rpm/dolibarr-forrpm.patch
M build/rpm/dolibarr.desktop
M build/rpm/file_contexts.dolibarr
M build/rpm/install.forced.php.fedora
M build/rpm/install.forced.php.generic
M build/rpm/install.forced.php.mandriva
M build/rpm/install.forced.php.opensuse
A build/travis-ci/apache.conf
M composer.json
M dev/codesniffer/README
M dev/codesniffer/php.ini
M dev/codesniffer/ruleset.dtd
M dev/codesniffer/ruleset.xml
M dev/codetemplates/README
M dev/codetemplates/codetemplates.dtd
M dev/codetemplates/codetemplates.xml
M dev/examples/README
A dev/initdata/documents_demo/.htaccess
A dev/initdata/documents_demo/commande/(PROV6)/(PROV6).pdf
A dev/initdata/documents_demo/commande/CO1107-0002/CO1107-0002.pdf
A dev/initdata/documents_demo/commande/CO1107-0003/CO1107-0003.pdf
A dev/initdata/documents_demo/commande/CO1107-0004/CO1107-0004.pdf
A dev/initdata/documents_demo/commande/CO1108-0001/CO1108-0001.pdf
A dev/initdata/documents_demo/custom/main.inc.php
A dev/initdata/documents_demo/custom/master.inc.php
A dev/initdata/documents_demo/doctemplates/invoices/template_invoice.odt
A dev/initdata/documents_demo/doctemplates/orders/template_order.odt
A dev/initdata/documents_demo/doctemplates/projects/template_project.odt
A dev/initdata/documents_demo/doctemplates/proposals/template_proposal.odt
A dev/initdata/documents_demo/doctemplates/tasks/template_task_summary.odt
A
dev/initdata/documents_demo/doctemplates/thirdparties/template_thirdparty.odt
A dev/initdata/documents_demo/expedition/sending/SH1302-0001/SH1302-0001.pdf
A dev/initdata/documents_demo/expensereport/(PROV2)/(PROV2).pdf
A
dev/initdata/documents_demo/expensereport/ADMIN-ER00001-150101/ADMIN-ER00001-150101.pdf
A
dev/initdata/documents_demo/expensereport/ADMIN-ER00002-150101/ADMIN-ER00002-150101.pdf
A dev/initdata/documents_demo/facture/(PROV149)/(PROV149).pdf
A dev/initdata/documents_demo/facture/AV1212-0001/AV1212-0001.pdf
A dev/initdata/documents_demo/facture/AV1212-0002/AV1212-0002.pdf
A dev/initdata/documents_demo/facture/AV1303-0003/AV1303-0003.pdf
A dev/initdata/documents_demo/facture/FA1007-0002/FA1007-0002.pdf
A dev/initdata/documents_demo/facture/FA1107-0006/FA1107-0006.pdf
A dev/initdata/documents_demo/facture/FA1107-0019/FA1107-0019_invoice.odt
A dev/initdata/documents_demo/facture/FA1108-0003/FA1108-0003.pdf
A dev/initdata/documents_demo/facture/FA1108-0004/FA1108-0004.pdf
A dev/initdata/documents_demo/facture/FA1108-0005/FA1108-0005.pdf
A dev/initdata/documents_demo/facture/FA1108-0007/FA1108-0007.pdf
A dev/initdata/documents_demo/facture/FA1212-0009/FA1212-0009.pdf
A dev/initdata/documents_demo/facture/FA1212-0009/FA1212-0009_invoice.odt
A dev/initdata/documents_demo/facture/FA1212-0011/FA1212-0011.pdf
A dev/initdata/documents_demo/facture/FA1212-0021/FA1212-0021.pdf
A dev/initdata/documents_demo/facture/FA1212-0023/FA1212-0023.pdf
A dev/initdata/documents_demo/facture/FA1507-0015/FA1507-0015.pdf
A dev/initdata/documents_demo/facture/FA1507-0015/FA1507-0015_invoice.odt
A dev/initdata/documents_demo/ficheinter/FI1007-0001/FI1007-0001.pdf
A dev/initdata/documents_demo/ficheinter/FI1511-0003/FI1511-0003.pdf
A
dev/initdata/documents_demo/fournisseur/commande/CF1007-0001/CF1007-0001.pdf
A
dev/initdata/documents_demo/fournisseur/commande/CF1007-0002/CF1007-0002.pdf
A
dev/initdata/documents_demo/fournisseur/commande/CF1303-0004/CF1303-0004.pdf
A dev/initdata/documents_demo/fournisseur/facture/6/1/16/16.pdf
A dev/initdata/documents_demo/fournisseur/facture/7/1/17/17.pdf
A dev/initdata/documents_demo/mycompany/logos/mybigcompany.png
A dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_mini.png
A dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_small.png
A dev/initdata/documents_demo/produit/APPLEPIE/applepieproduct.jpg
A
dev/initdata/documents_demo/produit/APPLEPIE/thumbs/applepieproduct_mini.jpg
A dev/initdata/documents_demo/produit/CAKECONTRIB/applepieproduct.jpg
A
dev/initdata/documents_demo/produit/CAKECONTRIB/thumbs/applepieproduct_mini.jpg
A dev/initdata/documents_demo/produit/COMP-XP4523/compxp4523product.jpg
A
dev/initdata/documents_demo/produit/COMP-XP4523/thumbs/compxp4523product_mini.jpg
A dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_114x114.png
A dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_512x512_en.png
A
dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_screenshot_home_720x1280.png
A
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_114x114_mini.png
A
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_512x512_en_mini.png
A
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_screenshot_home_720x1280_mini.png
A dev/initdata/documents_demo/produit/PEARPIE/pearpieproduct.jpg
A dev/initdata/documents_demo/produit/PEARPIE/thumbs/pearpieproduct_mini.jpg
A dev/initdata/documents_demo/produit/PINKDRESS/pinkdressproduct.jpg
A
dev/initdata/documents_demo/produit/PINKDRESS/thumbs/pinkdressproduct_mini.jpg
A dev/initdata/documents_demo/produit/ROLLUPABC/rolluproduct.jpg
A dev/initdata/documents_demo/produit/ROLLUPABC/thumbs/rolluproduct_mini.jpg
A dev/initdata/documents_demo/propale/PR1007-0001/PR1007-0001.pdf
A dev/initdata/documents_demo/propale/PR1007-0002/PR1007-0002.pdf
A dev/initdata/documents_demo/propale/PR1302-0005/PR1302-0005.pdf
A dev/initdata/documents_demo/propale/PR1302-0006/PR1302-0006.pdf
A dev/initdata/documents_demo/propale/PR1302-0007/PR1302-0007.pdf
A dev/initdata/documents_demo/societe/1/logos/indiancompany.png
A dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_mini.png
A dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_small.png
A dev/initdata/documents_demo/societe/10/logos/logo_nltechno_94x100.png
A
dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_mini.png
A
dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_small.png
A dev/initdata/documents_demo/societe/11/logos/comapnycorp1company.png
A
dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_mini.png
A
dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_small.png
A dev/initdata/documents_demo/societe/12/logos/pierrecurie.jpg
A dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_mini.jpg
A dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_small.jpg
A dev/initdata/documents_demo/societe/13/logos/companycorp2company.png
A
dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_mini.png
A
dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_small.png
A dev/initdata/documents_demo/societe/17/logos/bookkeepercompany.png
A
dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_mini.png
A
dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_small.png
A dev/initdata/documents_demo/societe/19/logos/magicfoodstore.png
A
dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_mini.png
A
dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_small.png
A dev/initdata/documents_demo/societe/2/logos/teclibcompany.png
A dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_mini.png
A dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_small.png
A dev/initdata/documents_demo/societe/25/logos/printcompany.png
A dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_mini.png
A dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_small.png
A dev/initdata/documents_demo/societe/3/logos/spanishcompany.png
A dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_mini.png
A
dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_small.png
A dev/initdata/documents_demo/societe/4/logos/thumbs/valeencompany_mini.png
A dev/initdata/documents_demo/societe/4/logos/thumbs/valeencompany_small.png
A dev/initdata/documents_demo/societe/4/logos/valeencompany.png
A dev/initdata/documents_demo/societe/5/logos/nocountrycomp.png
A dev/initdata/documents_demo/societe/5/logos/thumbs/nocountrycomp_mini.png
A dev/initdata/documents_demo/societe/5/logos/thumbs/nocountrycomp_small.png
A dev/initdata/documents_demo/societe/6/logos/swisstouch.png
A dev/initdata/documents_demo/societe/6/logos/thumbs/swisstouch_mini.png
A dev/initdata/documents_demo/societe/6/logos/thumbs/swisstouch_small.png
A dev/initdata/documents_demo/societe/7/logos/genericcustomer.png
A
dev/initdata/documents_demo/societe/7/logos/thumbs/genericcustomer_mini.png
A
dev/initdata/documents_demo/societe/7/logos/thumbs/genericcustomer_small.png
A dev/initdata/documents_demo/users/0/1/mariecurie.jpg
A dev/initdata/documents_demo/users/0/1/thumbs/mariecurie_mini.jpg
A dev/initdata/documents_demo/users/0/1/thumbs/mariecurie_small.jpg
A dev/initdata/documents_demo/users/1/0/IMG_0013.jpg
A dev/initdata/documents_demo/users/1/0/alberteinstein.jpg
A dev/initdata/documents_demo/users/1/0/thumbs/IMG_0013_mini.jpg
A dev/initdata/documents_demo/users/1/0/thumbs/IMG_0013_small.jpg
A dev/initdata/documents_demo/users/1/0/thumbs/alberteinstein_mini.jpg
A dev/initdata/documents_demo/users/1/0/thumbs/alberteinstein_small.jpg
A dev/initdata/documents_demo/users/2/0/daviddoe.png
A dev/initdata/documents_demo/users/2/0/thumbs/daviddoe_mini.png
A dev/initdata/documents_demo/users/2/0/thumbs/daviddoe_small.png
A dev/initdata/documents_demo/users/3/0/pierrecurie.jpg
A dev/initdata/documents_demo/users/3/0/thumbs/pierrecurie_mini.jpg
A dev/initdata/documents_demo/users/3/0/thumbs/pierrecurie_small.jpg
A dev/initdata/documents_demo/users/8/1/ldestailleur_200x200.jpg
A dev/initdata/documents_demo/users/8/1/thumbs/ldestailleur_200x200_mini.jpg
A
dev/initdata/documents_demo/users/8/1/thumbs/ldestailleur_200x200_small.jpg
R dev/initdata/img/alberteinstein.jpg
R dev/initdata/img/bookkeepercompany.png
R dev/initdata/img/johndoe.png
R dev/initdata/img/mariecurie.jpg
R dev/initdata/img/mybigcompany.png
R dev/initdata/img/pierrecurie.jpg
R dev/initdata/img/printcompany.png
M dev/initdata/mysqldump_dolibarr_3.8.0.sql
M dev/iso-normes/GURULABS-RPM-GUIDE-v1.0.PDF
M dev/iso-normes/address_format.txt
M dev/iso-normes/banknumber_format.txt
M dev/iso-normes/xmlexport.txt
M dev/phpunit/README
M dev/phpunit/eclipse_setup_for_pti_phpunit.png
M dev/skeletons/build_webservice_from_class.php
M dev/test/testtcpdf.php
M doc/images/appicon_128.png
M doc/images/appicon_16.ico
M doc/images/appicon_16.png
M doc/images/appicon_32.png
M doc/images/appicon_48.ico
M doc/images/appicon_64.png
M doc/images/dolibarr_73x73.png
M doc/images/dolibarr_logo.png
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/accountancy/supplier/list.php
M htdocs/admin/agenda_extsites.php
M htdocs/admin/delais.php
M htdocs/admin/dict.php
M htdocs/admin/tools/purge.php
M htdocs/bookmarks/card.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/card.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/rappro.php
M htdocs/compta/deplacement/card.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/mergepdftool.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/ajax/row.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/dolprintipp.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/filemanagerdol/browser/default/browser.css
M htdocs/core/filemanagerdol/browser/default/images/Folder.gif
M htdocs/core/filemanagerdol/browser/default/images/FolderUp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/ai.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/avi.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/bmp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/cs.gif
M
htdocs/core/filemanagerdol/browser/default/images/icons/32/default.icon.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/dll.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/doc.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/exe.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/fla.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/gif.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/htm.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/html.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/jpg.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/js.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/mdb.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/mp3.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/pdf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/png.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/ppt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/rdp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/swf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/swt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/txt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/vsd.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/xls.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/xml.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/zip.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/ai.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/avi.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/bmp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/cs.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/default.icon.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/dll.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/doc.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/exe.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/fla.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/gif.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/htm.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/html.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/jpg.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/js.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/mdb.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/mp3.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/pdf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/png.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/ppt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/rdp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/swf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/swt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/txt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/vsd.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/xls.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/xml.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/zip.gif
M htdocs/core/filemanagerdol/browser/default/js/common.js
M htdocs/core/filemanagerdol/browser/default/js/fckxml.js
M htdocs/core/filemanagerdol/browser/default/spacer.gif
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/date.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/price.lib.php
M htdocs/core/lib/report.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/modECM.class.php
M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/security/generate/README
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/list.php
M htdocs/expensereport/list.php
M htdocs/filefunc.inc.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/product/list.php
M htdocs/holiday/card.php
M htdocs/holiday/list.php
M htdocs/includes/adodbtime/adodb-time.inc.php
M htdocs/includes/fpdfi/README.txt
M htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.css
M htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.js
M htdocs/includes/jquery/plugins/jcrop/css/Jcrop.gif
M htdocs/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css
M htdocs/includes/jquery/plugins/jcrop/index.html
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js
M htdocs/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css
M htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.css
M htdocs/includes/jquery/plugins/jpicker/ChangeLog.txt
M htdocs/includes/jquery/plugins/jpicker/Example.html
M htdocs/includes/jquery/plugins/jpicker/ReadMe.txt
M htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css
M htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.min.css
M htdocs/includes/jquery/plugins/jpicker/images/AlphaBar.png
M htdocs/includes/jquery/plugins/jpicker/images/Bars.png
M htdocs/includes/jquery/plugins/jpicker/images/Maps.png
M htdocs/includes/jquery/plugins/jpicker/images/NoColor.png
M htdocs/includes/jquery/plugins/jpicker/images/bar-opacity.png
M htdocs/includes/jquery/plugins/jpicker/images/map-opacity.png
M htdocs/includes/jquery/plugins/jpicker/images/mappoint.gif
M htdocs/includes/jquery/plugins/jpicker/images/picker.gif
M htdocs/includes/jquery/plugins/jpicker/images/preview-opacity.png
M htdocs/includes/jquery/plugins/jpicker/images/rangearrows.gif
M htdocs/includes/jquery/plugins/jpicker/jPicker.css
M htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.js
M htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.min.js
M htdocs/includes/jquery/plugins/jqueryFileTree/images/application.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/code.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/css.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/db.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/directory.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/doc.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/file.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/film.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/flash.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/folder_open.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/html.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/java.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/linux.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/music.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/pdf.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/php.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/picture.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/ppt.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/psd.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/ruby.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/script.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/spinner.gif
M htdocs/includes/jquery/plugins/jqueryFileTree/images/txt.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/xls.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/zip.png
M htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css
M htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
M htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.js
M htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.min.js
M htdocs/includes/jquery/plugins/tiptip/tipTip.css
M htdocs/install/doctemplates/projects/template_project.odt
M htdocs/install/mysql/data/llx_c_input_method.sql
M htdocs/install/mysql/data/llx_c_input_reason.sql
M htdocs/install/mysql/migration/3.0.0-3.1.0.sql
M htdocs/install/mysql/migration/3.1.0-3.2.0.sql
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
M htdocs/install/mysql/tables/llx_resource.key.sql
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/en_US/sms.lang
M htdocs/langs/en_US/trips.lang
M htdocs/langs/en_US/users.lang
M htdocs/main.inc.php
M htdocs/margin/tabs/thirdpartyMargins.php
M htdocs/opensurvey/img/accept-24.png
M htdocs/opensurvey/img/accept.png
M htdocs/opensurvey/img/add-16.png
M htdocs/opensurvey/img/add-24.png
M htdocs/opensurvey/img/calendar-32.png
M htdocs/opensurvey/img/cancel.png
M htdocs/opensurvey/img/chart-32.png
M htdocs/opensurvey/img/fforward.png
M htdocs/opensurvey/img/medaille.png
M htdocs/opensurvey/img/next.png
M htdocs/opensurvey/img/object_opensurvey.png
M htdocs/opensurvey/img/previous.png
M htdocs/opensurvey/img/rewind.png
M htdocs/opensurvey/wizard/index.php
M htdocs/product/ajax/products.php
M htdocs/product/class/product.class.php
M htdocs/product/list.php
M htdocs/product/price.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/element.php
M htdocs/projet/tasks/time.php
M htdocs/public/cron/cron_run_jobs.php
M htdocs/public/demo/index.php
M htdocs/resource/class/resource.class.php
M htdocs/resource/list.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/consumption.php
M htdocs/societe/index.php
M htdocs/societe/notify/card.php
M htdocs/societe/price.php
M htdocs/theme/amarok/AUTHOR
M htdocs/theme/amarok/img/mainlevel.gif
M htdocs/theme/amarok/img/working.gif
M htdocs/theme/amarok/tpl/README
M htdocs/theme/common/mime/readme.txt
M htdocs/theme/eldy/style.css.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
M htdocs/viewimage.php
M htdocs/webservices/demo_wsclient_order.php-NORUN
M test/phpunit/AllTests.php
M test/phpunit/CMailFileTest.php
M test/phpunit/CategorieTest.php
M test/phpunit/ChargeSocialesTest.php
M test/phpunit/ContactTest.php
M test/phpunit/CoreTest.php
M test/phpunit/DiscountTest.php
M test/phpunit/EntrepotTest.php
M test/phpunit/Example_import_company_1.csv
M test/phpunit/ExportTest.php
M test/phpunit/Functions2LibTest.php
M test/phpunit/FunctionsLibTest.php
M test/phpunit/ImportTest.php
M test/phpunit/JsonLibTest.php
M test/phpunit/LangTest.php
M test/phpunit/ModulesTest.php
M test/phpunit/NumberingModulesTest.php
M test/phpunit/PdfDocTest.php
M test/phpunit/PgsqlTest.php
M test/phpunit/PricesTest.php
M test/phpunit/ProductTest.php
M test/phpunit/ScriptsTest.php
M test/phpunit/SecurityTest.php
M test/phpunit/SocieteTest.php
M test/phpunit/SqlTest.php
M test/phpunit/WebservicesInvoicesTest.php
M test/phpunit/WebservicesOrdersTest.php
M test/phpunit/WebservicesOtherTest.php
M test/phpunit/WebservicesProductsTest.php
M test/phpunit/WebservicesThirdpartyTest.php
M test/phpunit/WebservicesUserTest.php
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/upstream/3.8' into 3.8
Commit: 5f7cb75518168d679657b110eec382c26f529b54
https://github.com/Dolibarr/dolibarr/commit/5f7cb75518168d679657b110eec382c26f529b54
Author: Francis Appels <address@hidden>
Date: 2016-02-03 (Wed, 03 Feb 2016)
Changed paths:
M htdocs/product/card.php
Log Message:
-----------
Fix #4556 desiredstock and seuil_stock_alerte cleared on modify product card
removed inputs from update form also removed from update action
Commit: a65660712267f780dc47d812fe5e3e4679263c4f
https://github.com/Dolibarr/dolibarr/commit/a65660712267f780dc47d812fe5e3e4679263c4f
Author: Frédéric FRANCE <address@hidden>
Date: 2016-02-04 (Thu, 04 Feb 2016)
Changed paths:
M htdocs/core/class/CMailFile.class.php
Log Message:
-----------
Update CMailFile.class.php
Commit: 69e0f1ebc3405af903067c49a32582ec7b741265
https://github.com/Dolibarr/dolibarr/commit/69e0f1ebc3405af903067c49a32582ec7b741265
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-04 (Thu, 04 Feb 2016)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Add log to help debug
Commit: c9c5484805f03b1b810ae6a7059a259c36e8fa62
https://github.com/Dolibarr/dolibarr/commit/c9c5484805f03b1b810ae6a7059a259c36e8fa62
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M htdocs/core/class/CMailFile.class.php
Log Message:
-----------
Merge pull request #4570 from frederic34/patch-8
Update CMailFile.class.php
Commit: e9ee81682652181fec13fad33b4a1da8bfd8536d
https://github.com/Dolibarr/dolibarr/commit/e9ee81682652181fec13fad33b4a1da8bfd8536d
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M htdocs/product/card.php
Log Message:
-----------
Merge pull request #4561 from fappels/3.8
Fix #4556 Desired minimum stock and Stock limit for alert cleared on modify
product
Commit: dbc23314e473270e9212fb9355ba1f514926db9d
https://github.com/Dolibarr/dolibarr/commit/dbc23314e473270e9212fb9355ba1f514926db9d
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-10 (Thu, 10 Mar 2016)
Changed paths:
M ChangeLog
M build/debian/copyright
A dev/initdata/documents_demo/.htaccess
A dev/initdata/documents_demo/commande/(PROV6)/(PROV6).pdf
A dev/initdata/documents_demo/commande/CO1107-0002/CO1107-0002.pdf
A dev/initdata/documents_demo/commande/CO1107-0003/CO1107-0003.pdf
A dev/initdata/documents_demo/commande/CO1107-0004/CO1107-0004.pdf
A dev/initdata/documents_demo/commande/CO1108-0001/CO1108-0001.pdf
A dev/initdata/documents_demo/custom/main.inc.php
A dev/initdata/documents_demo/custom/master.inc.php
A dev/initdata/documents_demo/doctemplates/invoices/template_invoice.odt
A dev/initdata/documents_demo/doctemplates/orders/template_order.odt
A dev/initdata/documents_demo/doctemplates/projects/template_project.odt
A dev/initdata/documents_demo/doctemplates/proposals/template_proposal.odt
A dev/initdata/documents_demo/doctemplates/tasks/template_task_summary.odt
A
dev/initdata/documents_demo/doctemplates/thirdparties/template_thirdparty.odt
A dev/initdata/documents_demo/expedition/sending/SH1302-0001/SH1302-0001.pdf
A dev/initdata/documents_demo/expensereport/(PROV2)/(PROV2).pdf
A
dev/initdata/documents_demo/expensereport/ADMIN-ER00001-150101/ADMIN-ER00001-150101.pdf
A
dev/initdata/documents_demo/expensereport/ADMIN-ER00002-150101/ADMIN-ER00002-150101.pdf
A dev/initdata/documents_demo/facture/(PROV149)/(PROV149).pdf
A dev/initdata/documents_demo/facture/AV1212-0001/AV1212-0001.pdf
A dev/initdata/documents_demo/facture/AV1212-0002/AV1212-0002.pdf
A dev/initdata/documents_demo/facture/AV1303-0003/AV1303-0003.pdf
A dev/initdata/documents_demo/facture/FA1007-0002/FA1007-0002.pdf
A dev/initdata/documents_demo/facture/FA1107-0006/FA1107-0006.pdf
A dev/initdata/documents_demo/facture/FA1107-0019/FA1107-0019_invoice.odt
A dev/initdata/documents_demo/facture/FA1108-0003/FA1108-0003.pdf
A dev/initdata/documents_demo/facture/FA1108-0004/FA1108-0004.pdf
A dev/initdata/documents_demo/facture/FA1108-0005/FA1108-0005.pdf
A dev/initdata/documents_demo/facture/FA1108-0007/FA1108-0007.pdf
A dev/initdata/documents_demo/facture/FA1212-0009/FA1212-0009.pdf
A dev/initdata/documents_demo/facture/FA1212-0009/FA1212-0009_invoice.odt
A dev/initdata/documents_demo/facture/FA1212-0011/FA1212-0011.pdf
A dev/initdata/documents_demo/facture/FA1212-0021/FA1212-0021.pdf
A dev/initdata/documents_demo/facture/FA1212-0023/FA1212-0023.pdf
A dev/initdata/documents_demo/facture/FA1507-0015/FA1507-0015.pdf
A dev/initdata/documents_demo/facture/FA1507-0015/FA1507-0015_invoice.odt
A dev/initdata/documents_demo/ficheinter/FI1007-0001/FI1007-0001.pdf
A dev/initdata/documents_demo/ficheinter/FI1511-0003/FI1511-0003.pdf
A
dev/initdata/documents_demo/fournisseur/commande/CF1007-0001/CF1007-0001.pdf
A
dev/initdata/documents_demo/fournisseur/commande/CF1007-0002/CF1007-0002.pdf
A
dev/initdata/documents_demo/fournisseur/commande/CF1303-0004/CF1303-0004.pdf
A dev/initdata/documents_demo/fournisseur/facture/6/1/16/16.pdf
A dev/initdata/documents_demo/fournisseur/facture/7/1/17/17.pdf
A dev/initdata/documents_demo/mycompany/logos/mybigcompany.png
A dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_mini.png
A dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_small.png
A dev/initdata/documents_demo/produit/APPLEPIE/applepieproduct.jpg
A
dev/initdata/documents_demo/produit/APPLEPIE/thumbs/applepieproduct_mini.jpg
A dev/initdata/documents_demo/produit/CAKECONTRIB/applepieproduct.jpg
A
dev/initdata/documents_demo/produit/CAKECONTRIB/thumbs/applepieproduct_mini.jpg
A dev/initdata/documents_demo/produit/COMP-XP4523/compxp4523product.jpg
A
dev/initdata/documents_demo/produit/COMP-XP4523/thumbs/compxp4523product_mini.jpg
A dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_114x114.png
A dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_512x512_en.png
A
dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_screenshot_home_720x1280.png
A
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_114x114_mini.png
A
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_512x512_en_mini.png
A
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_screenshot_home_720x1280_mini.png
A dev/initdata/documents_demo/produit/PEARPIE/pearpieproduct.jpg
A dev/initdata/documents_demo/produit/PEARPIE/thumbs/pearpieproduct_mini.jpg
A dev/initdata/documents_demo/produit/PINKDRESS/pinkdressproduct.jpg
A
dev/initdata/documents_demo/produit/PINKDRESS/thumbs/pinkdressproduct_mini.jpg
A dev/initdata/documents_demo/produit/ROLLUPABC/rolluproduct.jpg
A dev/initdata/documents_demo/produit/ROLLUPABC/thumbs/rolluproduct_mini.jpg
A dev/initdata/documents_demo/propale/PR1007-0001/PR1007-0001.pdf
A dev/initdata/documents_demo/propale/PR1007-0002/PR1007-0002.pdf
A dev/initdata/documents_demo/propale/PR1302-0005/PR1302-0005.pdf
A dev/initdata/documents_demo/propale/PR1302-0006/PR1302-0006.pdf
A dev/initdata/documents_demo/propale/PR1302-0007/PR1302-0007.pdf
A dev/initdata/documents_demo/societe/1/logos/indiancompany.png
A dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_mini.png
A dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_small.png
A dev/initdata/documents_demo/societe/10/logos/logo_nltechno_94x100.png
A
dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_mini.png
A
dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_small.png
A dev/initdata/documents_demo/societe/11/logos/comapnycorp1company.png
A
dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_mini.png
A
dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_small.png
A dev/initdata/documents_demo/societe/12/logos/pierrecurie.jpg
A dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_mini.jpg
A dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_small.jpg
A dev/initdata/documents_demo/societe/13/logos/companycorp2company.png
A
dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_mini.png
A
dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_small.png
A dev/initdata/documents_demo/societe/17/logos/bookkeepercompany.png
A
dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_mini.png
A
dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_small.png
A dev/initdata/documents_demo/societe/19/logos/magicfoodstore.png
A
dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_mini.png
A
dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_small.png
A dev/initdata/documents_demo/societe/2/logos/teclibcompany.png
A dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_mini.png
A dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_small.png
A dev/initdata/documents_demo/societe/25/logos/printcompany.png
A dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_mini.png
A dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_small.png
A dev/initdata/documents_demo/societe/3/logos/spanishcompany.png
A dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_mini.png
A
dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_small.png
A dev/initdata/documents_demo/societe/4/logos/thumbs/valeencompany_mini.png
A dev/initdata/documents_demo/societe/4/logos/thumbs/valeencompany_small.png
A dev/initdata/documents_demo/societe/4/logos/valeencompany.png
A dev/initdata/documents_demo/societe/5/logos/nocountrycomp.png
A dev/initdata/documents_demo/societe/5/logos/thumbs/nocountrycomp_mini.png
A dev/initdata/documents_demo/societe/5/logos/thumbs/nocountrycomp_small.png
A dev/initdata/documents_demo/societe/6/logos/swisstouch.png
A dev/initdata/documents_demo/societe/6/logos/thumbs/swisstouch_mini.png
A dev/initdata/documents_demo/societe/6/logos/thumbs/swisstouch_small.png
A dev/initdata/documents_demo/societe/7/logos/genericcustomer.png
A
dev/initdata/documents_demo/societe/7/logos/thumbs/genericcustomer_mini.png
A
dev/initdata/documents_demo/societe/7/logos/thumbs/genericcustomer_small.png
A dev/initdata/documents_demo/users/0/1/mariecurie.jpg
A dev/initdata/documents_demo/users/0/1/thumbs/mariecurie_mini.jpg
A dev/initdata/documents_demo/users/0/1/thumbs/mariecurie_small.jpg
A dev/initdata/documents_demo/users/1/0/IMG_0013.jpg
A dev/initdata/documents_demo/users/1/0/alberteinstein.jpg
A dev/initdata/documents_demo/users/1/0/thumbs/IMG_0013_mini.jpg
A dev/initdata/documents_demo/users/1/0/thumbs/IMG_0013_small.jpg
A dev/initdata/documents_demo/users/1/0/thumbs/alberteinstein_mini.jpg
A dev/initdata/documents_demo/users/1/0/thumbs/alberteinstein_small.jpg
A dev/initdata/documents_demo/users/2/0/daviddoe.png
A dev/initdata/documents_demo/users/2/0/thumbs/daviddoe_mini.png
A dev/initdata/documents_demo/users/2/0/thumbs/daviddoe_small.png
A dev/initdata/documents_demo/users/3/0/pierrecurie.jpg
A dev/initdata/documents_demo/users/3/0/thumbs/pierrecurie_mini.jpg
A dev/initdata/documents_demo/users/3/0/thumbs/pierrecurie_small.jpg
A dev/initdata/documents_demo/users/8/1/ldestailleur_200x200.jpg
A dev/initdata/documents_demo/users/8/1/thumbs/ldestailleur_200x200_mini.jpg
A
dev/initdata/documents_demo/users/8/1/thumbs/ldestailleur_200x200_small.jpg
R dev/initdata/img/alberteinstein.jpg
R dev/initdata/img/bookkeepercompany.png
R dev/initdata/img/johndoe.png
R dev/initdata/img/mariecurie.jpg
R dev/initdata/img/mybigcompany.png
R dev/initdata/img/pierrecurie.jpg
R dev/initdata/img/printcompany.png
M dev/initdata/mysqldump_dolibarr_3.8.0.sql
M htdocs/admin/agenda_extsites.php
M htdocs/admin/delais.php
M htdocs/admin/dict.php
M htdocs/admin/tools/purge.php
M htdocs/bookmarks/card.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/mailing/cibles.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/bank/card.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/price.lib.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/modECM.class.php
M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/expedition/list.php
M htdocs/expensereport/list.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/holiday/card.php
M htdocs/holiday/list.php
M htdocs/langs/en_US/projects.lang
M htdocs/langs/en_US/sms.lang
M htdocs/main.inc.php
M htdocs/opensurvey/wizard/index.php
M htdocs/product/card.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/tasks/time.php
M htdocs/public/cron/cron_run_jobs.php
M htdocs/societe/consumption.php
M htdocs/societe/index.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
M htdocs/viewimage.php
M test/phpunit/FunctionsLibTest.php
M test/phpunit/NumberingModulesTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.8_backported
Commit: e9055a9f407c2159c9a9b8c5b070957c0a44a94c
https://github.com/Dolibarr/dolibarr/commit/e9055a9f407c2159c9a9b8c5b070957c0a44a94c
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-10 (Thu, 10 Mar 2016)
Changed paths:
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/export.php
M htdocs/accountancy/admin/productaccount.php
A htdocs/accountancy/bookkeeping/balance.php
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/bookkeeping/listbyyear.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/customer/lines.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/index.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/accountancy/supplier/lines.php
M htdocs/accountancy/supplier/list.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/tpl/objectline_edit.tpl.php
A htdocs/margin/checkMargins.php
M htdocs/margin/lib/margins.lib.php
Log Message:
-----------
Merge branch '3.8_backported' of address@hidden:Dolibarr/dolibarr.git into
3.8_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/c3a03b1c7e26...e9055a9f407c
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] c71d57: Fix: for avoid division by 0,
Laurent Destailleur <=