Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
77,028 Commits 36 Branches 189 Tags
1600ecc9ecc94e98bdb657b6e874f1d28b51cbd0
Commit Graph

425 Commits

Author SHA1 Message Date
Vaadasch
1600ecc9ec Change 0 and 1 to FALSE and TRUE for pgsql 
0 and 1 are read as False and True by Mysql, but not by PGsql.
FALSE and TRUE are correctly read by both => changing
 2019-07-30 19:35:03 +02:00
Laurent Destailleur
b1e21ed5fc FIX Computed field were not calculated into lists. 2019-07-11 22:18:44 +02:00
Laurent Destailleur
04f2fb604f Fix duplicate 'option_' in prefix 2019-06-19 15:48:37 +02:00
Laurent Destailleur
5f0fbcea9a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/contact/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
 2019-06-02 11:49:33 +02:00
Laurent Destailleur
f2088a084f Fix error management 2019-05-31 11:53:30 +02:00
Laurent Destailleur
cd75794aaa FIX #11169 #11202 2019-05-31 11:38:54 +02:00
Laurent Destailleur
ae3605d82d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf.php
	htdocs/core/class/extrafields.class.php
 2019-05-20 15:47:06 +02:00
Laurent Destailleur
ebf252f8a3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-20 15:40:50 +02:00
florian HENRY
e4d87ab2e7 fix: #11189 2019-05-19 02:05:13 +02:00
Supermanu
bbc6c0fe0c Show help text for extrafields in forms 2019-04-29 20:18:47 +02:00
Laurent Destailleur
e5c2027dbb NEW Add accounting code for eec sales and export sales on products 2019-04-25 01:16:29 +02:00
Lionel VESSILLER
8a220b9da1 New categories options in sellist and chbxlist extrafields 2019-04-02 11:01:46 +02:00
Laurent Destailleur
20f3af066c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/clients.php
 2019-03-23 22:44:14 +01:00
Laurent Destailleur
79ed4bc80b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-03-23 22:36:04 +01:00
Laurent Destailleur
aa33e4fd2a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-21 18:26:29 +01:00
Laurent Destailleur
55d64d441f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-21 18:26:02 +01:00
Frédéric FRANCE
d10b94e72b Update extrafields.class.php 2019-03-21 14:08:49 +01:00
Laurent Destailleur
a1fe1bb58c FIX when 2 extra fields are mandatory in 2 different entities 2019-03-21 12:33:39 +01:00
Laurent Destailleur
5d21547854 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/product/price.php
	htdocs/user/perms.php
 2019-03-21 12:20:24 +01:00
Laurent Destailleur
a7fdd34973 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-21 12:17:50 +01:00
Laurent Destailleur
032aa869e4 FIX Can't insert if there is extrafields mandatory on another entity. 
FIX Can't set default value of extrafield of type varchar
 2019-03-21 12:14:15 +01:00
Laurent Destailleur
4c85068a85 FIX Can't insert if there is extrafields mandatory on another entity. 2019-03-21 11:53:04 +01:00
Frédéric FRANCE
9b165f6b3f add visibility 2019-02-27 20:45:07 +01:00
Frédéric FRANCE
1e6ed94c5e Update extrafields.class.php 
The property $errno was declared of type integer, but $this->db->lasterrno() is of type string
 2019-02-25 21:39:45 +01:00
Frédéric FRANCE
03714e4bed Update extrafields.class.php 2019-02-24 09:17:45 +01:00
Frédéric FRANCE
1e43f8e54a PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Laurent Destailleur
a6dde3d6bd Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Frédéric FRANCE
03701fa091 psr2 2019-02-02 18:25:01 +01:00
Frédéric FRANCE
ff39491f15 wip 2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5 Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
59e993e834 Code comment 2019-01-25 12:03:07 +01:00
Maxime Kohlhaas
f50de03585 Merge branch 'develop' of github.com:atm-maxime/dolibarr into fix_extrafields_computed 2019-01-21 14:36:23 +01:00
Maxime Kohlhaas
c0b0d5484c Compute value of computed extrafield on fetch, not on show 2019-01-19 17:14:56 +01:00
Laurent Destailleur
59e38d4a81 Merge pull request #9897 from Vaadasch/develop 
NEW Update working chkbxlst filter for lists
 2018-12-14 15:33:50 +01:00
Laurent Destailleur
7a3ab13196 FIX #10183 using backport of fix done in 9.0 2018-12-13 20:45:51 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
9a0b5fb599 Fix extrafields 2018-11-07 12:25:22 +01:00
Vaadasch
0d7dbace63 Update extrafields.class.php 2018-10-30 07:20:42 +01:00
Vaadasch
a4c7787d8c Update extrafields.class.php 2018-10-29 22:00:08 +01:00
Vaadasch
2b91067966 Update working chkbxlst filter 
Update line 1337 to make the filtering on chkbxlst working
 2018-10-27 19:31:50 +02:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
01adaf253c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/product/list.php
 2018-10-24 03:35:44 +02:00
Laurent Destailleur
bf46a35a31 Fix size of key for extrafield of type select 2018-10-22 19:05:04 +02:00
Laurent Destailleur
3c8b365c3e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 14:53:39 +02:00
Laurent Destailleur
0c7b7ed7f4 FIX Required extrafield value numeric should accept '0' 2018-10-08 14:26:18 +02:00