Commit Graph

29756 Commits

Author SHA1 Message Date
Laurent Destailleur
2e702cceff Fix: Sanitize PHP_SELF 2011-11-09 13:40:13 +01:00
Laurent Destailleur
f060c1563a Normalize code 2011-11-09 12:40:33 +01:00
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
da27a55e41 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-08 17:20:12 +01:00
Regis Houssin
338b35e2a3 Fix: [Bug #232] Multiple Cross-Site-Scripting vulnerabilities 2011-11-08 17:11:30 +01:00
Regis Houssin
37076cc073 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-08 15:04:52 +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
c4e9e9d17a Update doc 2011-11-06 14:24:59 +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
02a70efdf5 Update doc 2011-11-06 01:39:52 +01:00
Laurent Destailleur
2240f5db44 Fix: Localisation of prices 2011-11-06 00:40:42 +01:00
Laurent Destailleur
8d265ed1f9 Fix message 2011-11-06 00:31:44 +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