Commit Graph

118175 Commits

Author SHA1 Message Date
marcusdeangabriel
5a0e231370
Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-09 08:46:45 +01:00
Laurent Destailleur
f444dd8f49 Trans 2023-02-09 00:58:55 +01:00
Laurent Destailleur
704faf734a NEW Auto activate some modules on install (export/import/wysiwyg editor) 2023-02-09 00:47:33 +01:00
Laurent Destailleur
f1c15e1714
Merge pull request #23295 from FliyFly/scrutinizernewproject
Fix(scrutinizer)
2023-02-08 16:13:00 +01:00
Laurent Destailleur
7d6db10710
Merge pull request #23658 from FliyFly/qodanaincompatiblereturn
Fix (qodana)
2023-02-08 16:06:25 +01:00
Laurent Destailleur
2dd4aac4c5
Merge pull request #23772 from lamrani002/DeleteRightManually
NEW functionality "Delete right manually" on ModuleBuilder
2023-02-08 16:02:29 +01:00
marcusdeangabriel
7c4f6c0e53
Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-08 15:37:33 +01:00
Laurent Destailleur
6a4f697013
Merge pull request #23835 from muhalikin/patch-1
Fix Shipment Creation from Order via REST API
2023-02-08 15:29:22 +01:00
muhalikin
821b423a24
Fix Shipment Creation from Order via REST API 2023-02-08 15:34:18 +03:00
Lamrani Abdel
352ac40d06 fix errors and conflicts 2023-02-07 15:26:23 +01:00
Lamrani Abdel
00affd520a fix conflits 2023-02-07 15:14:26 +01:00
stickler-ci
23d212d9dc Fixing style errors. 2023-02-07 13:58:29 +00:00
lamrani abdelwadoud
b67a676c89
Merge branch 'develop' into DeleteRightManually 2023-02-07 14:53:35 +01:00
marcusdeangabriel
83b76ddfd9
Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-07 08:23:48 +01:00
Laurent Destailleur
e671b63a02 Trans 2023-02-07 01:32:44 +01:00
Laurent Destailleur
dfd1133a48 css 2023-02-07 00:34:28 +01:00
Laurent Destailleur
cd2e82f4a5 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-07 00:22:27 +01:00
Laurent Destailleur
95b306ba84 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-07 00:19:54 +01:00
Laurent Destailleur
3dc8937ad3 Provide an object for computed extrafields 2023-02-07 00:11:33 +01:00
Laurent Destailleur
f66501dcdf Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-06 22:26:27 +01:00
Laurent Destailleur
eb5f1b6649 Fix filter on supplier categories 2023-02-06 22:26:09 +01:00
Laurent Destailleur
5bddb31b90 Fix csrf on referrer is duplicate with csrf on token. We keep token only 2023-02-06 21:23:02 +01:00
Laurent Destailleur
2f6a68481f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-02-06 19:46:54 +01:00
Laurent Destailleur
d31c6ff46b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-06 19:28:24 +01:00
Laurent Destailleur
4b062847ff Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-06 19:28:11 +01:00
Laurent Destailleur
ec9e8d3c3b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-06 19:22:27 +01:00
Laurent Destailleur
c3e5977174 NEW sepaStripe now creates the payment mode with type pm_ using new API 2023-02-06 19:22:08 +01:00
Laurent Destailleur
8758664900
Merge pull request #23805 from frederic34/patch-7
doc
2023-02-06 18:17:55 +01:00
Laurent Destailleur
2ab566e065
Merge pull request #23803 from frederic34/patch-4
colspan
2023-02-06 18:17:31 +01:00
Laurent Destailleur
bf13a8ead9 Code comment 2023-02-06 18:17:02 +01:00
Laurent Destailleur
4449b5bc64
Merge pull request #23808 from frederic34/patch-12
fix undefined method
2023-02-06 18:16:09 +01:00
Laurent Destailleur
09ba1972a6
Merge pull request #23810 from evarisk-theo/17.0
fix: socid post param on clicktodial add event button
2023-02-06 18:14:15 +01:00
Laurent Destailleur
6b6c39de90 Clean code 2023-02-06 17:57:49 +01:00
Théo David
7e15ea256f fix: socid post param on clicktodial add event button 2023-02-06 16:35:53 +01:00
Frédéric FRANCE
c55a32ee9c Merge remote-tracking branch 'upstream/develop' into patch-4 2023-02-06 16:35:23 +01:00
Frédéric FRANCE
d245313d1c
fix undefined method 2023-02-06 16:28:43 +01:00
marcusdeangabriel
a004f8b62c
Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-06 16:24:01 +01:00
Laurent Destailleur
2f8c4bd083 Fix label of var 2023-02-06 14:28:11 +01:00
Laurent Destailleur
fe35f5ec28 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-06 14:21:25 +01:00
Laurent Destailleur
a35e8faa2f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-06 14:13:50 +01:00
Laurent Destailleur
22d3d9cef5 Fix warning when using MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL 2023-02-06 14:13:37 +01:00
Frédéric FRANCE
9b0dfffe06
doc 2023-02-06 14:12:06 +01:00
Laurent Destailleur
1b4e572ec0 Code comment 2023-02-06 13:21:08 +01:00
Laurent Destailleur
5a25126117 Clean code and label of permission 2023-02-06 13:12:34 +01:00
Frédéric FRANCE
5920a9ec0a
colspan 2023-02-06 11:57:41 +01:00
mgabriel
b8cd507287 As suggested by Dolibarr, removed PROPALE_MODIFY_MARGIN_RATES as not needed. 2023-02-06 10:06:23 +01:00
marcusdeangabriel
f974295a45
Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-06 09:10:43 +01:00
Laurent Destailleur
ecddf3164d Fix phpunit 2023-02-06 03:41:15 +01:00
Laurent Destailleur
223765aecf Fix collapse/expand on extrafields 2023-02-06 03:36:52 +01:00
Laurent Destailleur
ffc9ab300b
Merge pull request #23780 from rycks/13_fix_update_public_note_error_when_document_model_not_found
13 fix update public note error when document model not found
2023-02-06 00:29:14 +01:00