Commit Graph

105097 Commits

Author SHA1 Message Date
lmarcouiller
8b2002fbfb Fix php 8.0 warnings of modulebuilder 2021-12-09 15:17:18 +01:00
Laurent Destailleur
160c8402ea
Merge pull request #19524 from 1ocate/typoReceive
Fix typo 'usercanreceived' -> 'usercanreceive' in '/htdocs/fourn/commande/card.php'
2021-12-08 21:39:55 +01:00
Laurent Destailleur
de3ac77d56
Merge pull request #19533 from lainwir3d/fr19531_product_restapi_allow_stock_loading_index
CLOSE #19531 Product REST API: allow list / search method to retrieve stock data.
2021-12-08 21:23:53 +01:00
Laurent Destailleur
f0cac384c5
Merge pull request #19553 from habot-it/patch-1
Add hookmanager in function pdf_pagefoot of pdf.lib.php
2021-12-08 19:18:09 +01:00
Laurent Destailleur
4e744dec65
Merge pull request #19542 from andreubisquerra/develop
FIX Avoid move line to the same place in TakePOS
2021-12-08 19:16:40 +01:00
Laurent Destailleur
22c271966d Fix the existing method dolEscapeXML should be enough. 2021-12-08 19:14:02 +01:00
Laurent Destailleur
7c2fbe4923
Merge pull request #19558 from yaslama/sepa_illegal_chars
Remove illegal characters in SEPA XML
2021-12-08 18:57:06 +01:00
Laurent Destailleur
e983ba58f9
Merge pull request #19534 from Hystepik/develop#3
Fix : php8.0  warning
2021-12-08 18:51:51 +01:00
Laurent Destailleur
90cff6aed9
Update list.php 2021-12-08 18:50:42 +01:00
Laurent Destailleur
51e7484d55 Fix var not defined 2021-12-08 18:49:57 +01:00
Laurent Destailleur
ea45fdce5c
Merge pull request #19535 from Hystepik/develop#4
Fix : php 8.0 warnings
2021-12-08 18:44:16 +01:00
Laurent Destailleur
919f80ee86 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-08 18:39:29 +01:00
Laurent Destailleur
9d11d265ec Fix phpcs 2021-12-08 18:37:52 +01:00
Laurent Destailleur
8f7b222764 Fix phpcs 2021-12-08 18:37:07 +01:00
Laurent Destailleur
72dc560ce8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-08 18:27:28 +01:00
Laurent Destailleur
69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php
2021-12-08 18:27:03 +01:00
Laurent Destailleur
d4501a6f67 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-12-08 18:21:56 +01:00
Laurent Destailleur
c3bfd5caa4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/adherents/type.php
	htdocs/asset/type.php
	htdocs/categories/edit.php
	htdocs/comm/action/card.php
	htdocs/compta/bank/card.php
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/class/extrafields.class.php
	htdocs/don/card.php
	htdocs/product/stock/card.php
	htdocs/projet/card.php
	htdocs/projet/tasks/task.php
	htdocs/user/group/card.php
2021-12-08 18:21:20 +01:00
Laurent Destailleur
e47e3b9797 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-12-08 18:09:55 +01:00
Laurent Destailleur
f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/adherents/card.php
	htdocs/categories/edit.php
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/product/stock/card.php
2021-12-08 17:56:05 +01:00
Laurent Destailleur
af6e21910d FIX #19536 2021-12-08 16:47:46 +01:00
habot-it
6501bb7cbf
Update pdf.lib.php 2021-12-08 16:43:11 +01:00
Laurent Destailleur
449cbcdf46
Merge pull request #19546 from javieralapps4up/develop
FIX When you pay an invoice, you can send the payment multiple times.
2021-12-08 16:31:40 +01:00
Laurent Destailleur
e6a82ed9a5
Merge pull request #19539 from hregis/fix_compatibility_with_multicompany
FIX compatibility with multicompany
2021-12-08 16:28:33 +01:00
Laurent Destailleur
57ebcf94c0
Merge pull request #19554 from atm-quentin/FIX_setoptionalfrompost
FIX set optional from post, we cant untick boolean field on product card
2021-12-08 16:27:41 +01:00
Laurent Destailleur
3baa9688b9
Merge pull request #19544 from FHenry/dev_error_return_hrm
fix: HRM new module skills
2021-12-08 16:17:45 +01:00
Laurent Destailleur
ea03019b54
Merge pull request #19549 from grandoc/new_branch_04_12_2021
update code : use loadlangs function
2021-12-08 16:16:32 +01:00
Laurent Destailleur
e887e44c25
Merge pull request #19528 from atm-greg/FIX_Uniformize_printFieldListHaving_hook
add printFieldListHaving hook
2021-12-08 16:10:36 +01:00
Laurent Destailleur
042bb9f5cc
Merge pull request #19556 from fappels/Debug_15
Fix shipment delete
2021-12-08 15:53:40 +01:00
Laurent Destailleur
990882e264
Merge branch 'develop' into Debug_15 2021-12-08 15:53:33 +01:00
Laurent Destailleur
0fa82fbb4e
Merge pull request #19559 from fappels/debug_15_part2
Extrafield showOutputField parameter 4 'extrafieldsobjectkey' is now required
2021-12-08 15:43:01 +01:00
Laurent Destailleur
deb0a468da
Merge pull request #19561 from marc-dll/14.0_FIX_contact_extrafields_separator
FIX: contact card: bad colspan value for separator extrafield in creation/modification form
2021-12-08 15:36:39 +01:00
Laurent Destailleur
460627e777
Merge pull request #19563 from marc-dll/develop_FIX_thirdparty_ajax
FIX: thirparty ajax selector: no name or highlighting if at least ref and/or address displayed
2021-12-08 15:35:50 +01:00
Laurent Destailleur
bfc4eb059f
Merge pull request #19567 from vincentjdc/expense-report-line-file-multi-company-fix
Fixes https://github.com/Dolibarr/dolibarr/issues/19541
2021-12-08 15:34:31 +01:00
Laurent Destailleur
597ab407f8
Merge pull request #19568 from Hystepik/develop#2
Fix inventory scanning function
2021-12-08 15:30:55 +01:00
Laurent Destailleur
df11210243
Merge pull request #19575 from atm-gregr/FIX_V13_No_Display_Contact_On_List_If_No_Mail_Adress
Fix v13 no display contact on list if no mail adress
2021-12-08 15:29:29 +01:00
Laurent Destailleur
9b65bb2085
Update list.php 2021-12-08 15:29:16 +01:00
Laurent Destailleur
5007282d7a Fix missing info popup on product 2021-12-08 15:16:06 +01:00
Laurent Destailleur
6b3cd703c6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-08 15:08:18 +01:00
Laurent Destailleur
8de8dacaa3 Fix php warning 2021-12-08 15:07:55 +01:00
atm-gregr
01893caa61 bad default value 2021-12-08 14:40:46 +01:00
Laurent Destailleur
106b8ceec5
Merge pull request #19574 from Hystepik/develop#5
Fix php8.0 warnings
2021-12-08 14:36:42 +01:00
Laurent Destailleur
b4de28f1db
Update index.php 2021-12-08 14:36:34 +01:00
atm-gregr
386771cffc fix display contat line on list 2021-12-08 14:21:42 +01:00
Florian HENRY
6f22827ff2 fix stuff 2021-12-08 09:33:42 +01:00
Laurent Destailleur
20f4b5389b Fix the experimental feature to manage session in database 2021-12-07 17:39:46 +01:00
Laurent Destailleur
0e7d23e169 Fix constraint and loading on module activation. 2021-12-07 14:14:13 +01:00
Laurent Destailleur
b238419020 Clean code 2021-12-07 13:39:06 +01:00
lmarcouiller
c6c7abbf1d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-12-07 10:48:17 +01:00
Vincent Dieltiens
5f5c284af7 Fixes https://github.com/Dolibarr/dolibarr/issues/19541 2021-12-07 09:37:47 +01:00