Commit Graph

208 Commits

Author SHA1 Message Date
Laurent Destailleur
cb8227f086 Fix syntax error 2015-12-03 10:04:13 +01:00
Sof
09b61fd185 Update extrafields.class.php 2015-11-30 18:06:15 +01:00
Sof
5dab92836b FIX: Warning: implode(): Invalid arguments passed
Declare array type before implode to avoid warning
2015-11-30 12:27:58 +01:00
philippe grand
928c44b04f Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-11-21 04:52:19 +01:00
Florian HENRY
87c9132a6d avoid error 2015-11-20 13:59:58 +01:00
Florian HENRY
101b45e397 Continue extrafeild $ID$ and select feature 2015-11-20 13:52:47 +01:00
Florian HENRY
b8cab9f4d9 continue extrafeild $ID$ and SELECT feature 2015-11-20 13:51:57 +01:00
Florian HENRY
1566be35a1 NEW : add $ID$ into extrafields management to allow use current object
id on filter for select list from table and checkbox list from table
2015-11-20 11:59:28 +01:00
philippe grand
4f280f63d0 [Qual] Uniformize code 2015-11-19 13:59:58 +01:00
Marcos García de La Fuente
0451cc1e73 FIX #3931 [Insight] Logical operators should be avoided - in htdocs/core/class/extrafields.class.php, line 261
Close #3931
2015-11-07 14:31:12 +01:00
Laurent Destailleur
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
Laurent Destailleur
20a1863866 FIX IF autocomplete was set on thirdparty list, it was not possible to
open list of extrafields.
2015-11-02 11:45:59 +01:00
Laurent Destailleur
3760f247a2 NEW Can now select fields to show in product list. Extrafields are also
supported.
2015-10-30 00:05:00 +01:00
Laurent Destailleur
f123e11c8e Doxygen 2015-10-20 12:53:32 +02:00
Laurent Destailleur
0c6441df74 FIX Using extrafield with type "Link to object" works correctly. 2015-10-20 12:40:37 +02:00
Laurent Destailleur
7b7d27920d Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/adherents/type.php
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/product/composition/card.php
2015-10-10 18:56:28 +02:00
Laurent Destailleur
f9485bd25b Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/core/class/extrafields.class.php
2015-10-09 20:35:17 +02:00
Raphaël Doursenaud
d24f5538f9 Fix: wrong parameters order 2015-10-05 20:25:55 +02:00
Christophe Battarel
bf262c2cae reenable search criteria in sql clause 2015-10-05 15:41:28 +02:00
Laurent Destailleur
09355b0c7b Fix filtering 2015-08-24 16:40:43 +02:00
Laurent Destailleur
2cf10ac05d Fix filtering 2015-08-24 16:32:43 +02:00
Laurent Destailleur
80fc4743c9 Fix the property "list" was not used. 2015-08-24 14:42:07 +02:00
Laurent Destailleur
ff8969073c Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/main.inc.php
2015-07-28 18:57:13 +02:00
Gauthier
556d01ff8a FIX : Line break display as a block 2015-07-28 15:14:54 +02:00
Gauthier
fa26b284a9 FIX : Line break display as a block 2015-07-21 16:39:00 +02:00
Laurent Destailleur
0ab3cd03c0 Merge pull request #2896 from GPCsolutions/extrafieldcontacttype
Allow usage of contact extrafield element type
2015-05-29 17:18:25 +02:00
Laurent Destailleur
c8949d0532 Some doxygen fixes 2015-05-25 18:43:46 +02:00
Raphaël Doursenaud
ec2035a73e Allow usage of contact extrafield element type
As documented in the methods comments
2015-05-25 17:19:27 +02:00
Florian HENRY
23eac58cc8 fix bug on new feature checkbox list form table 2015-05-18 13:13:50 +02:00
Raphaël Doursenaud
ce60ae0fcc [Qual] Fixed HTML readonly attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The readonly attribute is boolean.
2015-05-12 15:09:26 +02:00
Raphaël Doursenaud
5d2f081152 [Qual] Fixed HTML select form selected attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9 [Qual] Fixed HTML input form checked attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
Laurent Destailleur
0479bd5a59 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/modAdherent.class.php
2015-05-03 13:00:39 +02:00
Laurent Destailleur
6b3c060d9c Fix doxygen 2015-04-30 00:07:30 +02:00
Laurent Léonard
e0cc007487 Add sorting for extra fields values 2015-04-21 20:21:24 +02:00
Laurent Destailleur
493392d89f Remove warnings 2015-04-06 19:46:10 +02:00
Laurent Destailleur
8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/list.php
	htdocs/core/class/notify.class.php
	htdocs/core/login/functions_dolibarr.php
	htdocs/exports/export.php
	htdocs/langs/en_US/admin.lang
2015-04-01 16:33:39 +02:00
Laurent Destailleur
b83e9ea32f Merge branch 'loan' of https://github.com/frederic34/dolibarr into
frederic34-loan

Conflicts:
	htdocs/compta/bank/ligne.php
2015-03-30 02:56:26 +02:00
fmarcet
456b11d148 Fix: Not using where on sellist 2015-03-25 11:23:05 +01:00
Laurent Destailleur
87faf530e0 Merge pull request #2468 from defrance69/patch-55
Update extrafields.class.php
2015-03-22 21:28:53 +01:00
Laurent Destailleur
abcebd7875 Merge pull request #2462 from defrance69/patch-54
Update extrafields.class.php
2015-03-22 21:27:38 +01:00
BENKE Charles
730593b525 Update extrafields.class.php
if no elementtype send at the function, they return an empty array
2015-03-22 20:26:20 +01:00
Laurent Destailleur
2c61717e10 Fix sql syntax error 2015-03-18 14:19:17 +01:00
BENKE Charles
d5afa1b29f Update extrafields.class.php
Link object : include only if something to display
2015-03-18 13:23:14 +01:00
BENKE Charles
0aa2360691 Update extrafields.class.php
add new extrafields type 'link'
2015-03-14 12:31:22 +01:00
Laurent Destailleur
ba2c0a2651 Clean code of hooks.
Extrafield index on fk_object must be unique.
2015-03-13 20:27:54 +01:00
Laurent Destailleur
c271257452 Prepare extrafield for option by default into lists 2015-03-10 22:27:16 +01:00
Laurent Destailleur
364b185442 Fix sql syntax 2015-03-10 18:33:14 +01:00
Laurent Destailleur
ef14e4e7ed Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00