Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-30 13:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
This commit is contained in:
Laurent Destailleur
2022-05-09 16:53:53 +02:00
parent 0cac14c82f b3bfe22f58
commit 779b75bf65
5 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
View File

@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
/**