Commit Graph

26974 Commits

Author SHA1 Message Date
Laurent Destailleur
d8c975da3d More fields into import of products 2012-03-30 00:54:41 +02:00
Laurent Destailleur
3659191d83 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-28 20:13:15 +02:00
Laurent Destailleur
ec542f5ee5 New: Support tags into header and footer into ODT templates 2012-03-28 20:12:25 +02:00
Regis Houssin
b204ad5b84 Fix: multicompany compatibility 2012-03-29 01:42:05 +08:00
simnandez
956eb11172 Fix: Sanitize data 2012-03-28 16:49:36 +01:00
Laurent Destailleur
0370e06c84 Perf: Reduce nb of requests 2012-03-28 17:34:58 +02:00
Laurent Destailleur
fbfff99b80 Fix: Can delete a paiement if bank line was deleted. 2012-03-28 17:26:53 +02:00
Regis Houssin
973146ee46 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-28 16:16:51 +02:00
Laurent Destailleur
a8e37427bb Fix: Set date supplier invoice 2012-03-28 16:10:00 +02:00
Regis Houssin
d8d9062606 Fix: duplicate end tag and rename form parts 2012-03-28 16:03:04 +02:00
simnandez
3b8694432c Fix: Sanitize data 2012-03-28 09:57:02 +01:00
Laurent Destailleur
3e7136459f Fix: Reorder boxes 2012-03-28 02:57:49 +02:00
Laurent Destailleur
daf2a19396 New: Add signature at end of predefined email text 2012-03-28 00:56:12 +02:00
Laurent Destailleur
0c225372d6 Fix: Sanitize data 2 2012-03-27 18:36:32 +02:00
Laurent Destailleur
28cf1345e0 Fix: Sanitize data 2012-03-27 18:33:34 +02:00
Regis Houssin
6b415931b1 Merge pull request #136 from simnandez/develop
Fix: Uniformize code
2012-03-27 01:08:12 -07:00
Laurent Destailleur
02624c8170 Checkstyle 2012-03-27 10:01:12 +02:00
Laurent Destailleur
78ae7dc075 Checkstyle 2012-03-27 09:59:28 +02:00
simnandez
c7bfb82999 Fix: Uniformize code 2012-03-27 08:56:37 +01:00
Laurent Destailleur
325d055fbb Try a checkstyle fix 2012-03-27 09:46:00 +02:00
Laurent Destailleur
52f4f72e6f Checkstyle 2012-03-26 22:39:43 +02:00
Laurent Destailleur
66c2d24b9e Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-26 22:29:19 +02:00
Laurent Destailleur
f52a07eee5 Minor look fix, fix into ecm module when dir does not exists 2012-03-26 18:23:08 +02:00
Laurent Destailleur
e6efef9e5c Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-26 10:00:17 +02:00
Laurent Destailleur
e33b0dc01a Uniformize code with filemanager module 2012-03-26 09:57:52 +02:00
Regis Houssin
d7d5681b4b Fix: avoid phpunit warning 2012-03-26 08:18:03 +02:00
Laurent Destailleur
ffc0b2b44c Update ecm 2012-03-26 03:09:35 +02:00
Laurent Destailleur
350fcf52a9 Fix: W3C 2012-03-26 00:36:50 +02:00
Laurent Destailleur
1abe113627 Fix style 2012-03-26 00:27:14 +02:00
Laurent Destailleur
efc1c19737 New: Add option to move JNotify message position at bottom
Work on ajax ecm module.
2012-03-26 00:14:42 +02:00
Laurent Destailleur
74c39a10a2 Work on ajax ecm module 2012-03-25 22:47:37 +02:00
Laurent Destailleur
7d14ce2386 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-25 14:26:48 +02:00
Laurent Destailleur
693d0441b3 Fix: json emulated function now support utf8 char. 2012-03-25 14:25:32 +02:00
Grand Philippe
b3e55e179f first step to use fichinter within a custom place 2012-03-24 18:15:07 +01:00
Laurent Destailleur
8e745c88c5 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-24 15:21:09 +01:00
Laurent Destailleur
39ded746dc Work on ecm module using ajax 2012-03-24 15:20:49 +01:00
Regis Houssin
cf7170c14d Fix: set to null if empty 2012-03-24 22:18:11 +08:00
Regis Houssin
30fb26296d Fix: add check array in GETPOST
New: update multiselect with a fork
2012-03-24 21:20:22 +08:00
Regis Houssin
0aa40b0503 Fix: add multiselectarray() method and jQuery multiselect plugin 2012-03-24 19:52:28 +08:00
Regis Houssin
83272dfd69 Fix: compatibility with edit in place 2012-03-23 21:22:47 +01:00
Regis Houssin
d5aad28768 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into develop

Conflicts:
	htdocs/comm/mailing/fiche.php
2012-03-23 20:06:11 +01:00
Regis Houssin
8c7f405ac9 Fix: uniformize code 2012-03-23 20:03:57 +01:00
Laurent Destailleur
187dc0d762 Work on epxerimental feature MAIN_ECM_TRY_JS 2012-03-23 19:43:25 +01:00
Regis Houssin
ffc6812241 Fix: avoid php strict mode warning 2012-03-23 18:19:50 +01:00
Regis Houssin
3c794967c3 Fix: multiple avoid warning with php strict mode 2012-03-23 17:18:33 +01:00
Regis Houssin
be7da6f52c Fix: avoid warning in php strict mode 2012-03-23 16:44:45 +01:00
Regis Houssin
89be120764 Fix: missing actiontype of canvas 2012-03-23 22:46:15 +08:00
Laurent Destailleur
f5bd5677de Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-23 09:59:38 +01:00
Regis Houssin
1bcbe02562 Fix: wrong original values 2012-03-23 09:15:14 +01:00
Regis Houssin
de16037b93 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-23 09:03:58 +01:00