Commit Graph

112767 Commits

Author SHA1 Message Date
Laurent Destailleur
6ad9eb8ef1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/class/api_products.class.php
	htdocs/recruitment/recruitmentcandidature_list.php
	htdocs/recruitment/recruitmentjobposition_list.php
2021-10-24 00:02:15 +02:00
Laurent Destailleur
4ab59eebf3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-23 23:58:27 +02:00
Laurent Destailleur
fc29aa7d3b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-23 23:58:00 +02:00
Laurent Destailleur
1750e385a9 Merge pull request #19164 from tiaris/14.0_bug18934
FIX #18934 on-registration in the extrafieldsline database for deliveries
2021-10-23 23:57:23 +02:00
Laurent Destailleur
86ff951254 Fix ?: 2021-10-23 23:43:43 +02:00
Maxime Kohlhaas
77c716565e Fix #18922 : multicurrency sync in http with good currencylayer url 2021-10-23 23:42:06 +02:00
Jesús Jerez
fc307fb685 Merge branch 'develop' into canceled_orders 2021-10-23 23:24:47 +02:00
Laurent Destailleur
dd0fe2ee06 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 23:13:19 +02:00
Lucas Marcouiller
051f6ca717 Fix: php 8.0 warning commercial part 2021-10-23 23:12:42 +02:00
Polkiko
a58f713f6d NEW Canceled purchase orders do not qualify for total in project overview (and are hidden)
If purchase order has been canceled then it does not qualify for total amount and is not shown in table. It can be seen by clicking on the "show/hide" button.
2021-10-23 23:12:23 +02:00
Laurent Destailleur
44b030e23e Merge branch 'develop' into NEW_stockstransfers 2021-10-23 22:57:35 +02:00
Laurent Destailleur
f1f00be99c Merge pull request #19160 from frederic34/comptacashcontrol
fix warnings
2021-10-23 22:45:55 +02:00
Laurent Destailleur
321cfb3811 Update cashcontrol_list.php 2021-10-23 22:44:37 +02:00
Laurent Destailleur
e12d9ee979 Merge pull request #19156 from frederic34/defaultvaluegetglobal
can specify default in getDolGlobalString and getDolGlobalInt
2021-10-23 22:42:40 +02:00
Laurent Destailleur
dc1e57e267 Merge pull request #19155 from frederic34/patch-1
fix warnings
2021-10-23 22:41:05 +02:00
Frédéric FRANCE
993226000a Update viewcat.php 2021-10-23 22:39:27 +02:00
Laurent Destailleur
5078e3d863 Merge pull request #19161 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
2021-10-23 22:38:15 +02:00
Laurent Destailleur
f5cea6d312 Merge pull request #19154 from Hystepik/develop#3
Fix :  fix php 8.0 warnings
2021-10-23 22:37:50 +02:00
stickler-ci
53e9da4748 Fixing style errors. 2021-10-23 20:37:07 +00:00
Laurent Destailleur
06c1d79c05 Update html.form.class.php 2021-10-23 22:36:55 +02:00
Lucas Marcouiller
58b28d3d7d Fix: fix php 8.0 warnings project 2021-10-23 22:32:03 +02:00
Maxime Kohlhaas
29950a6afa Replace != by <> in SQL requests 2021-10-23 22:27:29 +02:00
Maxime Kohlhaas
00b617d17f Fix #18961 : no_email field has been replaced by mailing_unsubscribe table 2021-10-23 22:22:45 +02:00
Scrutinizer Auto-Fixer
f7a41f1848 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-23 20:22:10 +00:00
Jean
b027db49b5 FIX #18934
Non-registration in the extrafieldsline database for deliveries
2021-10-23 22:21:50 +02:00
Frédéric FRANCE
b9075660af fix warnings 2021-10-23 22:15:23 +02:00
Laurent Destailleur
a503a4dcc6 Fix scrutinizer 2021-10-23 22:12:57 +02:00
Laurent Destailleur
695078c77e Merge pull request #19158 from frederic34/patch-5
fix warning remove unused
2021-10-23 22:05:53 +02:00
Laurent Destailleur
47441b40b2 Merge pull request #19159 from frederic34/patch-7
security page doesnt detect xdebug
2021-10-23 22:05:22 +02:00
Frédéric FRANCE
6d9ee78704 security page doesnt detect xdebug 2021-10-23 21:53:04 +02:00
Frédéric FRANCE
cb66b71017 Update journals_list.php 2021-10-23 21:39:07 +02:00
Frédéric FRANCE
1639eae92e fix warning remove unused 2021-10-23 21:37:17 +02:00
Frédéric FRANCE
3a7ae07896 replace deprecated 2021-10-23 21:21:16 +02:00
Frédéric FRANCE
29371487a0 fix warning 2021-10-23 21:14:32 +02:00
Frédéric FRANCE
635cb34606 fix warning 2021-10-23 21:10:43 +02:00
Frédéric FRANCE
08e5b55d16 can specify default in getDolGlobalString and getDolGlobalInt 2021-10-23 21:06:37 +02:00
Frédéric FRANCE
cdba9909be fix warnings 2021-10-23 20:53:46 +02:00
Laurent Destailleur
bc353c19a9 Update card.php 2021-10-23 19:22:41 +02:00
Lucas Marcouiller
aec5e41656 Fix : fix php 8.0 warnings 2021-10-23 19:09:23 +02:00
Laurent Destailleur
fc4c6d2b03 FIX #14249 FIX #19150 2021-10-23 19:08:00 +02:00
Laurent Destailleur
25a2f3f15f css 2021-10-23 18:55:07 +02:00
Laurent Destailleur
ce4fe3f400 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 18:33:47 +02:00
Laurent Destailleur
7f19682724 Merge pull request #18503 from atm-adrien/NEW_develop_sub_BOM
NEW : Sub bill of materials
2021-10-23 18:26:46 +02:00
Laurent Destailleur
02aae5144d Merge pull request #19151 from andreubisquerra/develop
BUG Supplements is not showed from TakePOS
2021-10-23 18:24:56 +02:00
Laurent Destailleur
27638e46f6 Merge pull request #19152 from andreubisquerra/develop
Close cash with some terminals in TakePOS
2021-10-23 18:24:39 +02:00
andreubisquerra
6b45d68f83 Close cash with some terminals in TakePOS 2021-10-23 17:51:07 +02:00
Laurent Destailleur
3d82b78c88 Merge pull request #19144 from atm-john/fix_dom
FIX :  dom declaration
2021-10-23 17:31:39 +02:00
Laurent Destailleur
6832893cb8 Merge pull request #19143 from andreubisquerra/develop
TakePOS Split Sale fixes and improvements
2021-10-23 17:25:53 +02:00
Laurent Destailleur
5caa9ad4c7 Merge pull request #19146 from Hystepik/develop#3
Fix : PHP 8.0 warnings
2021-10-23 17:24:58 +02:00
Laurent Destailleur
8d069cf657 Merge pull request #19148 from homer8173/patch-27
FIX #18893 : source was overwrited by mistake
2021-10-23 17:24:23 +02:00