Laurent Destailleur c3fb559d3b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/modules/modProduct.class.php

2017-02-01 20:58:17 +01:00

..

activity

Fix css

2017-01-30 12:22:58 +01:00

admin

Fix no picto on setup pages

2016-08-04 10:19:30 +02:00

ajax

NEW: Add project and Hook to Loan

2016-11-14 19:25:50 +01:00

class

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-02-01 20:58:17 +01:00

stats

…

tasks

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-01-22 12:14:18 +01:00

card.php

Fix cancel button + logic to close project when setting opp to WON/LOST.

2017-02-01 13:25:16 +01:00

contact.php

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

2017-01-13 16:49:18 +01:00

document.php

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

2017-01-13 16:49:18 +01:00

element.php

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-01-16 00:02:43 +01:00

ganttchart.inc.php

…

ganttview.php

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

2017-01-13 16:49:18 +01:00

graph_opportunities.inc.php

Fix columns hidden

2016-12-10 23:08:11 +01:00

index.php

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

2017-01-13 16:49:18 +01:00

info.php

Fix bad side effect of uniformizing a constant name.

2017-02-01 15:47:08 +01:00

jsgantt_language.js.php

…

list.php

Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on

2017-01-15 20:49:20 +01:00

note.php

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

2017-01-13 16:49:18 +01:00

tasks.php

Fix css and look 5.0

2017-01-22 12:13:32 +01:00