Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
34,955 Commits 36 Branches 189 Tags
7c4b901b0a7098e74e487fa3837f3d2310723fcd
Commit Graph

3216 Commits

Author SHA1 Message Date
Regis Houssin
2d19624a14 Fix: reindenting and docgen 2011-11-11 11:15:36 +01:00
Laurent Destailleur
93ce51c8d7 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-11 00:42:28 +01:00
Laurent Destailleur
9ec3500b1f New: Add option INVOICE_POSITIVE_CREDIT_NOTE 2011-11-11 00:36:01 +01:00
Regis Houssin
104dd9869d Fix: add subelement rights 2011-11-10 23:09:03 +08:00
Regis Houssin
5f62a1f27f Fix: bad parameters 2011-11-10 14:44:10 +01:00
Regis Houssin
a5b847f3c4 Fix: void warning and uniform code 2011-11-10 10:13:44 +01:00
Laurent Destailleur
79b9ceda30 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-09 22:11:48 +01:00
Laurent Destailleur
10961fb2c9 New: Can choose warehouse for stock change on supplier approbation or 
supplier invoice validation
 2011-11-09 22:10:58 +01:00
Laurent Destailleur
8745ef572d Fix: Missing filter on company 2011-11-09 21:42:46 +01:00
Laurent Destailleur
9f42438714 New: Add hidden option PROJECT_HIDE_UNSELECTABLES 2011-11-09 18:52:59 +01:00
Laurent Destailleur
7d0a7f569e Fix: We must no enable FirePHP if not in a web context 2011-11-09 17:18:45 +01:00
Regis Houssin
8072f501ff Works on extend edit in place with external modules (in progress) 
Conflicts:

	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2011-11-09 17:13:25 +01:00
Laurent Destailleur
253084feb3 New: Can choose warehouse for invoice validation 2011-11-09 14:31:43 +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
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
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
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
Regis Houssin
9549c0c608 Fix: entity filter 2011-11-08 06:56:02 +08: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
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
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
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
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
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
Regis Houssin
356409bd72 Fix: add json_decode function for old PHP 2011-11-05 12:45:13 +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
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
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
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