Laurent Destailleur 10c2bdc193 Merge remote-tracking branch 'origin/3.4' into develop ...

Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/fr_FR/compta.lang

2013-09-04 15:13:38 +02:00

..

admin

[ task #1014 ] Add option to recursivly add parent cactegory

2013-07-31 21:52:49 +02:00

class

Merge remote-tracking branch 'origin/3.4' into develop

2013-09-04 15:13:38 +02:00

categorie.php

Fix: Error management

2013-08-21 13:02:33 +02:00

edit.php

Uniformize code, order of fiels in card and language files.

2013-04-28 01:12:40 +02:00

fiche.php

[ task #519 ] Add category association with contacts

2013-07-16 21:04:58 +02:00

index.php

Finnalise categorie contact

2013-07-30 17:24:27 +02:00

photos.php

Finnalise categorie contact

2013-07-30 17:24:27 +02:00

viewcat.php

Category contact again

2013-07-30 17:28:08 +02:00