Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 17:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
57,754 Commits 36 Branches 190 Tags
a40142460d059d94d97d8ca0f497c67a70e1756c
Commit Graph

248 Commits

Author SHA1 Message Date
Laurent Destailleur
fc4aa96cd7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/dispatch.php
 2017-01-20 21:02:05 +01:00
altatof
3dd160c663 use dol_escape_htmltag 2017-01-16 09:17:37 +01:00
altatof
55c0a99bce fix was not at the right place 2017-01-13 15:42:07 +01:00
altatof
487b5b25db FIX: extrafield input for varchar was not working with special char 
within (ie double quotes)
 2017-01-13 15:37:33 +01:00
Laurent Destailleur
71e368aa83 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-04 17:04:25 +01:00
Laurent Destailleur
2aae4ea6ea FIX We must not drop column if there is still record on other entities. 2017-01-04 15:05:13 +01:00
Laurent Destailleur
ecab7cb70e Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/class/product.class.php
 2016-12-14 12:29:41 +01:00
Laurent Destailleur
9b436ce871 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/product/class/product.class.php
 2016-12-11 02:51:32 +01:00
Laurent Destailleur
c2bee0f937 FIX #6088 2016-12-07 12:44:56 +01:00
Laurent Destailleur
017e384f16 FIX Preselected value for extrafield link was not correctly set 2016-12-06 13:10:44 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
Laurent Destailleur
3346fb1c75 Fix can change type from url to other string 2016-11-08 17:30:48 +01:00
Laurent Destailleur
6d70d39bbd NEW Add type "url" as possible extrafield. 2016-11-08 17:21:26 +01:00
arnaud
0bb7aaa62f Fix Extrafields edit crashed by maxwidthonsmartphone ... 2016-09-30 14:26:04 +02:00
Laurent Destailleur
39c4feaef7 Enhancement for usage on smartphone 2016-09-21 03:54:54 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
Laurent Destailleur
fead7967f2 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/commande/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/resource/class/resource.class.php
 2016-08-17 16:55:39 +02:00
florian HENRY
aa17564e93 FIX: #5594 2016-08-16 08:54:12 +02:00
florian HENRY
321814fae3 better fix for #5594 2016-08-09 15:17:19 +02:00
florian HENRY
90cb71f341 revert better fix 2016-08-08 13:54:51 +02:00
florian HENRY
15f187c466 better test 2016-08-08 13:54:03 +02:00
florian HENRY
94487cf411 FIX #5594 2016-08-08 13:43:44 +02:00
florian HENRY
2d932066c7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_new_password_extrafeilds_type 2016-07-07 09:17:39 +02:00
florian HENRY
fc2e7fb1ad FIX #5446 2016-07-05 15:45:33 +02:00
Laurent Destailleur
dcfc385645 Fix to avoid blocking error in auto upgrade process 2016-06-29 12:26:01 +02:00
florian HENRY
52f2e228f1 Add new password extrafields type 2016-06-28 10:21:10 +02:00
phf
cd79675f7a Fix using extrafield type "link to object" show error on edit card 2016-06-03 21:16:25 +02:00
Florian HENRY
c7a9f26ee5 NEW : continue hidden extrafield feature 2016-04-26 14:17:19 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Laurent Destailleur
7aaae143fc Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/expedition/card.php
 2016-02-15 02:01:58 +01:00
Raphaël Doursenaud
d038ca1875 FIX #4597 PHP 7 Uniform Variable Syntax 
PHP7 compatibility with the new Uniform Variable Syntax.
This change is compatible with both PHP 5 and PHP 7.
See: https://wiki.php.net/rfc/uniform_variable_syntax#backward_incompatible_changes
 2016-02-11 20:01:51 +01:00
phf
75c4888364 NEW feature hidden extrafields 2016-02-03 22:49:43 +01:00
Laurent Destailleur
c09fa6e0dd Fix empty keys are not allowed into select 2016-01-28 12:19:06 +01:00
Laurent Destailleur
06bbf4c966 Fix empty keys are not allowed into select 2016-01-27 21:10:42 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Florian HENRY
10a925f7b4 FIX: WHERE 1=1 2015-12-03 11:52:41 +01:00
Florian HENRY
281eaf2987 FIX : Use "WHERE true" instead of "WHERE 1" #4132 2015-12-03 10:27:23 +01:00
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
Florian HENRY
80f19de223 fix && vs and 2015-11-19 16:32:25 +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