Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 18:48:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,938 Commits 36 Branches 190 Tags
47ea0c274b51e6022a511bf9d582657c63d0a38f
Commit Graph

322 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
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
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
58e76947ac Debug modulebuilder for doc generation 2020-06-01 16:44:22 +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
bahfir abbes
cf68317ae7 fix:Clé de langue dans les titres de menus 2020-05-31 00:56:51 +01:00
Laurent Destailleur
264fd709e4 Fix template 2020-05-29 21:48:27 +02:00
Laurent Destailleur
972430d50c Fix template 2020-05-29 15:13:16 +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
nervo
ba0ca3f7f7 Reindent module template 2020-05-01 08:40:55 +02:00
Frédéric FRANCE
50ea0ee92a Update modMyModule.class.php 2020-04-21 22:40:24 +02:00
Frédéric FRANCE
350e75f283 make dolistore happy again 2020-04-19 22:05:47 +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
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
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
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
Tobias Sekan
94a4779429 fix indent 2020-02-24 15:10:36 +01:00
Tobias Sekan
899ae0f52d Add position to modulebuilder template 2020-02-24 15:07:13 +01:00
Philippe GRAND
7cc9639417 comment translation 2020-02-22 12:28:15 +01:00
Laurent Destailleur
52c7f908a0 Doxygen 2020-02-20 14:02:27 +01:00
Scrutinizer Auto-Fixer
fd48877dc6 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-18 22:47:25 +00:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
40b6886e2a Fix params 2020-02-06 10:09:27 +01:00
Scrutinizer Auto-Fixer
52dbd95223 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-09 23:02:05 +00:00
Laurent Destailleur
9729b3a1c7 Fix modulebuilder template 2020-01-07 12:39:47 +01:00
Laurent Destailleur
6602a7046e Doc 2020-01-07 11:21:17 +01:00
Laurent Destailleur
6cd6de092d Fix modulebuilder 2020-01-07 11:04:13 +01:00
Laurent Destailleur
804f7f3e1e Fix modulebuilder templates 2020-01-06 14:03:24 +01:00
Laurent Destailleur
2df9df2db0 Debug v11 2019-12-23 12:24:27 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
835d22f556 Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Laurent Destailleur
a612aefab7 Fix HTML5 2019-12-12 11:11:08 +01:00
Frédéric FRANCE
b59d93c8d7 doxygen 2019-12-11 20:11:53 +01:00
Scrutinizer Auto-Fixer
1eab97080c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-22 14:13:30 +00:00
Laurent Destailleur
fb70893229 Fix missing class reposition 2019-11-19 21:29:49 +01:00