Commit Graph

35656 Commits

Author SHA1 Message Date
Laurent Destailleur
ec5b4f5fa7 Fix: Start to fix some bug (pgsql compatibility), try to optimize
request. Added FIXME tags.
2013-01-15 15:36:04 +01:00
Laurent Destailleur
1851aa4646 Fix: Move not stable feature as experimental. Disabled box by default
because there is still some bug (pgsl support, filters) and major
problem to solve (it slow down seriously Dolibarr, result not accurate
for some status).
2013-01-15 15:26:46 +01:00
Laurent Destailleur
0c6c2eca8a Fix: Removed warning 2013-01-15 13:11:36 +01:00
Laurent Destailleur
4cf56eafa5 Qual: Removed useless param 2013-01-15 12:48:46 +01:00
Laurent Destailleur
f57409ddcd Merge remote-tracking branch 'origin/3.3' into develop 2013-01-15 12:06:41 +01:00
Laurent Destailleur
086b223c81 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-15 11:50:15 +01:00
Regis Houssin
92723bd6fe Fix: broken features 2013-01-15 11:41:12 +01:00
Regis Houssin
9152d5575f Merge pull request #609 from FHenry/3.3
Add option to fecth extrafield even if extranal extrafield module is
2013-01-15 02:35:56 -08:00
Laurent Destailleur
11bb3d0137 Fix: Several fixes into boxes management: boxes was loaded twice, logs
were wrong, global conf missing.
2013-01-15 11:35:10 +01:00
Regis Houssin
8a6bc63127 Fix: uniformize code 2013-01-15 11:23:24 +01:00
fhenry
52b4d98849 remove parenthesis not usefull 2013-01-15 11:11:24 +01:00
Regis Houssin
787d3bd6a9 Fix: use event method 2013-01-15 11:00:32 +01:00
fhenry
f214c06b1e Add option to fecth extrafield even if extranal extrafield module is
enabled. Usefull for web service to fetch optionnal from llx_extrafields
even if record or update is manage by hook with external module
2013-01-15 10:20:19 +01:00
Laurent Destailleur
285bcbecb7 Fix: init of new syslog handler system 2013-01-14 17:12:13 +01:00
Laurent Destailleur
3332709ba1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 16:51:38 +01:00
Regis Houssin
e06912dff3 Merge pull request #608 from FHenry/develop
Add standard extrafield type : mail, phone, price
2013-01-14 07:19:07 -08:00
fhenry
51098c1227 Add standard extrafield type :
- mail
	- phone
	- price
2013-01-14 16:13:09 +01:00
Laurent Destailleur
6942700ce7 New: Direct jump to edit page 2013-01-14 15:18:15 +01:00
Laurent Destailleur
e8ab24949a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 13:08:48 +01:00
Laurent Destailleur
49313fff3b Fix: External user should not see boxes of modules not allowed to
external users.
2013-01-14 13:06:08 +01:00
Laurent Destailleur
b9dc76ebaf Fix: List of contacts when connected as external user. 2013-01-14 12:27:19 +01:00
Laurent Destailleur
6746e76564 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 12:24:06 +01:00
Regis Houssin
f954ff509c Merge pull request #607 from atm-maxime/develop
Display bug on FF while closing proposal
2013-01-14 03:22:11 -08:00
Maxime Kohlhaas
14dde75c4b Display bug on FF while closing proposal 2013-01-14 12:17:21 +01:00
Regis Houssin
c9e4da8533 Merge pull request #606 from atm-maxime/develop
Multi-company compatibility with transverse mode
2013-01-14 03:04:22 -08:00
Maxime Kohlhaas
6abf682faa Multi-company compatibility with transverse mode for pdf models 2013-01-14 12:01:44 +01:00
Laurent Destailleur
07ba988cf8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 11:45:16 +01:00
Laurent Destailleur
297c10d16b Qual: externalise code of merging PDFs into a library. 2013-01-14 11:39:30 +01:00
Maxime Kohlhaas
fb1d99d0dd Multi-company compatibility with transverse mode for home boxes 2013-01-14 11:09:10 +01:00
Regis Houssin
cf12815ca9 Fix: phpunit error 2013-01-14 09:39:35 +01:00
Laurent Destailleur
0861fbfeb6 Fix: Missing kenya currency 2013-01-13 23:47:23 +01:00
Laurent Destailleur
8b77005eae Merge pull request #605 from FHenry/develop
remove dummy line
2013-01-13 11:59:14 -08:00
fhenry
b9c53fd796 remove dummy line 2013-01-13 20:50:54 +01:00
Laurent Destailleur
ff24a7df67 New: Add script to detect DOS (non Linux) files. 2013-01-13 19:34:43 +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
0f6506d457 Fix: not object error with option SERVICE_ARE_ECOMMERCE_200238EC 2013-01-13 18:57:55 +01:00
Laurent Destailleur
8ff12f7d55 Merge pull request #604 from simnandez/develop
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
2013-01-13 07:01:28 -08:00
Laurent Destailleur
1d95c68a74 Update 2013 2013-01-13 14:38:05 +01:00
simnandez
ffbb611eb4 [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 2013-01-13 10:57:39 +01:00
simnandez
b1369a2f01 [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 2013-01-12 22:08:52 +01:00
Laurent Destailleur
980bfde83e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-01-12 19:59:09 +01:00
Laurent Destailleur
c9a6da610d To allow module to use ckeditor/config.js 2013-01-12 16:00:38 +01:00
Laurent Destailleur
1bed4aa193 Merge pull request #602 from FHenry/develop
Add boolean (checkbox) standard extrafield feature
2013-01-12 06:53:48 -08:00
Laurent Destailleur
8152dda733 Merge pull request #601 from simnandez/develop
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
2013-01-12 06:45:34 -08:00
Laurent Destailleur
979ea42d3f Comments 2013-01-12 15:40:38 +01:00
Laurent Destailleur
054a9b7447 Merge pull request #600 from marcosgdf/test
Added tests for Adherent class functions
2013-01-12 06:36:14 -08:00
fhenry
2cdeb95b67 Set member id on create not by sql request after.
Mandatory for trigger USER_CREATE to do action if user is member
2013-01-12 15:16:38 +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
Marcos García
aff96e5050 Added test for functions fetch_login and resiliate 2013-01-12 14:14:36 +01:00
fhenry
d39368fd36 Add boolean (checkbox) standard extrafield feature 2013-01-12 14:02:39 +01:00