Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
107,259 Commits 36 Branches 189 Tags
a06b51e06c69f7c63e1a941ae68698cb997ae28d
Commit Graph

211 Commits

Author SHA1 Message Date
Laurent Destailleur
06804c3547 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
 2022-03-11 17:04:23 +01:00
Laurent Destailleur
6100bc86f8 FIX css not saved in modulebuilder 2022-03-11 10:32:06 +01:00
Laurent Destailleur
2142440b6c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/langs/en_US/errors.lang
 2022-03-07 13:23:47 +01:00
Laurent Destailleur
f4cb5810a7 FIX list of visible type of event was not correctly filtered 
FIX Error management on mass action "Approve holiday"
 2022-03-07 12:01:34 +01:00
Laurent Destailleur
dee5d8f9e8 Standardize name of button 2022-02-18 13:45:28 +01:00
Laurent Destailleur
bd3218b460 Fix remove dead code 2022-02-06 13:06:12 +01:00
Laurent Destailleur
e0956c1765 Fix missing token, missing reposition, missing modulepart 2022-01-22 15:33:47 +01:00
Laurent Destailleur
0037ee2254 Fix ckeditor plugins 2022-01-01 19:37:53 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2021-12-30 19:03:46 +01:00
Laurent Destailleur
62a74ed428 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/societe/list.php
 2021-12-30 17:57:45 +01:00
Laurent Destailleur
9f82aa1570 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/modulebuilder/template/admin/setup.php
 2021-12-30 17:51:25 +01:00
Maxime Kohlhaas
d82c1f34e0 Fix modulebuilder params for updatemask action 2021-12-25 11:33:26 +01:00
Laurent Destailleur
962ac263ba Fix look and feel v15 2021-11-27 15:29:48 +01:00
Laurent Destailleur
9a7c14199d Doc 2021-11-13 14:06:59 +01:00
Philippe GRAND
85a3bbba3d Translations 2021-11-08 13:51:03 +01:00
Laurent Destailleur
b4cfe35138 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 13:39:46 +02:00
Laurent Destailleur
b11dbf069e FIX Bad use of a forced contact of another company on PDF/ODT documents 2021-10-05 13:11:54 +02:00
Laurent Destailleur
fb8723d884 Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
1a8ad5abfa Propagate $outputlangs to getExtrafieldContent method. 2021-08-17 15:50:28 +02:00
Laurent Destailleur
7aeb652c66 Better sanitizing, fix phpcs 2021-06-29 18:22:36 +02:00
Laurent Destailleur
25c6b64b1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/delivery/doc/pdf_storm.modules.php
	htdocs/core/modules/reception/doc/pdf_squille.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
 2021-06-29 15:58:26 +02:00
Francis Appels
09382e0505 FIX #17919 pictures in docs. 
Supplier order and proposal worked for me.
Supplier invoice not implemented need new feature request.
 2021-06-24 10:12:34 +02:00
Philippe GRAND
5bde0dbc16 internationalization 2021-06-20 12:00:27 +02:00
Philippe GRAND
fa3e75c68a internationalization 2021-06-20 10:58:20 +02:00
Laurent Destailleur
e3e2dfd764 Fix generation of ODT (test if temporary directory is writable) 2021-06-20 05:11:46 +02:00
Laurent Destailleur
ce818d4f44 Debug doc templates of ODF 2021-06-20 03:41:45 +02:00
Laurent Destailleur
8b9af8f5ab Responsive 2021-06-13 01:27:04 +02:00
Laurent Destailleur
f3803bab91 Responsive 2021-05-18 16:28:30 +02:00
Laurent Destailleur
5eb9acf3e1 Update modMyModule.class.php 2021-04-09 11:50:34 +02:00
Florian HENRY
5555807104 fix: right definition id in modulebuilder 2021-04-09 08:51:09 +02:00
Laurent Destailleur
5b22eae3a3 Merge pull request #17071 from FHenry/fix_13_right_definition_ID_in_modulebuilder 
fix: Right ID defenition in module builder
 2021-04-02 01:34:16 +02:00
Laurent Destailleur
17b5228bd3 Update modMyModule.class.php 2021-04-02 01:34:04 +02:00
Laurent Destailleur
5fa6aa0ac1 Update modMyModule.class.php 2021-04-02 01:32:46 +02:00
Florian HENRY
b1562cffb1 better doc comment 2021-04-01 17:20:14 +02:00
Florian HENRY
03ee7ec433 fix: Right ID defenition in module builder 2021-04-01 17:08:26 +02:00
Laurent Destailleur
06078f231b NEW Can show the project ref or label into PDF documents 2021-04-01 13:02:44 +02:00
Laurent Destailleur
e3b019f923 Clean code 2021-03-23 01:32:17 +01:00
Frédéric FRANCE
f73c0abec1 code syntax m... directories 2021-02-26 18:26:44 +01:00
Laurent Destailleur
ec394a93f6 Merge pull request #16191 from grandoc/develop 
fix typo
 2021-02-07 19:59:54 +01:00
Frédéric FRANCE
eaaefe1382 5.5 to 5.6 2021-02-06 14:12:22 +01:00
Philippe GRAND
b77398b476 fix typo 2021-02-06 13:12:39 +01:00
Laurent Destailleur
aaddda9a6e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 14:13:08 +01:00
Laurent Destailleur
2ea5b331b4 README 2021-01-13 12:36:33 +01:00
Frédéric FRANCE
8117fb7cb2 Update modMyModule.class.php 2021-01-06 20:27:45 +01:00
Laurent Destailleur
5fc3a9ce7d Debug v13 2020-12-27 15:39:10 +01:00
Laurent Destailleur
832db82fce Fix warnings 2020-12-18 14:40:45 +01:00
Laurent Destailleur
46171a6ec8 Fix option MAIN_USE_COMPANY_NAME_OF_CONTACT 2020-12-02 21:27:15 +01:00
Laurent Destailleur
74605cec12 Fix warning 2020-11-25 18:07:52 +01:00