Commit Graph

106276 Commits

Author SHA1 Message Date
Laurent Destailleur
c057d6eafe Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-01 17:34:30 +01:00
Laurent Destailleur
bacf569e0b Fix phpcs 2021-12-01 17:33:26 +01:00
John BOTELLA
c0d00a859f use dol_escape_htmltag 2021-12-01 16:59:30 +01:00
lmarcouiller
ed7bfb333b fix php8.0 errors 2021-12-01 16:24:57 +01:00
lmarcouiller
171ecaa81d fix php8.0 warnings 2021-12-01 15:40:53 +01:00
Laurent Destailleur
3cb07fd1ec Doc 2021-12-01 15:37:31 +01:00
Laurent Destailleur
c6a071622a Avoid a useless select 2021-12-01 15:26:53 +01:00
lmarcouiller
4c92af9aca fix php8.0 warnings 2021-12-01 15:24:25 +01:00
Laurent Destailleur
f8a55362f6 Typo 2021-12-01 14:46:48 +01:00
50d422cdf6 CLOSE #19531 Product REST API: allow list / search method to retrieve stock data.
See feature request #19531
2021-12-01 16:33:47 +04:00
lmarcouiller
7512305b44 add porduct inventory but qty_view bug 2021-12-01 12:10:57 +01:00
Laurent Destailleur
259418d1dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-12-01 12:10:14 +01:00
Laurent Destailleur
4575bbae82 Clean code for browser notifications 2021-12-01 12:00:19 +01:00
stickler-ci
cc3ef5a3fb Fixing style errors. 2021-12-01 09:53:28 +00:00
Mélina
9190581d0a No category 2021-12-01 10:45:56 +01:00
Regis Houssin
efda10333c FIX missing default value for more comprehensive 2021-12-01 10:40:10 +01:00
Mélina
16ab6ce800 No Category 2021-12-01 10:26:24 +01:00
Jay Yeo
63c7ab0302 Fix typo 'usercanreceived' -> 'usercanreceive' in 'card.php' 2021-12-01 14:29:24 +07:00
Lucas Marcouiller
1c4a7a00cb fix php8.0 warning 2021-11-30 16:35:46 +01:00
atm-greg
db06de0ac2 add printFieldListHaving hook 2021-11-30 16:28:21 +01:00
Laurent Destailleur
8bace4c64e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
2021-11-30 16:24:18 +01:00
Laurent Destailleur
3de3adad74 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/ajax/objectonoff.php
2021-11-30 16:11:12 +01:00
stickler-ci
7c3b2f1e9b Fixing style errors. 2021-11-30 15:07:59 +00:00
Laurent Destailleur
87a66c7bf0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-11-30 15:57:14 +01:00
Laurent Destailleur
d84d09556c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-11-30 15:55:57 +01:00
Laurent Destailleur
feabb34a42 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-11-30 15:54:46 +01:00
Laurent Destailleur
5d7f8d3831 Fix fatal error 2021-11-30 15:54:28 +01:00
Mélina
e43b95f05a Show reference product 2021-11-30 15:41:46 +01:00
Lucas Marcouiller
f39dd30a7f fix precommit 2021-11-30 15:38:48 +01:00
Lucas Marcouiller
ae56619253 add productadd function but error on tabproduct 2021-11-30 15:38:27 +01:00
Laurent Destailleur
4189229b84
Merge pull request #19165 from Hystepik/develop#5
Fix: php 8.0 warning commercial part
2021-11-30 15:31:51 +01:00
Laurent Destailleur
31393802ff
Update card.php 2021-11-30 15:29:19 +01:00
Laurent Destailleur
055cb5c0c9
Merge pull request #18526 from cfoellmann/PR/deprecated-html
deprecated html attributes
2021-11-30 14:27:12 +01:00
Laurent Destailleur
7937a798b7
Merge pull request #18331 from marc-dll/12.0_FIX_invoice_multicurrency_discount
FIX: multicurrency: fields in discount unitialized when creating deposit
2021-11-30 14:23:37 +01:00
Laurent Destailleur
1122cd1e5e
Merge pull request #19163 from Hystepik/develop#4
Fix: php 8.0 warnings project
2021-11-30 14:18:23 +01:00
Laurent Destailleur
07506b523f Clean code 2021-11-30 14:09:46 +01:00
Laurent Destailleur
f66f9082e7
Merge pull request #19509 from fr69400/patch3
FIX Html conversion check with PDF_BOLD_PRODUCT_LABEL
2021-11-30 14:04:10 +01:00
Ferran Marcet
ac975ecc61 Undo changes 2021-11-30 13:30:17 +01:00
Laurent Destailleur
40491ca04e
Merge pull request #19419 from FHenry/dev_new_enhance_trad_select_dictionnary
NEW : for developpers allow translation label in select_dictionnary
2021-11-30 12:38:18 +01:00
Laurent Destailleur
31842ddb1e
Merge pull request #19427 from mrtnnbr/develop
Fix check for non-custom modules
2021-11-30 12:28:23 +01:00
Laurent Destailleur
0b4409a087
Merge pull request #19442 from andreubisquerra/14.0
TakePOS Direct Payment (Cash) Button doesn't work
2021-11-30 12:25:21 +01:00
Laurent Destailleur
429c4406c4
Merge pull request #19441 from andreubisquerra/develop
TakePOS Direct Payment (Cash) Button doesn't work
2021-11-30 12:24:58 +01:00
Laurent Destailleur
f43fb18287
Merge pull request #19452 from bomuux/patch-3
FIX contact/note.php always restricted for external users
2021-11-30 12:21:34 +01:00
Laurent Destailleur
5e55bb20e3
Update note.php 2021-11-30 12:21:21 +01:00
stickler-ci
c807286f0b Fixing style errors. 2021-11-30 11:17:48 +00:00
fr69400
19fc862a7e Merge branch 'patch3' of https://github.com/fr69400/dolibarr into patch3 2021-11-30 12:17:21 +01:00
Laurent Destailleur
a7f9ffd5d0
Merge pull request #19461 from frederic34/lastactivationversion
keep info on latest activation version of module
2021-11-30 12:16:39 +01:00
fr69400
078a040078 Update pdf.lib.php 2021-11-30 12:13:21 +01:00
Laurent Destailleur
dffc3eaefb
Merge pull request #19447 from inovea-conseil/NEW_return_url_sendpassword
New return url sendpassword
2021-11-30 12:07:17 +01:00