[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 461393: Merge pull request #9 from Do
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 461393: Merge pull request #9 from Dolibarr/8.0 |
|
Date: |
Tue, 26 Feb 2019 17:27:52 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 46139399edd5be284265f9ecc9b494269322b17c
https://github.com/Dolibarr/dolibarr/commit/46139399edd5be284265f9ecc9b494269322b17c
Author: Günter Lukas <address@hidden>
Date: 2019-01-22 (Tue, 22 Jan 2019)
Changed paths:
M ChangeLog
M htdocs/accountancy/journal/bankjournal.php
M htdocs/adherents/card.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/subscription.php
M htdocs/admin/defaultvalues.php
M htdocs/admin/dict.php
M htdocs/admin/system/filecheck.php
M htdocs/cashdesk/class/Facturation.class.php
M htdocs/cashdesk/index.php
M htdocs/cashdesk/tpl/liste_articles.tpl.php
M htdocs/comm/action/list.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/paymentterm.class.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/stats.class.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modPropale.class.php
M htdocs/install/inc.php
M htdocs/societe/card.php
M htdocs/societe/class/societe.class.php
M htdocs/user/card.php
M htdocs/user/param_ihm.php
Log Message:
-----------
Merge pull request #9 from Dolibarr/8.0
forksync 8.0
Commit: 1cf786acff1dc3c31c0006e47238c349e5179fb4
https://github.com/Dolibarr/dolibarr/commit/1cf786acff1dc3c31c0006e47238c349e5179fb4
Author: Günter Lukas <address@hidden>
Date: 2019-01-22 (Tue, 22 Jan 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Fix #10278
Fix #10278
Commit: b017213131e278ab1603d0e1a78402bed704e100
https://github.com/Dolibarr/dolibarr/commit/b017213131e278ab1603d0e1a78402bed704e100
Author: Frédéric FRANCE <address@hidden>
Date: 2019-02-17 (Sun, 17 Feb 2019)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
selectMulticurrency avoid malformed empty value
Commit: 9c5a4e303c45fe79c836fd391f948b75ed17bdef
https://github.com/Dolibarr/dolibarr/commit/9c5a4e303c45fe79c836fd391f948b75ed17bdef
Author: bomuux <address@hidden>
Date: 2019-02-27 (Wed, 27 Feb 2019)
Changed paths:
M htdocs/core/boxes/box_project.php
Log Message:
-----------
SQL error in box_project.php
Corrected a bug : for an internal user with no rights to see all
projects, the project box on home cause an error in log.
Finally a lot of simplification because
Project::getProjectsAuthorizedForUser do most of the filtering.
Conflicts:
htdocs/core/boxes/box_project.php
Commit: 238894a7e4bd00e28c04fc6e32c5799b0268ad07
https://github.com/Dolibarr/dolibarr/commit/238894a7e4bd00e28c04fc6e32c5799b0268ad07
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-27 (Wed, 27 Feb 2019)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge pull request #10624 from frederic34/patch-2
selectMulticurrency avoid malformed empty value
Commit: 86e2ffe3237e98be8d58422378891914782681a3
https://github.com/Dolibarr/dolibarr/commit/86e2ffe3237e98be8d58422378891914782681a3
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-27 (Wed, 27 Feb 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #10390 from glu000/8.0
Fix #10278
Commit: cbaa57b1e27183cea6bd36c4b68ab3f93d6923ae
https://github.com/Dolibarr/dolibarr/commit/cbaa57b1e27183cea6bd36c4b68ab3f93d6923ae
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-27 (Wed, 27 Feb 2019)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 401f587868464df72da93653dc15ec94e6373a9d
https://github.com/Dolibarr/dolibarr/commit/401f587868464df72da93653dc15ec94e6373a9d
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-27 (Wed, 27 Feb 2019)
Changed paths:
M htdocs/core/boxes/box_project.php
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/boxes/box_project.php
Commit: 97b51ec647bcd1f8210e5812ce75b1e2aeffd6f9
https://github.com/Dolibarr/dolibarr/commit/97b51ec647bcd1f8210e5812ce75b1e2aeffd6f9
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-27 (Wed, 27 Feb 2019)
Changed paths:
M htdocs/accountancy/admin/index.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/b33b3698c8a6...97b51ec647bc