Commit Graph

394 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
0bf540b3c1 Fix regression in edition of date 2018-09-17 09:17:11 +02:00
Frédéric FRANCE
987fdbe73c Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Frédéric FRANCE
3e71f4e6b0 Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98 Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Laurent Destailleur
d011204624 Fix switch of extrafields between all and only one entity 2018-09-10 17:36:46 +02:00
Frédéric FRANCE
8249756726 replace select_date 2018-09-09 10:40:00 +02:00
Frédéric FRANCE
d08b68e8ed move phpcs:ignore 2018-09-03 20:38:52 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Frédéric FRANCE
b03f4004ea PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
fe4260a014 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Philippe GRAND
d91b1fd895 Update and standardize code 2018-08-22 11:06:34 +02:00
Philippe GRAND
a669830427 Update and standardize code 2018-08-22 10:37:16 +02:00
Frédéric FRANCE
3210181a3d rule for private function is different 2018-08-14 10:21:34 +02:00
Frédéric FRANCE
850ac34020 mark non camelCaps function 2018-08-13 17:26:32 +02:00
Laurent Destailleur
61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/list.php
2018-08-08 17:44:22 +02:00
Laurent Destailleur
8d54df4263 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
2018-08-08 17:31:23 +02:00
gauthier
cadf931e8d FIX : extrafieldkey 2018-07-31 15:02:51 +02:00
Frédéric FRANCE
2dd907a8e1 extrafield totalizable 2018-07-26 09:41:44 +02:00
Laurent Destailleur
f747cefda3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/install/upgrade2.php
2018-07-16 15:44:44 +02:00
Laurent Destailleur
45a45b0dec NEW Can enable a module, even external module, from command line
Conflicts:
	htdocs/install/upgrade2.php
2018-07-16 15:35:00 +02:00
Laurent Destailleur
e3d9e609d5 Fix var not defined 2018-07-16 11:20:54 +02:00
Laurent Destailleur
d3d1b6d513 NEW Can enable a module, even external module, from command line 2018-07-09 13:02:01 +02:00
Laurent Destailleur
60c62895bf WIP Can add tooltips on extrafields 2018-06-28 19:13:23 +02:00
Laurent Destailleur
25b1d063ae Fix length of hidden password 2018-06-24 11:45:10 +02:00
Laurent Destailleur
f4bef82bfa Fix td not closed and js code duplicated (at wrong place) 2018-06-13 13:00:08 +02:00
Laurent Destailleur
8d62c06653 css 2018-06-05 11:25:41 +02:00
Laurent Destailleur
b6955692b4 Fix autofill of password 2018-06-05 11:22:00 +02:00
Laurent Destailleur
5ff3398048 Try to fix evil Google Chrome autopopulate bug 2018-06-01 18:27:17 +02:00
Laurent Destailleur
a2d485c14f Fix management of enabled property extrafields 2018-05-13 14:27:40 +02:00
Laurent Destailleur
fb8ad77378 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2018-04-23 23:09:53 +02:00