Commit Graph

112767 Commits

Author SHA1 Message Date
Laurent Destailleur
cd1f5fead1 phpcs 2022-01-26 13:51:56 +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
6d04bac740 phpcs 2022-01-26 13:50:49 +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
cceb98a195 Correct VAR forget 2022-01-26 13:28:14 +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
1b50350600
Merge pull request #19910 from atm-adrien/NEW_Add_Hooks_salaries_sociales
NEW : Add hooks on salaries and sociales card
2022-01-26 12:58:48 +01:00
Laurent Destailleur
15bc641699
Merge pull request #19933 from Markusi13/develop
Github Issues: Removed the required Code of Conduct checkbox so it doesn't show "done 1 task" on issues.
2022-01-26 12:58:16 +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
1c45104f38 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-26 12:43:00 +01:00
Laurent Destailleur
b4961c598b
Merge pull request #19932 from ATM-Consulting/fix_14.0_export_html_tag_test
FIX : Replace restricthtml to nohtml in export .
2022-01-26 12:42:35 +01:00
Laurent Destailleur
42f252b636 Add one more test 2022-01-26 12:39:41 +01:00
Markusi13
a47145f962
Update feature_request.yml 2022-01-26 12:23:25 +01:00
Markusi13
b7d199657b
Update bug_report.yml 2022-01-26 12:23:12 +01:00
Laurent Destailleur
9b1b107ed0
Merge pull request #19772 from simnandez/develop_hotfix19760
FIX #19760 Uniformize labels
2022-01-26 12:14:57 +01:00
Laurent Destailleur
ab610a90ac
Merge pull request #19924 from atm-quentin/NEW_Multiple_batch_consume
NEW : split consumption line on MO
2022-01-26 12:07:41 +01:00
jpb
23e5ff08eb change to alphawithlgt 2022-01-26 12:07:06 +01:00
Laurent Destailleur
eb336c81a1
Merge pull request #19926 from aspangaro/16a9
NEW API Proposals - Add POST lines
2022-01-26 12:06:33 +01:00
Laurent Destailleur
e2734eca43
Merge pull request #19928 from thomas-Ngr/develop_new_add_header_before_public_ticket_list
NEW : add hook before the public ticket list
2022-01-26 12:01:37 +01:00
jpb
ec1f784247 replace restricthtml to nohtml. 2022-01-26 11:43:44 +01:00
Laurent Destailleur
2c26cc7d6b
Merge pull request #19925 from bb2a/patch-1
FIX - Trigger setPaymentMethods
2022-01-26 11:39:38 +01:00
Laurent Destailleur
ebdea44de9
Merge pull request #19927 from aspangaro/16a10
NEW Proposal - Add filter on proposal get lines
2022-01-26 11:38:25 +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
Laurent Destailleur
7b990a1a7f Fix phpcs 2022-01-26 11:30:19 +01:00
Laurent Destailleur
2dda4f5924 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-01-26 11:29:50 +01:00
Laurent Destailleur
3e1cfc2997 NEW Add status "Obsolete" to KM articles 2022-01-26 11:29:27 +01:00
pandreani
95df5bebe6 NEW stock limit in stock export CSV 2022-01-26 10:35:08 +01:00
Laurent Destailleur
7cb22e0cf9
Merge pull request #19921 from Markusi13/develop
Github Issues: Updated repo bug/feature request templates to the new yml version
2022-01-26 10:29:08 +01:00
Thomas Negre
ec723657c9 new : allow informations to be displayed before the public ticket list 2022-01-26 09:55:41 +01:00
Alexandre SPANGARO
31787a99f0 NEW Proposal - Add filter on proposal get lines 2022-01-26 08:50:57 +01:00
stickler-ci
71876755d2 Fixing style errors. 2022-01-26 06:35:26 +00:00
Alexandre SPANGARO
68ba60896f Copyright 2022-01-26 07:31:17 +01:00
Alexandre SPANGARO
30fd55addc NEW API Proposals - Add POST lines 2022-01-26 07:29:37 +01:00
Anthony Berton
4f54149555
Update commonobject.class.php 2022-01-25 22:28:47 +01:00
BB2A Anthony Berton
54b5fed67b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action 2022-01-25 16:45:30 +01:00
Adrien Raze
08d830f450 FIX : Fixing total_cost, qty_frozen and display problems 2022-01-25 16:40:28 +01:00
Quentin VIAL-GOUTEYRON
4de5ee97b3 NEW : split consumption line on MO 2022-01-25 16:37:33 +01:00
Juanjo Menent
56cb81287e Merge remote-tracking branch 'upstream/develop' into develop_hotfix19760
# Conflicts:
#	htdocs/install/mysql/migration/15.0.0-16.0.0.sql
2022-01-25 16:25:44 +01:00
Laurent Destailleur
a7d3facf88 Fix tooltip for payment 2022-01-25 16:10:46 +01:00
Thomas Negre
311d6d666d fix ticket : an external user should be able to access only its own company tickets. 2022-01-25 16:07:56 +01:00
Laurent Destailleur
58fcf88e24
Merge pull request #19922 from thomas-Ngr/develop_fix_restrict_external_user_ticket_list
fix :  restrict external user ticket list view
2022-01-25 16:07:18 +01:00
Laurent Destailleur
243999d223
Merge pull request #19746 from atm-quentin/NEW_contact_pj_filter_list
NEW : Contact filter project list
2022-01-25 16:06:31 +01:00
Laurent Destailleur
34e930d952
Merge pull request #19737 from aspangaro/16a6
NEW Add possibility with constant MAIN_LOGIN_BADCHARUNAUTHORIZED to define bad character unauthorized into login name
2022-01-25 16:04:11 +01:00
Laurent Destailleur
05ff99f2e6
Update user.class.php 2022-01-25 16:03:30 +01:00
Laurent Destailleur
6677eccf45
Update user.class.php 2022-01-25 16:01:50 +01:00
Laurent Destailleur
dc1b4d825b
Merge pull request #19733 from atm-quentin/NEW_contact_project_tab
NEW: Project contact tab
2022-01-25 15:59:18 +01:00
Laurent Destailleur
f773872dd1
Merge branch 'develop' into NEW_contact_project_tab 2022-01-25 15:58:54 +01:00