[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 203096: fix : ODT project substitutio
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 203096: fix : ODT project substitution |
|
Date: |
Thu, 16 Aug 2018 05:50:21 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 20309665e60ea50ff3f1050ffcc91a934f21e025
https://github.com/Dolibarr/dolibarr/commit/20309665e60ea50ff3f1050ffcc91a934f21e025
Author: florian HENRY <address@hidden>
Date: 2018-08-14 (Tue, 14 Aug 2018)
Changed paths:
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/install/doctemplates/projects/template_project.odt
Log Message:
-----------
fix : ODT project substitution
Commit: 5a1a6ac095dfaf23020a06b018a1584bcd333802
https://github.com/Dolibarr/dolibarr/commit/5a1a6ac095dfaf23020a06b018a1584bcd333802
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-15 (Wed, 15 Aug 2018)
Changed paths:
M htdocs/comm/action/card.php
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
Fix error message
Commit: 15144a24731abc4d6ddf030cda413355bf5f88b9
https://github.com/Dolibarr/dolibarr/commit/15144a24731abc4d6ddf030cda413355bf5f88b9
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-15 (Wed, 15 Aug 2018)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 8.0.1
Commit: 7d6e25789c15a4fbe6af0ee371d8879fc091fc07
https://github.com/Dolibarr/dolibarr/commit/7d6e25789c15a4fbe6af0ee371d8879fc091fc07
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-15 (Wed, 15 Aug 2018)
Changed paths:
M htdocs/contrat/services_list.php
Log Message:
-----------
Fix popup customer
Commit: e88b68f131e4440c8be16af12cd9ab518a31bfb6
https://github.com/Dolibarr/dolibarr/commit/e88b68f131e4440c8be16af12cd9ab518a31bfb6
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-16 (Thu, 16 Aug 2018)
Changed paths:
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/install/doctemplates/projects/template_project.odt
Log Message:
-----------
Merge pull request #9246 from atm-florian/6.0
fix : ODT project substitution
Commit: 4b7889b295ac376efbe9ed09a5aa6418dad863d8
https://github.com/Dolibarr/dolibarr/commit/4b7889b295ac376efbe9ed09a5aa6418dad863d8
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-16 (Thu, 16 Aug 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Fix left join broken
Commit: 2719c4eb43d9c8aa87aabe05c43c51b3ecd4f0cc
https://github.com/Dolibarr/dolibarr/commit/2719c4eb43d9c8aa87aabe05c43c51b3ecd4f0cc
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-16 (Thu, 16 Aug 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Fix escape
Commit: 1922c3d881a050071f0e5f42b96bda6cbea221e0
https://github.com/Dolibarr/dolibarr/commit/1922c3d881a050071f0e5f42b96bda6cbea221e0
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-16 (Thu, 16 Aug 2018)
Changed paths:
M htdocs/langs/en_US/companies.lang
Log Message:
-----------
Fix menu entry
Commit: 9f5cc2d05fa55309a2e41b34efe537a0998d3878
https://github.com/Dolibarr/dolibarr/commit/9f5cc2d05fa55309a2e41b34efe537a0998d3878
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-16 (Thu, 16 Aug 2018)
Changed paths:
M htdocs/langs/en_US/companies.lang
Log Message:
-----------
Fix menu entry
Commit: 1b1258b2efd9f9f2de79751a3c9a1389750895a9
https://github.com/Dolibarr/dolibarr/commit/1b1258b2efd9f9f2de79751a3c9a1389750895a9
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-16 (Thu, 16 Aug 2018)
Changed paths:
M htdocs/admin/modulehelp.php
Log Message:
-----------
Fix url in tooltip
Commit: 0c654bd452a6df57279df3b012c425f5b920a8e6
https://github.com/Dolibarr/dolibarr/commit/0c654bd452a6df57279df3b012c425f5b920a8e6
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-16 (Thu, 16 Aug 2018)
Changed paths:
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/install/doctemplates/projects/template_project.odt
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: 4c523846095cb9b34e1382323a4027b206aaeb5e
https://github.com/Dolibarr/dolibarr/commit/4c523846095cb9b34e1382323a4027b206aaeb5e
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-16 (Thu, 16 Aug 2018)
Changed paths:
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/install/doctemplates/projects/template_project.odt
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: 4e02b134da696f7b60ed73b57b6615517d8be424
https://github.com/Dolibarr/dolibarr/commit/4e02b134da696f7b60ed73b57b6615517d8be424
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-16 (Thu, 16 Aug 2018)
Changed paths:
M htdocs/comm/action/card.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/contrat/services_list.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/install/doctemplates/projects/template_project.odt
M htdocs/langs/en_US/companies.lang
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/7075fdf8f516...4e02b134da69
**NOTE:** This service has been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.