and all this duplicated options were useless.

into develop

Conflicts:
	htdocs/compta/deplacement/fiche.php

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

Conflicts:
	htdocs/core/lib/functions.lib.php

Fix: remove unused function php2js

Fix: add osx files in gitignore

Fix: entity filter

Add another restriction

"javascript" is not necessary for send javascript code

Fix: [bug 227] LocalTaxes: Suppliers calculate problem

into develop

Conflicts:
	htdocs/admin/boxes.php
	htdocs/admin/ihm.php
	htdocs/core/lib/usergroups.lib.php
	htdocs/main.inc.php