Laurent Destailleur
|
e9346298b2
|
trans
|
2020-08-22 15:48:42 +02:00 |
|
Laurent Destailleur
|
03af14294a
|
Standardize code. Debug module HRM
|
2020-08-22 15:29:19 +02:00 |
|
Laurent Destailleur
|
5d7a9c9af4
|
FIX Picto of HRM module
|
2020-07-26 20:51:49 +02:00 |
|
Laurent Destailleur
|
c2a9819daa
|
Debug establishment management
|
2020-05-29 21:45:50 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
e5fc928fda
|
add new rule
|
2020-05-21 02:02:54 +02:00 |
|
Laurent Destailleur
|
2d0abebca3
|
CSS
|
2020-05-19 04:40:08 +02:00 |
|
Laurent Destailleur
|
16e46c672c
|
Clean code
|
2020-04-20 15:06:27 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Scrutinizer Auto-Fixer
|
e8083e2a65
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-23 14:54:02 +00:00 |
|
Laurent Destailleur
|
6f0f1e1163
|
Fix edit of country of establishment
|
2020-03-12 13:08:42 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Scrutinizer Auto-Fixer
|
f197196719
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:46 +00:00 |
|
Scrutinizer Auto-Fixer
|
8a527631a0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:02 +00:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
Laurent Destailleur
|
68691ddd8a
|
Merge pull request #12265 from grandoc/new_branch_30_10_2019
add comment
|
2019-11-02 11:49:28 +01:00 |
|
Frédéric FRANCE
|
dbed10a701
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-01 21:39:20 +01:00 |
|
Laurent Destailleur
|
e684c1c450
|
Look and feel v11
|
2019-11-01 12:11:29 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Philippe GRAND
|
991e1b8767
|
add some comment
|
2019-10-30 10:02:44 +01:00 |
|
Laurent Destailleur
|
9a10b4ef38
|
Merge pull request #12229 from frederic34/patch-13
css
|
2019-10-30 03:08:38 +01:00 |
|
Frédéric FRANCE
|
b2b057e9b5
|
clean indent
|
2019-10-27 09:51:15 +01:00 |
|
Frédéric FRANCE
|
b57f82c25d
|
css
|
2019-10-25 18:25:40 +02:00 |
|
Frédéric FRANCE
|
86f22c4563
|
do not ignore lines with mix od tabs and spaces
|
2019-10-20 17:17:22 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
33cc0c017c
|
responsive
|
2019-10-15 04:20:51 +02:00 |
|
Laurent Destailleur
|
457117762a
|
Fix bad br
|
2019-10-03 18:32:31 +02:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
7f93f046e9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-28 06:02:25 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Laurent Destailleur
|
a264a4766a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-20 03:45:04 +02:00 |
|
Alexandre SPANGARO
|
30fb89ad5e
|
Responsive HRM index
|
2019-06-18 22:03:29 +02:00 |
|
ICstage
|
820c420ae5
|
FIX Missing hooks
|
2019-06-18 14:07:52 +02:00 |
|
Laurent Destailleur
|
21a1e0d7b3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/categories/index.php
htdocs/comm/action/list.php
htdocs/comm/action/rapport/index.php
htdocs/compta/paiement.php
htdocs/compta/sociales/document.php
htdocs/compta/tva/document.php
htdocs/core/actions_massactions.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/facture/paiement.php
htdocs/loan/document.php
htdocs/main.inc.php
|
2019-06-04 19:03:27 +02:00 |
|
Laurent Destailleur
|
57cfb4b007
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/class/website.class.php
|
2019-06-02 12:36:07 +02:00 |
|
Maxime Kohlhaas
|
6dd01e86e9
|
Fix : avoid warning and uniformize var use
|
2019-05-31 15:53:23 +02:00 |
|
Laurent Destailleur
|
2218994958
|
FIX Duplicate encoding on error message
|
2019-05-29 09:51:45 +02:00 |
|
Laurent Destailleur
|
5be2c45d61
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/card.php
htdocs/expedition/shipment.php
htdocs/livraison/card.php
|
2019-03-14 19:23:59 +01:00 |
|
Laurent Destailleur
|
a35a2faacb
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/expedition/card.php
htdocs/livraison/card.php
|
2019-03-14 19:06:21 +01:00 |
|
Laurent Destailleur
|
a8bd8a2101
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-03-14 18:49:24 +01:00 |
|
Laurent Destailleur
|
5ec8adb7f5
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2019-03-14 18:48:35 +01:00 |
|
gauthier
|
885797b748
|
FIX : useless join
|
2019-03-14 17:00:51 +01:00 |
|
Laurent Destailleur
|
e7cd8d690c
|
Remove warnings
|
2019-03-13 19:06:45 +01:00 |
|
Frédéric FRANCE
|
b69f63e7d7
|
replace html by html5
|
2019-03-10 09:32:19 +01:00 |
|
Frédéric FRANCE
|
014f69850e
|
add visibility
|
2019-03-01 23:08:57 +01:00 |
|
Frédéric FRANCE
|
796ea6f4ea
|
add visibility
|
2019-02-28 23:19:58 +01:00 |
|
Frédéric FRANCE
|
0022c4fe72
|
add visibility
|
2019-02-28 22:44:12 +01:00 |
|
Frédéric FRANCE
|
4f9e35f350
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-28 20:48:23 +01:00 |
|
Frédéric FRANCE
|
8ea475df64
|
Update establishment.class.php
|
2019-02-27 16:11:19 +01:00 |
|
Frédéric FRANCE
|
49cbaed569
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-27 14:21:15 +01:00 |
|
Laurent Destailleur
|
24a8bd12fe
|
Update admin_establishment.php
|
2019-02-27 13:33:34 +01:00 |
|
wdammak
|
b1782f0fc8
|
rename function select_establishments to selectEstablishments
|
2019-02-27 04:05:02 +01:00 |
|
wdammak
|
0a28d06213
|
Add parent company
|
2019-02-26 22:36:53 +01:00 |
|
wdammak
|
672c7f8b19
|
Fix phpcs
|
2019-02-26 22:31:07 +01:00 |
|
wdammak
|
a706710f44
|
Add parent company
|
2019-02-26 18:46:30 +01:00 |
|
wdammak
|
0e7ed6d169
|
Add parent company
|
2019-02-26 18:45:53 +01:00 |
|
wdammak
|
b79bcb25ea
|
Add parent company
|
2019-02-26 18:45:07 +01:00 |
|
Frédéric FRANCE
|
1c07006015
|
wip
|
2019-02-25 21:36:27 +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 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +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
|
e42fe4022a
|
Uniformize lenght of small list
|
2019-01-25 15:22:36 +01:00 |
|
Philippe GRAND
|
e6d5925b7a
|
update with html5 compliant code
|
2019-01-19 12:52:34 +01:00 |
|
Frédéric FRANCE
|
12dcda7e02
|
Merge remote-tracking branch 'upstream/develop' into fieldlabel
|
2018-11-15 22:01:36 +01:00 |
|
Frédéric FRANCE
|
42a9abad56
|
remove fieldlabel and add fieldeditkey
|
2018-10-27 17:45:29 +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 |
|
Philippe GRAND
|
596dba9ce1
|
Standardize code
|
2018-10-06 12:14:47 +02:00 |
|
Philippe GRAND
|
b3925dd2bd
|
Standardize code
|
2018-10-05 16:04:10 +02:00 |
|
Philippe GRAND
|
073ec85208
|
Standardize code
|
2018-10-05 15:51:08 +02:00 |
|
Frédéric FRANCE
|
ad2d15bef1
|
reduce complexity of establishment class
|
2018-09-16 19:11:56 +02:00 |
|
Laurent Destailleur
|
d6ee00f2e7
|
Fix constructors does not need return value
|
2018-09-16 10:22:23 +02:00 |
|
Frédéric FRANCE
|
4e619dd0ed
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-05 18:51:21 +02:00 |
|
Laurent Destailleur
|
ab8155f170
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
|
2018-09-04 21:35:43 +02:00 |
|
Frédéric FRANCE
|
65b74ad30f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-04 20:48:35 +02:00 |
|
Laurent Destailleur
|
cdc1e1fc76
|
Fix responsive
|
2018-09-04 09:37:51 +02:00 |
|
Frédéric FRANCE
|
2a5c994009
|
move phpcs:ignore
|
2018-09-02 14:01:37 +02:00 |
|
Philippe GRAND
|
3de16a145e
|
Standardize and update code
|
2018-09-02 11:08:41 +02:00 |
|
Philippe GRAND
|
7b0d3c32ab
|
Standardize and Update code
|
2018-09-01 22:55:10 +02:00 |
|
Philippe GRAND
|
5d273960dc
|
fix conflict
|
2018-09-01 22:40:38 +02:00 |
|
Philippe GRAND
|
45cbc36a15
|
Standardize and update code
|
2018-09-01 15:27:55 +02:00 |
|
Philippe GRAND
|
bb05e80a87
|
Standardize and update code
|
2018-08-31 18:47:25 +02:00 |
|
Philippe GRAND
|
70ae8c6081
|
Standardize and update code
|
2018-08-31 18:27:16 +02:00 |
|
Frédéric FRANCE
|
fe4260a014
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-28 09:34:53 +02:00 |
|
Laurent Destailleur
|
7219bac0b2
|
Merge pull request #9168 from frederic34/trimtrailing
Trimtrailing
|
2018-08-28 02:30:02 +02:00 |
|
Philippe GRAND
|
87067b2bc9
|
Standardize and update code
|
2018-08-23 18:35:45 +02:00 |
|
Philippe GRAND
|
06da7f54a2
|
Update and standardize code
|
2018-08-22 18:48:53 +02:00 |
|
Frédéric FRANCE
|
c0478cb42f
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-14 15:54:40 +02:00 |
|
Frédéric FRANCE
|
d30874750f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-14 09:02:12 +02:00 |
|
Frédéric FRANCE
|
850ac34020
|
mark non camelCaps function
|
2018-08-13 17:26:32 +02:00 |
|
Philippe GRAND
|
f1f64db4dc
|
standardize code
|
2018-08-13 10:20:21 +02:00 |
|
Frédéric FRANCE
|
c991a4d204
|
trim trailing
|
2018-07-26 18:05:20 +02:00 |
|