Commit Graph

573 Commits

Author SHA1 Message Date
Christian Humpel
b60463cefa Fix #21768 The Contact is now showing in the card, if no company is selected. 2022-08-17 00:04:22 +02:00
Laurent Destailleur
72c010622b FIX empty with hasRight and add phpunit to avoid this in future 2022-08-14 16:38:20 +02:00
Laurent Destailleur
533e4f2424 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/fr_FR/accountancy.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/products.lang
2022-08-12 16:03:09 +02:00
Laurent Destailleur
059d0073ff FIX Maxi debug v16 2022-08-12 15:54:50 +02:00
ptibogxiv
d91c90bba1
FIX lang label & flag in user/card.php 2022-08-06 19:49:03 +02:00
lmarcouiller
05ca9da7e1 Fix : php 8.1 warnings 2022-07-29 15:46:13 +02:00
Laurent Destailleur
6ce2b02207 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-28 02:39:27 +02:00
Laurent Destailleur
13df3747d0 Fix look and feel v16 2022-07-27 13:59:01 +02:00
Laurent Destailleur
e1cd297d99 css 2022-07-27 13:49:28 +02:00
Laurent Destailleur
fc9b3e3d70 Factorize code into a function dolJSToSetRandomPassword() 2022-07-27 13:42:43 +02:00
Laurent Destailleur
24f8e9c401 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 18:09:38 +02:00
Regis Houssin
0c7a868306 FIX avoid Passing null to parameter #1 of type string is deprecated 2022-07-16 16:20:11 +02:00
Laurent Destailleur
daf8c0ff1e Cherry pick 2022-07-06 19:19:47 +02:00
Christian Foellmann
4c5e05e411 fix page titles
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/contact/list.php
	htdocs/product/stock/movement_list.php
	htdocs/user/list.php
2022-07-06 19:19:08 +02:00
Laurent Destailleur
bc11cf62f8 FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0 2022-06-13 10:44:20 +02:00
Laurent Destailleur
19a8fd0b73
Update card.php 2022-06-12 18:40:21 +02:00
ptibogxiv
7d35e94fc5
Fix php8 compatibility 2022-06-12 14:41:06 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Laurent Destailleur
1ef66c208f
Update card.php 2022-06-01 19:34:29 +02:00
stickler-ci
adb37a5f5f Fixing style errors. 2022-06-01 09:53:51 +00:00
Quentin VIAL-GOUTEYRON
682da1fabe FIX if password doesnt match rule it created a user without password 2022-06-01 11:33:15 +02:00
Laurent Destailleur
8d84ccfe01 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/theme/eldy/global.inc.php
2022-05-17 23:30:48 +02:00
Laurent Destailleur
6106d54632 css 2022-05-13 09:54:10 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
2022-04-11 21:22:27 +02:00
Laurent Destailleur
3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/holiday/card.php
	htdocs/user/card.php
2022-04-11 21:14:51 +02:00
Laurent Destailleur
b8d1acaff7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/holiday/card.php
	htdocs/user/card.php
2022-04-11 20:57:16 +02:00
Laurent Destailleur
974fb46fda Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/user/card.php
2022-04-11 20:43:20 +02:00
Florian HENRY
798c7a8a0b try with tzserver 2022-04-06 14:09:44 +02:00
atm-steve
4fa656be96
Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-30 12:13:17 +02:00
Laurent Destailleur
1a8af3509e Fix regression in button 2022-03-17 00:19:48 +01:00
steve
436b8fa5b5 apply feedbacks 2022-03-03 16:18:09 +01:00
steve
9900e5dd31 Clean 2022-03-02 14:51:16 +01:00
steve
e2f727ef55 feat: langs trans ref_employee and national registration number 2022-03-02 14:21:49 +01:00
steve
dcabd046d9 feat: add ref_employee and national_registration_number fields 2022-03-02 11:52:44 +01:00
Steve
cb17f2029e wip: add ref_employee and national_registration_number fields 2022-03-02 11:20:07 +01:00
Steve
5bf186c8ce Merge branch 'dolibarrdevelop' into WIP_Employee_management_improvement 2022-03-01 11:42:57 +01:00
steve
1908acb131 feat: add Accountancy code 2022-03-01 11:42:10 +01:00
Laurent Destailleur
280be9b29f
Merge pull request #20163 from SteveATM/FIX_replace_divbutaction_by_dolgetbuttonaction
FIX: Replace User divbutaction by dolgetbuttonaction
2022-02-28 21:25:25 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
2022-02-28 20:12:28 +01:00
Laurent Destailleur
32f2eb8c94 Debug v15 2022-02-28 12:13:06 +01:00
Laurent Destailleur
a0baea1e6b
Merge branch 'develop' into FIX_replace_divbutaction_by_dolgetbuttonaction 2022-02-25 14:20:24 +01:00
Laurent Destailleur
4973019630 Fix #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd 2022-02-24 09:59:16 +01:00
Steve
f70e97bafa fix: travis 2022-02-23 15:45:50 +01:00
Steve
bd6c547b4d fix: merge develop 2022-02-23 15:20:45 +01:00
Steve
6047e4e90b fix: travis + stickler 2022-02-23 15:06:58 +01:00
Steve
b99557e60c fix: feedback travis 2022-02-23 14:59:39 +01:00
Steve
c7077ef1d7 fix: send mail title 2022-02-23 14:49:12 +01:00
Steve
f6985ae546 merge develop 2022-02-23 12:25:44 +01:00
Steve
9a95fc7a00 wip: pull request feedback 2022-02-23 11:13:31 +01:00
Steve
c26b1e58a2 wip: pull request feedback 2022-02-23 11:09:59 +01:00