[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] b99623: fix: when agenda is filterd w
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] b99623: fix: when agenda is filterd with "todo" event, do ... |
|
Date: |
Mon, 04 Jun 2018 06:14:41 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: b996237142d6bc26aca90af038e230d1ba8f9054
https://github.com/Dolibarr/dolibarr/commit/b996237142d6bc26aca90af038e230d1ba8f9054
Author: florian HENRY <address@hidden>
Date: 2018-05-30 (Wed, 30 May 2018)
Changed paths:
M htdocs/comm/action/index.php
M htdocs/comm/action/listactions.php
M htdocs/comm/action/pertype.php
M htdocs/comm/action/peruser.php
Log Message:
-----------
fix: when agenda is filterd with "todo" event, do not display "not
applicable" event
Commit: 0785029fe083999833b3430dc43ac3dedbccc552
https://github.com/Dolibarr/dolibarr/commit/0785029fe083999833b3430dc43ac3dedbccc552
Author: atm-greg <address@hidden>
Date: 2018-05-31 (Thu, 31 May 2018)
Changed paths:
M htdocs/societe/consumption.php
Log Message:
-----------
Add supplier proposal in linkedObjects type select of the suppliers
Commit: 7eaa2011ba6ed75919221d49eeb4cf0e34eff1e0
https://github.com/Dolibarr/dolibarr/commit/7eaa2011ba6ed75919221d49eeb4cf0e34eff1e0
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-04 (Mon, 04 Jun 2018)
Changed paths:
M htdocs/comm/action/index.php
M htdocs/comm/action/listactions.php
M htdocs/comm/action/pertype.php
M htdocs/comm/action/peruser.php
Log Message:
-----------
Merge pull request #8900 from atm-florian/6.0_fixagenda
fix: when agenda is filterd with "todo" event, do not display "not applicable"
event
Commit: 840330deeac172d339f90a12fd5103d1fffcff76
https://github.com/Dolibarr/dolibarr/commit/840330deeac172d339f90a12fd5103d1fffcff76
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-04 (Mon, 04 Jun 2018)
Changed paths:
M htdocs/societe/consumption.php
Log Message:
-----------
Merge pull request #8905 from
atm-greg/Add_supplier_proposals_in_suppliers_linkedObjects
Add supplier proposal in linkedObjects type select of the suppliers
Commit: de2ffa11224fada820b9f87cc90988b7da1d5f70
https://github.com/Dolibarr/dolibarr/commit/de2ffa11224fada820b9f87cc90988b7da1d5f70
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-04 (Mon, 04 Jun 2018)
Changed paths:
M htdocs/comm/action/index.php
M htdocs/comm/action/list.php
M htdocs/comm/action/pertype.php
M htdocs/comm/action/peruser.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/comm/action/listactions.php
Commit: 3368e35502afb4560b4bf549d7b4c9a17e7b9852
https://github.com/Dolibarr/dolibarr/commit/3368e35502afb4560b4bf549d7b4c9a17e7b9852
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-04 (Mon, 04 Jun 2018)
Changed paths:
M htdocs/societe/consumption.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: 7a8fac41985ba62985f33e6c6b8e0732216896f6
https://github.com/Dolibarr/dolibarr/commit/7a8fac41985ba62985f33e6c6b8e0732216896f6
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-04 (Mon, 04 Jun 2018)
Changed paths:
M htdocs/comm/action/index.php
M htdocs/comm/action/list.php
M htdocs/comm/action/pertype.php
M htdocs/comm/action/peruser.php
M htdocs/societe/consumption.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/list.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/69dd11f7c626...7a8fac41985b
**NOTE:** This service 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.