Commit Graph

105560 Commits

Author SHA1 Message Date
Laurent Destailleur
4af80507cb Fix #yogosha8282 2022-01-09 20:25:10 +01:00
Laurent Destailleur
423a4ea104 Debug v15 2022-01-09 19:48:38 +01:00
Laurent Destailleur
cc72418ab9 Fix example 2022-01-09 14:22:42 +01:00
Laurent Destailleur
4ce77e62c6 Debug v15 2022-01-09 14:19:55 +01:00
Laurent Destailleur
fcfb6a55f4 Fix error management 2022-01-09 13:50:10 +01:00
Laurent Destailleur
eddc2a1a26 FIX #yogosha8272 2022-01-08 19:50:55 +01:00
Laurent Destailleur
c3a42162d9 FIX The vat code was not correctly managed on PDF templates 2022-01-08 14:43:24 +01:00
Laurent Destailleur
3a6b5199ec Debug module intracomm 2022-01-08 01:19:04 +01:00
Laurent Destailleur
60b2479389 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/list.php
2022-01-07 16:00:19 +01:00
Laurent Destailleur
7618966f81 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/comm/action/list.php
	htdocs/core/class/utils.class.php
	htdocs/install/mysql/data/llx_20_c_departements.sql
2022-01-07 15:56:21 +01:00
Laurent Destailleur
ff31d660c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-07 15:50:40 +01:00
Laurent Destailleur
451fa396aa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
2022-01-07 15:50:30 +01:00
Laurent Destailleur
b23b82bd6f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-01-07 15:49:09 +01:00
Laurent Destailleur
7dfb369a98 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-01-07 15:48:23 +01:00
Laurent Destailleur
265aeb76e6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/utils.class.php
	htdocs/expensereport/class/expensereport.class.php
2022-01-07 15:48:13 +01:00
Laurent Destailleur
5ee74d7c07 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2022-01-07 15:45:51 +01:00
Laurent Destailleur
1541e20870 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/class/utils.class.php
2022-01-07 15:43:28 +01:00
Laurent Destailleur
53709cf509 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/class/utils.class.php
2022-01-07 15:40:05 +01:00
Laurent Destailleur
10e32c056e FIX avoid infinite loop on dump with popen 2022-01-07 15:35:33 +01:00
Laurent Destailleur
144a8af438 Debug v15 2022-01-07 14:28:58 +01:00
Laurent Destailleur
bdac615cba Fix empty column 2022-01-07 14:01:15 +01:00
Laurent Destailleur
51a36040f1 Fix special char in sepa file on address 2022-01-07 13:03:03 +01:00
Laurent Destailleur
0d6ef2e76b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-07 12:44:03 +01:00
Laurent Destailleur
500b0e0218 FIX Sepa payment with company name with accent 2022-01-07 12:43:41 +01:00
Laurent Destailleur
6aeae8fe7f Debug v15 2022-01-07 12:27:07 +01:00
Laurent Destailleur
aa64b9c524
Merge pull request #19756 from oscim/patch-44
Update paiementfourn.class.php
2022-01-07 10:46:19 +01:00
Laurent Destailleur
f2beaf5eae
Merge pull request #19729 from fmarcet/13.0
Fix: correctly display the products of a warehouse in the pdf
2022-01-07 10:45:10 +01:00
Laurent Destailleur
6cecc3c2aa Fix clean data after update 2022-01-07 10:25:58 +01:00
Laurent Destailleur
1a61da209c Fix responsive 2022-01-06 18:16:02 +01:00
Laurent Destailleur
144a56d073 Clean code 2022-01-06 18:12:02 +01:00
Laurent Destailleur
c6b404ad7f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-06 18:03:01 +01:00
Laurent Destailleur
6cb0374784 Fix responsive 2022-01-06 18:02:44 +01:00
oscim
f157a22cd0
Update paiementfourn.class.php
For stock in fetch object payment id type
2022-01-06 16:55:24 +01:00
Laurent Destailleur
13a3d0057b
Merge pull request #19644 from FHenry/dev_public_page_multientity_ticket
FIX: manage multientity in ticket public page by querystring (#Evarisk)
2022-01-06 16:53:35 +01:00
Laurent Destailleur
26e8496c46 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/card.php
2022-01-06 16:15:58 +01:00
Laurent Destailleur
2d0f4cab51
Merge pull request #19705 from atm-maxime/fix_supplier_credit_transfer
Fix supplier credit transfer
2022-01-06 16:10:53 +01:00
Laurent Destailleur
18978ac84e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-01-06 16:08:49 +01:00
Laurent Destailleur
b4ff7826db Trans 2022-01-06 16:08:21 +01:00
Laurent Destailleur
132d393d23 Code comment 2022-01-06 16:06:17 +01:00
Laurent Destailleur
79fbe7488e
Merge pull request #19721 from grandoc/new_branch_01_01_2022
Fix : Fatal error: Uncaught Error: Call to a member function deleteFr…
2022-01-06 16:04:18 +01:00
Laurent Destailleur
aba6aed7d7
Merge pull request #19726 from vdegrandpre/FIX-19725-LDAP-AUTH-500
FIX - 19725 - Authentification LDAP échoue avec erreur 500
2022-01-06 16:03:35 +01:00
Laurent Destailleur
aee61cb470
Update ldap.class.php 2022-01-06 16:02:47 +01:00
Laurent Destailleur
f848953238
Merge pull request #19732 from defrance/patch-173
FIX : allow create supplier order from other external modules
2022-01-06 15:58:31 +01:00
Laurent Destailleur
37daf7764d
Merge pull request #19753 from atm-lena/13.0_FIX_ActionCommList_LateWarning
FIX : late warning calculation on action comm list
2022-01-06 12:55:37 +01:00
stickler-ci
ec11be2480 Fixing style errors. 2022-01-06 10:31:50 +00:00
atm-lena
97d9b4571a FIX : late warning calculation on action comm list 2022-01-06 11:21:46 +01:00
Laurent Destailleur
6708d4a4d4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-06 11:15:40 +01:00
Laurent Destailleur
1e467c60f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/compta/facture/list.php
	htdocs/product/stock/movement_list.php
2022-01-06 11:15:28 +01:00
Laurent Destailleur
623133dd84 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-06 11:07:27 +01:00
Laurent Destailleur
b381f24897 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/mrp/mo_movements.php
2022-01-06 11:07:05 +01:00