Commit Graph

794 Commits

Author SHA1 Message Date
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we
can move it during init of environment and use it globally.
2013-01-25 19:12:54 +01:00
Laurent Destailleur
0db303ca59 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-23 23:35:39 +01:00
Laurent Destailleur
3472282703 Fix: [ bug #667 ] Customer categories wrong tree shown after update
3.2->3.3
2013-01-23 23:34:43 +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
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-01-13 19:33:54 +01:00
Laurent Destailleur
ec8b260bf6 New: Prepare 3.4 branch
New: Add hook for agenda, info and category tabs
2013-01-12 14:34:16 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
Regis Houssin
8908f977b8 Fix: converting line delimiters !!! 2012-11-14 11:31:08 +01:00
Laurent Destailleur
e7164cb243 Fix: Some checkstyle errors 2012-11-11 18:18:57 +01:00
simnandez
353c932e11 Fix: if no results do not charge data 2012-11-06 12:33:35 +01:00
simnandez
425ebae802 New: More import options. Products categories 2012-10-26 18:19:04 +02:00
Regis Houssin
15aa2497ab Fix: compatibility with multicompany sharings 2012-10-16 17:59:00 +02:00
Regis Houssin
9f43d8613c Fix: missing clean parameters 2012-10-09 16:59:19 +02:00
Regis Houssin
8486f9d85d Fix: missing spaces 2012-10-09 16:33:28 +02:00
Laurent Destailleur
8b4886073c Fix: Removed the FIXME. This is supported by the pgsql driver. 2012-10-09 12:03:39 +02:00
Regis Houssin
72a1194d14 Fix: search with case sensitive method
FIXME: Mysql "LIKE" is case insensitive by default and use LIKE BINARY
for case sensitive, Pgsql "LIKE" is case sensitive by default, and use
ILIKE for case insensitive
2012-10-09 10:57:15 +02:00
Regis Houssin
d61a8ee947 Fix: missing comma 2012-10-09 08:47:11 +02:00
Regis Houssin
089603e1c5 Fix: add import_key field 2012-10-09 08:40:32 +02:00
Regis Houssin
7f7676d357 Fix: uniformize variable name 2012-10-08 20:44:12 +02:00
Regis Houssin
0975918cc6 Fix: [task #146] Remove table llx_categorie_association
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-10-08 19:27:02 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
a7bfc722d5 Fix: use specific variable 2012-09-09 16:31:00 +02:00
Laurent Destailleur
2c2d17b101 Fix: Try a fix to avoid having the hover on array that should not have
it.
2012-09-09 13:13:24 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Laurent Destailleur
816e317dd2 Fix into categorie functions 2012-08-05 23:58:42 +02:00
Regis Houssin
a157327859 Fix: strict mode paradise 2012-07-28 11:28:37 +02:00
Laurent Destailleur
7883124958 New: [ task #454 ] Add "No category" into filters on category 2012-07-28 00:53:51 +02:00
Laurent Destailleur
a2e745fab6 Fix: Function return was missing in some case. Save bug of empty
category.
2012-07-27 23:21:22 +02:00
Regis Houssin
c6cd17cf3f Fix: strict mode... far away 2012-07-24 17:52:46 +02:00
Regis Houssin
66b2f630ac Fix: big avoid strict mode errors 2012-07-09 12:31:21 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Laurent Destailleur
2a3db5a3ac Fix: new self is not compatible with most version of PHP. Also result is
not predicable as it depends on PHP version.
2012-05-21 20:31:02 +02:00
Regis Houssin
5f835bed7e Fix: broken features 2012-05-21 15:45:44 +02:00
Regis Houssin
161e39794e Fix: security update for multicompany 2012-04-15 11:30:06 +02:00
Regis Houssin
e49df57667 Fix: compatibility with php 5.4 and E_STRICT mode 2012-04-14 15:04:46 +02:00
Regis Houssin
921c8607d7 Fix: multicompany sharings and uniformize code 2012-04-07 10:19:33 +02:00
Laurent Destailleur
c77bc5adf5 Doxygen 2012-03-31 15:42:33 +02:00
Regis Houssin
b204ad5b84 Fix: multicompany compatibility 2012-03-29 01:42:05 +08:00
Laurent Destailleur
f37e3956b8 Prepare code to allow usage of ajax in ecm module 2012-03-21 21:32:36 +01:00
Regis Houssin
33bf32073f Fix: add more debug log 2012-03-21 11:17:52 +01:00
Regis Houssin
1aa71803ce Fix: add begin/commit/rollback 2012-03-21 10:08:49 +01:00
Regis Houssin
2341e6c881 Fix: add log for debug phpunit error 2012-03-21 09:47:55 +01:00
Regis Houssin
b83026f883 Fix: for multicompany category sharing 2012-03-20 22:46:57 +08:00
Regis Houssin
507e9af5cb Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-20 14:42:53 +01:00
Regis Houssin
b7af14393c Fix: for multicompany category sharing 2012-03-20 14:42:43 +01:00