Laurent Destailleur 938936b8f2 Merge remote-tracking branch 'origin/3.6' into 3.7 ...

Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/core/lib/functions.lib.php

2015-02-20 22:51:47 +01:00

..

action

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-02-20 22:51:47 +01:00

admin

Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now

2014-12-04 13:20:56 +01:00

mailing

Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into

2015-02-18 22:54:02 +01:00

propal

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-02-18 23:51:41 +01:00

prospect

PHPDoc and misc fixes for several folders

2015-02-10 11:38:13 +01:00

address.php

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

card.php

PHPDoc and misc fixes for several folders

2015-02-10 11:38:13 +01:00

contact.php

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

index.php

PHPDoc and misc fixes for several folders

2015-02-10 11:38:13 +01:00

list.php

Update /comm/list.php

2014-11-23 17:43:32 +01:00

multiprix.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

propal.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-01-18 17:13:42 +01:00

recap-client.php

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

remise.php

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

remx.php

PHPDoc and misc fixes for several folders

2015-02-10 11:38:13 +01:00