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 |
|
fhenry
|
10ed8c141e
|
Update method in thirdparty web service
|
2013-01-10 23:30:26 +01:00 |
|
fhenry
|
0e1d83c698
|
Change sample data for createThirdParty
|
2012-12-13 19:58:36 +01:00 |
|
fhenry
|
3fc51c2786
|
Commit without password
|
2012-12-13 12:50:52 +01:00 |
|
fhenry
|
14c1616adb
|
Full standard extrafields management in Thirds Party Web service
|
2012-12-13 12:34:00 +01:00 |
|
Regis Houssin
|
ead2a81baf
|
Fix: merge problem
|
2012-08-23 18:45:41 +02:00 |
|
Regis Houssin
|
56a22d2b59
|
Fix: rename for security raison
|
2012-08-23 18:15:54 +02:00 |
|