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

Conflicts:
	htdocs/core/lib/project.lib.php

2019-07-25 17:54:14 +02:00

..

admin

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

2019-07-04 12:27:00 +02:00

ajax

Merge branch 'develop' into nospaceaftercomma

2019-01-30 18:27:35 +01:00

canvas

Translation lignes -> lines

2019-07-05 21:50:35 +02:00

class

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

2019-07-14 00:44:35 +02:00

composition

Fix look and feel v10

2019-05-22 13:42:27 +02:00

dynamic_price

Fix dynamic prices bug caused by arg displacement

2019-04-07 21:41:31 +02:00

inventory

Fix confusion between ->childs and ->childsoncascade

2019-06-22 20:17:40 +02:00

stats

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

2019-06-29 02:04:16 +02:00

stock

Translation of some comments

2019-07-05 21:37:25 +02:00

agenda.php

Update agenda.php

2019-05-19 09:15:51 +02:00

card.php

Rename ->produit into ->product. Still permissions to rename.

2019-06-24 21:18:49 +02:00

document.php

Look and feel v10

2019-03-29 13:26:26 +01:00

fournisseurs.php

Work on nblignes -> nblines

2019-06-29 16:38:14 +02:00

index.php

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

2019-07-25 17:54:14 +02:00

list.php

Rename ->produit into ->product. Still permissions to rename.

2019-06-24 21:18:49 +02:00

note.php

Merge branch 'develop' into nospaceaftercomma

2019-01-30 18:27:35 +01:00

popuprop.php

replace html code by html5

2019-02-24 11:18:55 +01:00

price.php

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

2019-07-18 18:23:24 +02:00

reassort.php

Translation lignes -> lines

2019-07-05 21:50:35 +02:00

reassortlot.php

Translation lignes -> lines

2019-07-05 21:50:35 +02:00

traduction.php

Merge branch 'develop' into nospaceaftercomma

2019-02-03 19:27:16 +01:00