lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
121,269 Commits 43 Branches 150 Tags 886 MiB
add_rest_api_region
Commit Graph

3416 Commits

Author SHA1 Message Date
Laurent Destailleur
c28e6a46e2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/install/step5.php
 2022-11-02 00:15:21 +01:00
Laurent Destailleur
39ef32326f Better responsive behaviour 2022-11-01 12:05:52 +01:00
Laurent Destailleur
124a969127 Debug v17 2022-10-31 15:35:00 +01:00
Laurent Destailleur
f0e51d4a28 Debug v17 - use of 'mode' for user list and filter on categories 2022-10-31 08:22:53 +01:00
kkhelifa
c4543eff73 FIX: Fix the request SQL for transversal user, the join on usergroup table must be with getEntity('usergroup') and not other element 2022-10-28 16:31:01 +02:00
Florian HENRY
15b19840fb fix: cannot edit propal note 2022-10-27 14:40:47 +02:00
Florian HENRY
0f1b63ec9b fix: cannot edit propal note 2022-10-27 14:38:37 +02:00
Laurent Destailleur
1f9424a4b3 Clean code/options 2022-10-25 11:34:31 +02:00
Laurent Destailleur
1618bfc902 Debug v17 2022-10-25 10:53:19 +02:00
Laurent Destailleur
cae2f26c05 Responsive 2022-10-22 02:38:44 +02:00
Laurent Destailleur
9a5a3a3517 Fix link to create event from user card 2022-10-21 16:21:09 +02:00
Laurent Destailleur
8c9e5dda1b FIX #yogosha12673 2022-10-20 16:53:18 +02:00
Laurent Destailleur
2aea86dc8c FIX #yogosha12673 2022-10-20 13:58:59 +02:00
Faustin
168ea58a07 NEW #22546 : can now set user supervisors using mass action in htdocs/user 2022-10-12 18:59:05 +02:00
Laurent Destailleur
92d0dff65d Clean code 2022-10-11 02:40:55 +02:00
Laurent Destailleur
201b774d6d Clean code 2022-10-10 20:14:51 +02:00
Laurent Destailleur
959aef914e Clean code 2022-10-04 23:53:17 +02:00
Laurent Destailleur
eebb8290f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-10-02 13:52:48 +02:00
Laurent Destailleur
dfc4543be2 Fix warning 2022-10-02 13:52:14 +02:00
Laurent Destailleur
b1ad4d8580 Warning 2022-10-02 13:40:50 +02:00
Laurent Destailleur
07966f5e6b Clean code 2022-10-01 14:00:43 +02:00
Laurent Destailleur
147e4bcedb Clean code 2022-09-27 15:16:44 +02:00
Laurent Destailleur
5aaf17a340 css 2022-09-27 15:01:07 +02:00
Laurent Destailleur
f5e5de1eba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-09-25 17:12:03 +02:00
Laurent Destailleur
86091c3fde Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-25 17:01:44 +02:00
Alexandre SPANGARO
3cf2048518 Use isModEnabled 2022-09-25 06:32:35 +02:00
Alexandre SPANGARO
37834d3c62 Use isModEnabled 2022-09-25 06:26:04 +02:00
Alexandre SPANGARO
a6040867c8 Use isModEnabled 2022-09-25 06:16:11 +02:00
Alexandre SPANGARO
5d19588037 Use isModEnabled 2022-09-25 06:13:47 +02:00
Alexandre SPANGARO
2a8b32ff98 Use isModEnabled 2022-09-25 06:06:06 +02:00
Philippe GRAND
e10abd95f1 update code toward php8 compliance 2022-09-24 14:56:50 +02:00
Jean
88ff4ad4bc FIX #22379 creating events on supplier order 2022-09-24 09:13:19 +02:00
Laurent Destailleur
a87aa30e75 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-23 18:53:18 +02:00
Jean
7d4b2a664e FIX #22379 creating events on supplier order 2022-09-23 16:47:54 +02:00
lmarcouiller
b0d2aa6d9b Fix : php 8.1 warnings 2022-09-23 16:05:11 +02:00
Regis Houssin
4f6cf3f067 FIX missing check if category module is enabled 2022-09-23 11:46:55 +02:00
Laurent Destailleur
d314ed380b NEW Can edit property css, cssview, csslist on extrafields 2022-09-22 13:01:11 +02:00
Laurent Destailleur
b69031e979 Fix php8.1 2022-09-21 03:23:03 +02:00
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
Laurent Destailleur
cb7db080cd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-21 01:21:11 +02:00
kevin
81ce609b7b FIX no when contains an @ 2022-09-13 16:04:20 +02:00
Laurent Destailleur
8771dc197b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-12 10:32:50 +02:00
Laurent Destailleur
5b2b5e6a58 Fix picto multicompany 2022-09-10 08:33:36 +02:00
Laurent Destailleur
767897595b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-10 02:46:10 +02:00
Laurent Destailleur
5521cb6afc Fix picto multicompany 2022-09-10 02:45:25 +02:00
Laurent Destailleur
62f8c533c5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-09 18:36:06 +02:00
Laurent Destailleur
8b2fca8cca Try a fix for margin hasRights 2022-09-09 18:10:31 +02:00
Laurent Destailleur
cf887dba16
Merge pull request #22075 from grandoc/new_branch_04_09_2022 
update code
 2022-09-09 18:03:43 +02:00
Laurent Destailleur
7a277d9560
Merge branch 'develop' into loaddolibarrenv 2022-09-09 17:02:05 +02:00
Laurent Destailleur
7e6d52c137
Merge pull request #22168 from Hystepik/develop#2 
Fix : php 8.1 warnings
 2022-09-09 15:51:03 +02:00
Laurent Destailleur
b23ab2cb71 FIX #yogosha12266 2022-09-09 13:58:54 +02:00
lmarcouiller
68b72ac17d Fix : php 8.1 warnings 2022-09-09 10:06:16 +02:00
Frédéric France
da8617e3ff Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-08 18:59:23 +02:00
Laurent Destailleur
e19e65d362 Fix phpunit 2022-09-08 16:38:39 +02:00
Laurent Destailleur
4c09252650 Clean code 2022-09-08 12:29:46 +02:00
Laurent Destailleur
1e0ce2f90a FIX test on hasRight for product module 2022-09-08 12:29:33 +02:00
Frédéric France
07e761d115 Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-07 20:37:29 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Laurent Destailleur
9d4bc513be Fix regression 2022-09-07 16:39:19 +02:00
Laurent Destailleur
11fc7cd870
Merge pull request #22099 from Hystepik/develop#5 
Fix : permission check code
 2022-09-07 13:10:42 +02:00
Alexandre SPANGARO
7b560c19e0
Merge branch 'develop' into develop 2022-09-06 21:32:58 +02:00
Laurent Destailleur
8ee927f593 Fix search 2022-09-06 20:53:51 +02:00
lmarcouiller
3df3bd8c4a Fix ; permission check code 2022-09-06 15:37:00 +02:00
Alexandre SPANGARO
faee162b91 FIX Travis - Complete WIP #22059 2022-09-06 04:48:26 +02:00
Philippe GRAND
d5df85fd3e update code 2022-09-04 13:34:19 +02:00
Laurent Destailleur
cacad72123
Update note.php 2022-09-03 11:53:14 +02:00
ptibogxiv
98b88fab9b Update note.php 2022-09-03 11:12:45 +02:00
ptibogxiv
cfcd243314 Merge branch 'patch-46' of https://github.com/ptibogxiv/dolibarr into patch-46 2022-09-03 11:07:57 +02:00
ptibogxiv
a0bb17aea9 wip 2022-09-03 11:07:47 +02:00
ptibogxiv
98362881a6
Update note.php 2022-09-03 11:06:38 +02:00
Laurent Destailleur
19c3763a55
Merge branch 'develop' into userbankaccount 2022-09-02 11:53:02 +02:00
Laurent Destailleur
a28eb9296f
Update userbankaccount.class.php 2022-09-02 11:51:28 +02:00
Frédéric France
47c5ec7fc6 Merge remote-tracking branch 'upstream/develop' into productbatch 2022-09-01 19:55:24 +02:00
Laurent Destailleur
5ba0520195 FIX fatal error abs on non int 2022-09-01 15:41:08 +02:00
Laurent Destailleur
a865388b9c FIX fatal error abs on non int 2022-09-01 15:38:31 +02:00
Laurent Destailleur
6903b96f6b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-01 12:39:25 +02:00
Laurent Destailleur
8bf8beb898 Debug module ticket 2022-09-01 10:54:20 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +02:00
Frédéric France
ece2f5553a fix php8 warnings 2022-08-31 21:49:10 +02:00
Laurent Destailleur
e0b1ad308b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-08-30 19:38:35 +02:00
Frédéric FRANCE
8ab6d293e1 Merge remote-tracking branch 'upstream/develop' into userbankaccount 2022-08-29 17:00:09 +02:00
Frédéric FRANCE
ec764595f8 enhance bank display for user 2022-08-29 16:59:23 +02:00
Philippe GRAND
d0ad4ba8c4 FIX php8 compatibility 2022-08-28 14:42:46 +02:00
Philippe GRAND
37409b1b01 FIX php8 compatibility 2022-08-28 14:42:27 +02:00
Philippe GRAND
b0c3784620 FIX php8 compatibility 2022-08-28 14:42:03 +02:00
Philippe GRAND
679c258b3d FIX php8 compatibility 2022-08-28 14:41:42 +02:00
Philippe GRAND
664a483e54 FIX php8 compatibility 2022-08-28 14:41:03 +02:00
Philippe GRAND
5aba964726 FIX php8 compatibility 2022-08-28 14:40:36 +02:00
Philippe GRAND
0aba1f6753 FIX php8 compatibility 2022-08-28 14:39:50 +02:00
Philippe GRAND
31f45d29e5 FIX php8 compatibility 2022-08-28 14:39:29 +02:00
Philippe GRAND
9b37dfc7e8 FIX php8 compatibility 2022-08-28 14:39:07 +02:00
Philippe GRAND
ab5a29198d FIX php8 compatibility 2022-08-28 14:38:43 +02:00
Philippe GRAND
736432b751 FIX php8 compatibility 2022-08-28 14:38:13 +02:00
Philippe GRAND
4ee4edae4c FIX php8 compatibility 2022-08-28 14:37:36 +02:00
Philippe GRAND
24cd634866 FIX php8 compatibility 2022-08-28 14:37:00 +02:00
Philippe GRAND
cd5ae18d69 FIX php8 compatibility 2022-08-28 14:36:36 +02:00
Philippe GRAND
e2ea2a2ae1 FIX php8 compatibility 2022-08-28 14:36:09 +02:00
Philippe GRAND
5d7c98ea08 FIX php8 compatibility 2022-08-28 14:34:33 +02:00
Philippe GRAND
31c287ec58 FIX php8 compatibility 2022-08-28 14:33:56 +02:00
Laurent Destailleur
2e905b127a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/index.php
	htdocs/product/admin/product.php
 2022-08-25 14:35:08 +02:00
Laurent Destailleur
0d693d723a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/comm/propal/class/api_proposals.class.php
 2022-08-25 14:31:47 +02:00
Laurent Destailleur
a4c0177db0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/user/bank.php
 2022-08-25 14:29:09 +02:00
Frédéric FRANCE
1927131799
add trans 2022-08-24 16:38:05 +02:00
Frédéric France
582f6b196e use isModEnabled 2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Christian Humpel
49315de03a Fix #21768 The Contact is now showing in the card, if no company is selected. 2022-08-22 13:44:31 +02:00
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
Laurent Destailleur
3c65841e19 Debug v16 2022-08-12 14:41:44 +02:00
Laurent Destailleur
9bc6c41ca7 Clean code: No more fetch to clone 2022-08-11 23:59:25 +02:00
Laurent Destailleur
c1bea1b1e4 Add the anti-csrf-token into header 2022-08-10 22:24:45 +02:00
Laurent Destailleur
8db8914a41
Merge pull request #21678 from ptibogxiv/patch-34 
NEW default_lang for members
 2022-08-10 05:10:03 +02:00
ptibogxiv
1a1c5d9110 Update user.class.php 2022-08-07 10:14:05 +02:00
ptibogxiv
d91c90bba1
FIX lang label & flag in user/card.php 2022-08-06 19:49:03 +02:00
Laurent Destailleur
a064b25fdd css 2022-08-04 13:45:39 +02:00
Laurent Destailleur
fb173da0f3 css 2022-08-04 11:14:21 +02:00
lmarcouiller
da53e5ee5c fix hasRights warnings 2022-08-02 19:42:33 +02:00
lmarcouiller
9d036e24e1 fix hasRights warnings 2022-08-02 11:53:33 +02:00
lmarcouiller
05ca9da7e1 Fix : php 8.1 warnings 2022-07-29 15:46:13 +02:00
lmarcouiller
d1d5e0836f Fix : HasRight on user.class.php for $permlevel2 2022-07-29 15:12:25 +02:00
lmarcouiller
3dc0e14f0e Fix : HasRight on user.class.php for $permlevel2 2022-07-29 13:04:04 +02:00
Laurent Destailleur
a4b7f38346 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_actions.php
	htdocs/core/boxes/box_contracts.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/boxes/box_services_expired.php
	htdocs/core/boxes/box_supplier_orders.php
	htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
 2022-07-29 11:22:01 +02:00
Laurent Destailleur
f66dfb1c08 phpv8 2022-07-29 11:08:04 +02:00
Laurent Destailleur
0b568aebad Fix missing link to vcal for some tabs of user 2022-07-29 10:41:09 +02:00
Laurent Destailleur
108292db3a
Merge pull request #21610 from bb2a/FIX---strlower-to-email 
FIX - strlower to email
 2022-07-28 19:05:59 +02:00
Laurent Destailleur
b6a6dd91d8 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-07-28 18:52:44 +02:00
Laurent Destailleur
eac926e01d Fix phpv8 2022-07-28 18:30:26 +02:00
Anthony Berton
cfc9819e49 FIX - strlower for email 2022-07-28 15:13: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
Yoan Mollard
edb2e95aaf Fixed labels for permission errors 2022-07-22 17:33:04 +02:00
Yoan Mollard
840437d312 Fixed labels for permission errors 2022-07-19 23:55:55 +02:00
Laurent Destailleur
cc15923cfb
Merge pull request #21517 from hregis/fix_passing_null_of_type_string_is_deprecated 
FIX avoid Passing null to parameter #1 of type string is deprecated
 2022-07-19 00:57:34 +02:00
Laurent Destailleur
8edebcf314 FIX Debug v16 2022-07-18 13:17:46 +02:00
Laurent Destailleur
95ee25660e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-18 13:16:25 +02:00
Laurent Destailleur
076d93452f FIX Debug v16 2022-07-18 11:59:22 +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
2c707f0258 Doc 2022-07-16 12:02:30 +02:00
Laurent Destailleur
25e034721c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-11 00:06:57 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty" 
This reverts commit e0b664066b.
 2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Laurent Destailleur
c0977e5ee8
Merge pull request #21469 from cfoellmann/PR/card-empty-action 
FIX default to create on card.php if $action is empty
 2022-07-10 18:50:48 +02:00
Christian Foellmann
aaca9bc03d default to create on card.php if $action is empty 2022-07-08 09:16:02 +02:00
Christian Foellmann
6c9f46c73e some more fixes to titles 2022-07-08 09:09:50 +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
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
BB2A Anthony Berton
f9eee31f74 FIX - php V8 user class 2022-07-04 15:51:54 +02:00
BB2A Anthony Berton
f105883b4f FIX - php V8 user class 2022-07-04 10:01:17 +02:00
stickler-ci
23d948cec4 Fixing style errors. 2022-06-27 10:56:08 +00:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Laurent Destailleur
930ce5b305 Responsive 2022-06-23 22:29:07 +02:00
Laurent Destailleur
de61b53bd7 responsive 2022-06-23 22:18:23 +02:00
Laurent Destailleur
4b79d91437 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-23 12:35:24 +02:00
Frédéric France
287f868fbb use getDolGlobalString 2022-06-22 08:36:24 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
050cc48d7e Debug v16 2022-06-14 11:54:41 +02:00
Laurent Destailleur
293b08ab1d Debug v16 2022-06-14 11:47:56 +02:00
Laurent Destailleur
2b5b9957c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-13 10:44:49 +02:00
Laurent Destailleur
bc11cf62f8 FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0 2022-06-13 10:44:20 +02:00
Laurent Destailleur
0020b8782f
Merge pull request #21222 from ptibogxiv/patch-19 
Fix php8 compatibility
 2022-06-12 21:00:41 +02:00
ptibogxiv
fe557ce9db
Update bank.php 2022-06-12 20:41:27 +02:00
Laurent Destailleur
19a8fd0b73
Update card.php 2022-06-12 18:40:21 +02:00
ptibogxiv
e82c01d24e
Fix php8 compatibility 2022-06-12 14:48:14 +02:00
ptibogxiv
7d35e94fc5
Fix php8 compatibility 2022-06-12 14:41:06 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
NASDAMI Quatadah
3d0a8dd595 running phpcs one last time 2022-06-09 13:29:49 +02:00
stickler-ci
7b3fe948a0 Fixing style errors. 2022-06-09 11:20:59 +00:00
NASDAMI Quatadah
7f86c53b3e fixing bug 20500 2022-06-09 13:15:40 +02:00
Laurent Destailleur
1838baaa5c Debug v16 2022-06-08 21:20:12 +02:00
Laurent Destailleur
32c6daee2f CSS 2022-06-07 18:18:01 +02:00
Laurent Destailleur
cd041c9ea1 Clean code 2022-06-03 02:41:00 +02:00
Laurent Destailleur
3751fc92ca Clean code 2022-06-01 20:47:14 +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
1655890f84 Debug v16 2022-05-31 10:35:36 +02:00
Regis Houssin
82e19879d5 FIX php8.1 warning 2022-05-21 23:43:01 +02:00
Lucas Marcouiller
51041bbea1 Fix : php 8.0 warnings 2022-05-21 18:46:41 +02:00
Laurent Destailleur
4b996f79a9 Debug v16 2022-05-19 13:52:29 +02:00
Laurent Destailleur
5f9ef61d32 Debug v16 2022-05-19 09:36:47 +02:00
Laurent Destailleur
ddf9c06e2c Debug v16 2022-05-18 17:06:42 +02:00
Laurent Destailleur
d22ba9aa66 css 2022-05-18 17:02:50 +02:00
Laurent Destailleur
5736709991 Look and feel v16 2022-05-18 16:55:03 +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
ddd0848acc Look and feel v16 2022-05-17 01:21:33 +02:00
Florian HENRY
fa6d738037 NEW: Add event block on facture_rec #20870 2022-05-13 10:46:02 +02:00
Laurent Destailleur
6106d54632 css 2022-05-13 09:54:10 +02:00
Laurent Destailleur
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +02:00
Laurent Destailleur
8023e1b0cd Debug v16 2022-04-30 20:41:18 +02:00
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Laurent Destailleur
fa8ce6e4fd
Merge pull request #20710 from fappels/develop_confirm_createbills 
Move massaction 'confirm_createbills' from actions_massactions.inc.php to commande/list.php
 2022-04-29 17:19:18 +02:00
Laurent Destailleur
147e61472c Clean code: Remove all   entities. 2022-04-29 13:10:28 +02:00
Laurent Destailleur
822a0a37f3 Fix phpunit 2022-04-28 22:37:21 +02:00
Laurent Destailleur
ebe68350d1 IP for last and previous login is now saved inuser table 2022-04-28 17:34:04 +02:00
Francis Appels
7e44227df2 Cleanup 'confirm_createbills' 2022-04-25 14:28:57 +02:00
Laurent Destailleur
2113a944ce Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-14 23:14:56 +02:00
Laurent Destailleur
0c82ce1b69 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 23:04:36 +02:00
Laurent Destailleur
031669493d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-14 23:03:35 +02:00
Laurent Destailleur
27ef6840d5 # WARNING: head commit changed in the meantime 
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
 2022-04-14 23:01:49 +02:00
Laurent Destailleur
c4f80b4e71
Merge pull request #19424 from marc-dll/12.0_FIX_employee_tab_holiday_length 
FIX: user employee tab: offset in open days messes up holiday length calculation
 2022-04-14 22:59:20 +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
8f3335f75d CSS 2022-04-11 21:17:35 +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
Laurent Destailleur
3a2815a9c0 Debug and clean v16 2022-04-07 23:44:57 +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
steve
8f39efd2b9 fix: change Read and Write employee label with personal information 2022-03-30 12:11:07 +02:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-03-23 17:26:25 +01:00
Laurent Destailleur
947b6008c8
Merge pull request #20308 from frederic34/patch-1 
Fix do not modify entity on group edit
 2022-03-23 16:55:55 +01:00
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
 2022-03-19 17:34:26 +01:00
Laurent Destailleur
ed631b2b06 Fix doxygen, missing error message 2022-03-18 16:14:20 +01:00
Frédéric FRANCE
53909828f9
Update card.php 2022-03-17 10:56:14 +01:00
Laurent Destailleur
1a8af3509e Fix regression in button 2022-03-17 00:19:48 +01:00
steve
1555a95ce8 Activate new rights read and write 2022-03-14 16:50:43 +01:00
Frédéric FRANCE
3dfd92e9c0
Fix do not modify entity on group edit 
https://www.dolibarr.fr/forum/t/etoile-globalgroup-dans-les-groupes-dutilisateurs-quelle-signification-quel-usage/38772/26
 2022-03-08 21:19:29 +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
Steve
26e23219e6 feat: dolGetButtonAction 2022-02-23 10:34:54 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
209ab708d4 FIX #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd 2022-02-22 21:24:34 +01:00
Steve
3fb0d307b1 wip: clean comments 2022-02-22 17:23:34 +01:00