Commit Graph

1571 Commits

Author SHA1 Message Date
Laurent Destailleur
d5324ff3db Fix template 2020-06-27 14:41:11 +02:00
Laurent Destailleur
781f571a15 Fix template 2020-06-27 14:38:40 +02:00
Laurent Destailleur
10a4188eff Clean template 2020-06-26 01:14:24 +02:00
Laurent Destailleur
b6c1cdad7c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/projet/element.php
2020-06-24 09:59:08 +02:00
Laurent Destailleur
1762e10e69 Fix return code not returned 2020-06-24 09:55:10 +02:00
Laurent Destailleur
a607ff4c1a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/langs/fr_FR/ticket.lang
	htdocs/mrp/mo_card.php
2020-06-18 15:50:31 +02:00
Laurent Destailleur
c0b269b9ee Fix Permissions on MO and API for MO 2020-06-18 01:09:30 +02:00
Laurent Destailleur
42860d752c Fix templates 2020-06-17 22:11:22 +02:00
Laurent Destailleur
3527d011f5
Merge pull request #14006 from bafbes/abb110215
fix:The label must be a dictionary key
2020-06-11 23:15:52 +02:00
Laurent Destailleur
4b47a270af
Update index.php 2020-06-11 23:15:00 +02:00
Laurent Destailleur
5794b1abea Fix for use with text browser
Conflicts:
	htdocs/main.inc.php
2020-06-10 12:46:55 +02:00
Laurent Destailleur
bd22ad4174 Fix for use with text browser 2020-06-10 12:35:39 +02:00
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
Laurent Destailleur
d9b0083923 Enhance modulebuilder 2020-03-08 18:28:31 +01:00
Laurent Destailleur
f357661745 Fix PHPCS 2020-03-04 02:14:40 +01:00
Laurent Destailleur
e9d0831cf8
Merge branch 'develop' into abb90064 2020-03-02 21:15:46 +01:00
Laurent Destailleur
7e2c2913bc
Update myobject.class.php 2020-03-02 21:13:02 +01:00
Laurent Destailleur
86f0d6db41
Update myobject.class.php 2020-03-02 21:06:57 +01:00
Laurent Destailleur
2ca5532a21
Update myobject.class.php 2020-03-02 21:03:59 +01:00
Laurent Destailleur
75cddcd2de
Merge pull request #13193 from TobiasSekan/NewLinePosOdtTemplate
NEW Support of tag {line_pos} for line numbers for tables in ODT templates
2020-02-25 00:05:01 +01:00
Laurent Destailleur
9d9429f66b New: Can limit number of tabs by page. 2020-02-24 20:41:29 +01:00
Laurent Destailleur
4fc3158962 Clean code 2020-02-24 20:20:09 +01: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
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
Laurent Destailleur
52c7f908a0 Doxygen 2020-02-20 14:02:27 +01:00
Laurent Destailleur
2c477c7169 Fix doxygen 2020-02-20 13:54:41 +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
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modUser.class.php
2020-02-12 20:30:20 +01:00
Laurent Destailleur
d419315e98 FIX #13048 2020-02-12 19:36:29 +01:00
Laurent Destailleur
3a74c3d7e9 Enhance property ->ismulticompanymanaged to define an object with entity
on its parent.
2020-02-08 14:40:30 +01:00
Laurent Destailleur
c3beb854a2 Definition of $fields for member and subscriptions 2020-02-08 13:44:31 +01:00
Laurent Destailleur
11c6447096 Generic report 2020-02-07 12:13:55 +01:00
Laurent Destailleur
40b6886e2a Fix params 2020-02-06 10:09:27 +01:00
Laurent Destailleur
ffa847bc8e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-02 19:32:37 +01:00
Laurent Destailleur
0db77c1de6 CSS 2020-01-31 14:52:43 +01:00
Laurent Destailleur
1c24bcc724 FIX CVE Need permission to be able to develop modules 2020-01-31 10:29:41 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
7b10c2440b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:42 +01:00
Florian Mortgat
1e77ddbf11 FIX: '0' is a valid search value in object list filters 2020-01-29 17:52:22 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6 FIX Missing value of $formconfirm as parameters of hook 2020-01-28 12:00:27 +01:00
Laurent Destailleur
df478dc170 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-27 01:53:49 +01:00
Laurent Destailleur
4510ef488e doc modulebuilder 2020-01-25 22:43:56 +01:00
Laurent Destailleur
ee6952e66f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-25 19:22:42 +01:00
Laurent Destailleur
12556aa835 Fix modulebuilder 2020-01-25 19:21:37 +01:00
Laurent Destailleur
92856788a3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-20 18:39:46 +01:00
Laurent Destailleur
cfc74db5bc FIX field 'private' on email templates was not managed. 2020-01-20 18:38:53 +01:00
Laurent Destailleur
18f2b09fb1 Debug v11 2020-01-20 12:25:25 +01:00
dvdwalker
8ba234c928
Update actions_mymodule.class.php 2020-01-17 07:40:28 -03:00
Laurent Destailleur
5772dce460 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
2020-01-15 12:09:21 +01:00
Laurent Destailleur
c8ff847480 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/modulebuilder/index.php
2020-01-15 11:56:46 +01:00
Laurent Destailleur
0442105bd4 Fix Generation of zip of module 2020-01-15 11:55:27 +01:00
Laurent Destailleur
03a1897089 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/stocks.lang
2020-01-13 13:44:32 +01:00
Laurent Destailleur
ccdee44ed1 Look and feel v11 2020-01-13 13:35:29 +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
f48c7d2ecf Fix modulebuilder 2020-01-09 22:31:23 +01:00
Laurent Destailleur
0e58edd896 Fix modulebuilder 2020-01-09 22:27:24 +01:00
Laurent Destailleur
255c280170 Fix visibility 2020-01-09 11:44:15 +01:00
Laurent Destailleur
20b63b702e Fix visibility 2020-01-09 11:42:57 +01:00
Laurent Destailleur
b3d8a1e76a Fix template 2020-01-08 19:46:43 +01:00
Laurent Destailleur
4fb88f45d4 Fix template 2020-01-08 19:46:13 +01:00
Laurent Destailleur
f5c98290e1 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-07 14:02:27 +01:00
Laurent Destailleur
192de503bb Modulebuilder template 2020-01-07 14:01:56 +01:00
Laurent Destailleur
8e3eaed280 Modulebuilder template 2020-01-07 13:54:13 +01:00
Laurent Destailleur
750fa83e96 FIX Bad management of elementtype not llx_actioncomm 2020-01-07 13:49:52 +01:00
Laurent Destailleur
6029e82e90 FIX Bad management of elementtype not llx_actioncomm 2020-01-07 13:48:44 +01:00
Laurent Destailleur
d80764a179 Fix column not visible after switching column when visibility=3 2020-01-07 12:43:05 +01:00
Laurent Destailleur
9729b3a1c7 Fix modulebuilder template 2020-01-07 12:39:47 +01:00
Laurent Destailleur
a1803f5d62 Fix column not visible after switching column when visibility=3 2020-01-07 12:39:05 +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
73806d6a3a Justificativedoc validation 2020-01-06 14:35:11 +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
8059463941 Debug v11 2019-12-20 17:54:54 +01:00
Laurent Destailleur
58771c7d8a Debug MRP v11 2019-12-20 17:39:42 +01:00
Laurent Destailleur
c0ef3b46ad Work on MRP module 2019-12-20 15:31:05 +01:00
Laurent Destailleur
ca6277379a Fix regression 2019-12-20 11:17:03 +01:00
Laurent Destailleur
9f86cd8824 Debug v11 2019-12-20 11:14:16 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
af9d34efca CSS v11 2019-12-18 21:49:28 +01:00
Laurent Destailleur
4a734e53a6 Fix column too low.
Fix automatic event not found if from a module with several objects
2019-12-17 14:47:58 +01:00
Laurent Destailleur
5aeb667e94 Debug modulebuilder 2019-12-17 12:06:09 +01:00
Laurent Destailleur
211c135c2c css 2019-12-17 03:09:50 +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
Frédéric FRANCE
255b9f82a8
clean markdown 2019-12-05 20:57:43 +01:00
Frédéric FRANCE
23a4eaf689
clean markdown 2019-12-04 08:26:40 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Laurent Destailleur
1636d341c7 Debug module BOM
Enhance demo data for TakePOS
2019-11-28 15:18:14 +01:00
Laurent Destailleur
24bb345ee1 Fix bad name of function 2019-11-22 15:35:19 +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
Laurent Destailleur
16d67a1a8e Fix several trouble with some types in modulebuilder
Fix difference between null and 0
2019-11-17 17:36:36 +01:00
Laurent Destailleur
52787b56b2 Fix when limit = 0
Look and feel v11
2019-11-14 11:00:49 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
2019-11-14 08:50:06 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer
87585c0f2a Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 17:32:11 +00:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-12 08:46:08 +00:00
Laurent Destailleur
8c1bba5a60 Fix cancel link 2019-11-11 21:11:12 +01:00
Laurent Destailleur
19213b0d3d Fix modulebuilder 2019-11-11 21:02:32 +01:00
Laurent Destailleur
96314c9c26 Debug BOM 2019-11-09 20:12:27 +01:00
Laurent Destailleur
b1394463db Debug mrp 2019-11-09 20:02:46 +01:00
Laurent Destailleur
5b6ace387e Debug BOM and MO module 2019-11-09 19:47:49 +01:00
Laurent Destailleur
917c8df225 Add type of db driver in stats 2019-11-09 12:24:18 +01:00
Scrutinizer Auto-Fixer
812d0af1d9 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 14:51:54 +00:00
Laurent Destailleur
89105fdd36 Fix code according to modulebuilder 2019-11-07 11:40:35 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
d972fa8bcb Fix pb with model_pdf 2019-11-05 20:20:57 +01:00
Laurent Destailleur
7c4942b7be Fix debug BOM/MO 2019-11-05 20:14:33 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
ec8bd6327d Fix css 2019-11-04 18:53:46 +01:00
Laurent Destailleur
4ca85eacc1 Debug module BOM 2019-11-04 15:45:50 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Laurent Destailleur
e67a1a8118 Debug 2019-11-04 14:20:42 +01:00
Laurent Destailleur
b0ea276233 Debug MO module 2019-11-04 14:13:36 +01:00
Laurent Destailleur
f242cf4cc1 Debug modulebuilder 2019-11-03 19:15:32 +01:00
Laurent Destailleur
b958997268 Clean code of APIs 2019-11-02 14:49:26 +01:00
Laurent Destailleur
1b5ca2418b Fix delete of object 2019-11-02 14:08:39 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019
add comment
2019-11-02 11:49:28 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
a14aab5eb1 Fix template 2019-11-02 00:18:50 +01:00
Laurent Destailleur
941043dd67 Fix navigation on resources 2019-11-02 00:17:08 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
f74833cfe1 Make modulebuilder more compatible with multicompany 2019-11-01 18:44:32 +01:00
Laurent Destailleur
012c5ef0c4 Can use substitution variables into filter of fields link 2019-11-01 18:35:48 +01:00
Laurent Destailleur
2af23aa658 Enhance modulebuilder 2019-11-01 17:54:17 +01:00
Laurent Destailleur
135e65c4aa Look and feel v11
Enhance the progress bar of tasks
2019-11-01 15:53:57 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
2019-11-01 12:52:03 +01:00
Laurent Destailleur
5b5a2e9804 Clean code 2019-11-01 03:25:09 +01:00
Laurent Destailleur
3e513c73e2 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-11-01 03:11:05 +01:00
Laurent Destailleur
70530b558d Enable / Disable js css in modulebuilder 2019-11-01 03:10:48 +01:00
Laurent Destailleur
af09c77a0c Fix phpcs 2019-10-31 22:15:18 +01:00
Laurent Destailleur
a1700e71be Fix phpcs 2019-10-31 21:18:38 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
645390c990 Work on BOM templates 2019-10-31 02:36:16 +01:00
stickler-ci
ae2dc713c4 Fixing style errors. 2019-10-30 09:03:43 +00:00
Philippe GRAND
a1bd895e41 add some comment 2019-10-30 10:04:03 +01:00
Laurent Destailleur
bc3f088f50 Enhance modulebuilder
Work on MO
2019-10-30 01:35:41 +01:00
Laurent Destailleur
7f1b67f0e4 Add warehouse for production on MO 2019-10-27 16:28:03 +01:00
Laurent Destailleur
afa3ed499f Can export BOMs 2019-10-27 15:56:20 +01:00
Laurent Destailleur
e17cc5b2e5 Debug cloning of BOMs 2019-10-27 00:26:11 +02:00
Laurent Destailleur
b4eb14ee44 Use dolGetStatus 2019-10-24 16:43:23 +02:00
Laurent Destailleur
6855f588b5 Use dolGetStatus 2019-10-24 16:38:06 +02:00
Laurent Destailleur
64ac113761 Show dictionaries of a module in module builder 2019-10-24 14:56:43 +02:00
Laurent Destailleur
30263bee03 Look and feel v11 2019-10-24 14:19:49 +02:00
Laurent Destailleur
2fc46a4922 Error management 2019-10-24 14:08:26 +02:00
Laurent Destailleur
7d6306dfa8 Look and feel v11 2019-10-24 13:09:50 +02:00
Laurent Destailleur
1ea3865f0d Look and feel v11 2019-10-24 13:01:03 +02:00
Laurent Destailleur
4ff53539a8 Exclude *.back 2019-10-24 11:51:24 +02:00
Laurent Destailleur
2e476c20af Fix remove bad file 2019-10-24 11:43:59 +02:00
Laurent Destailleur
6fa3b53cf7 NEW Module builder can generate CSS of JS file. 2019-10-24 11:41:36 +02:00
Laurent Destailleur
f22d390cba Debug modulebuilder 2019-10-24 11:21:05 +02:00
Laurent Destailleur
8768c553b1 Debug modulebuilder 2019-10-24 11:16:06 +02:00
Laurent Destailleur
3d99ee92af Debug modulebuilder 2019-10-24 11:01:34 +02:00
Laurent Destailleur
0f87a7ebb3 Debug modulebuilder 2019-10-24 10:54:25 +02:00
Laurent Destailleur
d35c29a0fa Fix template 2019-10-23 22:30:06 +02:00
Laurent Destailleur
ce20cc39d1 Enhance template 2019-10-23 22:28:46 +02:00
Laurent Destailleur
9a386da7f5 NEW Can crop/resize image attached on a bank record 2019-10-23 16:07:09 +02:00
Laurent Destailleur
5ad7ca5620 Code more generic around setting projet on a card 2019-10-22 13:43:24 +02:00
Laurent Destailleur
aa4afcfe8a NEW Can set a filter on object linked in modulebuilder. 2019-10-22 03:49:09 +02:00
Laurent Destailleur
8e474701c1 Fix missing token 2019-10-21 15:49:08 +02:00
Laurent Destailleur
e261d63295 NEW Can add a button "Create" after combo of object with modulebuilder. 2019-10-21 14:44:39 +02:00
Frédéric FRANCE
360bf55f5b
clean indent 2019-10-20 01:09:11 +02:00
Laurent Destailleur
eb525769be Fix link to user 2019-10-17 20:32:11 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
205967976c Can set a BOM to draft 2019-10-16 18:35:15 +02:00
Laurent Destailleur
a9e57fa2b2 Clean page 2019-10-16 12:32:26 +02:00
Laurent Destailleur
517fcf45d1 Look and feel v11 2019-10-16 11:23:06 +02:00
Laurent Destailleur
ffc4820970 Fix counter of BOM 2019-10-16 02:05:23 +02:00
Laurent Destailleur
d3df04c5aa Mutualize code 2019-10-16 01:36:07 +02:00
Laurent Destailleur
fb3d20107c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/exports/export.php
	htdocs/filefunc.inc.php
2019-10-15 03:51:57 +02:00
Laurent Destailleur
056f7f826b Clean code 2019-10-14 20:41:28 +02:00
Laurent Destailleur
9ba992b8b6 Work on inventory module 2019-10-12 12:31:35 +02:00
Laurent Destailleur
dccfdad9dd Work on inventory feature 2019-10-12 11:32:47 +02:00
Laurent Destailleur
d9dde34ba6 Fix phpcs 2019-10-11 17:24:02 +02:00
Laurent Destailleur
16f44b0963 Responsive 2019-10-09 15:07:12 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Laurent Destailleur
f89701b4d4 Fix technical id align on left 2019-10-02 18:55:18 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
0f2b36bb82 Work on MRP module 2019-09-29 18:39:52 +02:00
Laurent Destailleur
2b57d486dc NEW Upgrade ACE editor to v1.4.6 2019-09-28 13:50:32 +02:00
Laurent Destailleur
db32ca99c6 Fix translation and sql request 2019-09-28 12:36:09 +02:00
Laurent Destailleur
86e5465197 Standardize extrafields code 2019-09-28 10:55:09 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
2286cc2a5f Fix autojump when 1 record found 2019-09-18 20:16:39 +02:00
Laurent Destailleur
9f6fe0bf5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/orders.lang
2019-09-14 18:27:58 +02:00
Laurent Destailleur
844f0903da Fix missing fields 2019-09-14 17:34:57 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
66a9fabd06 If you develop your own emailing target selector and used
parent::add_to_target(...), you must now use parent::addToTargets(...)
2019-09-09 14:18:25 +02:00
Laurent Destailleur
d061e61d25 Fix add_to_target has only 1 param. 2019-09-09 13:45:25 +02:00
Laurent Destailleur
f6e04ba314 Fix sql error 2019-09-09 13:05:41 +02:00
Laurent Destailleur
c7bab8681a Fix sql error #11845 2019-09-09 13:05:08 +02:00
Laurent Destailleur
ed02cdfddb Fix phpcs 2019-09-09 11:23:53 +02:00
Laurent Destailleur
feca9a7ee3 Fix phpcs 2019-09-08 21:28:17 +02:00
Laurent Destailleur
452c248a0d Show list of menus and permission on the modulebuilder. 2019-09-07 14:49:48 +02:00
Laurent Destailleur
09d6826e62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/supplier_order.php
	htdocs/langs/en_US/admin.lang
2019-09-06 14:27:01 +02:00
Laurent Destailleur
bc0b8dfad0 FIX Consistency in direct debit order lists.
FIX Confirmation of deletion
2019-09-06 14:24:33 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
f893854986 Fix remove warnings 2019-09-05 14:24:13 +02:00
Laurent Destailleur
5f3c7cb8dc Fix compatibility with hooks tha add , at begin of sql string 2019-09-01 21:46:46 +02:00
Laurent Destailleur
5e00ca6066 Fix compatibility with hooks tha add , at begin of sql string 2019-09-01 21:45:09 +02:00
Laurent Destailleur
c81c8543da Fix bad param 2019-08-31 13:26:55 +02:00
Laurent Destailleur
a0a33dbe3e Fix bad param 2019-08-31 13:26:22 +02:00
Laurent Destailleur
3b96271bd7 Add a warning to avoid headache 2019-08-30 02:21:34 +02:00
Laurent Destailleur
f445410415 Look and feel 2019-08-29 02:16:05 +02:00
Laurent Destailleur
85016a7a45 Fix bad error when module not enabled 2019-08-28 13:12:43 +02:00
Laurent Destailleur
f21cb54ae6 FIX management of extrafields in modulebuilder 2019-08-28 13:12:38 +02:00
Laurent Destailleur
b05b3e897f Fix bad error when module not enabled 2019-08-28 13:11:51 +02:00
Laurent Destailleur
55334dff3b FIX management of extrafields in modulebuilder 2019-08-28 13:04:22 +02:00
Laurent Destailleur
7236df37d4 FIX error management when adding a property with type real 2019-08-28 12:16:59 +02:00
Laurent Destailleur
ed42f59201 FIX error management when adding a property with type real 2019-08-28 12:10:28 +02:00
Laurent Destailleur
54203dda1f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/modules.php
2019-08-21 16:25:48 +02:00
Laurent Destailleur
f98d3c5c48 FIX Do not show tooltip if tooltip is empty 2019-08-20 14:08:30 +02:00
Laurent Destailleur
b294f22285 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-04 13:07:09 +02:00
Laurent Destailleur
83412e3c90 Fix warning 2019-08-03 16:38:57 +02:00
Laurent Destailleur
5b2ca3b631 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commonobject.class.php
2019-08-03 16:37:25 +02:00
Laurent Destailleur
76b7aa2e0f Fix fields with visible = 3 must not be visible into list 2019-08-02 19:20:19 +02:00
Laurent Destailleur
55e8aca47e Fix skeleton of module 2019-08-02 19:06:40 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
e5d34de877 FIX compatibility mysql 8. rank is reserved
FIX Permission for BOM menu
2019-07-09 00:14:01 +02:00
Laurent Destailleur
9405ce335e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 15:43:43 +02:00
Laurent Destailleur
657a3ae4c5 FIX permission to delete a draft purchase order 2019-07-04 12:43:32 +02:00
Laurent Destailleur
b177787f0a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
	htdocs/product/class/product.class.php
2019-06-29 18:28:51 +02:00
Laurent Destailleur
a33071d779 FIX #11421 2019-06-28 12:52:35 +02:00
Laurent Destailleur
d048c0f125 Removed dead code 2019-06-24 23:00:04 +02:00
Laurent Destailleur
60596d4237
Merge pull request #11376 from bafbes/abb90061
Fix:modulebuilder output folder
2019-06-24 15:29:13 +02:00
Laurent Destailleur
a340bb616d
Update myobject_document.php 2019-06-24 15:28:13 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Bahfir Abbes
d949447670
Update myobject.class.php 2019-06-21 17:18:51 +01:00
Bahfir Abbes
79f6ec6fac
extend constant to objects into modules 2019-06-21 17:12:58 +01:00
Bahfir Abbes
78e44ef077
Update myobject.class.php 2019-06-20 23:35:35 +01:00
Abbes Bahfir
ce92036434 new:Show object photos in modulebuilder lists with a constant to format output as user list photos 2019-06-20 23:16:26 +01:00
Laurent Destailleur
6d38f5ec9c FIX #11369 2019-06-20 02:56:44 +02:00
Abbes Bahfir
1079535894 Fix:modulebuilder output folder 2019-06-19 17:57:17 +01:00
Laurent Destailleur
08d5ca4ddb Debug page to export accounting documents 2019-06-17 17:53:43 +02:00
Laurent Destailleur
900e860f6d Fix list of events for BOM module 2019-06-12 19:32:29 +02:00
Laurent Destailleur
e5754519cb Fix doxygen 2019-06-06 18:57:57 +02:00
Laurent Destailleur
20a388e8d7 Fix init of module 2019-06-06 18:55:24 +02:00
Laurent Destailleur
06e0ec5e0c Fix link 2019-06-05 08:26:08 +02:00
Laurent Destailleur
969e139d5c Fix parameters of accessforbidden 2019-06-04 12:21:27 +02:00
Laurent Destailleur
664e0b81d8 Debug module BOM 2019-06-03 22:07:34 +02:00
Laurent Destailleur
a143dba9f8 Work on incomplete code on BOM module 2019-06-03 20:46:11 +02:00
Laurent Destailleur
72f55e1d81 Debug modulebuilder 2019-06-03 18:11:53 +02:00
Laurent Destailleur
cafb3840b7 Fix look and feel v10 2019-05-29 12:56:11 +02:00
Laurent Destailleur
42306835d2 Fix CSS 2019-05-29 09:38:19 +02:00
Laurent Destailleur
c131363dd1 Debug modulebuilder 2019-05-22 19:40:48 +02:00
Laurent Destailleur
7eeb028375 Debug modulebuilder 2019-05-22 19:34:08 +02:00
Laurent Destailleur
1e90a06ecb Fix module builder 2019-05-22 19:21:55 +02:00
Laurent Destailleur
18f1952e2d Fix set of properties 2019-05-22 14:49:18 +02:00
Laurent Destailleur
983ac4e758
Merge pull request #11220 from frederic34/patch-5
printObjectLines return void
2019-05-21 22:39:58 +02:00
Laurent Destailleur
c1a0e9385f
Merge pull request #11219 from frederic34/patch-2
dol_print_object_info return void
2019-05-21 22:38:39 +02:00
Laurent Destailleur
2c0c1dbef3 Debug modulebuilder 2019-05-21 16:16:19 +02:00
Laurent Destailleur
e463b17c15 Fix look and feel v10 2019-05-21 15:31:56 +02:00
Laurent Destailleur
3c1b860da4 Fix css 2019-05-20 12:16:39 +02:00
Laurent Destailleur
2debffe170 Debug modulebuilder for lines 2019-05-19 16:21:11 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Frédéric FRANCE
7b317c4cbf
printObjectLines return void 2019-05-19 09:28:34 +02:00
Frédéric FRANCE
ff37fddcf1
Update myobject_agenda.php 2019-05-19 09:16:45 +02:00
Laurent Destailleur
2bbb04085e Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/modulebuilder/template/class/myobject.class.php
2019-05-19 02:15:01 +02:00
Laurent Destailleur
71ef8c881b Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
2019-05-19 02:06:20 +02:00
Laurent Destailleur
c6ccb92a51 Fix table shown when there is no perm
Fix edit admin status of another admin
2019-05-19 01:41:42 +02:00
ATM-Marc
9b805f742b FIX: modulebuilder: hardcoded llx_ 2019-05-18 20:09:00 +02:00
Laurent Destailleur
30d91994b8
Merge pull request #11197 from homer8173/develop
fix modulebuilder & takepos
2019-05-18 00:56:49 +02:00
Laurent Destailleur
950b963762
Merge pull request #11196 from inoveaconseil/FIX#11045
FIX #11045
2019-05-18 00:55:38 +02:00
Laurent Destailleur
8fc5fdd1c7
Update myobject_card.php 2019-05-18 00:54:41 +02:00
Norbert Penel / OSCSS
f569785e85 fix modulebuilder
tms mustn't have a not null
2019-05-18 00:39:31 +02:00
Nicolas ZABOURI
9ab718ec5e FIX #11045 2019-05-18 00:19:06 +02:00
Nicolas ZABOURI
cf45bbb698 FIX #11160 2019-05-17 23:50:57 +02:00
Laurent Destailleur
bdb467b17a fix typo 2019-05-16 09:32:06 +02:00
Laurent Destailleur
f0cdaff936 Fix status of crons 2019-05-13 10:26:30 +02:00
Laurent Destailleur
3def11d5c9 Standardize translation 2019-05-10 19:32:46 +02:00
Laurent Destailleur
0bd4c61009 Fix default setup of module workflow was not set 2019-05-10 18:15:09 +02:00
Laurent Destailleur
3bf162dcd6 Clean code for v10 2019-05-09 14:36:48 +02:00
Laurent Destailleur
1e036f3513 Correct support for type price on module builder
Fix link of ref in cash fence list
2019-05-08 01:09:38 +02:00
Laurent Destailleur
dc1ee29fef Fix default permission of new users 2019-05-07 23:03:45 +02:00
Laurent Destailleur
0f8c7df6fe Debug api of module BOM 2019-05-02 12:19:43 +02:00
Laurent Destailleur
4756499a81 Debug module builder for generation of APIs 2019-05-02 12:03:14 +02:00
Laurent Destailleur
a77b46f072 Removed warnings 2019-04-23 12:52:48 +02:00
Frédéric FRANCE
5dbf31d975
Update myobject_list.php 2019-04-18 10:19:14 +02:00
Frédéric FRANCE
32b703e6c5
Update myobject_list.php 2019-04-18 09:33:47 +02:00
Laurent Destailleur
cf058e7d3b NEW Ask date of invoice when using the Clone feature. 2019-04-12 12:12:08 +02:00
Laurent Destailleur
26594fab98 Debug module ticket 2019-04-10 15:11:38 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
0091b65a83 Fix phpcs 2019-04-01 18:10:14 +02:00
Nicolas ZABOURI
1e9287c9d8 0.1 2019-03-28 23:57:17 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Frédéric FRANCE
03785aa53f
Update index.php 2019-03-18 11:45:54 +01:00
Laurent Destailleur
e3dd62ed72 Fix type 2019-03-18 10:26:36 +01:00
Laurent Destailleur
b3dc6d7d1d NEW Generation of doc by modulebuilder can include README and CHANGELOG 2019-03-17 19:33:25 +01:00
Laurent Destailleur
39b9ca2397 Work on documentation generation by modulebuilder 2019-03-17 15:45:50 +01:00
Laurent Destailleur
7f007f4182 Prepare modulebuilder to work on core modules 2019-03-17 02:46:28 +01:00
Laurent Destailleur
d44be341a5 NEW Add property 'noteditable' in modulebuilder 2019-03-17 01:45:46 +01:00
Laurent Destailleur
c2badb57d7 NEW: Add module debugbar 2019-03-16 16:27:14 +01:00
Laurent Destailleur
e7cd8d690c Remove warnings 2019-03-13 19:06:45 +01:00
Laurent Destailleur
e0208cb3d6 Generation of PDF doc 2019-03-13 18:11:15 +01:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Laurent Destailleur
d33fb9eff0 Work on BOM module 2019-03-12 19:30:32 +01:00
Laurent Destailleur
6ae36ce6a7 Work on BOM 2019-03-12 19:20:01 +01:00
Laurent Destailleur
fe6b682ec0 NEW Add visibility with value 4 in framework to define fields to show on
forms and list but not on creation forms.
2019-03-12 17:45:19 +01:00
Laurent Destailleur
da2aba96eb Can setup tool to build html or pdf for module builder documentation 2019-03-12 11:51:20 +01:00
Laurent Destailleur
281bde5461 Debug modulebuilder 2019-03-12 11:03:11 +01:00
Laurent Destailleur
384c732685 FIX Missing token in POST of form 2019-03-11 15:58:37 +01:00
Laurent Destailleur
935fe7c22a Debug and enhance modulebuilder. 2019-03-10 19:33:28 +01:00
Laurent Destailleur
1bd422b8b9 CSS 2019-03-10 14:45:16 +01:00
Laurent Destailleur
40afeebe2d
Merge pull request #10748 from frederic34/patch-2
Update mailinglist_mymodule_myobject.modules.php
2019-03-07 12:31:09 +01:00
Laurent Destailleur
401ad65975 Fix API explorer was broken due to corrupted API 2019-03-06 18:04:36 +01:00
Laurent Destailleur
0c2a0c643b NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__ 2019-03-06 14:33:05 +01:00
Frédéric FRANCE
b4851e3d40
Update mailinglist_mymodule_myobject.modules.php
Warning: Declaration of mailing_***********::add_to_target($mailing_id) should be compatible with MailingTargets::add_to_target($mailing_id, $cibles)
2019-03-05 21:54:51 +01:00
Laurent Destailleur
0d6a2f446c
Merge pull request #10740 from frederic34/patch-4
Update mymodulewidget1.php
2019-03-05 18:43:02 +01:00
Frédéric FRANCE
162f2614e5
Update mymodulewidget1.php 2019-03-04 23:25:23 +01:00
Frédéric FRANCE
f283782445
change visibility 2019-03-04 19:57:46 +01:00
Frédéric FRANCE
ee9d0e2208
replace html by html5 in margin and modulebuilder 2019-03-03 09:08:29 +01:00
Laurent Destailleur
a5711a51ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/lib/json.lib.php
	test/phpunit/JsonLibTest.php
2019-03-02 18:30:17 +01:00
Frédéric FRANCE
40d34940f1
fix exclude from phpcs 2019-03-02 10:00:51 +01:00
Frédéric FRANCE
014f69850e
add visibility 2019-03-01 23:08:57 +01:00
Frédéric FRANCE
92c5c15033
add visibility 2019-02-28 20:48:07 +01:00
Frédéric FRANCE
675a17a74c
wip 2019-02-26 00:34:43 +01:00
Frédéric FRANCE
06db81f3c3
wip 2019-02-26 00:02:39 +01:00
Laurent Destailleur
e4698fb6a5 Merge 2019-02-18 19:14:25 +01:00
Laurent Destailleur
b1d19fe79a Removed not used file 2019-02-15 12:21:14 +01:00
Laurent Destailleur
205152501e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
	htdocs/public/payment/newpayment.php
2019-02-12 13:39:39 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
Laurent Destailleur
e8fc72ecf4
Merge pull request #10538 from frederic34/html5boxes
replace html align by class in boxes
2019-02-12 13:32:42 +01:00
Laurent Destailleur
9b8a13cfe6 Dolibarrize module ticket 2019-02-11 15:41:07 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
529354718b
replace html align by class in boxes 2019-02-09 15:24:21 +01:00
Laurent Destailleur
2d4ccec309 Fix document generation of modulebuilder 2019-02-09 14:12:36 +01:00
Laurent Destailleur
7f4bbcf9a5 Some minor fix in default values and modulebuilder 2019-02-09 13:40:22 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
2019-01-30 16:17:09 +01:00
Frédéric FRANCE
77747ac2a3
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-28 16:35:12 +01:00
Laurent Destailleur
4398649af6 Add hooks to add column in list of payment modes 2019-01-28 01:46:59 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
844643c37d
Merge pull request #10375 from grandoc/new_branch_19_01_2019
update with html5 compliant code
2019-01-20 19:48:32 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime
Fix
2019-01-19 13:22:38 +01:00
Philippe GRAND
6fc28af92b update with html5 compliant code 2019-01-19 12:53:47 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Laurent Destailleur
e3d53867f4 WIP Billing task time 2019-01-18 18:11:10 +01:00
Laurent Destailleur
a72d92006b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 13:57:33 +01:00
Laurent Destailleur
f4dd8a4e50 Update myobject_card.php 2019-01-16 12:47:44 +01:00
Bahfir Abbes
66f17ac422 simplification 2019-01-16 12:47:36 +01:00
Abbes Bahfir
6b808acfbb linl back to list if cancelled on create 2019-01-16 12:47:31 +01:00
Laurent Destailleur
0f2406c202 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-15 10:55:28 +01:00
Laurent Destailleur
8c6fde72f8 Several fixes in look and feel of module survey 2019-01-13 19:36:00 +01:00
Laurent Destailleur
38ebb4ce4e Fix XFRAMEOPTIONS_ALLOWALL 2019-01-11 17:05:50 +01:00
Laurent Destailleur
6e078105ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
2019-01-06 01:22:10 +01:00
Laurent Destailleur
b1559dbc39 Fix perms 2019-01-05 15:22:24 +01:00
ldestailleur
451b3e30cc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00
ldestailleur
1b19f5153b Fix cash fence feature 2019-01-03 14:18:02 +01:00
ldestailleur
dbbfdd984a Fix emailcollector can't be used without syntax rules 2019-01-03 11:47:27 +01:00
Laurent Destailleur
fccd76aeae Fix phpcs 2018-12-22 19:25:08 +01:00
Laurent Destailleur
ecb790ad8f
Merge branch 'develop' into new_branch_20_12_2018 2018-12-22 18:23:44 +01:00
Laurent Destailleur
b8d0e6ed8b
Update index.php 2018-12-22 18:22:12 +01:00
Philippe GRAND
c3a898daa6 better form display and fix 2018-12-20 13:44:49 +01:00
Philippe GRAND
33d035139f fix typo and add translation 2018-12-20 10:17:52 +01:00
Philippe GRAND
1fea8a2968 fix : syntax error 2018-12-19 15:58:23 +01:00
Philippe GRAND
76e3390c2e fix : bad url 2018-12-19 15:25:25 +01:00
Philippe GRAND
1d59b582d7 add comments 2018-12-19 13:56:51 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
57c41bac56 Fix parameter session_cache_limiter 2018-12-18 15:07:32 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
5ec9a1ca7f Remove deprecated parameter 2018-12-11 10:15:13 +01:00
Laurent Destailleur
bb565d33f9 FIX Several fixes in fetchAll 2018-11-27 16:39:08 +01:00
Laurent Destailleur
61fddadc3f Complete the fetchAll of modulebuilder + websitepage 2018-11-20 18:29:29 +01:00
Laurent Destailleur
e020597ba7 Fix deletion for class build with modulebuilder 2018-11-19 21:11:26 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Laurent Destailleur
84983140b6
Merge pull request #9896 from hregis/develop_email
FIX change my deprecated email
2018-11-11 17:35:35 +01:00
Laurent Destailleur
35419fa206 Dolibarize code 2018-11-11 15:06:08 +01:00
Laurent Destailleur
bae1ff67a4
Merge pull request #9986 from frederic34/patch-9
remove warning
2018-11-10 12:16:10 +01:00
Laurent Destailleur
e86e3ec7ac Work on email collector 2018-11-09 19:30:44 +01:00
Frédéric FRANCE
172468587d
Update mymodulewidget1.php 2018-11-09 18:13:13 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Frédéric FRANCE
1fd398234f
remove warning 2018-11-09 15:29:49 +01:00
Laurent Destailleur
c74ad61365 Fix look and feel v8 2018-11-08 10:04:25 +01:00
Laurent Destailleur
193b153fbf Work on email collector 2018-11-07 18:02:08 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
9a0b5fb599 Fix extrafields 2018-11-07 12:25:22 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
52d4426e87 Debug new modules 2018-11-05 16:38:07 +01:00
Laurent Destailleur
d65bf1fbc7 Fix emailcollector 2018-11-05 15:31:41 +01:00
Laurent Destailleur
01d7b1e96a Fix readme detection 2018-11-05 10:15:22 +01:00
Frédéric FRANCE
aa8236dd98
fix phpcs 2018-10-31 21:33:37 +01:00
Laurent Destailleur
970f501147 Debug modulebuilder 2018-10-31 20:10:20 +01:00
Laurent Destailleur
e4cfc2c6cb Fix public 2018-10-31 17:30:08 +01:00
Laurent Destailleur
0ca5da055f Debug v9 2018-10-31 15:04:01 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
Laurent Destailleur
68f6ebd0ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/security.lib.php
	htdocs/modulebuilder/template/myobject_card.php
2018-10-30 14:47:39 +01:00
Laurent Destailleur
b4c9df65f9 FIX #9907 Can set several modules on ->depends 2018-10-30 13:56:51 +01:00
Laurent Destailleur
8fbf5b1f33 FIX deletion on draft is allowed if we are allwoed to create 2018-10-29 18:28:19 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-26 15:31:24 +02:00
Laurent Destailleur
cae83cd8e7 Add solution to translate 2018-10-26 11:10:04 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
762d82f2fe Move declaration into common 2018-10-19 13:38:05 +02:00
Laurent Destailleur
97429aeb7a
Merge pull request #9721 from grandoc/new_branch_10_10_2018
Standardize and update code
2018-10-16 19:30:19 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
Laurent Destailleur
502c52b78f Show real path of module if not into custom 2018-10-16 18:09:43 +02:00
Laurent Destailleur
f5029bf52b Fix template 2018-10-16 17:46:14 +02:00
Laurent Destailleur
e19453450d Fix closing tag 2018-10-13 19:57:34 +02:00
Philippe GRAND
9e494e65e0 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-12 19:04:02 +02:00
Philippe GRAND
849a1a9400 Standardize and update code 2018-10-12 09:26:58 +02:00
Abbes Bahfir
8160dcec6a Fix: Undeclared global variable 2018-10-09 16:10:49 +01:00
Philippe GRAND
5583211246 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-06 12:00:24 +02:00
Laurent Destailleur
e24117e75b Fix position of modules is string on 2 digits 2018-10-06 11:57:53 +02:00
Philippe GRAND
073ec85208 Standardize code 2018-10-05 15:51:08 +02:00
Laurent Destailleur
0fd7a5a172
Merge pull request #9659 from frederic34/patch-15
typo in template
2018-10-04 17:22:47 +02:00
Laurent Destailleur
dec313810d
Update myobject_list.php 2018-10-04 17:09:19 +02:00
Frédéric FRANCE
a7b2b00230
typo in template 2018-10-02 15:56:12 +02:00
Abbes Bahfir
0cb5b52318 Fix : backtopage link in listings 2018-10-01 11:10:46 +01:00
Laurent Destailleur
873f43db94 Uniformize interface for tickets 2018-10-01 03:19:21 +02:00
Philippe GRAND
574cfad48f Standardize and update code 2018-09-28 14:49:34 +02:00
Laurent Destailleur
ec2dd7ba4e Remove not used code 2018-09-28 13:13:04 +02:00
Laurent Destailleur
e9dd967610 Support nomassaction param on list 2018-09-28 13:12:47 +02:00
Laurent Destailleur
a4cd96e03c Clean code when there is no setup to do 2018-09-24 10:08:57 +02:00
Laurent Destailleur
e277670a70
Merge pull request #9573 from grandoc/new_branch_20_09_2018
Standardize and update code from New branch 20 09 2018
2018-09-23 15:35:42 +02:00
Laurent Destailleur
0abe05c6b7 Fix no form inside a table 2018-09-21 11:29:01 +02:00
Philippe GRAND
7c92157636 Standardize and update code 2018-09-20 14:25:53 +02:00
Laurent Destailleur
7fb2b1a769 Fix reset extrafields that must be unique when cloning 2018-09-16 22:30:13 +02:00
Laurent Destailleur
ab0f842db6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 12:55:44 +02:00
Laurent Destailleur
a0bcf999c5 FIX #9043 2018-09-16 09:45:33 +02:00
Laurent Destailleur
a6d4185d6b FIX #9043 2018-09-16 09:44:52 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +02:00
Laurent Destailleur
e0613e04db
Merge pull request #9446 from frederic34/patch-14
Update myobject.class.php
2018-09-12 18:24:55 +02:00
Frédéric FRANCE
aab617aeb3
remove deprecated 2018-09-09 18:38:48 +02:00
Frédéric FRANCE
2dd01011f8
Update myobject.class.php 2018-09-09 14:25:35 +02:00
Frédéric FRANCE
7e0b1055db
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-09 13:36:53 +02:00
Laurent Destailleur
f29720cc98 Fix scrutinizer bug 2018-09-08 18:40:36 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Philippe GRAND
0492492df1 fix merge 2018-09-04 12:30:06 +02:00
Frédéric FRANCE
7288335c6d
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-03 19:01:11 +02:00
Regis Houssin
2b7e15edbd FIX remove old triggers 2018-09-03 09:35:14 +02:00
Philippe GRAND
7a0c19485e fix merge 2018-09-03 09:34:08 +02:00
Frédéric FRANCE
35232b753a
move phpcs:ignore 2018-09-02 20:37:12 +02:00
Frédéric FRANCE
03a5aba8a2
move phpcs:ignore 2018-09-02 18:49:23 +02:00
Frédéric FRANCE
0c16761f48
Update myobject.class.php 2018-09-02 10:23:00 +02:00
Philippe GRAND
7b0d3c32ab Standardize and Update code 2018-09-01 22:55:10 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps
mark non camelCaps function
2018-09-01 15:37:56 +02:00
Philippe GRAND
c013f9cf3d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 15:13:04 +02:00
Laurent Destailleur
c2548b8b39
Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm
NEW hook formConfirm always called if hooked
2018-09-01 14:50:08 +02:00
Philippe GRAND
17e349eba2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 14:27:53 +02:00
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
2018-09-01 14:16:57 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Philippe GRAND
bb05e80a87 Standardize and update code 2018-08-31 18:47:25 +02:00
Philippe GRAND
70ae8c6081 Standardize and update code 2018-08-31 18:27:16 +02:00
Laurent Destailleur
bdbe2c02ed Sample 2018-08-31 10:51:32 +02:00
ksar-ksar
49d3bea192 Remove the test
After discussion with Frederic, the best solution is to remove the test
2018-08-30 11:27:48 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Laurent Destailleur
45e30271b3 Merge 2018-08-28 02:37:06 +02:00
Laurent Destailleur
2db84a679e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/modulebuilder/index.php
2018-08-28 02:35:45 +02:00
Laurent Destailleur
1842a4bb41
Merge pull request #9278 from grandoc/new_branch_21_08_2018
Update and standardize code
2018-08-28 02:13:28 +02:00
Frédéric FRANCE
d8bf4a0ecf
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-25 09:07:04 +02:00
ksar-ksar
a844855ade Update hook formConfirm
The hook should be called when the $formconfirm is not empty
2018-08-24 16:40:26 +02:00
Laurent Destailleur
79aa0bbd1c Fix duplicate load 2018-08-24 12:28:44 +02:00
Laurent Destailleur
a153b2f121 Fix bad link 2018-08-24 11:54:04 +02:00
Laurent Destailleur
085f8cf604 Fix bad link 2018-08-24 11:51:06 +02:00
Laurent Destailleur
89d55f3b46 Fix lib in modulebuilder 2018-08-24 11:45:22 +02:00
Laurent Destailleur
32594e8048 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-24 10:47:10 +02:00
Laurent Destailleur
64427dafb6 Fix back to page when canceling an edit in the module template 2018-08-23 20:21:27 +02:00
Laurent Destailleur
781a55429a FIX API template to delete a record 2018-08-23 20:03:41 +02:00
Laurent Destailleur
7a35b560a6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-23 19:51:52 +02:00
Laurent Destailleur
499d93b8c4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/projet/class/task.class.php
	htdocs/projet/tasks/task.php
2018-08-23 19:50:58 +02:00
Laurent Destailleur
019ff534a0 FIX api template for list in module builder 2018-08-23 19:46:08 +02:00
Laurent Destailleur
e6acacee4b Fix cleandata method of modulebuilder template of AAPI 2018-08-23 19:19:25 +02:00
Laurent Destailleur
e2e09f8534 Fix hookmanager var 2018-08-23 17:56:16 +02:00
Laurent Destailleur
61ced8220b Fix sample doc 2018-08-23 17:49:14 +02:00
Philippe GRAND
0c75c41e7b Update and standardize code 2018-08-22 19:56:24 +02:00
Philippe GRAND
a36061079b Update and standardize code 2018-08-22 11:11:59 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
d68f176e7e
replace obsolete phpcs tags 2018-08-16 14:59:06 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration 2018-08-16 00:52:55 +02:00
Laurent Destailleur
3b245f1b30
Merge pull request #9247 from frederic34/missingReturn
return comment
2018-08-16 00:35:39 +02:00
Frédéric FRANCE
54a078149a
function declaration 2018-08-15 17:34:35 +02:00
Frédéric FRANCE
a0a6afc224
return comment 2018-08-14 12:23:10 +02:00
Philippe GRAND
e35da2f84d Standardize code 2018-08-14 09:55:58 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Laurent Destailleur
61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/list.php
2018-08-08 17:44:22 +02:00
Philippe GRAND
948647f3f9 comment translation 2018-08-04 14:17:51 +02:00
Laurent Destailleur
51effef629 Reset pagination when current page too high 2018-08-02 18:22:08 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Frédéric FRANCE
fa2de55109
test include 2018-07-26 11:50:54 +02:00
Laurent Destailleur
e72e56ce2d
Merge pull request #9041 from grandoc/new_branch_02_07_2018
update description code
2018-07-16 10:03:54 +02:00
Laurent Destailleur
e4be3ab954 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-13 09:09:51 +02:00
Laurent Destailleur
872895c0b6 Code comment 2018-07-12 11:17:21 +02:00
Laurent Destailleur
f3de1af601 Finish webdav experimental module 2018-07-10 14:56:04 +02:00
Philippe GRAND
47e80123d5 Docs : update code 2018-07-07 11:36:46 +02:00
Philippe GRAND
2023a58397 fix : Typo 2018-07-02 17:32:42 +02:00
Laurent Destailleur
63f3143718 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-02 12:18:34 +02:00
Laurent Destailleur
7bf33b1bac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/hrm/index.php
	htdocs/install/mysql/tables/llx_website_account.key.sql
	htdocs/modulebuilder/template/myobject_card.php
2018-07-02 12:16:51 +02:00
Laurent Destailleur
edd2e12b8d css 2018-06-30 14:35:33 +02:00
Laurent Destailleur
e4388e63fa
Merge pull request #8891 from inoveaconseil/develop
NEW: ADD url to see the last version of a external module
2018-06-30 01:17:10 +02:00
Laurent Destailleur
da138db528 FIX combo into popup become crazy with IE10
Conflicts:
	htdocs/asset/card.php
	htdocs/modulebuilder/template/myobject_card.php
2018-06-28 12:16:12 +02:00
Laurent Destailleur
3ea2d81279 FIX combo into popup become crazy with IE10 2018-06-28 12:05:02 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
Laurent Destailleur
edd7499375 Fix clone with new architecture 2018-06-19 09:21:23 +02:00
Laurent Destailleur
e402f68593 Clean code 2018-06-19 08:51:25 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Laurent Destailleur
bc0080b945
Merge pull request #8945 from bafbes/abb7009
Fix: Do not activate module if errors found on execution of module SQL queries
2018-06-13 21:28:04 +02:00
Laurent Destailleur
98ae8e18df
Update modMyModule.class.php 2018-06-13 21:27:57 +02:00
Laurent Destailleur
e69b0102a5
Merge pull request #8935 from inoveaconseil/modulebuilder
Fix include for older version
2018-06-13 20:43:38 +02:00
Laurent Destailleur
4be069a3b5
Update setup.php 2018-06-13 20:43:02 +02:00
Abbes Bahfir
2f759e0c18 Fix: Do not activate module if errors on module SQL queries execution 2018-06-12 00:43:01 +01:00
Inovea Conseil
75bb5c1624 Fix include for older version 2018-06-08 16:01:09 +02:00
Laurent Destailleur
485dc9a57a Clean code 2018-06-08 15:37:25 +02:00
Laurent Destailleur
6e62727c37 Fix scrutinizer bug 2018-06-06 18:18:50 +02:00
Laurent Destailleur
9730138845 Code comment 2018-06-05 11:06:44 +02:00
Laurent Destailleur
29ee5dffc4 Clean code 2018-06-04 12:55:55 +02:00
Inovea Conseil
78b3067de3 NEW: ADD admin page for modulebuilder
ADD custom README
ADD choice to generate about page and documentation folder
2018-05-30 13:54:43 +02:00
Inovea Conseil
7c57b360a3 Auto stash before merge of "develop" and "Dolibarr/develop" 2018-05-30 13:45:17 +02:00
Inovea Conseil
9391ec4951 Merge remote-tracking branch 'Dolibarr/develop' into develop 2018-05-30 13:44:00 +02:00
Laurent Destailleur
c1f5c6becf
Merge pull request #8877 from frederic34/longlines
soft limit length of lines to 500 chars
2018-05-30 11:19:29 +02:00
Inovea Conseil
e0c1e33012 NEW: ADD url to see the last version of a external module 2018-05-30 00:20:31 +02:00
Inovea Conseil
fc7b88e5e6
Fix missing substitution
Missing substitution for object
2018-05-29 23:04:35 +02:00
Frédéric FRANCE
055508f343
remove one warning 2018-05-27 20:56:45 +02:00
Frédéric FRANCE
58e5715ac3
loadlangs 2018-05-26 17:57:30 +02:00
Frédéric FRANCE
1b69c2357f
typo 2018-05-23 17:16:58 +02:00
Laurent Destailleur
de84f0e687 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/filefunc.inc.php
2018-05-21 23:35:09 +02:00
Laurent Destailleur
e5561ecdfb Remove useless files 2018-05-21 22:14:15 +02:00
Laurent Destailleur
ef395fc36b Fix scrutinizer bugs 2018-05-16 15:23:52 +02:00
Laurent Destailleur
b84baece3c Code comment 2018-05-12 11:32:00 +02:00
Laurent Destailleur
32ace6a8cf NEW Add hook setContentSecurityPolicy 2018-04-30 15:17:38 +02:00
Laurent Destailleur
f1b9188e9b
Merge pull request #8563 from ATM-Marc/NEW_backurlforcard
NEW: default add action: new param $backurlforcard to redirect to card
2018-04-27 11:57:15 +02:00
Laurent Destailleur
fef5a24870
Update myobject_card.php 2018-04-27 11:52:40 +02:00
florian HENRY
70961bd075 fix perms 2018-04-24 12:46:16 +02:00
Laurent Destailleur
461ae46cc4 FIX When on a high page and searching for a small result, list was not
visible.
2018-04-24 11:37:57 +02:00
Laurent Destailleur
a0152f8e7a Better template 2018-04-21 16:07:40 +02:00
Laurent Destailleur
cef9782179 Clean defined constant at begin of pages 2018-04-21 12:00:55 +02:00
Marc de Lima Lucio
1a9675e410 FIX: user $backtopage insteead of $backurlforcard 2018-04-18 10:12:19 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00