Commit Graph

106100 Commits

Author SHA1 Message Date
andreubisquerra
9d228b13de
FIX pay value 2022-01-28 17:22:41 +01:00
Laurent Destailleur
e507fa12fa
Merge pull request #19951 from FHenry/15.0_fix_warning
fix:silent warning php Select Lot
2022-01-28 17:08:54 +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
Laurent Destailleur
4b5792899e FIX Presentation of qty already order duplicated on reception card 2022-01-28 15:51:18 +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
Laurent Destailleur
34f3ec8a39 Try a fix with php that return a fatal error on some mysql 2022-01-28 11:11:36 +01:00
Laurent Destailleur
5ff37febe3 Trans 2022-01-28 09:58:58 +01:00
Laurent Destailleur
047c55bd02 Fix look and feel v15 2022-01-28 08:49:47 +01:00
Laurent Destailleur
3f9feef914 Comment 2022-01-27 20:38:38 +01:00
Laurent Destailleur
6bd2caee08 test 2022-01-27 16:35:26 +01:00
Florian HENRY
4f08409419 fix:waring php 2022-01-27 12:02:58 +01:00
Laurent Destailleur
2f1857a23a Log 2022-01-27 11:51:51 +01:00
Laurent Destailleur
b0e5d63ee2 Better log 2022-01-27 11:49:38 +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
2e525a719d Fix selection of migration script 2022-01-26 19:12: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
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
4bac7e012f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-26 14:43:16 +01:00
Laurent Destailleur
9180e9a5c6 Clean code 2022-01-26 14:42:26 +01:00
Laurent Destailleur
abc5a93d99
Merge pull request #19827 from defrance/patch-175
NEW : use addMoreActionsButtonsList hook in list
2022-01-26 14:19:14 +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
15d4d44cb5 css 2022-01-26 14:01:41 +01:00
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