Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

112767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
10225d2b1f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-12-09 17:59:08 +01:00
Laurent Destailleur
e3932377a6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2021-12-09 17:58:57 +01:00
Laurent Destailleur
37fd2e05b9
Merge pull request #19582 from atm-florianm/FIX_13.0_duplicate_hook_printFieldListWhere_in_replenish 
FIX 13.0: printFieldListWhere called twice on same query
 2021-12-09 17:40:50 +01:00
Laurent Destailleur
290ce46948
Merge pull request #19584 from javieralapps4up/develop 
FIX In the card of a direct debit, if you change the limit, it gets disordered and vice versa
 2021-12-09 17:36:21 +01:00
Laurent Destailleur
c4ef3ec116
Merge pull request #19578 from fr69400/patch4 
FIX - Missing one html conversion
 2021-12-09 17:31:03 +01:00
Laurent Destailleur
baabfd380f
Update pdf.lib.php 2021-12-09 17:25:06 +01:00
Laurent Destailleur
1fa8e1db98
Merge pull request #19579 from atm-maxime/fix_xml_trunc 
Fix #18586 : special char "…" not allowed in XML file and added by dol_trunc
 2021-12-09 17:21:56 +01:00
Laurent Destailleur
2fc51b9758 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-09 17:21:04 +01:00
Laurent Destailleur
98d534d7a4
Merge pull request #19581 from hregis/fix_wrong_sql_request 
FIX wrong syntax of sql request
 2021-12-09 17:20:17 +01:00
Laurent Destailleur
30107837a5
Merge pull request #19588 from Hystepik/develop#2 
Fix php 8.0 warnings of modulebuilder
 2021-12-09 17:19:42 +01:00
Laurent Destailleur
d80f83caf4 Clean code 2021-12-09 17:19:31 +01:00
lmarcouiller
8b2002fbfb Fix php 8.0 warnings of modulebuilder 2021-12-09 15:17:18 +01:00
Laurent Destailleur
9462481e83 Doc 2021-12-09 14:51:35 +01:00
Laurent Destailleur
6b9636c3b8 FIX deletion of direct debit or credit transfer 2021-12-09 12:54:18 +01:00
Laurent Destailleur
ecf98530bb Debug SEPA payment module 2021-12-09 12:42:04 +01:00
Laurent Destailleur
7ea8b7851a Code comment 2021-12-09 11:56:54 +01:00
stickler-ci
93356d9dc4 Fixing style errors. 2021-12-09 10:25:58 +00:00
javieralapps4up
0c2dce372f
FIX In the card of a direct debit 
FIX In the card of a direct debit, if you change the limit, it gets disordered and vice versa
 2021-12-09 11:24:03 +01:00
Laurent Destailleur
d6ab7ab953 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
	htdocs/install/repair.php
	htdocs/user/class/user.class.php
 2021-12-09 11:15:40 +01:00
Laurent Destailleur
a9bdefa358 FIX select too large into addrights (pb of missing parenthesis) 2021-12-09 11:12:40 +01:00
Laurent Destailleur
b5d1ea4629 FIX select too large into addrights (pb of missing parenthesis) 2021-12-09 11:07:38 +01:00
Regis Houssin
1098426005 FIX wrong syntax of sql request 2021-12-09 10:31:02 +01:00
Laurent Destailleur
76779aa9e1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-12-09 10:00:59 +01:00
Laurent Destailleur
92a0c9e4fb Fix sql error in repair.php 2021-12-09 10:00:42 +01:00
Laurent Destailleur
f4d7cbe045 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-09 09:54:09 +01:00
Laurent Destailleur
7ce6009958 Removed deprecated option 2021-12-09 09:53:32 +01:00
fr69400
abd984bc14
Update pdf.lib.php 2021-12-09 09:39:22 +01:00
stickler-ci
f74077a2e7 Fixing style errors. 2021-12-09 08:35:12 +00:00
Maxime Kohlhaas
1123bf3cde Fix #18586 : special char "…" not allowed in XML file and added by dol_trunc 2021-12-09 09:34:00 +01:00
fr69400
d0413f423f FIX - Missing one html conversion 2021-12-09 09:33:00 +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
1697cdf4b9
Merge pull request #19526 from hregis/fix_missing_default_value 
FIX missing default value for more comprehensive
 2021-12-08 21:26:56 +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
646ba34f89
Update functions.lib.php 2021-12-08 19:15:35 +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