Laurent Destailleur 5a1a5548df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ...

Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/societe/class/societe.class.php

2018-10-19 14:27:15 +02:00

..

activity

Fix list of tasks on time consumed

2018-09-16 13:28:37 +02:00

admin

clean and update code

2018-06-10 18:29:04 +02:00

ajax

loadlangs

2018-05-26 21:11:25 +02:00

class

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-08-23 19:50:58 +02:00

stats

clean and update code

2018-06-10 18:29:04 +02:00

tasks

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-08-23 19:50:58 +02:00

card.php

FIX content lost when editing a label with "

2018-10-15 11:05:04 +02:00

comment.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-08-23 19:50:58 +02:00

contact.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-08-23 19:50:58 +02:00

document.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-08-23 19:50:58 +02:00

element.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-10-19 14:27:15 +02:00

ganttchart.inc.php

Fix <br /> (xml) into <br> (html)

2018-01-17 13:26:57 +01:00

ganttview.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-08-23 19:50:58 +02:00

graph_opportunities.inc.php

Fix for multicompany

2018-02-06 10:57:53 +01:00

index.php

clean and update code

2018-06-10 18:29:04 +02:00

info.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-08-23 19:50:58 +02:00

jsgantt_language.js.php

Clean defined constant at begin of pages

2018-04-21 12:00:55 +02:00

list.php

Fix search on project

2018-09-07 15:01:34 +02:00

note.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-08-23 19:50:58 +02:00

tasks.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-08-23 19:50:58 +02:00