Commit Graph

127089 Commits

Author SHA1 Message Date
Frédéric FRANCE
981fd12872
fix missing translations 2025-02-18 11:10:49 +01:00
Frédéric FRANCE
2dbfe1e2e3
fix missing translations 2025-02-18 11:08:14 +01:00
ldestailleur
cabd8a680e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-18 10:25:53 +01:00
Laurent Destailleur (aka Eldy)
9d61b20ecd Fix php stan 2025-02-18 10:24:00 +01:00
Benjamin Falière
49cd08bc87
Merge branch 'develop' into fixMB 2025-02-18 10:04:17 +01:00
ldestailleur
58e243e535 Fix phpstan 2025-02-17 22:02:14 +01:00
Laurent Destailleur
2c7b2a11d0
Update myobject.class.php 2025-02-17 19:53:09 +01:00
Laurent Destailleur
bec6401388
Merge branch 'develop' into 22_accfydefault 2025-02-17 19:50:10 +01:00
VESSILLER
612f34f719 FIX #33101 white page on ticket card when adding a link by reference 2025-02-17 19:49:31 +01:00
Laurent Destailleur
28cacb8d1a
Merge pull request #33102 from Easya-Solutions/fix-ticket-addlinkbyref-in-view-mode
FIX #33101 white page on ticket card when adding a link by reference
2025-02-17 19:47:35 +01:00
Laurent Destailleur
68db1800e7
Merge pull request #33094 from iLLixM/develop
New: Option to set Third Party Customer Code equal to Member Reference
2025-02-17 19:46:19 +01:00
Laurent Destailleur
fc610a0adf
Merge pull request #33092 from mdeweerd/phan/2025.2.14.societe-1
Qual: Fix phan notices (societe)
2025-02-17 19:45:38 +01:00
Benjamin Falière
23ae7b5e7d
Merge branch 'develop' into fixMB 2025-02-17 18:49:25 +01:00
Laurent Destailleur
cac751ead0
Merge branch 'develop' into feat-order-tags 2025-02-17 18:20:01 +01:00
ldestailleur
b65189f4e3 Fix regression 2025-02-17 18:18:57 +01:00
Alexandre SPANGARO
167e327459 FIX CI phpstan 2025-02-17 17:23:18 +01:00
Laurent Destailleur
4d46197aed
Update html.form.class.php 2025-02-17 17:23:16 +01:00
ldestailleur
7566f72796 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-02-17 16:47:08 +01:00
ldestailleur
1904d4da6e FIX harmless PHP warnings 2025-02-17 16:42:11 +01:00
Alexandre SPANGARO
23fc3e18d3 Merge branch 'develop' into 22_accfydefault 2025-02-17 16:41:11 +01:00
Benjamin Falière
c52d0d2db0 Restore contributor line 2025-02-17 16:22:57 +01:00
Benjamin Falière
ca85ad74b9 FIX(modulebuilder): validate after creation 2025-02-17 16:18:19 +01:00
Laurent Destailleur
417f10c99d
Update modCategorie.class.php 2025-02-17 16:08:20 +01:00
ldestailleur
33d722c84f API use syntax "Authorization: Bearer ..." instead of "DOLAPIKEY: ..." 2025-02-17 16:02:22 +01:00
VESSILLER
eaf978cb12 FIX #33101 white page on ticket card when adding a link by reference 2025-02-17 15:09:31 +01:00
ldestailleur
180013b1ed Debug v21 2025-02-17 14:53:44 +01:00
Laurent Destailleur
1e4a9bfe9b
Update modCategorie.class.php 2025-02-17 14:41:01 +01:00
Laurent Destailleur
6ab146468e
Merge branch 'develop' into feat-order-tags 2025-02-17 14:30:00 +01:00
ldestailleur
1cad2a092e Standardize the category tables. 2025-02-17 14:29:44 +01:00
ldestailleur
730c6971da Debug v21 2025-02-17 14:20:40 +01:00
Laurent Destailleur
1df8cc3bd5
Merge branch 'develop' into feat-order-tags 2025-02-17 14:03:53 +01:00
ldestailleur
5de4d8a166 Standardize category tables 2025-02-17 14:02:39 +01:00
ldestailleur
fc96a88bd9 Standardize category tables 2025-02-17 14:01:16 +01:00
ldestailleur
8e411b3ead Standardize category tables 2025-02-17 13:59:59 +01:00
ldestailleur
9af5292cc3 Standardize category tables 2025-02-17 13:58:47 +01:00
Alexandre SPANGARO
3ab4a08c13 Language 2025-02-17 13:53:01 +01:00
ldestailleur
d800b721fd Standardize category tables 2025-02-17 13:52:52 +01:00
Alexandre SPANGARO
803995b645 Merge branch '22_accfydefault' of https://github.com/aspangaro/dolibarr into 22_accfydefault 2025-02-17 13:51:49 +01:00
Alexandre SPANGARO
d259b2a65c Update language 2025-02-17 13:51:47 +01:00
ldestailleur
3339ca0ed7 Standardize category tables 2025-02-17 13:45:16 +01:00
ldestailleur
33b915abbe NEW Better presentation of list of user approver. 2025-02-17 13:18:20 +01:00
Laurent Destailleur
8f58256ede
Update viewcat.php 2025-02-17 11:46:29 +01:00
MDW
5035580e56
Qual: Fix phan notices (societe) 2025-02-17 09:44:12 +01:00
Alexandre SPANGARO
a194d2f0c4 Remove dev code 2025-02-17 06:41:59 +01:00
Alexandre SPANGARO
330bd5543a Add missing trad 2025-02-17 06:38:07 +01:00
Alexandre SPANGARO
da54ed8e57 Indentation 2025-02-17 06:30:55 +01:00
Laurent Destailleur
8402394e5b
Merge branch 'develop' into feat-order-tags 2025-02-17 04:06:32 +01:00
Laurent Destailleur
bd6c9b6d0d
Merge branch 'develop' into 22_accfydefault 2025-02-17 04:02:57 +01:00
Laurent Destailleur
a5a5e7d3ab
Merge branch 'develop' into develop 2025-02-17 04:02:51 +01:00
ldestailleur
99e8842f0a Fix phpstan 2025-02-17 03:49:11 +01:00
ldestailleur
511f92aeb3 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-17 02:28:23 +01:00
ldestailleur
824f4e06b5 Debug v21 smartphone 2025-02-17 02:27:36 +01:00
Laurent Destailleur
11cbeeff82
Merge branch 'develop' into 22_accfydefault 2025-02-17 02:24:49 +01:00
Laurent Destailleur
21ded4f599
Merge branch 'develop' into develop 2025-02-17 02:24:42 +01:00
ldestailleur
6d0423ac53 Fix warnings 2025-02-17 02:24:17 +01:00
ldestailleur
3258dd4837 Fix TODO 2025-02-16 23:15:51 +01:00
ldestailleur
4a6baf1df4 Enhance AI 2025-02-16 23:06:58 +01:00
ldestailleur
47d59c7938 NEW Add a test mode for AI setup 2025-02-16 22:45:14 +01:00
Alexandre SPANGARO
8e36ecf4f7 Add default fiscal year on all report 2025-02-16 21:29:03 +01:00
ldestailleur
bc1dbae6b0 Enhance test of AI 2025-02-16 19:56:03 +01:00
ldestailleur
31c2aa5c63 Fix js syntax error 2025-02-16 19:54:58 +01:00
ldestailleur
320dbe483e Fix js syntax error. 2025-02-16 19:52:17 +01:00
iLLixM
92a8fcccfe New: Option to set Third Party Customer Code equal to Member Reference
when using the function of creating third parties from members, you are able to set the customer code equal to the existing member reference by setting the parameter THIRDPARTY_CUSTOMERCODE_EQUALS_MEMBERREF
2025-02-16 18:54:51 +01:00
ldestailleur
c404b0702e Prepare 20.0.5 2025-02-16 15:41:23 +01:00
ldestailleur
7fc8136362 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-16 14:50:09 +01:00
ldestailleur
415c38ed6b Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-02-16 14:32:33 +01:00
ldestailleur
cb18bebb87 Fix warning on date 2025-02-16 14:23:16 +01:00
Alexandre SPANGARO
8bd3564eee Merge branch 'develop' into 22_accfydefault 2025-02-16 11:32:50 +01:00
ldestailleur
dcc0ededf8 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-02-15 18:12:20 +01:00
Laurent Destailleur (aka Eldy)
45321f938a Debug v21 2025-02-15 18:10:41 +01:00
Laurent Destailleur
63c0e8a513
Merge pull request #26693 from moreauftheobald/develop_adherent_type_class_update
Adherent type class refactoring
2025-02-15 00:10:22 +01:00
Laurent Destailleur (aka Eldy)
ed87ce34bf Debug v21 2025-02-15 00:09:10 +01:00
Laurent Destailleur (aka Eldy)
41774efabb Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-02-14 23:55:06 +01:00
Laurent Destailleur (aka Eldy)
2a2584b765 Debug v21 2025-02-14 23:54:43 +01:00
Laurent Destailleur
63483e960b
Update adherent_type.class.php 2025-02-14 23:49:09 +01:00
Laurent Destailleur
0cd52e0810
Update adherent_type.class.php 2025-02-14 23:42:25 +01:00
Laurent Destailleur
d49750a5e2
Update adherent_type.class.php 2025-02-14 23:34:43 +01:00
Laurent Destailleur
c15a37b879
Merge pull request #33089 from Easya-Solutions/qual-shipment-replace-warehouse
QUAL use fk_warehouse instead of deprecated entrepot_id in line batch
2025-02-14 23:25:25 +01:00
ldestailleur
f3eec99040 Fix #33048 warning 2025-02-14 23:22:40 +01:00
Laurent Destailleur
f4cd3bb803
Merge pull request #33085 from Hystepik/new-add-website-security-constant
New add website security constant for CSPRO
2025-02-14 22:32:57 +01:00
Laurent Destailleur
8dc02126da
Merge pull request #33088 from Easya-Solutions/qual-shipment-dispatch-db-prefix
QUAL replace MAIN_DB_PREFIX with db prefix in shipment dispatch
2025-02-14 22:31:42 +01:00
VESSILLER
5d6d07745e QUAL use fk_warehouse instead of deprecated entrepot_id in line batch 2025-02-14 16:47:08 +01:00
Florent Poinsaut
fa512af180 NEW #22848 FIx phpstan alert 2025-02-14 15:46:40 +01:00
VESSILLER
6d87423e88 QUAL replace MAIN_DB_PREFIX with db prefix in shipment dispatch 2025-02-14 14:35:54 +01:00
Florent Poinsaut
c8cc7884e4 NEW #22848 Fix CI 2025-02-14 14:35:44 +01:00
Florent Poinsaut
05a11b7cef NEW Dolibarr#22848 typo 2025-02-14 14:35:36 +01:00
Florent Poinsaut
941e703e34 NEW #22848 Fix doc 2025-02-14 14:34:42 +01:00
Florent Poinsaut
6dcb53f4c3 NEW #22848 Fix link between invoice and order and tags export / import 2025-02-14 14:34:23 +01:00
Florent Poinsaut
ee8791666c NEW #22848 Remove linked categories 2025-02-14 14:32:59 +01:00
Florent Poinsaut
0c6ee5d47d NEW #22848 Use the right tag id 2025-02-14 14:32:43 +01:00
Florent Poinsaut
8152d88b00 NEW #22848 Add import and export functions 2025-02-14 14:30:40 +01:00
Florent Poinsaut
ba78df46bd NEW #22848 Fix Typo 2025-02-14 14:30:01 +01:00
Florent Poinsaut
bfed762fe9 NEW Dolibarr#22848 Add order tags 2025-02-14 14:29:49 +01:00
Laurent Destailleur (aka Eldy)
46d94d25d3 Try to exclude GETPOST from dol_eval allowed functions 2025-02-14 13:29:51 +01:00
Hystepik
ea92fc39b3 fix CI 2025-02-14 11:44:19 +01:00
Hystepik
421390a3ad fix CI 2025-02-14 11:39:17 +01:00
Hystepik
1696e4d154 New add website security constant for CSPRO 2025-02-14 11:13:39 +01:00
Laurent Destailleur
7b2e315d23
Merge branch 'develop' into develop_adherent_type_class_update 2025-02-14 02:33:53 +01:00
Laurent Destailleur (aka Eldy)
d7205f3404 Fix: The translation should be a step done the later as possible when we
need to exploit or output a translated data. Must not be done at each
call to load meta information.
2025-02-14 02:14:19 +01:00
Laurent Destailleur (aka Eldy)
eeb8907f33 Fix missing properties 2025-02-14 02:09:59 +01:00
Laurent Destailleur
fb1e3151c2
Merge pull request #32903 from hregis/fix_dev_add_mysoc_currency
QUAL add $mysoc->currency and call default lang before setMysoc()
2025-02-14 01:59:48 +01:00
Laurent Destailleur
bbea873a46
Merge pull request #33081 from mdeweerd/phan/2025.2.13.resource-salary
Qual: Fix phan notices (resource+salary)
2025-02-14 01:49:50 +01:00
Laurent Destailleur
8109d03eab
Merge pull request #33079 from mdeweerd/phan/2025.2.13.recruitment
Qual: Fix phan notices (recruitment+various_payment)
2025-02-14 01:49:31 +01:00
MDW
78f5938485
Qual: Fix phan notices (resource+salary) 2025-02-14 01:42:25 +01:00
Laurent Destailleur
a58ab30e30
Update inputs.php 2025-02-13 23:57:17 +01:00
MDW
c405666765
Qual: Fix phan notices (recruitment) 2025-02-13 22:37:20 +01:00
Laurent Destailleur
9ebbf5be62
Merge branch '20.0' into fix_20_sql_order_twice 2025-02-13 20:47:23 +01:00
Laurent Destailleur
9a08b2c638
Merge branch 'develop' into NEW/DocumentationUI/Inputs 2025-02-13 20:46:06 +01:00
Laurent Destailleur (aka Eldy)
d223f8a0b9 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-13 20:42:23 +01:00
Laurent Destailleur (aka Eldy)
805d9a58ec Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-02-13 20:39:40 +01:00
Laurent Destailleur (aka Eldy)
705164cc9f Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-02-13 20:39:19 +01:00
Laurent Destailleur (aka Eldy)
909fa449f6 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-02-13 20:37:26 +01:00
Laurent Destailleur (aka Eldy)
256e0e0470 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-02-13 20:37:12 +01:00
Laurent Destailleur (aka Eldy)
36fd5b7b26 FIX #CVE-2024-34051 2025-02-13 20:29:25 +01:00
Laurent Destailleur
cae8e0425e
Merge branch 'develop' into NEW/DocumentationUI/Inputs 2025-02-13 19:28:24 +01:00
Laurent Destailleur (aka Eldy)
09e1708268 Fix missing files.lib 2025-02-13 18:57:04 +01:00
Regis Houssin
8150cc6159 FIX wrong ODT path for multicompany 2025-02-13 18:20:47 +01:00
Laurent Destailleur
276af7df89
Merge branch 'develop' into NEW/DocumentationUI/Inputs 2025-02-13 17:46:46 +01:00
Laurent Destailleur (aka Eldy)
097ba9bc9e Clean code 2025-02-13 17:44:36 +01:00
Laurent Destailleur
65875c2a1b
Merge pull request #33076 from Daoud-mohamed/use-personalized-header-for-website-payment-page
New use personalized header for website payment page
2025-02-13 17:35:42 +01:00
Laurent Destailleur
e69b645289
Merge pull request #33075 from fappels/21_fix_fk_bom_child
FIX: fk_bom_child missing in origin line list
2025-02-13 17:34:17 +01:00
Laurent Destailleur
055e1971c7
Merge branch 'develop' into NEW/DocumentationUI/Inputs 2025-02-13 17:31:19 +01:00
Laurent Destailleur
971ebb2b6f
Merge pull request #33073 from mdeweerd/phan/20250213.reception
Qual: Fix phan notices (reception)
2025-02-13 17:30:11 +01:00
Laurent Destailleur
861725e87b
Merge pull request #33070 from frederic34/patch-11
fix phpdoc
2025-02-13 17:29:41 +01:00
Laurent Destailleur (aka Eldy)
8ee93533bd CSS 2025-02-13 17:28:33 +01:00
Regis Houssin
c55eb6773c FIX wrong path for odt models 2025-02-13 17:16:35 +01:00
Mohamed DAOUD
842196c96a use personalized header for website payment page 2025-02-13 16:53:44 +01:00
Francis Appels
7bf4e8ab6b Fix missing fk_bom_child in printOriginLinesList 2025-02-13 16:29:47 +01:00
atm-lena
a675c3fcaf Fix errors 2025-02-13 16:01:39 +01:00
atm-lena
924868a683 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW/DocumentationUI/Inputs 2025-02-13 15:59:12 +01:00
atm-lena
b661ea69d4 Fix translations 2025-02-13 15:52:31 +01:00
atm-lena
2fc61b5433 Add translation 2025-02-13 15:51:06 +01:00
atm-lena
c0d39e08ae Add element and reorganize 2025-02-13 15:49:32 +01:00
MDW
d8678c793e
Qual: Fix phan notices (reception) 2025-02-13 15:39:39 +01:00
Laurent Destailleur
67e119fdb1
Merge branch 'develop' into fix-error-on-update-in-editsecurity 2025-02-13 15:37:07 +01:00
Laurent Destailleur (aka Eldy)
da7bd36ce4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-13 15:36:51 +01:00
Laurent Destailleur (aka Eldy)
f02554d328 Fix warnings 2025-02-13 15:36:39 +01:00
Laurent Destailleur
9a7767908a
Merge pull request #33063 from ilhan69/patch-2
Fix: don stats: SQL query was not formatted correctly due to double quotes
2025-02-13 15:30:09 +01:00
Laurent Destailleur
48944b691c
Merge pull request #33060 from GregoryBT/patch-2
fix: Fix undefined value $socid
2025-02-13 15:28:01 +01:00
Laurent Destailleur (aka Eldy)
c3aaa6a510 Clean code 2025-02-13 15:22:03 +01:00
Frédéric FRANCE
781bff6e9d
Update date.lib.php 2025-02-13 15:06:01 +01:00
Regis Houssin
521a8b7f0a FIX sql "order by" is defined twice 2025-02-13 14:41:18 +01:00
Ilhan K.
4bc2258e13 Fix: donation: fix url to see last 3 donations 2025-02-13 14:40:39 +01:00
Kévin Begot
9b8ac97bf0 fix: cast timestamp to int 2025-02-13 14:40:24 +01:00
Laurent Destailleur
89e9de5cec Update tasks.php 2025-02-13 14:40:08 +01:00
Ilhan K.
fffb22421c Fix: projects/tasks list : nothing is displayed when you check a task to delete it (mass action) 2025-02-13 14:39:59 +01:00
Laurent Destailleur
0d220914a1
Merge pull request #33049 from ilhan69/develop
Fix: projects/tasks list : nothing is displayed when you check a task to delete it (mass action)
2025-02-13 14:39:00 +01:00
Laurent Destailleur
6212f978d7
Update tasks.php 2025-02-13 14:38:49 +01:00
Laurent Destailleur
a1f9147709
Merge pull request #33047 from RemiLecas/patch-2
fix: remove unused variable $show_files
2025-02-13 14:31:14 +01:00
Laurent Destailleur
9e620f99ae
Merge pull request #33071 from kbegot/patch-3
fix: cast timestamp to int
2025-02-13 14:28:06 +01:00