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
89,109 Commits 35 Branches 179 Tags 1.7 GiB
9165ea9e67
Commit Graph

1009 Commits

Author SHA1 Message Date
Laurent Destailleur
6f12488e30 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2020-06-07 19:55:48 +02:00
Laurent Destailleur
9f8a3916c2 FIX #14051 #14052 2020-06-07 19:37:42 +02:00
Laurent Destailleur
b221c65165 Merge 2020-06-06 21:56:23 +02:00
Laurent Destailleur
88aaec63f7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 18:57:41 +02:00
Laurent Destailleur
7061e9b4cb Fix deletion of website page 2020-06-06 18:57:24 +02:00
Laurent Destailleur
f92426034f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/index.php
 2020-06-03 01:06:27 +02:00
Laurent Destailleur
3b4fe0d582 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/product/class/html.formproduct.class.php
 2020-06-02 13:31:22 +02:00
Laurent Destailleur
cd4c161ca7
Merge pull request #14005 from bafbes/abb110214 
Fix:To get translated, the key need to be one single word
 2020-06-01 21:09:53 +02:00
Laurent Destailleur
bdeee9ea99
Merge pull request #14007 from bafbes/abb110216 
fix:replace some bd field types by their correspondant field type
 2020-06-01 20:55:06 +02:00
Laurent Destailleur
52d0c1a9ae
Update index.php 2020-06-01 20:54:24 +02:00
Laurent Destailleur
2324834b73 Debug modulebuilder for doc generation 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/modulebuilder/template/admin/setup.php
 2020-06-01 16:47:50 +02:00
Laurent Destailleur
38001a4e89 Fix perms 2020-06-01 16:46:11 +02:00
Laurent Destailleur
58e76947ac Debug modulebuilder for doc generation 2020-06-01 16:44:22 +02:00
Laurent Destailleur
b648f30482 Fix perms 2020-06-01 14:52:26 +02:00
Laurent Destailleur
adb20c6a90 checkstyle 2020-06-01 12:36:09 +02:00
Laurent Destailleur
c8d0476728 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
 2020-06-01 04:09:52 +02:00
Laurent Destailleur
dbac97a908 Fix several troubles into numbering modules. 
Prefix for takepos moved from TK to TC (TK was already used for tasks)
 2020-06-01 04:02:47 +02:00
Laurent Destailleur
838a13cec1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-01 02:41:11 +02:00
Laurent Destailleur
5a8c4ad3f5 Debug modulebuilder 2020-06-01 00:01:23 +02:00
Laurent Destailleur
28df07225d Debug modulebuilder 2020-05-31 23:23:56 +02:00
Laurent Destailleur
62dacfa713 Debug modulebuilder 2020-05-31 23:11:49 +02:00
Laurent Destailleur
c04903d15c Fix debug modulebuilder for doc and ref generation 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2020-05-31 23:01:13 +02:00
Laurent Destailleur
e2bb04dcae Fix debug modulebuilder for doc and ref generation 2020-05-31 22:59:33 +02:00
Laurent Destailleur
b24c0e57a6 Fix transifex 2020-05-31 10:29:38 +02:00
stickler-ci
a5ed630a57 Fixing style errors. 2020-05-31 00:19:21 +00:00
bahfir abbes
fe52539787 fix:rempalcement de qqes valeurs de champs de BDDs par les valeurs adéquates 2020-05-31 01:14:44 +01:00
bahfir abbes
ef890a29eb fix:Le label doit être une clé de dictionnaire 2020-05-31 01:10:27 +01:00
bahfir abbes
cf68317ae7 fix:Clé de langue dans les titres de menus 2020-05-31 00:56:51 +01:00
Laurent Destailleur
8dbc0ff040 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/prelevement.php
	htdocs/admin/system/phpinfo.php
	htdocs/modulebuilder/index.php
 2020-05-31 00:31:14 +02:00
Laurent Destailleur
f9ac4c2ada Fix template 2020-05-30 01:25:51 +02:00
Laurent Destailleur
a69be00d37 Fix template 2020-05-30 01:23:47 +02:00
Laurent Destailleur
48596122e4 Fix template 2020-05-30 01:17:23 +02:00
Laurent Destailleur
e2656ff2f8 Update template 2020-05-30 00:49:11 +02:00
Laurent Destailleur
0fd3292715 Fix show error message 2020-05-30 00:35:11 +02:00
Laurent Destailleur
926a9f68c4 Trans 2020-05-30 00:23:14 +02:00
Laurent Destailleur
455ba002b4 css 2020-05-29 22:13:10 +02:00
Laurent Destailleur
540a64bbba Fix templates 2020-05-29 21:48:33 +02:00
Laurent Destailleur
264fd709e4 Fix template 2020-05-29 21:48:27 +02:00
Laurent Destailleur
21c58e9fab Error management 2020-05-29 15:29:47 +02:00
Laurent Destailleur
7f8c0d0e7a Fix templates 2020-05-29 15:29:33 +02:00
Laurent Destailleur
972430d50c Fix template 2020-05-29 15:13:16 +02:00
Laurent Destailleur
ab82797dfc var not defined 2020-05-29 13:20:33 +02:00
Laurent Destailleur
b11ef125c3 FIX Force of HTML content only for ckeditor 
Conflicts:
	htdocs/modulebuilder/index.php
 2020-05-29 03:27:30 +02:00
Laurent Destailleur
a0a440cf5f FIX Force of HTML content only for ckeditor 2020-05-29 03:26:05 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-25 22:40:59 +02:00
Laurent Destailleur
17382051c2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 22:19:50 +02:00
Laurent Destailleur
e4ef6334aa Look and feel v12 2020-05-25 14:08:36 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:54:33 +02:00
Philippe GRAND
23282acfbc update 2020-05-21 11:20:01 +02:00
Frédéric FRANCE
85625a46bb
add new rule 2020-05-21 09:35:30 +02:00
Frédéric FRANCE
43dcd9beb5
add new rule 2020-05-21 00:02:33 +02:00
Laurent Destailleur
672ea60ffd FIX #13896 2020-05-15 13:58:34 +02:00
Frédéric FRANCE
91dcf10375
session_cache_limiter before starting session 2020-05-06 23:56:02 +02:00
Laurent Destailleur
eacb1b3b2e Debug modulebuilder 2020-05-05 21:45:10 +02:00
Laurent Destailleur
650096ea0f Fix look and feel v12 2020-05-05 21:27:40 +02:00
Laurent Destailleur
41aaf5363d Fix templates 2020-05-05 18:53:41 +02:00
Laurent Destailleur
e871e736eb Fix for #5824 2020-05-05 17:55:03 +02:00
Laurent Destailleur
3857c08277 Fix quick search on MO 2020-05-04 13:24:09 +02:00
Laurent Destailleur
4d6a45d491 Major doxygen fix 2020-05-03 22:48:35 +02:00
Laurent Destailleur
14a81eea5f
Merge pull request #13781 from nervo/reindent-module-template 
Reindent module template
 2020-05-01 20:45:47 +02:00
nervo
ba0ca3f7f7 Reindent module template 2020-05-01 08:40:55 +02:00
nervo
bc32b75fd2 PSR-2 Noncompliance 2020-05-01 08:13:03 +02:00
Laurent Destailleur
3c1d989c30 FIX #13751 2020-04-27 11:41:35 +02:00
Laurent Destailleur
068a890c36 Enable more PHPCS rules 2020-04-25 19:13:20 +02:00
Laurent Destailleur
38f2aad0c6 Debug asset module 2020-04-25 03:19:30 +02:00
Frédéric FRANCE
50ea0ee92a
Update modMyModule.class.php 2020-04-21 22:40:24 +02:00
Laurent Destailleur
16e46c672c Clean code 2020-04-20 15:06:27 +02:00
Frédéric FRANCE
f546103c01 make dolistore happy again 2020-04-20 14:37:52 +02:00
Frédéric FRANCE
350e75f283
make dolistore happy again 2020-04-19 22:05:47 +02:00
Laurent Destailleur
4bbe307b41 Look and feel v12 2020-04-19 15:34:53 +02:00
Maxime Kohlhaas
7fea2bc557 Update changelog + trigger name change for class UserGroup 2020-04-15 08:44:29 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
4ff503d20a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/list.php
	htdocs/supplier_proposal/list.php
 2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3 FIX #11855 2020-04-10 01:37:04 +02:00
Laurent Destailleur
83af4ebea4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/product/stock/class/entrepot.class.php
	htdocs/product/stock/list.php
 2020-04-10 01:22:22 +02:00
Frédéric FRANCE
fc34b5a4cb
compress png with zopflipng 2020-04-06 19:03:48 +02:00
Laurent Destailleur
b1c5490a74 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/extrafields_add.tpl.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2020-04-05 04:03:53 +02:00
Laurent Destailleur
5516d747af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-05 04:01:38 +02:00
Laurent Destailleur
87ff94fc64 Add generic fields 2020-04-05 03:59:23 +02:00
Scrutinizer Auto-Fixer
612bac6598 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-05 00:44:59 +00:00
Laurent Destailleur
2f1b25c67a Fix property not defined 2020-04-05 02:43:30 +02:00
Laurent Destailleur
221f20e13f Fix merge 2020-04-03 19:24:16 +02:00
Laurent Destailleur
28a1b7af35 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-04-03 18:07:24 +02:00
Laurent Destailleur
e6641b5369 Fix doc 2020-04-03 18:01:54 +02:00
Laurent Destailleur
d46417c8bd FIX #13482 2020-04-03 17:53:17 +02:00
Laurent Destailleur
372d719693 #13482 2020-04-03 15:48:54 +02:00
Laurent Destailleur
e9bddf5c26 Fix enable/disable of module 2020-04-03 15:36:41 +02:00
Laurent Destailleur
d7e4e5f18c Fix modulebuilder clone message 2020-04-03 15:14:59 +02:00
Laurent Destailleur
a13287e285 Fix: validate of object is ok even if some fields are missing 2020-04-03 14:56:15 +02:00
Laurent Destailleur
f7b6895dc6 Fix option to not generate doc in modulebuilder. 2020-04-03 14:02:37 +02:00
Laurent Destailleur
71910b2181 Fix warning 2020-04-03 13:01:17 +02:00
Laurent Destailleur
259f23e96b Look and feel v11 2020-03-27 11:56:45 +01:00
Laurent Destailleur
fd3d13cfcf Look and feel v11 2020-03-27 11:15:38 +01:00
Laurent Destailleur
a5379c7144 FIX All forms must use newToken() 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/cashcontrol/cashcontrol_card.php
	htdocs/supplier_proposal/card.php
 2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9 FIX All forms must use newToken() 2020-03-24 13:10:35 +01:00
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-23 14:54:02 +00:00
Laurent Destailleur
4f442905b2 A new way to navigate between pages in list is available 2020-03-17 03:31:58 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
52290b002a NEW Another way to navigate between pages for some lists 2020-03-13 12:53:22 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00