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

Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php

2018-08-12 20:08:20 +02:00

..

admin

loadlangs

2018-05-26 17:57:30 +02:00

ajax

Clean defined constant at begin of pages

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

canvas

Merge pull request #8982 from hregis/7.0_bug6

2018-06-18 14:32:35 +02:00

class

FIX update extrafields

2018-08-12 16:29:26 +02:00

composition

Fix syntax error

2018-06-23 17:11:19 +02:00

dynamic_price

loadlangs

2018-05-26 17:57:30 +02:00

inventory

FIX combo into popup become crazy with IE10

2018-06-28 12:16:12 +02:00

stats

Fix ref on list

2018-07-18 14:09:44 +02:00

stock

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

2018-07-24 19:23:40 +02:00

agenda.php

loadlangs

2018-05-26 23:52:52 +02:00

card.php

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

2018-06-26 01:25:03 +02:00

document.php

loadlangs

2018-05-26 23:52:52 +02:00

fournisseurs.php

loadlangs

2018-05-26 23:52:52 +02:00

index.php

Fix look and feel v8

2018-06-23 12:41:03 +02:00

list.php

Fix css

2018-06-22 22:53:53 +02:00

note.php

loadlangs

2018-05-26 23:52:52 +02:00

popuprop.php

loadlangs

2018-05-26 23:52:52 +02:00

price.php

Fix warning

2018-07-11 10:01:26 +02:00

reassort.php

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

2018-08-12 20:08:20 +02:00

reassortlot.php

Fix: avoid warning

2018-06-19 19:00:23 +02:00

traduction.php

Fix: wrong var name "shownav"

2018-06-19 18:33:22 +02:00