Gauthier PC portable 024
|
92ae884331
|
Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code
|
2021-09-29 08:35:21 +02:00 |
|
Gauthier PC portable 024
|
f12a300795
|
FIX : td
|
2021-09-29 08:35:08 +02:00 |
|
stickler-ci
|
e8a5a2cc62
|
Fixing style errors.
|
2021-09-29 06:34:00 +00:00 |
|
Gauthier PC portable 024
|
eccff256b1
|
FIX : IHM
|
2021-09-29 08:30:30 +02:00 |
|
Gauthier PC portable 024
|
409c8c8d57
|
FIX : stickler feedbacks part 2
|
2021-09-29 07:49:42 +02:00 |
|
Gauthier PC portable 024
|
9713f6afd9
|
FIX : stickler feedbacks part 1
|
2021-09-28 08:40:15 +02:00 |
|
Laurent Destailleur
|
37603b451a
|
Fix token in url
|
2021-09-27 12:24:01 +02:00 |
|
Gauthier PC portable 024
|
fde0f1ac25
|
NEW : HRM integration, source code
|
2021-09-27 11:20:38 +02:00 |
|
Laurent Destailleur
|
d760686239
|
Fix case of newtoken()
|
2021-09-18 22:24:00 +02:00 |
|
Laurent Destailleur
|
8bdc53f469
|
Fix Add action classify as sensitive actions
|
2021-09-18 20:49:24 +02:00 |
|
Laurent Destailleur
|
62b721a904
|
Add deletecontact as sentitive action
Replace dol_buildpath with DOL_URL_ROOT
|
2021-09-18 19:34:46 +02:00 |
|
Laurent Destailleur
|
ee066ad725
|
Cast sql var
|
2021-09-03 21:25:43 +02:00 |
|
Laurent Destailleur
|
fb8723d884
|
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons
replace remaining SubmitCancel buttons
|
2021-08-28 18:39:06 +02:00 |
|
Laurent Destailleur
|
46d993c9a6
|
Clean code
|
2021-08-27 22:42:04 +02:00 |
|
Laurent Destailleur
|
2f225ee7e5
|
Clean code by adding cast int.
|
2021-08-27 16:33:03 +02:00 |
|
Christian Foellmann
|
f094b4c70c
|
fix up most of the remaining submit inputs
|
2021-08-24 17:04:17 +02:00 |
|
Laurent Destailleur
|
22339a3ed3
|
Merge pull request #18451 from cfoellmann/PR/form-buttons-function
improve forms - buttonsSaveCreate()
|
2021-08-24 15:26:03 +02:00 |
|
Laurent Destailleur
|
23829ae637
|
Cast numeric into on sql request
|
2021-08-23 18:56:46 +02:00 |
|
Laurent Destailleur
|
d4b5ee6c85
|
Fix cast into variable into sql request.
|
2021-08-23 17:41:11 +02:00 |
|
Christian Foellmann
|
d706c3b1ec
|
use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination
|
2021-08-20 14:41:30 +02:00 |
|
lmarcouiller
|
51a28a4ac4
|
Fix lang error on hrm/index.php
|
2021-08-11 20:48:22 +02:00 |
|
lmarcouiller
|
6b20b32f07
|
Fix lang error on hrm/index.php
|
2021-08-05 16:31:21 +02:00 |
|
Laurent Destailleur
|
7dab4ef571
|
Debug v14
|
2021-07-06 11:18:09 +02:00 |
|
Laurent Destailleur
|
d57699b7d7
|
css
|
2021-06-23 10:22:51 +02:00 |
|
Laurent Destailleur
|
e04cf7d53a
|
css
|
2021-06-16 22:17:44 +02:00 |
|
Laurent Destailleur
|
fb46ece906
|
Fix yogosha 6347
|
2021-06-09 15:36:47 +02:00 |
|
Laurent Destailleur
|
1e657b8621
|
Fix value of showoncombobox
|
2021-06-05 15:14:10 +02:00 |
|
Laurent Destailleur
|
ea5d374f23
|
Update index.php
|
2021-05-17 06:57:21 +02:00 |
|
Maxime Kohlhaas
|
240137b768
|
Fix HRM homepage
|
2021-05-16 16:04:19 +02:00 |
|
Laurent Destailleur
|
468d44a23b
|
Merge pull request #17333 from dolibit-ut/patch-289
Update admin_establishment.php
|
2021-04-19 20:19:16 +02:00 |
|
Laurent Destailleur
|
8f6d842a68
|
Merge pull request #17332 from dolibit-ut/patch-288
Update index.php
|
2021-04-19 20:19:06 +02:00 |
|
UT from dolibit
|
985dc83b8c
|
Update admin_hrm.php
$title = $langs->trans('Parameters');
llxHeader('', $title, '');
|
2021-04-19 17:53:29 +02:00 |
|
UT from dolibit
|
f2781ee017
|
Update admin_establishment.php
$title = $langs->trans('Establishments');
llxHeader('', $title, '');
|
2021-04-19 17:51:52 +02:00 |
|
UT from dolibit
|
ec97c5aa09
|
Update index.php
$title = $langs->trans('HRMArea');
llxHeader('', $title, '');
|
2021-04-19 17:50:13 +02:00 |
|
Laurent Destailleur
|
8a62d97b89
|
Remove one thousand of useless files
|
2021-04-12 15:57:16 +02:00 |
|
Laurent Destailleur
|
d5bab315e3
|
FIX #yogosha5738
|
2021-03-27 15:03:18 +01:00 |
|
Laurent Destailleur
|
95a7e13e3a
|
Debug establishment
|
2021-03-27 14:54:09 +01:00 |
|
Laurent Destailleur
|
a5034d44f7
|
$_POST war
|
2021-03-24 19:53:31 +01:00 |
|
Laurent Destailleur
|
6063b02bf4
|
Fix #ygosha5698
|
2021-03-22 12:47:23 +01:00 |
|
Alexandre SPANGARO
|
03481a0197
|
Uniformize translation
|
2021-03-16 04:22:43 +01:00 |
|
Frédéric FRANCE
|
4377a5eccb
|
fix php8 warning
|
2021-03-14 20:42:06 +01:00 |
|
Laurent Destailleur
|
12f50a76d7
|
Fix yogosha #5627
|
2021-03-14 11:48:39 +01:00 |
|
Frédéric FRANCE
|
6cef78befb
|
code syntax hrm imports install intracommreport loan directory
|
2021-02-26 18:20:21 +01:00 |
|
Frédéric FRANCE
|
d5ffbae3b3
|
Update admin_hrm.php
|
2021-02-07 18:24:30 +01:00 |
|
Laurent Destailleur
|
efc3bad7c6
|
Merge pull request #15678 from frederic34/fk_element
doxygen
|
2020-12-07 22:31:08 +01:00 |
|
Laurent Destailleur
|
936699786a
|
Fix translation
|
2020-12-07 14:44:20 +01:00 |
|
Frédéric FRANCE
|
4e18f46f28
|
doxygen
|
2020-12-05 23:53:55 +01:00 |
|
Givriz
|
dca4cf5987
|
Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
|
2020-11-23 15:12:52 +01:00 |
|
Givriz
|
c48129e279
|
Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
|
2020-11-19 20:23:38 +01:00 |
|
Laurent Destailleur
|
6d4d3c618d
|
FIX #15369 and standardize permission "readall"
|
2020-11-13 09:55:53 +01:00 |
|
Laurent Destailleur
|
ed8a0093ff
|
Debug v13
|
2020-11-05 22:25:14 +01:00 |
|
Frédéric FRANCE
|
ddb29eb754
|
Update establishment.class.php
|
2020-11-02 12:50:09 +01:00 |
|
Frédéric FRANCE
|
3d1dbd62ac
|
doxygen
|
2020-11-02 12:47:42 +01:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Frédéric FRANCE
|
9a470fa42d
|
replace deprecated
|
2020-10-22 22:50:03 +02:00 |
|
Scrutinizer Auto-Fixer
|
1512521d91
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-07 13:01:28 +00:00 |
|
Laurent Destailleur
|
0893f0250a
|
Minor bug fixes
|
2020-10-02 12:54:56 +02:00 |
|
Laurent Destailleur
|
7b3a7c9921
|
Add token on all url with action=delete
|
2020-10-01 10:50:54 +02:00 |
|
Laurent Destailleur
|
51d0856f50
|
Remove bad exakat rules
|
2020-09-27 21:20:39 +02:00 |
|
Laurent Destailleur
|
e52559783f
|
Look and feel v13
|
2020-09-21 13:54:26 +02:00 |
|
Laurent Destailleur
|
bfbb217607
|
Fix GETPOST on 'action'
|
2020-09-16 19:39:50 +02:00 |
|
Scrutinizer Auto-Fixer
|
b78ff67d7e
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-09-07 08:18:17 +00:00 |
|
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 |
|
Frédéric FRANCE
|
a0a5d33641
|
test include
|
2018-07-26 17:30:53 +02:00 |
|
Laurent Destailleur
|
7bf33b1bac
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/hrm/index.php
htdocs/install/mysql/tables/llx_website_account.key.sql
htdocs/modulebuilder/template/myobject_card.php
|
2018-07-02 12:16:51 +02:00 |
|
Laurent Destailleur
|
ca8144c5ea
|
Fix error message
|
2018-06-29 19:08:35 +02:00 |
|
Philippe GRAND
|
da2f07c848
|
clean and update code
|
2018-06-21 15:01:45 +02:00 |
|
Frédéric FRANCE
|
622c394283
|
loadlangs
|
2018-05-26 21:11:25 +02:00 |
|
Laurent Destailleur
|
ccd9aa8059
|
Fight against dolibarr warnings
|
2018-04-21 12:16:12 +02:00 |
|
Laurent Destailleur
|
0c45760dd4
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/step5.php
htdocs/langs/en_US/holiday.lang
htdocs/public/payment/newpayment.php
htdocs/public/stripe/newpayment.php
|
2018-03-19 17:58:19 +01:00 |
|
Laurent Destailleur
|
e0164884ee
|
Better management of hidden option HOLIDAY_HIDE_BALANCE
|
2018-03-19 15:13:36 +01:00 |
|
Laurent Destailleur
|
04934cc4aa
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
|
2018-02-27 19:18:43 +01:00 |
|
Laurent Destailleur
|
41638e6dff
|
Fix back link of look and feel v7
|
2018-02-26 09:20:05 +01:00 |
|
Laurent Destailleur
|
b4446764f8
|
Clean code of deprecated usage
|
2018-02-21 14:48:25 +01:00 |
|
Laurent Destailleur
|
f0855da0fb
|
Fix responsive
|
2018-02-15 12:57:04 +01:00 |
|
Laurent Destailleur
|
d938a56282
|
Clean code
|
2017-11-11 01:10:17 +01:00 |
|
Laurent Destailleur
|
800fe9e1d8
|
Add warning test to avoid sql errors
|
2017-11-04 20:03:08 +01:00 |
|
Laurent Destailleur
|
202712be94
|
Work on module builder
|
2017-10-25 22:02:07 +02:00 |
|
Laurent Destailleur
|
5b1f5b0f20
|
Fix translation done twice into field title of array
|
2017-08-02 13:31:53 +02:00 |
|
Laurent Destailleur
|
3fdfebf7ef
|
Fix position of top menu does not follow 'position' field.
|
2017-06-27 04:25:41 +02:00 |
|
Laurent Destailleur
|
470165615f
|
Fix look and feel v6
|
2017-05-19 16:32:23 +02:00 |
|
Laurent Destailleur
|
4e7353f8a0
|
Clean code
|
2017-05-19 13:39:00 +02:00 |
|
Laurent Destailleur
|
fa290c34fa
|
Fix against SQL injection. Add phpunit to detect missing escapement.
|
2017-05-12 16:55:11 +02:00 |
|
Laurent Destailleur
|
4c056d68d8
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
|
2017-04-15 17:02:05 +02:00 |
|
Laurent Destailleur
|
846204bdb4
|
Replace usage of $bc[$var] with class="oddeven"
|
2017-04-14 13:02:29 +02:00 |
|
Laurent Destailleur
|
39ebaec064
|
Replace usage of $bc[$var] with class="oddeven"
|
2017-04-14 11:22:48 +02:00 |
|
Laurent Destailleur
|
9b42177bd5
|
Fix half day for leave request.
|
2017-03-23 10:52:09 +01:00 |
|
Laurent Destailleur
|
4c0ff38020
|
Fix closing boxes
|
2017-03-15 11:58:13 +01:00 |
|
Laurent Destailleur
|
184d52525a
|
PHP code to manage pair/impair is replaced by native CSS.
|
2017-03-07 22:45:22 +01:00 |
|
Laurent Destailleur
|
19e60f03b9
|
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
|
2017-02-21 14:17:44 +01:00 |
|
Gustavo Novaro
|
e71f216f16
|
var to public
Improve code style
|
2016-12-23 14:21:15 -03:00 |
|
Laurent Destailleur
|
7600a10f2d
|
FIX #6156
|
2016-12-12 12:33:43 +01:00 |
|
Laurent Destailleur
|
6c4f15df63
|
Fix lot of fix in css look to match v5 rules.
|
2016-12-11 16:11:42 +01:00 |
|
Laurent Destailleur
|
91ede48390
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2016-09-01 11:37:40 +02:00 |
|
Laurent Destailleur
|
7d056f6857
|
NEW Use small photo of user on all user links
|
2016-09-01 11:29:30 +02:00 |
|
Laurent Destailleur
|
1360372a3c
|
Fix hrm module
|
2016-08-31 18:57:27 +02:00 |
|
Laurent Destailleur
|
f04a3bf0c8
|
Fix sql error
|
2016-08-31 18:46:47 +02:00 |
|
Laurent Destailleur
|
8fd082cf16
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/hrm/hrm.php
|
2016-08-31 16:16:19 +02:00 |
|
Laurent Destailleur
|
8cfac3b5c3
|
FIX Several problems when using smartphone
|
2016-08-31 12:38:54 +02:00 |
|
Laurent Destailleur
|
3d2dc3c66e
|
NEW Each user can select its landing page.
|
2016-07-26 21:12:52 +02:00 |
|
Laurent Destailleur
|
9019576394
|
Fix css class opacitymedium was not used everywhere.
|
2016-06-07 15:58:02 +02:00 |
|