lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,818 Commits 43 Branches 150 Tags 886 MiB
f60b664c16
Commit Graph

25647 Commits

Author SHA1 Message Date
Laurent Destailleur
45cee744c0 Fix: We must not filter HTML content but only javascript content. This 
is to avoid to block fckeditor edition.
 2011-11-09 12:22:07 +01:00
Laurent Destailleur
72c0a15f56 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/commande/fiche.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/fiche.php
 2011-11-09 12:17:29 +01:00
Laurent Destailleur
9342b419fa Little speed enhancement 2011-11-09 12:10:28 +01:00
Laurent Destailleur
90b43e2dfb Fix: Can edit accountancy code 2011-11-09 11:51:58 +01:00
Regis Houssin
6b48e3af89 Fix: remove obsolete code 2011-11-08 23:27:49 +01:00
Regis Houssin
cbec43e098 Fix: change 'editfieldkey' and 'editfieldval' for compatibility with 
external module and hook system.
Fix: uniform code
 2011-11-09 06:14:42 +08:00
Regis Houssin
338b35e2a3 Fix: [Bug #232] Multiple Cross-Site-Scripting vulnerabilities 2011-11-08 17:11:30 +01:00
Regis Houssin
e8fcda3303 Fix: bug #232 
Multiple Cross-Site-Scripting vulnerabilities
 2011-11-08 15:04:10 +01:00
Regis Houssin
d8e8d047f4 Fix: bug #232 
Multiple Cross-Site-Scripting vulnerabilities
 2011-11-08 14:44:27 +01:00
Regis Houssin
f0c327c070 Fix: uniform code 
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
 2011-11-08 17:22:31 +08:00
Laurent Destailleur
cdacf73743 Fix: [ bug #228 ] Facture depuis commande remisée 2011-11-08 00:48:26 +01:00
Laurent Destailleur
824db25a74 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/core/class/commonobject.class.php
 2011-11-08 00:17:20 +01:00
Laurent Destailleur
3d0c324f5f Fix: Message for stock movement was wrong or missing 2011-11-08 00:03:19 +01:00
Regis Houssin
9549c0c608 Fix: entity filter 2011-11-08 06:56:02 +08:00
Regis Houssin
5cf59a1346 Fix: uniform code 2011-11-07 17:31:03 +01:00
Regis Houssin
a3e461c211 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-07 17:05:44 +01:00
Regis Houssin
c9ea31a9d5 Fix: remove unused files 
Fix: add datatables library in package
 2011-11-07 17:05:06 +01:00
Regis Houssin
dea5ec5e26 Fix: reorder problem with external module 2011-11-07 22:32:22 +08:00
Laurent Destailleur
8d1284ed42 Choose warehouse for order validation 2011-11-07 15:04:02 +01:00
Regis Houssin
f1426c80d4 Fix: entity filter 2011-11-07 09:41:41 +01:00
Laurent Destailleur
8193e8a54e Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-06 15:45:03 +01:00
Laurent Destailleur
83f2061e0e Start to work on feature to select stock id for increase/decrease. 2011-11-06 15:42:53 +01:00
Laurent Destailleur
8d46ae1d35 Qual: Better error managment on numbering setup 2011-11-06 15:12:18 +01:00
Laurent Destailleur
699f759843 Fix: Bad sql request 2011-11-06 14:23:09 +01:00
Laurent Destailleur
9e50499195 Last movement date info is mre clear. 2011-11-06 13:54:06 +01:00
Regis Houssin
ca63f3d8e9 Fix: uniform code and reindent 2011-11-06 11:11:43 +01:00
Regis Houssin
1b1bb551d9 Fix: Perl-style comments are not allowed. Use "// Comment." or "/* 
comment */" instead.
 2011-11-06 10:11:23 +01:00
Regis Houssin
38c4c88b5f Fix: Avoid function calls in a FOR loop test part 2011-11-06 10:00:45 +01:00
Regis Houssin
75ed344520 Fix: invalid EOL char 2011-11-06 09:51:55 +01:00
Laurent Destailleur
2240f5db44 Fix: Localisation of prices 2011-11-06 00:40:42 +01:00
Regis Houssin
029c405b7d Fix: hide edit in place icon if MAIN_EDIT_ALSO_INLINE is not defined 2011-11-06 00:14:08 +01:00
Laurent Destailleur
6d0f72dfed Look: Uniformize buttons 2011-11-05 23:22:32 +01:00
Laurent Destailleur
40da2e23d2 Qual: Reduce sub-options of module fckeditor. This make code cleaner 
and all this duplicated options were useless.
 2011-11-05 23:18:49 +01:00
Regis Houssin
995e07041a Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-05 22:32:43 +01:00
Regis Houssin
94b393e760 Fix: show icon if edit in place is possible 2011-11-05 22:32:25 +01:00
Laurent Destailleur
5de1db527c Fix: Autocalculate rows and cols 2011-11-05 22:20:02 +01:00
Laurent Destailleur
c9b7bdf22f Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/compta/deplacement/fiche.php
 2011-11-05 21:47:41 +01:00
Laurent Destailleur
06c5f3427c New: There is now two "inline edit" solution: Solution 1 use jquery 
and is enabled if MAIN_USE_JQUERY_JEDITABLE is on. Solution 2 use a link
"edit field" on resubmit page for eache field (this is by default). And
we are ready to add more.
New: Add also option MAIN_EDIT_ALSO_INLINE. Goal of this option is to
say: Even if this field can be edited by a global edit form, we allow
field to be edited with the "inline edit" feature (whatever is the
inline edit solution active). This option is to keep the standard
behaviour "We must click a "modify" button to allow to edit globally all
fields at once working and have only this way. If option is on, we can
also use the inlinde edit. If off, inline edit is available only for
fields not included into a global "modify" form.
line
 2011-11-05 21:24:55 +01:00
Regis Houssin
fd49fc97c8 Fix: bad function name 2011-11-05 19:44:48 +01:00
Laurent Destailleur
2b9285384c Merge editfield and editInPlace 2011-11-05 18:25:04 +01:00
Laurent Destailleur
cf365593dc Qual: Revert parameter order (optionnal at end) 2011-11-05 15:43:07 +01:00
Laurent Destailleur
3f30cebce3 Qual: Prepare to merge editfield and editInPlace 2011-11-05 15:12:37 +01:00
Laurent Destailleur
cd514693c5 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-05 13:23:22 +01:00
Laurent Destailleur
c60a2ff76f Fix: new lines not correctly outputed 2011-11-05 13:22:00 +01:00
Laurent Destailleur
f16b751642 Fix: Missing menu icons 2011-11-05 13:11:10 +01:00
Regis Houssin
356409bd72 Fix: add json_decode function for old PHP 2011-11-05 12:45:13 +01:00
Laurent Destailleur
fd9e0d8643 Qual: Removed code that must be stored into external modules 2011-11-05 12:34:54 +01:00
Laurent Destailleur
97573659c2 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-05 03:18:19 +01:00
Laurent Destailleur
c819b3b87c Fix: Must work with PHP 5.* 2011-11-05 03:15:35 +01:00
Laurent Destailleur
de8018a5f0 Fix: Error management 2011-11-05 03:15:11 +01:00
Regis Houssin
4482c6ac0a Fix: change for external modules 
Fix: add osx files in gitignore
 2011-11-05 00:24:13 +08:00
Regis Houssin
4dc318c9fd Fix: translation 2011-11-04 11:09:13 +01:00
Regis Houssin
9be80725d0 Fix: increase size of fields 2011-11-04 10:22:14 +01:00
Regis Houssin
6bbc1a1a77 Fix: move transverse mode parameters in conf.php 2011-11-04 09:09:53 +01:00
Regis Houssin
0c5648dd6f Fix: indent 2011-11-04 08:29:10 +01:00
Regis Houssin
1b568deaf6 Fix: avoid warning 2011-11-04 08:21:47 +01:00
Laurent Destailleur
61fc8b6081 Fix: Wrong field 2011-11-04 02:53:31 +01:00
Laurent Destailleur
68ece6228b Fix admin login creation 2011-11-04 02:00:19 +01:00
Laurent Destailleur
fbdb483510 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-04 00:28:53 +01:00
Laurent Destailleur
c16c09a451 Qual: Mutualize code to delete previews 2011-11-04 00:27:30 +01:00
Regis Houssin
7c54bf489d Fix: problem with multicompany 2011-11-03 18:39:06 +01:00
Regis Houssin
42e608bd63 Fix: chmod 644 2011-11-03 18:03:52 +01:00
Regis Houssin
fdaadc31da Fix: uniform code 
Fix: entity filter
 2011-11-03 17:38:04 +01:00
Regis Houssin
832b78911c Fix: optimize code 2011-11-03 11:49:22 +01:00
Regis Houssin
ea94610492 Fix: security 
Add another restriction
 2011-11-03 10:35:52 +01:00
Regis Houssin
9cc3bf0f87 Fix: security 
"javascript" is not necessary for send javascript code
 2011-11-03 10:07:09 +01:00
Laurent Destailleur
d872f4d389 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-03 02:02:50 +01:00
Laurent Destailleur
7f0cca8fb9 Look: Enhancements into themes. 2011-11-03 01:59:13 +01:00
Laurent Destailleur
9444e8d63d Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/admin/boxes.php
	htdocs/admin/ihm.php
	htdocs/core/lib/usergroups.lib.php
	htdocs/main.inc.php
 2011-11-02 22:51:52 +01:00
Laurent Destailleur
253a21eb33 Perf: Little optimization 2011-11-02 22:41:34 +01:00
Laurent Destailleur
ee92964ef7 Security: Fix more security holes 2011-11-02 22:15:59 +01:00
Juanjo Menent
2f7365043c Fix: [bug 227] LocalTaxes: Suppliers calculate problem 2011-11-02 21:06:21 +01:00
Regis Houssin
0c8e4b8f1b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/user/index.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
 2011-11-02 20:29:27 +01:00
Regis Houssin
921a379740 Fix: security 2011-11-02 20:24:51 +01:00
Laurent Destailleur
7f4944da31 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-02 20:18:48 +01:00
Laurent Destailleur
074939b4ff Security: A lot of security fixes 2011-11-02 20:17:55 +01:00
Laurent Destailleur
5b5ac9cbe2 Fix: Add missing entries 2011-11-02 19:15:29 +01:00
Laurent Destailleur
d394fb621a Fix: Try to fix trigger tha change password 2011-11-02 18:05:45 +01:00
Laurent Destailleur
388706a354 Fix: Format error 2011-11-02 18:02:31 +01:00
Laurent Destailleur
e6d27e0731 Doxygen 2011-11-02 14:15:44 +01:00
Laurent Destailleur
dcd97bb1cf Better error management 2011-11-02 14:15:14 +01:00
Laurent Destailleur
e764f2137d Doxygen 2011-11-02 14:14:46 +01:00
Laurent Destailleur
2bffe2a174 Qual: Clean code: Removed code of external modules 2011-11-01 23:22:10 +01:00
Laurent Destailleur
4c95c486f6 Qual: Removed hardcoded code for external module. Replaced by hook. 2011-11-01 18:36:06 +01:00
Laurent Destailleur
0cd241d3a3 Move translation keys 2011-11-01 18:33:14 +01:00
Laurent Destailleur
c00b67209f New: Clear code 2011-11-01 18:32:48 +01:00
Laurent Destailleur
eba302c00f Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-01 15:36:59 +01:00
Laurent Destailleur
4a49d32689 Fix: Removed warning 2011-11-01 15:34:11 +01:00
Regis Houssin
7bb76a8cb2 Fix: translation 2011-11-01 15:18:33 +01:00
Laurent Destailleur
bb9dd1be10 Fix: db connexion not closed 2011-11-01 15:06:03 +01:00
Laurent Destailleur
13552bb3a4 Minor fix into action management 2011-11-01 15:05:42 +01:00
Laurent Destailleur
2996ee7639 New: Add trigger ACTION_DELETE and ACTION_MODIFY 
Fix: LOG_ERROR must be LOG_ERR
 2011-11-01 13:22:39 +01:00
Laurent Destailleur
28d6fc03f9 New: Add ref_ext on actions 2011-11-01 04:58:47 +01:00
Laurent Destailleur
ecb6c1e67d Fix: DST is correctly detected 2011-11-01 04:57:45 +01:00
Laurent Destailleur
8c42f48ad7 New: Add ref_ext on actions 2011-11-10 04:07:38 +01:00
Laurent Destailleur
b8e73966f2 Fix: Usage of FirePHP does not erase set_include_path done 2011-11-01 02:31:33 +01:00
Regis Houssin
dfcc0cff0c Fix: security 2011-10-31 18:52:25 +01:00
Regis Houssin
9f4ab4c1b1 Fix: css problem 
New: add change year and month in jQuery datepicker
 2011-10-31 18:38:17 +01:00
Regis Houssin
d9eb4cbeb9 New: add edit in place with ckeditor 
Fix: remove unused jQuery plugin ckeip
 2011-10-31 16:57:10 +01:00
Regis Houssin
61bb08dfa5 Fix: optimize css 2011-10-31 15:23:18 +01:00