Laurent Destailleur fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop ...

Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php

2013-05-03 00:15:02 +02:00

..

admin

Reveiw extrafield for womplaiance with wiki

2013-04-26 10:29:14 +02:00

ajax

fix [ bug #827 ] AJAX search does not respect multiprice level

2013-04-30 21:35:27 +02:00

canvas

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

class

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

2013-05-03 00:15:02 +02:00

composition

Qual: Make code simpler.

2013-04-22 13:01:22 +02:00

stats

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

stock

Fix: Bad div closing

2013-03-30 19:40:52 +01:00

document.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

fiche.php

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

2013-04-27 15:15:31 +02:00

fournisseurs.php

TVA NPR : can use * in tva when set supplier price

2013-03-28 09:30:42 +04:00

index.php

Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap

2013-04-25 01:13:13 +02:00

liste.php

Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap

2013-04-25 01:13:13 +02:00

photos.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

popuprop.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

price.php

Product price : updated always with HT base type after product import

2013-02-26 12:52:37 +01:00

reassort.php

Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap

2013-04-25 01:13:13 +02:00

traduction.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00