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

Conflicts:
	htdocs/webservices/server_user.php

2013-03-12 14:55:13 +01:00

..

admin

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

2013-01-16 15:45:17 +01:00

ajax

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

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

canvas

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

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

class

Test to avoid infinite loop

2013-02-19 21:10:31 +01:00

composition

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

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

stats

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

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

stock

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

2013-03-12 14:55:13 +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

New: hookmanager class is used frequently and is a factory object, so we

2013-01-25 19:12:54 +01:00

fournisseurs.php

New: hookmanager class is used frequently and is a factory object, so we

2013-01-25 19:12:54 +01:00

index.php

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

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

liste.php

Fix: Pagination at bottom not work correctly with filters applied

2013-02-22 08:57:28 +01: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

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

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

traduction.php

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

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