[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 12d243: FIX #12040
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 12d243: FIX #12040 |
|
Date: |
Thu, 10 Oct 2019 01:37:25 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 12d243b8d4b8f3bed17d96a9bdd69c23547eaf4c
https://github.com/Dolibarr/dolibarr/commit/12d243b8d4b8f3bed17d96a9bdd69c23547eaf4c
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-07 (Mon, 07 Oct 2019)
Changed paths:
M htdocs/core/modules/modProduct.class.php
Log Message:
-----------
FIX #12040
Commit: 839929f7648c1150dcb0603aa5de3e27b9338231
https://github.com/Dolibarr/dolibarr/commit/839929f7648c1150dcb0603aa5de3e27b9338231
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-07 (Mon, 07 Oct 2019)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
FIX #12026
Commit: 2ba8506608a61c031a681f1183dc459a06dce994
https://github.com/Dolibarr/dolibarr/commit/2ba8506608a61c031a681f1183dc459a06dce994
Author: Laurent De Coninck <address@hidden>
Date: 2019-10-07 (Mon, 07 Oct 2019)
Changed paths:
M htdocs/admin/security.php
M htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
Log Message:
-----------
validate the 0 as min value consecutive; meaning not take that rule into
account
Commit: 156eb7fa6176999cf255931d6f92716607e39d90
https://github.com/Dolibarr/dolibarr/commit/156eb7fa6176999cf255931d6f92716607e39d90
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-07 (Mon, 07 Oct 2019)
Changed paths:
M htdocs/admin/security.php
M htdocs/admin/system/about.php
M htdocs/admin/ticket.php
M htdocs/admin/ticket_public.php
M htdocs/core/class/cunits.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/html.formticket.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/payments.lib.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modService.class.php
M htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
M htdocs/expedition/card.php
M htdocs/langs/en_US/agenda.lang
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/public/ticket/list.php
M htdocs/public/ticket/view.php
M htdocs/societe/project.php
M htdocs/ticket/card.php
M htdocs/ticket/class/ticket.class.php
M htdocs/ticket/list.php
M htdocs/user/class/user.class.php
M htdocs/user/group/card.php
M htdocs/user/group/perms.php
Log Message:
-----------
Merge branch '10.0' into hotfix/12041-security-generate-password
Commit: 7ed3561344de9ed05a37029a0861e27441649e00
https://github.com/Dolibarr/dolibarr/commit/7ed3561344de9ed05a37029a0861e27441649e00
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-07 (Mon, 07 Oct 2019)
Changed paths:
M htdocs/admin/security.php
M htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
Log Message:
-----------
Merge pull request #12057 from laudeco/hotfix/12041-security-generate-password
[Fix #12041] - validate the 0 as min value consecutive
Commit: bb72efefc5fcf0f3b9bea6af698941a3a961a14b
https://github.com/Dolibarr/dolibarr/commit/bb72efefc5fcf0f3b9bea6af698941a3a961a14b
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-07 (Mon, 07 Oct 2019)
Changed paths:
M htdocs/core/modules/import/import_xlsx.modules.php
Log Message:
-----------
Fix phpcs
Commit: 51be0fad99c5a628e0507162987dd32a5b5342ec
https://github.com/Dolibarr/dolibarr/commit/51be0fad99c5a628e0507162987dd32a5b5342ec
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-07 (Mon, 07 Oct 2019)
Changed paths:
M htdocs/admin/security.php
M htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: 091df082fc023c3ddd301ae1f59e64c96eee3be4
https://github.com/Dolibarr/dolibarr/commit/091df082fc023c3ddd301ae1f59e64c96eee3be4
Author: Laurent De Coninck <address@hidden>
Date: 2019-10-08 (Tue, 08 Oct 2019)
Changed paths:
M htdocs/user/bank.php
Log Message:
-----------
fix the access of the bank account of one user
There are 3 ways to access this tab :
1. If the module holiday is enabled
2. If the module holidays is enabled
3. If the module expense report is enabled
More over that, the application checks if the user can access the bank
account of the selected user. The application does that twice (logical
^^), first to know if the tab has to be displayed or not. Second time,
when you arrive on the page /user/bank.php to know if you have access
(eg. if you type the url directly).
In this second check, the check of the expense report module was missing
(added by this PR). This caused the following issue: the tab was visible
but when the user clicked on itn, he received an error as he cannot
access the page.
Commit: 958fdd5a4035bcf9b1df567de5b121db82e7fcd7
https://github.com/Dolibarr/dolibarr/commit/958fdd5a4035bcf9b1df567de5b121db82e7fcd7
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-08 (Tue, 08 Oct 2019)
Changed paths:
M htdocs/user/bank.php
Log Message:
-----------
Merge pull request #12061 from laudeco/hotfix/access_bank_account_user
FIX the access of the bank account of one user
Commit: 760783b98b442bbe9d5563ba0bf69ea6e741f30d
https://github.com/Dolibarr/dolibarr/commit/760783b98b442bbe9d5563ba0bf69ea6e741f30d
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-08 (Tue, 08 Oct 2019)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
FIX #11942
Commit: 73422b2149efd90695a891446ecaf3707056047d
https://github.com/Dolibarr/dolibarr/commit/73422b2149efd90695a891446ecaf3707056047d
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-08 (Tue, 08 Oct 2019)
Changed paths:
M htdocs/user/bank.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: 7377c30bfe23e577fc50b877f22ddaba8775c1a3
https://github.com/Dolibarr/dolibarr/commit/7377c30bfe23e577fc50b877f22ddaba8775c1a3
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-08 (Tue, 08 Oct 2019)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Fix limit
Commit: 8921a103c1bc921f35c442b6027a33cc92f80af9
https://github.com/Dolibarr/dolibarr/commit/8921a103c1bc921f35c442b6027a33cc92f80af9
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-08 (Tue, 08 Oct 2019)
Changed paths:
M htdocs/langs/en_US/margins.lang
Log Message:
-----------
Trans
Commit: 6de31f2c54035343f06e59891ce30214e0b71bf2
https://github.com/Dolibarr/dolibarr/commit/6de31f2c54035343f06e59891ce30214e0b71bf2
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-08 (Tue, 08 Oct 2019)
Changed paths:
M htdocs/langs/en_US/margins.lang
M htdocs/margin/agentMargins.php
Log Message:
-----------
Better translation
Commit: 1c105718b9d679f2aef25c04b272dfc8df1fe946
https://github.com/Dolibarr/dolibarr/commit/1c105718b9d679f2aef25c04b272dfc8df1fe946
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-08 (Tue, 08 Oct 2019)
Changed paths:
A dev/initdemo/documents_demo/adherent/1/photos/person5.jpeg
A dev/initdemo/documents_demo/adherent/1/photos/thumbs/person5_mini.jpeg
A dev/initdemo/documents_demo/adherent/1/photos/thumbs/person5_small.jpeg
A dev/initdemo/documents_demo/adherent/2/photos/pierrecurie.jpg
A dev/initdemo/documents_demo/adherent/2/photos/thumbs/pierrecurie_mini.jpg
A dev/initdemo/documents_demo/adherent/2/photos/thumbs/pierrecurie_small.jpg
A dev/initdemo/documents_demo/adherent/3/photos/person9.jpeg
A dev/initdemo/documents_demo/adherent/3/photos/thumbs/person9_mini.jpeg
A dev/initdemo/documents_demo/adherent/3/photos/thumbs/person9_small.jpeg
A dev/initdemo/documents_demo/adherent/4/photos/person2.jpeg
A dev/initdemo/documents_demo/adherent/4/photos/thumbs/person2_mini.jpeg
A dev/initdemo/documents_demo/adherent/4/photos/thumbs/person2_small.jpeg
M dev/initdemo/mysqldump_dolibarr_10.0.0.sql
Log Message:
-----------
Update demo
Commit: 9f4aadae18e05183e8f267acb006207de90927b9
https://github.com/Dolibarr/dolibarr/commit/9f4aadae18e05183e8f267acb006207de90927b9
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-09 (Wed, 09 Oct 2019)
Changed paths:
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modService.class.php
Log Message:
-----------
Missing Nature, Duration and Type fields in export of products
Commit: 9da1d5025bc5492de5c66604cd451711105c4ee2
https://github.com/Dolibarr/dolibarr/commit/9da1d5025bc5492de5c66604cd451711105c4ee2
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-09 (Wed, 09 Oct 2019)
Changed paths:
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/supplier/list.php
Log Message:
-----------
FIX If product account not suggested during bind, it is not preselected
Commit: f2d04fe55cce45fe5295f1dff4bb318d43cb2386
https://github.com/Dolibarr/dolibarr/commit/f2d04fe55cce45fe5295f1dff4bb318d43cb2386
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-09 (Wed, 09 Oct 2019)
Changed paths:
M htdocs/core/lib/product.lib.php
Log Message:
-----------
Code comment
Commit: aebae5ff83f6c14b999ef7c06eaadafde432faa2
https://github.com/Dolibarr/dolibarr/commit/aebae5ff83f6c14b999ef7c06eaadafde432faa2
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-10 (Thu, 10 Oct 2019)
Changed paths:
A dev/initdemo/documents_demo/adherent/1/photos/person5.jpeg
A dev/initdemo/documents_demo/adherent/1/photos/thumbs/person5_mini.jpeg
A dev/initdemo/documents_demo/adherent/1/photos/thumbs/person5_small.jpeg
A dev/initdemo/documents_demo/adherent/2/photos/pierrecurie.jpg
A dev/initdemo/documents_demo/adherent/2/photos/thumbs/pierrecurie_mini.jpg
A dev/initdemo/documents_demo/adherent/2/photos/thumbs/pierrecurie_small.jpg
A dev/initdemo/documents_demo/adherent/3/photos/person9.jpeg
A dev/initdemo/documents_demo/adherent/3/photos/thumbs/person9_mini.jpeg
A dev/initdemo/documents_demo/adherent/3/photos/thumbs/person9_small.jpeg
A dev/initdemo/documents_demo/adherent/4/photos/person2.jpeg
A dev/initdemo/documents_demo/adherent/4/photos/thumbs/person2_mini.jpeg
A dev/initdemo/documents_demo/adherent/4/photos/thumbs/person2_small.jpeg
M dev/initdemo/mysqldump_dolibarr_10.0.0.sql
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/supplier/list.php
M htdocs/admin/security.php
M htdocs/categories/class/categorie.class.php
M htdocs/core/lib/product.lib.php
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modService.class.php
M htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
M htdocs/langs/en_US/margins.lang
M htdocs/margin/agentMargins.php
M htdocs/user/bank.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/margins.lang
htdocs/user/class/user.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/28b87f9e2720...aebae5ff83f6