Commit Graph

15 Commits

Author SHA1 Message Date
Laurent Destailleur
bda39f25bf New: Default aprrover for holidays i sby default hierchical parent. 2013-04-14 01:04:11 +02:00
Laurent Destailleur
6bbac00c22 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/user/fiche.php
2013-02-12 15:17:22 +01:00
Laurent Destailleur
9f7a06e04d Fix: Test not complete 2013-02-01 09:56:45 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Laurent Destailleur
f345e43dad Fix: date 2012-12-30 22:23:23 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
474b68b3e4 Fix: strict mode mother 2012-11-14 11:29:22 +01:00
Regis Houssin
00784ffce5 Fir: go to hell 2012-09-06 09:48:25 +02:00
Regis Houssin
7bd18ba840 Fix: phpunit error again ! pfff 2012-09-06 09:17:01 +02:00
Regis Houssin
c9ea50c51f Try another method 2012-09-06 09:09:00 +02:00
Regis Houssin
e0bb5f334d Try to avoid phpunit errors 2012-09-06 08:31:38 +02:00
Regis Houssin
0b057a071a Fix: for avoid phpunit errors 2012-09-06 08:24:29 +02:00
Laurent Destailleur
00cd6a050d Uniformise code 2012-09-05 13:10:13 +02:00