lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
117,364 Commits 43 Branches 150 Tags 886 MiB
3e0689879d
Commit Graph

3277 Commits

Author SHA1 Message Date
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