Commit Graph

26452 Commits

Author SHA1 Message Date
Laurent Destailleur
91be7b279e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-30 17:28:23 +01:00
Laurent Destailleur
723b9d101a FIX #yogosha8604 2022-01-30 17:24:10 +01:00
Laurent Destailleur
a9737a91e7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-30 16:31:42 +01:00
Laurent Destailleur
87de9a8a23 Fix #yogosha8590 2022-01-30 16:30:19 +01:00
Laurent Destailleur
7f13561158 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-30 02:06:08 +01:00
Laurent Destailleur
9e86e5ce93 Fix creation of page 2022-01-30 01:46:14 +01:00
Laurent Destailleur
5942bc57e6 Add DDOS protection 2022-01-30 01:03:07 +01:00
Laurent Destailleur
2fea78c90a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/data/llx_c_action_trigger.sql
2022-01-29 16:48:40 +01:00
Laurent Destailleur
728df13238 Optimize files loaded on login and passwordforgotten page 2022-01-29 16:22:55 +01:00
Laurent Destailleur
d75dd51bb7 Clean code to debug fulldayevent 2022-01-29 00:39:20 +01:00
Laurent Destailleur
d9691e16d5
Merge pull request #18081 from lmag/fix_ticket_substitution
fix: #19428 ticket substitution
2022-01-28 20:01:10 +01:00
Laurent Destailleur
289ce87f6d Fix fatal error 2022-01-28 19:06:41 +01:00
Laurent Destailleur
d72538506f
Merge pull request #19935 from atm-adrien/NEW_SUB_BOM_develop
NEW : Sub-bom
2022-01-28 19:01:30 +01:00
Laurent Destailleur
9dd44c6d5c
Merge pull request #19958 from SylvainLegrand/New_improve_the_reading_of_profIDs
New - Improve the reading of profIDs
2022-01-28 18:08:59 +01:00
Laurent Destailleur
adf8f3886b Merge 2022-01-28 18:07:56 +01:00
Laurent Destailleur
a113231e7b
Merge pull request #19961 from chiariello/develop
NEW #17123 added ExtraFields for Stock Mouvement
2022-01-28 18:04:22 +01:00
Laurent Destailleur
2686541156 Fix late picto 2022-01-28 17:59:58 +01:00
Laurent Destailleur
d545ba5049
Merge pull request #19948 from OPEN-DSI/fix_vat_report_by_month_and_rate_with_vat_src_code
NEW VAT Report by month - Show detail by rate and also by code
2022-01-28 17:21:14 +01:00
Laurent Destailleur
c01e942a1c
Merge pull request #19960 from fappels/15_reception_missing_translation_key
Fix missing reception module description translation key.
2022-01-28 17:08:17 +01:00
Francis Appels
8d75f575e5 Fix missing reception module description translation key. 2022-01-28 16:35:14 +01:00
Laurent Destailleur
7c9b97d035 css 2022-01-28 16:29:27 +01:00
Laurent Destailleur
a631c94193 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-28 15:58:15 +01:00
Laurent Destailleur
ef70777cf1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/reception/card.php
2022-01-28 15:57:09 +01:00
Salvatore Chiariello
e70604c485 NEW|New #17123 added ExtraFields for Stock Mouvement 2022-01-28 14:57:36 +01:00
Laurent Destailleur
bd2d7792f4 css 2022-01-28 13:52:42 +01:00
Laurent Destailleur
da744f5cb9 Fix link 2022-01-28 13:44:15 +01:00
Sylvain Legrand
66b6b5e91a stickler-ci 2022-01-28 11:31:17 +01:00
Sylvain Legrand
b65f849c5d New - Improve the reading of profIDs 2022-01-28 11:22:12 +01:00
Laurent Destailleur
34f3ec8a39 Try a fix with php that return a fatal error on some mysql 2022-01-28 11:11:36 +01:00
Alexandre SPANGARO
2d0427a5b1
Update tax.lib.php 2022-01-27 06:21:07 +01:00
Alexandre SPANGARO
1ed096316a
Merge branch 'Dolibarr:develop' into fix_vat_report_by_month_and_rate_with_vat_src_code 2022-01-27 06:11:20 +01:00
Laurent Destailleur
32b2b6e788 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-26 19:57:00 +01:00
Laurent Destailleur
932096f332 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-26 19:56:50 +01:00
Laurent Destailleur
538c5f14d3 Fix phpcs 2022-01-26 19:56:02 +01:00
Laurent Destailleur
33d67e74c2
Merge pull request #19934 from bb2a/Add_param_color_button_action
NEW - ADD config text color of button action
2022-01-26 16:46:12 +01:00
Adrien Raze
e52fb89182 FIX : Fixing stickler returns 2022-01-26 16:36:58 +01:00
Adrien Raze
d38ff3ad9b FIX : Fixing stickler returns 2022-01-26 15:53:30 +01:00
Laurent Destailleur
512df3c580 Try to address a better solution for #19776 2022-01-26 15:12:42 +01:00
Anthony Berton
49efba7ded
Merge branch 'develop' into Add_param_color_button_action 2022-01-26 15:12:16 +01:00
BB2A Anthony Berton
28b9ead688 ADD config text color 2022-01-26 15:06:51 +01:00
Laurent Destailleur
0d66646052 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-26 14:08:20 +01:00
Laurent Destailleur
7ce6f13933 Fix php8 2022-01-26 14:07:13 +01:00
Laurent Destailleur
38408f916b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-01-26 13:51:25 +01:00
Laurent Destailleur
416543a5f5 Standardize code to allow deletion of an odt template 2022-01-26 13:49:46 +01:00
Laurent Destailleur
ae0f428acc
Merge pull request #19923 from bb2a/Add_param_color_button_action
NEW - Add param color button action
2022-01-26 13:48:23 +01:00
Laurent Destailleur
f94d84e395
Merge pull request #19655 from cfoellmann/wus/hotfix/fontawesome-PR
use any available fontawesome icon in picto
2022-01-26 13:44:38 +01:00
BB2A Anthony Berton
656dc02e7d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action 2022-01-26 13:03:01 +01:00
Laurent Destailleur
3b4c7ceb3b Code comment 2022-01-26 13:00:48 +01:00
Laurent Destailleur
60fff852ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-26 12:53:06 +01:00
Laurent Destailleur
30fba23326
Merge pull request #19931 from Easya-Solutions/new-stock-add-limit-stock-csv
NEW stock limit in stock export CSV
2022-01-26 11:36:53 +01:00