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

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/install/repair.php

2017-11-14 19:47:33 +01:00

..

action

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

2017-11-14 19:47:33 +01:00

admin

Fix translation of extrafields type

2017-10-24 18:05:43 +02:00

mailing

Fix encoding with select2

2017-11-03 16:29:23 +01:00

propal

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

2017-11-14 19:47:33 +01:00

prospect

New: getEntity function use true $shared value by default

2017-05-30 18:50:54 +02:00

address.php

USe second parameter in GETPOST

2017-09-15 10:50:50 +02:00

card.php

Error management after extrafield update

2017-10-24 19:04:40 +02:00

contact.php

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

index.php

Fix search filter when using extrafields 'links'

2017-11-12 12:39:23 +01:00

multiprix.php

Fix css and look 5.0

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

recap-client.php

…

remise.php

USe second parameter in GETPOST

2017-09-15 10:50:50 +02:00

remx.php

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

2017-10-13 22:01:56 +02:00