Commit Graph

103157 Commits

Author SHA1 Message Date
hystepik
4a0822ef2c Fix : fatal error in adherent/agenda.php 2022-11-26 12:21:50 +01:00
Laurent Destailleur
b522517c75
Merge pull request #22994 from ibuiv/patch-1
Fix #20685 User Id not transmitted on Api addTimeSpent
2022-11-26 11:30:47 +01:00
stickler-ci
c8090a0361 Fixing style errors. 2022-11-26 10:13:48 +00:00
Laurent Destailleur
fa34ea3dc5
Merge pull request #22997 from SylvainLegrand/fix_#21357
Fix #21357
2022-11-26 10:57:18 +01:00
Laurent Destailleur
db7d88e675
Merge pull request #20694 from Easya-Solutions/new-contract-list-filter-category-customer
NEW customer category filter on contract list
2022-11-26 10:46:00 +01:00
lvessiller-opendsi
864b49677b
Update list.php 2022-11-26 10:45:01 +01:00
Laurent Destailleur
7f44d1f915
Merge pull request #20695 from Easya-Solutions/new-project-list-filter-category-customer
NEW customer category filter on project list
2022-11-26 10:43:25 +01:00
lvessiller-opendsi
ecccbd3cab
Update list.php
rename MAIN_SEARCH_CATEGORY_CUSTOMER_ON_LISTS
2022-11-26 10:41:58 +01:00
Laurent Destailleur
732d13f798
Merge pull request #20776 from Easya-Solutions/new-task-list-filter-category-customer
NEW customer category filter on task list
2022-11-26 10:39:38 +01:00
lvessiller-opendsi
126a29ec02
Update list.php
rename const MAIN_SEARCH_CATEGORY_CUSTOMER_ON_LISTS
2022-11-26 10:38:36 +01:00
Laurent Destailleur
ab970d049f
Merge pull request #23006 from rycks/dev_project_to_invoice_user_rights
fix #23005: change lire to creer (rights)
2022-11-26 10:26:43 +01:00
Laurent Destailleur
7884216197
Merge pull request #23003 from rycks/14_fix_api_status_on_delete
fix #22766: better API response HTTP code
2022-11-26 10:26:21 +01:00
Laurent Destailleur
37f4c846cb
Merge pull request #22996 from ATM-Nicolas/fix_api_documents_inconsistency
FIX : Documents API inconsistency
2022-11-26 10:22:58 +01:00
Laurent Destailleur
e77aa31e47
Merge pull request #23009 from atm-maxime/fix_count_in_lists
Fix count in lists
2022-11-26 10:21:29 +01:00
Delthair
60257cec09
Fix #22998 Disabled module before delete (modulebuilder)
Ensure that the module is disabled before delete
2022-11-26 10:06:39 +01:00
antonin_tdj
cd94e42291
add parenthesis 2022-11-26 09:32:10 +01:00
antonin_tdj
5b53d1c5cf
add cast to avoid sql injection (eldy asked)
add cast to avoid sql injection (eldy asked)
2022-11-26 09:30:40 +01:00
Laurent Destailleur
25e1f88e18 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-26 02:07:13 +01:00
Laurent Destailleur
c8e5ca9691 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-26 01:54:53 +01:00
Laurent Destailleur
096bd39ae7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:54:17 +01:00
Maxime Kohlhaas
eb7222227d Fix : use count() in lists - part 3 2022-11-26 01:53:18 +01:00
Laurent Destailleur
860f2414c4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-26 01:46:37 +01:00
Laurent Destailleur
63541d1515 Fix phpcs 2022-11-26 01:45:58 +01:00
Laurent Destailleur
c62c7e3805 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
2022-11-26 01:43:09 +01:00
Francis Appels
7a8c35baa7 FIX Negative consumption in MO creates additional goods issue #21343 2022-11-26 01:33:11 +01:00
Eric
bafa1a1ee8
Update time.php 2022-11-26 01:29:36 +01:00
Eric Seigne
89101a2862 fix #23005: change lire to creer (rights) 2022-11-26 01:26:58 +01:00
Maxime Kohlhaas
fb310de0aa Fix : use count() in lists - part 2 2022-11-26 01:23:45 +01:00
Laurent Destailleur
bc0990ab6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-26 01:22:59 +01:00
Laurent Destailleur
b231bcb64a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
2022-11-26 01:21:51 +01:00
Laurent Destailleur
1921d427e9 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:14:09 +01:00
Laurent Destailleur
85e9ac1e40 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:13:58 +01:00
Laurent Destailleur
c09236e15a Fix #22592 #22992 2022-11-26 01:13:31 +01:00
Nicolas Domenech
b98eaa4d45 #FIX: #22509 default value on integer fields don't retrieve by setSaveQuery 2022-11-26 01:01:22 +01:00
stickler-ci
3fd81293a3 Fixing style errors. 2022-11-25 23:57:35 +00:00
Laurent Destailleur
28a006fff3
Merge pull request #22986 from Easya-Solutions/fix-22886
FIX #22886
2022-11-26 00:55:14 +01:00
Maxime Kohlhaas
8c597543e1 Fix : use count() in lists - part 1 2022-11-26 00:54:49 +01:00
Laurent Destailleur
543e80128a
Merge pull request #22972 from jtraulle/hooks-facture-rec
New Add hooks addMoreActionsButtons and formConfirm to card-rec.php
2022-11-26 00:54:08 +01:00
Eric Seigne
616e2b79ef fix #22766: better API response HTTP code 2022-11-26 00:50:45 +01:00
Laurent Destailleur
c460510309
Merge pull request #22984 from andreubisquerra/patch-1
FIX Responsive TakePOS action buttons
2022-11-26 00:47:53 +01:00
ATM-Nicolas
e767c9b4a9 FIX : Stickler 2022-11-26 00:42:50 +01:00
ATM-Nicolas
a0553c6e52 FIX : Stickler 2022-11-26 00:35:08 +01:00
stickler-ci
ebae1c024f Fixing style errors. 2022-11-25 23:24:17 +00:00
antonin_tdj
9852d470ec
Fix #20533 Dispatch Tab Quantity
Fix #20533
Dispatch Tab Total Quantity now considers services (and the configuration option to manage stocks on services)
2022-11-26 00:23:29 +01:00
Laurent Destailleur
b84a7def1f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-26 00:22:57 +01:00
Laurent Destailleur
0165c6d490 Better error management on API delete 2022-11-26 00:22:01 +01:00
Sylvain Legrand
6768697497 Fix #21357 2022-11-26 00:13:15 +01:00
Laurent Destailleur
175cdf3668
Merge pull request #22983 from EchoLoGeek/#21771
#21771
2022-11-26 00:10:27 +01:00
Laurent Destailleur
4b7157e82a
Update card.php 2022-11-26 00:10:15 +01:00
ATM-Nicolas
f3e689f841 FIX : Documents API inconsistency 2022-11-26 00:02:17 +01:00
Laurent Destailleur
eb2fada50f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-26 00:00:49 +01:00
Laurent Destailleur
c2cacdb8a5 Fix fatal error 2022-11-25 23:59:06 +01:00
Laurent Destailleur
f79778db40 Fix js null error 2022-11-25 23:47:17 +01:00
antonin_tdj
59ec20f549
Fix #20685 User Id not transmitted on Api addTimeSpent
Fix #20685 User Id not transmitted on Api addTimeSpent

The User ID will be transmitted to the API call (if 0 then, the user will be selected from API key)
2022-11-25 23:44:32 +01:00
Laurent Destailleur
1ec862b491
Merge pull request #22982 from inovea-conseil/fix_19877
FIX#19877
2022-11-25 23:41:18 +01:00
Laurent Destailleur
42d09f597c
Merge pull request #22980 from inovea-conseil/FIX#19828
FIX#19828
2022-11-25 23:36:28 +01:00
antonin_tdj
e7034f3c52
Merge branch 'Dolibarr:develop' into develop 2022-11-25 23:20:11 +01:00
stickler-ci
1d0f329ac5 Fixing style errors. 2022-11-25 22:15:01 +00:00
VESSILLER
7b0e429edb FIX #22886 2022-11-25 23:08:54 +01:00
Bahfir Abbes
cbf103ef74
FIX for #22882 2022-11-25 22:58:51 +01:00
andreubisquerra
e36e8d15ae
FIX Responsive TakePOS action buttons
Nantes 2022
2022-11-25 22:50:26 +01:00
stickler-ci
9f5a046e10 Fixing style errors. 2022-11-25 21:46:25 +00:00
EchoLoGeek
3b9122bada
Update main.lang 2022-11-25 22:37:13 +01:00
stickler-ci
1c6828e816 Fixing style errors. 2022-11-25 21:36:11 +00:00
EchoLoGeek
8cb2cb0429
Update card.php 2022-11-25 22:34:53 +01:00
amarchal
f7adbfef16 block visibility to private contact (thirdparty list / card) 2022-11-25 22:33:34 +01:00
Mathieu
023bc7d20e FIX#19877 2022-11-25 22:29:44 +01:00
IC-Ilies
b5ab1f612c FIX#19828 2022-11-25 22:29:35 +01:00
Laurent Destailleur
f42f083d10 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-25 22:20:58 +01:00
amarchal
d3ccfeeadc hide private contact in thirdparty list 2022-11-25 22:12:41 +01:00
ATM-Nicolas
3475e55b80 FIX : Bankaccounts API fetch with 'id' and 'socid' 2022-11-25 22:11:17 +01:00
Laurent Destailleur
84e955cb61
Merge pull request #22889 from noec764/14_FIX_Add_Footer_HookAccountancy
14 fix add footer hook accountancy
2022-11-25 22:01:11 +01:00
Laurent Destailleur
1c53d32ba0
Merge pull request #22969 from Hystepik/develop#4
Fix : Yogosha#12007 add protection in dol_add_file_process
2022-11-25 22:00:13 +01:00
Graveen
f85c239e4f Bugfix: supplier order list is no longer including suppliers were status is set to inactive 2022-11-25 19:22:10 +01:00
Jean Traullé
8fa6d36978
New Add hooks addMoreActionsButtons and formConfirm to card-rec.php 2022-11-25 18:06:16 +01:00
hystepik
6dc3b13d6c fix error 2022-11-25 17:32:37 +01:00
hystepik
50d525ed70 Fix : Yogosha#12007 2022-11-25 17:20:39 +01:00
Noé Courtier
863a56c02c Merge branch '14_FIX_Add_Footer_HookAccountancy' of github.com:noec764/dolibarr into 14_FIX_Add_Footer_HookAccountancy 2022-11-25 16:51:19 +01:00
Noé Courtier
acf629ad1c Merge branch 'develop' of github.com:Dolibarr/dolibarr into 14_FIX_Add_Footer_HookAccountancy 2022-11-25 16:50:23 +01:00
Laurent Destailleur
b04d4dd867
Merge pull request #22689 from bb2a/NEW---Compléte-function-pdfBuildThirdpartyName-to-use-company-name-of-contact
NEW Make option PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME visible
2022-11-25 16:49:35 +01:00
Laurent Destailleur
03485a2f73
Merge pull request #22680 from OPEN-DSI/14.0_fix_start_cron_in_multientities_with_verif_test_condition
FIX: Fix the position of the verification condition of the test field in case of multi entities
2022-11-25 16:34:27 +01:00
Laurent Destailleur
6475c9320d
Merge pull request #22968 from Hystepik/develop#3
fix : php 8.1 warnings
2022-11-25 16:28:14 +01:00
Laurent Destailleur
64950e9d8c
Merge pull request #22832 from bb2a/NEW---Shipping-address-to-invoice
NEW - Shipping address to invoice
2022-11-25 16:16:00 +01:00
Laurent Destailleur
9c786a1b50
Update pdf_sponge.modules.php 2022-11-25 16:15:32 +01:00
Laurent Destailleur
84a977afe2
Update pdf_crabe.modules.php 2022-11-25 16:13:59 +01:00
hystepik
68fc388047 fix php 8.1 warnings 2022-11-25 15:48:52 +01:00
hystepik
efc1697c62 fix : php8.1 warnings 2022-11-25 15:34:38 +01:00
Laurent Destailleur
317530fc8b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-25 12:49:30 +01:00
Laurent Destailleur
45be6dd25b Prepare 16.0.3 2022-11-25 12:48:26 +01:00
Laurent Destailleur
f4c27d40bb
Merge pull request #22959 from aspangaro/18a1
NEW: IHM - Add module ticket/intervention in quick add menu
2022-11-25 12:41:15 +01:00
Laurent Destailleur
e4355468e4
Merge pull request #22958 from aspangaro/17b11
FIX: Asset - Compatibility SQL, typo, language key, ChangeLog
2022-11-25 12:37:09 +01:00
Laurent Destailleur
587daa77ea Better setup by default 2022-11-25 12:27:53 +01:00
stickler-ci
ec156ddf84 Fixing style errors. 2022-11-25 11:26:31 +00:00
Noé Courtier
043b2e9ea3 FIX: copy same behaviour in other accountancy files 2022-11-25 12:18:32 +01:00
Nicolas Domenech
f2f58e434e fix: can't use parameter morcss in select task because parameter is overwrite 2022-11-25 12:16:34 +01:00
Laurent Destailleur
0ccca81f12 Debug v17 - Finish move of type of event into actioncomm 2022-11-25 12:11:51 +01:00
Noé Courtier
2ada053855 FIX: Use the Hook addMoreActionsButtons resPrint 2022-11-25 11:44:34 +01:00
atm-steve
f3c257003d resolve issue 2022-11-25 10:53:44 +01:00
Laurent Destailleur
6a28bcaafa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-25 10:45:27 +01:00
Laurent Destailleur
e4a3126cf8 Fix bad value 'system' for AC_OTH 2022-11-25 10:42:33 +01:00
atm-steve
8d879eb8f5 feat: add name alias column 2022-11-25 10:24:44 +01:00
Alexandre SPANGARO
3f83f1e1bc NEW: IHM - Add module ticket/intervention in quick add menu 2022-11-25 05:28:01 +01:00
Alexandre SPANGARO
8dff478f39 Merge remote-tracking branch 'upstream/develop' into 17b11 2022-11-25 04:51:14 +01:00
Alexandre SPANGARO
01a0a10832 Move module asset to experimental 2022-11-25 04:42:31 +01:00
Alexandre SPANGARO
517544e7c3 Compatibility - Remove WITH 2022-11-25 04:42:10 +01:00
Alexandre SPANGARO
035f7c57c4 Compatibility - Remove WITH 2022-11-25 04:38:30 +01:00
Maxime Kohlhaas
834d30b9d0 Fix expedition stats abstract method 2022-11-24 23:21:23 +01:00
Laurent Destailleur
511a3eda95
Merge pull request #22953 from Hystepik/develop#2
Fix : Api warning php 8.1
2022-11-24 23:20:12 +01:00
hystepik
9d566c41df Fix : api warning php 8.1 2022-11-24 22:52:05 +01:00
Laurent Destailleur
ce5bb5cd64 Fix warning 2022-11-24 22:49:37 +01:00
Laurent Destailleur
9047f9638f Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2022-11-24 22:32:02 +01:00
Laurent Destailleur
2e57cb1acb
Merge pull request #22950 from fboitel/FIX-SECURITY-Fail2ban-public-pages
SECURITY FIX limit requests public pages
2022-11-24 21:22:57 +01:00
fboitel
00f5a2ddc8
Merge branch 'Dolibarr:develop' into FIX-SECURITY-Fail2ban-public-pages 2022-11-24 19:10:35 +01:00
stickler-ci
848328da9f Fixing style errors. 2022-11-24 17:29:34 +00:00
andreubisquerra
1a5d719de3
FIX TakePOS head bar scroll in mobile 2022-11-24 18:26:47 +01:00
Laurent Destailleur
5135ea9a86 Move asset module as experimental 2022-11-24 16:58:31 +01:00
Laurent Destailleur
53a1867be8 Fix phpcs 2022-11-24 16:40:44 +01:00
Faustin
c11fc9d3e5 unwanted commented code 2022-11-24 14:30:34 +01:00
Faustin
6e4eeb8b3c Limit member subscription on public page by ip adress 2022-11-24 14:26:50 +01:00
Faustin
9a028c9137 Limit survey answer on public page by ip adress 2022-11-24 13:10:43 +01:00
Faustin
0901bf55c3 Limit eventorganization attendee on public page by ip adress + fix some bugs on that page 2022-11-24 10:58:43 +01:00
Alexandre SPANGARO
409a114038 Wrong variable 2022-11-24 03:58:59 +01:00
Alexandre SPANGARO
016a74e98b Language key missing 2022-11-24 03:58:34 +01:00
Laurent Destailleur
40bc26a666 NEW Ad the target to select attendees of event for emailings 2022-11-23 21:29:15 +01:00
Laurent Destailleur
6f31727112 Fix trans 2022-11-23 20:36:30 +01:00
Laurent Destailleur
03e8e49465 Fix responsive 2022-11-23 20:31:26 +01:00
Faustin
c539ed9f57 Limit conference suggest on public page by ip adress 2022-11-23 20:26:26 +01:00
Faustin
7ee47b725b no wanted changes 2022-11-23 19:52:32 +01:00
Faustin
dfb10f7362 Limit booth suggest on public page by ip adress 2022-11-23 19:51:34 +01:00
Faustin
08010fae5c Limit booth suggest on public page by ip adress 2022-11-23 19:51:17 +01:00
Laurent Destailleur
dd50854b05 Fix log 2022-11-23 18:58:17 +01:00
Laurent Destailleur
4d11b5db31 Fix error management 2022-11-23 18:52:43 +01:00
Laurent Destailleur
b42b0ef841 Fix error management 2022-11-23 18:49:59 +01:00
Faustin
1e88704a14 Limit project creation on public page by ip adress 2022-11-23 17:32:32 +01:00
Laurent Destailleur
fb2b4ea388 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-23 17:07:36 +01:00
Laurent Destailleur
d0ac102bd0 Debug v17 2022-11-23 17:07:11 +01:00
Laurent Destailleur
459961711e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-23 17:01:29 +01:00
Laurent Destailleur
1a8dbd75ea Fix update socialnetworks 2022-11-23 16:59:40 +01:00
Faustin
1b5bbf72fc Limit partnership creation on public page by ip adress 2022-11-23 13:41:02 +01:00
Laurent Destailleur
5d87296f00
Merge pull request #22882 from fappels/17_debug_product_list
Fix new method for fast scanlist for subselects.
2022-11-23 13:01:22 +01:00
Laurent Destailleur
9bdd17af1d
Update list.php 2022-11-23 13:00:50 +01:00
Laurent Destailleur
39d8e44b3d
Merge pull request #22885 from alsoft10/16.0
BUG FIXED #22883
2022-11-23 12:38:59 +01:00
Laurent Destailleur
795895e18f
Merge pull request #22936 from Easya-Solutions/14.0_fix-get-next-value-year-on-one-digit
FIX compute next value when year is on one digit for reset counter
2022-11-23 12:33:27 +01:00
Laurent Destailleur
97863440cb
Merge pull request #22937 from atm-gauthier/FIX_total_invoice_on_show_objects_linked_bloc
FIX : $sign is useless
2022-11-23 12:27:50 +01:00
Laurent Destailleur
fb3bbee0a3
Merge pull request #22938 from Daviid-P/15.0
FIX Broken Permissions check, $object is null.
2022-11-23 12:22:21 +01:00
atm-steve
e7096509b5 add project label and ref columns 2022-11-23 12:19:07 +01:00
Laurent Destailleur
4c02652d87 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-23 12:07:42 +01:00
Laurent Destailleur
9a0b10bf9f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-23 12:06:34 +01:00
Laurent Destailleur
207f56ff64 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-23 12:06:21 +01:00
Laurent Destailleur
2f0880020c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-23 12:02:25 +01:00
Laurent Destailleur
9ee4c73036 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-23 11:58:59 +01:00
Laurent Destailleur
c9930ee6ce Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-23 11:58:46 +01:00
David Pareja Rodriguez
05e850dbfc FIX Broken Permissions check, $object is null.
This code was probably copy&paste'd from `htdocs/compta/prelevement/card.php` where the `$object` variable exists.

On `htdocs/compta/prelevement/line.php` `$object` is not defined, and `$type` come from the `$type = GETPOST('type', 'aZ09');` which ends up being overwritten with null.
2022-11-23 11:58:21 +01:00
Laurent Destailleur
3a59344c2f Fix responsive 2022-11-23 11:57:53 +01:00
Gauthier PC portable 024
b77f63bc5c FIX : $sign is useless 2022-11-23 11:24:29 +01:00
Laurent Destailleur
a36ed6a3c4 Debug v17 2022-11-23 10:43:09 +01:00
VESSILLER
ed2a9a22e8 FIX compute next value when year is on one digit for reset counter 2022-11-23 08:36:20 +01:00
Anthony Berton
ff5609273b
Update pdf_other.php 2022-11-23 00:29:49 +01:00
Laurent Destailleur
a59bdfba0c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-11-23 00:00:47 +01:00
Laurent Destailleur
8f196c1214 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-11-22 23:55:45 +01:00
Laurent Destailleur
5ba80117ec FIX #22858 #22862 2022-11-22 23:53:00 +01:00
Laurent Destailleur
5756018941
Merge branch 'develop' into fix_issue_don_payement_payement 2022-11-22 22:09:22 +01:00
stickler-ci
8f9dea244d Fixing style errors. 2022-11-22 21:08:41 +00:00
Laurent Destailleur
5ad7894849 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-11-22 22:05:43 +01:00
Laurent Destailleur
2c1571c514 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-11-22 22:05:33 +01:00
Laurent Destailleur
f782ac6654 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-11-22 22:03:47 +01:00
Laurent Destailleur
8d35258370
Update facture.php 2022-11-22 22:02:47 +01:00
Laurent Destailleur
1e54e695b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-11-22 22:00:59 +01:00
Laurent Destailleur
7d0fd0d815
Merge pull request #22881 from lamrani002/fix_issue_22846
Fix issue #22846
2022-11-22 21:59:29 +01:00
Laurent Destailleur
da8d6d958a
Update list.php 2022-11-22 21:56:46 +01:00
Laurent Destailleur
18c0372fee
Merge pull request #22894 from ksar-ksar/patch-18
FIX #22893
2022-11-22 21:55:01 +01:00
Laurent Destailleur
5c012a53f8
Update contact.lib.php 2022-11-22 21:54:21 +01:00
Laurent Destailleur
2d27acbe8d
Merge pull request #22895 from cfoellmann/PR/fix-load-lang
FIX load correct language file
2022-11-22 21:52:16 +01:00
Laurent Destailleur
6c9521560e
Merge pull request #22896 from FHenry/dev_add_lotBatch_in_recpetion_Object_forPDF
NEW: add batch lot for reception and squille PDF
2022-11-22 21:51:39 +01:00
Laurent Destailleur
4628fc6313
Merge pull request #22921 from atm-steve/fix_filter_by_hierarchy_on_project_task_by_month
fix: filter user by hierarchy on task
2022-11-22 21:39:37 +01:00
Laurent Destailleur
da937c1ba1
Merge pull request #22926 from FliyFly/scrutinizerDonPayement
Fix(scrutinizer)
2022-11-22 21:33:18 +01:00
Laurent Destailleur
427a785fb3 Update help on security 2022-11-22 21:27:30 +01:00
stickler-ci
76fdf0006d Fixing style errors. 2022-11-22 20:17:37 +00:00
josett225
e38ef6bc8c Update create.php 2022-11-22 21:03:28 +01:00
Laurent Destailleur
f15c7a1e80 Responsive 2022-11-22 15:48:29 +01:00
Hasanuzzaman Sattar
b3f455e6db
Merge branch 'Dolibarr:16.0' into 16.0 2022-11-22 20:08:14 +05:30
ATM-Nicolas
3d9b2a1676 FIX : SQL request parenthesis 2022-11-22 15:32:37 +01:00
atm-steve
1a73f4e9c6 fix: filter user by hierarchy on task 2022-11-22 15:07:33 +01:00
atm-steve
416c809f74 fix: filter user by hierarchy on task 2022-11-22 15:05:24 +01:00
FLIO
313f622ea8 Fix(scrutinizer) https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/don/payment/payment.php?selectedLabels%5B0%5D=9&selectedSeverities%5B0%5D=10&orderField=lastFound&order=desc&honorSelectedPaths=0 2022-11-22 14:15:14 +01:00
Laurent Destailleur
3d8404ecb3 Standardize code with reception (option to allow negative shipment) 2022-11-22 13:47:01 +01:00
Maxime Kohlhaas
7be0e0da1c Fix API right check 2022-11-22 13:46:42 +01:00
Laurent Destailleur
ba1f82b354 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-22 13:42:32 +01:00
Laurent Destailleur
f79e52bc85 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-22 13:42:17 +01:00
Laurent Destailleur
a90d509d06 NEW: Show delivery mode on PDF for proposals 2022-11-22 13:02:01 +01:00
Laurent Destailleur
8d6ccd4185
Merge pull request #22902 from fboitel/FIX-error-500-stat-page
Fix error 500 on task stats screen
2022-11-21 21:16:13 +01:00
Laurent Destailleur
d6b77b2404
Merge pull request #22904 from daraelmin/patch-4
Fix #22675 - avoid warning when weight is empty
2022-11-21 21:15:50 +01:00
Laurent Destailleur
e301aa70c4
Merge pull request #22905 from fboitel/feature-checkbox-left-column
NEW checkbox left column for most of lists
2022-11-21 21:14:39 +01:00
Laurent Destailleur
e36afdbde9
Merge pull request #22909 from Humml87/16.0_Fix_#22768_MO_List_Filter
Fix #22768 remove "natural_search" on status and fk_parent_line.
2022-11-21 21:05:01 +01:00
Laurent Destailleur
282bddeac8
Merge pull request #22911 from FliyFly/scrutinizerFileLib
Fix(scrutinizer) Typing error
2022-11-21 21:03:09 +01:00
Laurent Destailleur
6aefc9edfc Enable MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA by default 2022-11-21 18:30:17 +01:00
Laurent Destailleur
af413cb09f Fix #yogosha13195 2022-11-21 15:12:46 +01:00
Laurent Destailleur
322124690c Fix sql syntax error 2022-11-21 14:47:31 +01:00
FLIO
44709f986c Fix(scrutinizer) https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/lib/files.lib.php?selectedLabels%5B0%5D=9&selectedSeverities%5B0%5D=10&orderField=lastFound&order=desc&honorSelectedPaths=0 2022-11-21 11:37:35 +01:00
Anthony Berton
a9b14b7b2d Copy 2022-11-21 09:29:30 +01:00
Anthony Berton
cb20ac6567 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW---Shipping-address-to-invoice 2022-11-21 08:26:24 +01:00
Laurent Destailleur
8a70e0de72 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-21 04:03:20 +01:00
Laurent Destailleur
7c1eac9774 Fix sqli ->escape after ->escapeforlike 2022-11-21 03:58:22 +01:00
stickler-ci
b5cafeefcf Fixing style errors. 2022-11-20 23:16:19 +00:00
Christian Humpel
92647d30e7 Fix #22768 remove "natural_search" on status and fk_parent_line. 2022-11-21 00:07:50 +01:00
Laurent Destailleur
767f5db7dc Typo 2022-11-20 22:42:35 +01:00
Laurent Destailleur
3041edc013 Debug 2022-11-20 21:59:35 +01:00
Laurent Destailleur
e5a4824ed2 Enhance default WEBSITE_MAIN_SECURITY_FORCECSP 2022-11-20 16:12:18 +01:00
Laurent Destailleur
c5459a47eb Enhance default WEBSITE_MAIN_SECURITY_FORCECSP 2022-11-20 16:08:32 +01:00
Laurent Destailleur
c2d0f97063 Website 2022-11-20 15:13:40 +01:00
Laurent Destailleur
1aa304c758 Debug v17 2022-11-20 15:01:07 +01:00
Laurent Destailleur
1c43d40acf Debug v17 2022-11-20 14:37:31 +01:00
Laurent Destailleur
067663263a Fix error management 2022-11-20 12:54:43 +01:00
josett225
19273c8da1 Fix PaymentBankTransfer Line page management with Select and Input 2022-11-20 05:33:31 +01:00
Faustin
4b5629caa7 checkbox colum on left for poll list 2022-11-20 01:54:42 +01:00
Faustin
9f9cd7a4b3 checkbox colum on left for tickets list 2022-11-20 01:51:14 +01:00
Faustin
eddb215173 checkbox colum on left for action list 2022-11-20 00:10:04 +01:00
Faustin
5244b71d4c checkbox colum on left for recruitment list 2022-11-20 00:06:18 +01:00
Faustin
9fc4a762a3 checkbox colum on left for expense report list 2022-11-19 23:56:22 +01:00
Faustin
d78a707972 checkbox colum on left for leave list 2022-11-19 23:52:10 +01:00
Faustin
9c64a21bd9 checkbox colum on left for ledger list 2022-11-19 23:38:13 +01:00
Faustin
306d0c0b3a checkbox colum on left for journals list 2022-11-19 23:32:45 +01:00
Faustin
78ef383d32 checkbox colum on left for bank account lists 2022-11-19 23:26:07 +01:00
Faustin
251cd3df6c checkbox colum on left for supplier invoice lists 2022-11-19 23:12:00 +01:00
Faustin
c715e729e7 checkbox colum on left for intervention lists 2022-11-19 22:58:04 +01:00
Faustin
7867cdec1f checkbox colum on left for contract lists 2022-11-19 22:42:24 +01:00
Faustin
574b9159ca checkbox colum on left for contract lists 2022-11-19 22:42:15 +01:00
daraelmin
4912f6a720
Fix #22675 - avoid warning when weight is empty 2022-11-19 22:15:58 +01:00
Faustin
85652a278d checkbox colum on left for supplier command lists 2022-11-19 18:05:24 +01:00
Faustin
c3e0bd63d0 checkbox colum on left for supplier proposal lists 2022-11-19 17:52:30 +01:00
Faustin
e1cebbf58a checkbox colum on left for inventory list 2022-11-19 17:16:17 +01:00
Faustin
c75183209a checkbox colum on left for mrp list 2022-11-19 16:54:55 +01:00
Faustin
fadc54b9dc checkbox colum on left for bom list 2022-11-19 16:43:02 +01:00
Faustin
a930437946 Unwanted insert 2022-11-19 15:59:08 +01:00
Faustin
67b9a7dc07 Methods déclaration 2022-11-19 15:34:24 +01:00
Laurent Destailleur
728bcf677e Debug v17 2022-11-19 13:36:52 +01:00
Laurent Destailleur
0117e65651 Clean no more used files 2022-11-19 10:26:56 +01:00
Laurent Destailleur
c6714fa576 CSS 2022-11-18 20:01:54 +01:00
Anthony Berton
420ccd3c6b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW---Shipping-address-to-invoice 2022-11-18 17:08:05 +01:00
Anthony Berton
4ea20e6511 Clean code 2022-11-18 17:06:11 +01:00
Anthony Berton
d25cc6e832 Clean 2022-11-18 16:28:21 +01:00
Anthony Berton
b272877fe2 Sponge and FIx and optimise 2022-11-18 16:20:52 +01:00
Francis Appels
43674f385c replace preg_replace by str_replace 2022-11-18 16:14:14 +01:00
Laurent Destailleur
92d4d2f8e7 Fix download of sample import files with DoliDroid 2022-11-18 16:02:35 +01:00
Laurent Destailleur
ce98547015 Fix download of sample import files with DoliDroid 2022-11-18 15:56:18 +01:00
Laurent Destailleur
fe6e8a5ec1 Fix perms 2022-11-18 15:25:11 +01:00
root
435b82bbc8 #22883 2022-11-18 19:03:39 +05:30
Hasanuzzaman Sattar
e364c399fd
Merge branch 'Dolibarr:16.0' into 16.0 2022-11-18 18:59:39 +05:30
Laurent Destailleur
2dffe3748d Debug v17 - Fix missing delete picto on ODT setup 2022-11-18 13:41:27 +01:00
Laurent Destailleur
1e684353b7 Debug v17 2022-11-18 12:59:21 +01:00