[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 536e99: fix regex main.inc.php fatal
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 536e99: fix regex main.inc.php fatal |
|
Date: |
Fri, 27 Sep 2019 12:11:49 +0000 (UTC) |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 536e99e3c9e3156db98e825384d4793488d9fa84
https://github.com/Dolibarr/dolibarr/commit/536e99e3c9e3156db98e825384d4793488d9fa84
Author: florian HENRY <address@hidden>
Date: 2019-09-19 (Thu, 19 Sep 2019)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
fix regex main.inc.php fatal
Commit: 3b555797d1e36b0d8a17f93d1cc701c843537df9
https://github.com/Dolibarr/dolibarr/commit/3b555797d1e36b0d8a17f93d1cc701c843537df9
Author: florian HENRY <address@hidden>
Date: 2019-09-19 (Thu, 19 Sep 2019)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
fix regex
Commit: 575e4d11d0e48efc44baef1f4901526f007bdb04
https://github.com/Dolibarr/dolibarr/commit/575e4d11d0e48efc44baef1f4901526f007bdb04
Author: gauthier <address@hidden>
Date: 2019-09-19 (Thu, 19 Sep 2019)
Changed paths:
M htdocs/compta/paiement_charge.php
Log Message:
-----------
FIX : wrong test
Commit: b4f31d61fa85af43224103cbcde9910e257ccb75
https://github.com/Dolibarr/dolibarr/commit/b4f31d61fa85af43224103cbcde9910e257ccb75
Author: Laurent De Coninck <address@hidden>
Date: 2019-09-23 (Mon, 23 Sep 2019)
Changed paths:
M htdocs/projet/class/project.class.php
M htdocs/projet/element.php
Log Message:
-----------
allow to remove one custom referent in the project.
Allow to remove one custom referent from the project.
When we develop one module that supports the custom referent in a
project and if you don't follow the same naming convention as in the
other table (in french). You cannot remove the element.
This fix support now the property 'project_field'. And thus set this
column to null.
[see: #11881]
Commit: 26cd418320efd5d79f2e1719e797ef76905a2e1a
https://github.com/Dolibarr/dolibarr/commit/26cd418320efd5d79f2e1719e797ef76905a2e1a
Author: Frédéric FRANCE <address@hidden>
Date: 2019-09-24 (Tue, 24 Sep 2019)
Changed paths:
M htdocs/product/dynamic_price/class/price_parser.class.php
Log Message:
-----------
Update price_parser.class.php
Commit: 5417dc0356e69a058db8cdc13c45215a005b7d36
https://github.com/Dolibarr/dolibarr/commit/5417dc0356e69a058db8cdc13c45215a005b7d36
Author: John Botella <address@hidden>
Date: 2019-09-24 (Tue, 24 Sep 2019)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix top menu right padding
Commit: 089392618931a14ebf75f66295d2dec7c51518f2
https://github.com/Dolibarr/dolibarr/commit/089392618931a14ebf75f66295d2dec7c51518f2
Author: JC Prieto <address@hidden>
Date: 2019-09-25 (Wed, 25 Sep 2019)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Update expedition.class.php
Clear lines before fech them.
Commit: 280219843e11f358ac465b60078df381f5865243
https://github.com/Dolibarr/dolibarr/commit/280219843e11f358ac465b60078df381f5865243
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-26 (Thu, 26 Sep 2019)
Changed paths:
M dev/initdemo/initdemo.sh
Log Message:
-----------
Update demo
Commit: b0615d477e73247116467d97c7a6ccab8c6fa19f
https://github.com/Dolibarr/dolibarr/commit/b0615d477e73247116467d97c7a6ccab8c6fa19f
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-26 (Thu, 26 Sep 2019)
Changed paths:
R dev/initdemo/documents_demo/users/0/1/mariecurie.jpg
R dev/initdemo/documents_demo/users/0/1/thumbs/mariecurie_mini.jpg
R dev/initdemo/documents_demo/users/0/1/thumbs/mariecurie_small.jpg
R dev/initdemo/documents_demo/users/1/0/IMG_0013.jpg
R dev/initdemo/documents_demo/users/1/0/alberteinstein.jpg
R dev/initdemo/documents_demo/users/1/0/thumbs/IMG_0013_mini.jpg
R dev/initdemo/documents_demo/users/1/0/thumbs/IMG_0013_small.jpg
R dev/initdemo/documents_demo/users/1/0/thumbs/alberteinstein_mini.jpg
R dev/initdemo/documents_demo/users/1/0/thumbs/alberteinstein_small.jpg
A dev/initdemo/documents_demo/users/1/alberteinstein.jpg
A dev/initdemo/documents_demo/users/1/thumbs/alberteinstein_mini.jpg
A dev/initdemo/documents_demo/users/1/thumbs/alberteinstein_small.jpg
A dev/initdemo/documents_demo/users/10/mariecurie.jpg
A dev/initdemo/documents_demo/users/10/thumbs/mariecurie_mini.jpg
A dev/initdemo/documents_demo/users/10/thumbs/mariecurie_small.jpg
A dev/initdemo/documents_demo/users/11/person4.jpeg
A dev/initdemo/documents_demo/users/11/thumbs/person4_mini.jpeg
A dev/initdemo/documents_demo/users/11/thumbs/person4_small.jpeg
A dev/initdemo/documents_demo/users/12/person6.jpeg
A dev/initdemo/documents_demo/users/12/thumbs/person6_mini.jpeg
A dev/initdemo/documents_demo/users/12/thumbs/person6_small.jpeg
A dev/initdemo/documents_demo/users/13/person7.jpeg
A dev/initdemo/documents_demo/users/13/thumbs/person7_mini.jpeg
A dev/initdemo/documents_demo/users/13/thumbs/person7_small.jpeg
A dev/initdemo/documents_demo/users/14/person3.jpeg
A dev/initdemo/documents_demo/users/14/thumbs/person3_mini.jpeg
A dev/initdemo/documents_demo/users/14/thumbs/person3_small.jpeg
A dev/initdemo/documents_demo/users/16/person1.jpeg
A dev/initdemo/documents_demo/users/16/thumbs/person1_mini.jpeg
A dev/initdemo/documents_demo/users/16/thumbs/person1_small.jpeg
A dev/initdemo/documents_demo/users/17/person5.jpeg
A dev/initdemo/documents_demo/users/17/thumbs/person5_mini.jpeg
A dev/initdemo/documents_demo/users/17/thumbs/person5_small.jpeg
A dev/initdemo/documents_demo/users/18/ldestailleur_200x200.jpg
A dev/initdemo/documents_demo/users/18/thumbs/ldestailleur_200x200_mini.jpg
A dev/initdemo/documents_demo/users/18/thumbs/ldestailleur_200x200_small.jpg
A dev/initdemo/documents_demo/users/19/person2.jpeg
A dev/initdemo/documents_demo/users/19/thumbs/person2_mini.jpeg
A dev/initdemo/documents_demo/users/19/thumbs/person2_small.jpeg
R dev/initdemo/documents_demo/users/2/0/daviddoe.png
R dev/initdemo/documents_demo/users/2/0/thumbs/daviddoe_mini.png
R dev/initdemo/documents_demo/users/2/0/thumbs/daviddoe_small.png
A dev/initdemo/documents_demo/users/2/person9.jpeg
A dev/initdemo/documents_demo/users/2/thumbs/person9_mini.jpeg
A dev/initdemo/documents_demo/users/2/thumbs/person9_small.jpeg
R dev/initdemo/documents_demo/users/3/0/pierrecurie.jpg
R dev/initdemo/documents_demo/users/3/0/thumbs/pierrecurie_mini.jpg
R dev/initdemo/documents_demo/users/3/0/thumbs/pierrecurie_small.jpg
A dev/initdemo/documents_demo/users/3/pierrecurie.jpg
A dev/initdemo/documents_demo/users/3/thumbs/pierrecurie_mini.jpg
A dev/initdemo/documents_demo/users/3/thumbs/pierrecurie_small.jpg
A dev/initdemo/documents_demo/users/4/person8.jpeg
A dev/initdemo/documents_demo/users/4/thumbs/person8_mini.jpeg
A dev/initdemo/documents_demo/users/4/thumbs/person8_small.jpeg
R dev/initdemo/documents_demo/users/8/1/ldestailleur_200x200.jpg
R dev/initdemo/documents_demo/users/8/1/thumbs/ldestailleur_200x200_mini.jpg
R
dev/initdemo/documents_demo/users/8/1/thumbs/ldestailleur_200x200_small.jpg
R dev/initdemo/documents_demo/users/9/1/eldy_php.jpg
R dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_mini.jpg
R dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_small.jpg
Log Message:
-----------
Update demo
Commit: 0e5d0a7784f5d9eca89db7f45bec57513f1d9433
https://github.com/Dolibarr/dolibarr/commit/0e5d0a7784f5d9eca89db7f45bec57513f1d9433
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-26 (Thu, 26 Sep 2019)
Changed paths:
A
dev/initdemo/documents_demo/ticket/TS1909-0002/dolibarr_screenshot1_300x188.png
A
dev/initdemo/documents_demo/ticket/TS1909-0002/thumbs/dolibarr_screenshot1_300x188_mini.png
A
dev/initdemo/documents_demo/ticket/TS1909-0002/thumbs/dolibarr_screenshot1_300x188_small.png
Log Message:
-----------
Add data for tickets
Commit: aa5f35f14fc3661e6023d45b868855356dd1bef2
https://github.com/Dolibarr/dolibarr/commit/aa5f35f14fc3661e6023d45b868855356dd1bef2
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-26 (Thu, 26 Sep 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix image on ticket
Commit: 24e5b6ab79a9c96cb33bc5d8b8d05bb52cb4c581
https://github.com/Dolibarr/dolibarr/commit/24e5b6ab79a9c96cb33bc5d8b8d05bb52cb4c581
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-26 (Thu, 26 Sep 2019)
Changed paths:
M dev/initdemo/savedemo.sh
Log Message:
-----------
Fix default filename of dump
Commit: 33754f1951be53fa5fbfcac56426cc83cd95b1dc
https://github.com/Dolibarr/dolibarr/commit/33754f1951be53fa5fbfcac56426cc83cd95b1dc
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-26 (Thu, 26 Sep 2019)
Changed paths:
M dev/initdemo/mysqldump_dolibarr_10.0.0.sql
Log Message:
-----------
Update demo
Commit: cdb6e7f9a652bd89e26c5175b64e6a1114ff34ed
https://github.com/Dolibarr/dolibarr/commit/cdb6e7f9a652bd89e26c5175b64e6a1114ff34ed
Author: JC Prieto <address@hidden>
Date: 2019-09-26 (Thu, 26 Sep 2019)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Fix moved to fetch_line()
Fix moved to fetch_line()
Commit: b52e5d51e3139977bb3d8a75c0d90c8a84e427dd
https://github.com/Dolibarr/dolibarr/commit/b52e5d51e3139977bb3d8a75c0d90c8a84e427dd
Author: Alexandre SPANGARO <address@hidden>
Date: 2019-09-26 (Thu, 26 Sep 2019)
Changed paths:
M htdocs/compta/tva/quadri_detail.php
Log Message:
-----------
FIX colspan on VAT quadri report
Commit: 5d7e542d37a0623a7c24357b8ef26fccb2034b41
https://github.com/Dolibarr/dolibarr/commit/5d7e542d37a0623a7c24357b8ef26fccb2034b41
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-26 (Thu, 26 Sep 2019)
Changed paths:
M htdocs/compta/tva/quadri_detail.php
Log Message:
-----------
Merge pull request #11970 from aspangaro/10.0_colspan
FIX colspan on VAT quadri report
Commit: d4364dd44e4a6b4dfe9abd23c2b742cdfb1d51af
https://github.com/Dolibarr/dolibarr/commit/d4364dd44e4a6b4dfe9abd23c2b742cdfb1d51af
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-26 (Thu, 26 Sep 2019)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge pull request #11956 from atm-john/10.0_fix_top_menu_size
FIX top menu right padding
Commit: 8c3c7fd857d7bc7f78ad00eac43ad4e820f93bac
https://github.com/Dolibarr/dolibarr/commit/8c3c7fd857d7bc7f78ad00eac43ad4e820f93bac
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/takepos/takepos.php
Log Message:
-----------
Fix remove + of categ on product thumb
Commit: cd295662d6d9146c0dd4d1409b75378e42d654fd
https://github.com/Dolibarr/dolibarr/commit/cd295662d6d9146c0dd4d1409b75378e42d654fd
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/compta/tva/quadri_detail.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: 13f5decdf7be8ba41b94377aea99bf2078272660
https://github.com/Dolibarr/dolibarr/commit/13f5decdf7be8ba41b94377aea99bf2078272660
Author: Marc de Lima Lucio <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
FIX: shipping card: missing user error messages when classifying closed or
billed
Commit: 435edf999b1dcfae379a3f06f476bdfe1cf24a71
https://github.com/Dolibarr/dolibarr/commit/435edf999b1dcfae379a3f06f476bdfe1cf24a71
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/takepos/takepos.php
Log Message:
-----------
Fix: label of product not always visible after a search
Commit: 61f87715256520685e80f8f49383f24aabaeccf3
https://github.com/Dolibarr/dolibarr/commit/61f87715256520685e80f8f49383f24aabaeccf3
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Merge pull request #11959 from prietojc/patch-10
FIX: expedition.class.php
Commit: 99cfea1ff44bade26762502cff194d06c5450dee
https://github.com/Dolibarr/dolibarr/commit/99cfea1ff44bade26762502cff194d06c5450dee
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/compta/paiement_charge.php
Log Message:
-----------
Update paiement_charge.php
Commit: fe15871fe39f8f8516e09cb589f106f3ada9551c
https://github.com/Dolibarr/dolibarr/commit/fe15871fe39f8f8516e09cb589f106f3ada9551c
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/compta/paiement_charge.php
Log Message:
-----------
Merge pull request #11935 from atm-gauthier/8.0_chargesociale
FIX : wrong test
Commit: 59a099b17660cb142732b1f9c34c67b52bee2b82
https://github.com/Dolibarr/dolibarr/commit/59a099b17660cb142732b1f9c34c67b52bee2b82
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/product/dynamic_price/class/price_parser.class.php
Log Message:
-----------
Merge pull request #11954 from frederic34/patch-18
add missing error code in price parser
Commit: de1180179242f856df12849bbd0dc84f6de1c79b
https://github.com/Dolibarr/dolibarr/commit/de1180179242f856df12849bbd0dc84f6de1c79b
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
Merge pull request #11971 from ATM-Marc/FIX_8.0_shipping_errors
FIX: shipping card: missing user error messages when classifying closed or
billed
Commit: 7f9ea2e223c0044b7d838ef034319ae117aea130
https://github.com/Dolibarr/dolibarr/commit/7f9ea2e223c0044b7d838ef034319ae117aea130
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Merge pull request #11929 from atm-florian/9.0
fix regex main.inc.php warning
Commit: 2eaa9103367a9838cf148747f049a92eff75be96
https://github.com/Dolibarr/dolibarr/commit/2eaa9103367a9838cf148747f049a92eff75be96
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/projet/class/project.class.php
Log Message:
-----------
Update project.class.php
Commit: 34aa64bae21e92d215bcf88b38f3c9ef467911b6
https://github.com/Dolibarr/dolibarr/commit/34aa64bae21e92d215bcf88b38f3c9ef467911b6
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Update element.php
Commit: 412e0f193be724c131a8720aa31ebc95f03660b3
https://github.com/Dolibarr/dolibarr/commit/412e0f193be724c131a8720aa31ebc95f03660b3
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Update element.php
Commit: ab33665f7bc3c4a55ec5346693398c8ab31e7cce
https://github.com/Dolibarr/dolibarr/commit/ab33665f7bc3c4a55ec5346693398c8ab31e7cce
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/projet/class/project.class.php
M htdocs/projet/element.php
Log Message:
-----------
Merge pull request #11950 from laudeco/hotfix/11881-remove-referent
[FIX][#11881] - remove referent from the project
Commit: 5d456382488a3f716d39b1de629b727b2e81f3d6
https://github.com/Dolibarr/dolibarr/commit/5d456382488a3f716d39b1de629b727b2e81f3d6
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/compta/paiement_charge.php
M htdocs/expedition/card.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 6d1a571aedb5697784d949de52c5baf771b26b83
https://github.com/Dolibarr/dolibarr/commit/6d1a571aedb5697784d949de52c5baf771b26b83
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/compta/paiement_charge.php
M htdocs/expedition/card.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/product/dynamic_price/class/price_parser.class.php
Commit: da35e3d7cdd9d85512c1c2abc2409eecc8df8db6
https://github.com/Dolibarr/dolibarr/commit/da35e3d7cdd9d85512c1c2abc2409eecc8df8db6
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/expedition/class/expedition.class.php
M htdocs/projet/class/project.class.php
M htdocs/projet/element.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: f3bc319a7883acc202c58de7d70a0d20ec12e2aa
https://github.com/Dolibarr/dolibarr/commit/f3bc319a7883acc202c58de7d70a0d20ec12e2aa
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
A
dev/initdemo/documents_demo/ticket/TS1909-0002/dolibarr_screenshot1_300x188.png
A
dev/initdemo/documents_demo/ticket/TS1909-0002/thumbs/dolibarr_screenshot1_300x188_mini.png
A
dev/initdemo/documents_demo/ticket/TS1909-0002/thumbs/dolibarr_screenshot1_300x188_small.png
R dev/initdemo/documents_demo/users/0/1/mariecurie.jpg
R dev/initdemo/documents_demo/users/0/1/thumbs/mariecurie_mini.jpg
R dev/initdemo/documents_demo/users/0/1/thumbs/mariecurie_small.jpg
R dev/initdemo/documents_demo/users/1/0/IMG_0013.jpg
R dev/initdemo/documents_demo/users/1/0/alberteinstein.jpg
R dev/initdemo/documents_demo/users/1/0/thumbs/IMG_0013_mini.jpg
R dev/initdemo/documents_demo/users/1/0/thumbs/IMG_0013_small.jpg
R dev/initdemo/documents_demo/users/1/0/thumbs/alberteinstein_mini.jpg
R dev/initdemo/documents_demo/users/1/0/thumbs/alberteinstein_small.jpg
A dev/initdemo/documents_demo/users/1/alberteinstein.jpg
A dev/initdemo/documents_demo/users/1/thumbs/alberteinstein_mini.jpg
A dev/initdemo/documents_demo/users/1/thumbs/alberteinstein_small.jpg
A dev/initdemo/documents_demo/users/10/mariecurie.jpg
A dev/initdemo/documents_demo/users/10/thumbs/mariecurie_mini.jpg
A dev/initdemo/documents_demo/users/10/thumbs/mariecurie_small.jpg
A dev/initdemo/documents_demo/users/11/person4.jpeg
A dev/initdemo/documents_demo/users/11/thumbs/person4_mini.jpeg
A dev/initdemo/documents_demo/users/11/thumbs/person4_small.jpeg
A dev/initdemo/documents_demo/users/12/person6.jpeg
A dev/initdemo/documents_demo/users/12/thumbs/person6_mini.jpeg
A dev/initdemo/documents_demo/users/12/thumbs/person6_small.jpeg
A dev/initdemo/documents_demo/users/13/person7.jpeg
A dev/initdemo/documents_demo/users/13/thumbs/person7_mini.jpeg
A dev/initdemo/documents_demo/users/13/thumbs/person7_small.jpeg
A dev/initdemo/documents_demo/users/14/person3.jpeg
A dev/initdemo/documents_demo/users/14/thumbs/person3_mini.jpeg
A dev/initdemo/documents_demo/users/14/thumbs/person3_small.jpeg
A dev/initdemo/documents_demo/users/16/person1.jpeg
A dev/initdemo/documents_demo/users/16/thumbs/person1_mini.jpeg
A dev/initdemo/documents_demo/users/16/thumbs/person1_small.jpeg
A dev/initdemo/documents_demo/users/17/person5.jpeg
A dev/initdemo/documents_demo/users/17/thumbs/person5_mini.jpeg
A dev/initdemo/documents_demo/users/17/thumbs/person5_small.jpeg
A dev/initdemo/documents_demo/users/18/ldestailleur_200x200.jpg
A dev/initdemo/documents_demo/users/18/thumbs/ldestailleur_200x200_mini.jpg
A dev/initdemo/documents_demo/users/18/thumbs/ldestailleur_200x200_small.jpg
A dev/initdemo/documents_demo/users/19/person2.jpeg
A dev/initdemo/documents_demo/users/19/thumbs/person2_mini.jpeg
A dev/initdemo/documents_demo/users/19/thumbs/person2_small.jpeg
R dev/initdemo/documents_demo/users/2/0/daviddoe.png
R dev/initdemo/documents_demo/users/2/0/thumbs/daviddoe_mini.png
R dev/initdemo/documents_demo/users/2/0/thumbs/daviddoe_small.png
A dev/initdemo/documents_demo/users/2/person9.jpeg
A dev/initdemo/documents_demo/users/2/thumbs/person9_mini.jpeg
A dev/initdemo/documents_demo/users/2/thumbs/person9_small.jpeg
R dev/initdemo/documents_demo/users/3/0/pierrecurie.jpg
R dev/initdemo/documents_demo/users/3/0/thumbs/pierrecurie_mini.jpg
R dev/initdemo/documents_demo/users/3/0/thumbs/pierrecurie_small.jpg
A dev/initdemo/documents_demo/users/3/pierrecurie.jpg
A dev/initdemo/documents_demo/users/3/thumbs/pierrecurie_mini.jpg
A dev/initdemo/documents_demo/users/3/thumbs/pierrecurie_small.jpg
A dev/initdemo/documents_demo/users/4/person8.jpeg
A dev/initdemo/documents_demo/users/4/thumbs/person8_mini.jpeg
A dev/initdemo/documents_demo/users/4/thumbs/person8_small.jpeg
R dev/initdemo/documents_demo/users/8/1/ldestailleur_200x200.jpg
R dev/initdemo/documents_demo/users/8/1/thumbs/ldestailleur_200x200_mini.jpg
R
dev/initdemo/documents_demo/users/8/1/thumbs/ldestailleur_200x200_small.jpg
R dev/initdemo/documents_demo/users/9/1/eldy_php.jpg
R dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_mini.jpg
R dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_small.jpg
M dev/initdemo/initdemo.sh
M dev/initdemo/mysqldump_dolibarr_10.0.0.sql
M dev/initdemo/savedemo.sh
M htdocs/compta/paiement_charge.php
M htdocs/compta/tva/quadri_detail.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/projet/class/project.class.php
M htdocs/projet/element.php
M htdocs/takepos/takepos.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/takepos/takepos.php
Commit: fc591931232335d3b77b0066fcaf08a5ed631212
https://github.com/Dolibarr/dolibarr/commit/fc591931232335d3b77b0066fcaf08a5ed631212
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/core/boxes/box_fournisseurs.php
M htdocs/societe/paymentmodes.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/6de173494bbd...fc5919312323