Commit Graph

92586 Commits

Author SHA1 Message Date
Jools
5ef73bf882
Change module_part to modulepart 2020-12-09 16:26:31 +01:00
Laurent Destailleur
89828c18d1 CSS 2020-12-09 12:32:21 +01:00
Laurent Destailleur
7459607eb9 Look fix 2020-12-09 12:23:37 +01:00
Laurent Destailleur
43b1be01d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-08 23:08:56 +01:00
Laurent Destailleur
2429cbe7ca Update doc 2020-12-08 23:08:47 +01:00
Laurent Destailleur
a92ad1484a
Merge pull request #15709 from hregis/fix_add_hook_for_security
NEW add hook "loginCheckSecurityAccess" (eg for external captcha)
2020-12-08 23:08:17 +01:00
Laurent Destailleur
a5eb2e56cb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/card.php
2020-12-08 22:27:27 +01:00
Laurent Destailleur
89854ea137 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-08 22:24:14 +01:00
Laurent Destailleur
75b8794d72 Fix column must be NULL 2020-12-08 22:23:24 +01:00
Laurent Destailleur
e987e6e093 Context for hook showSocinfoOnPrint has been moved from
"showsocinfoonprint" to "main"
2020-12-08 22:16:38 +01:00
Laurent Destailleur
51128c1d55
Merge pull request #15692 from ATM-Consulting/FIX/12.0_regression_basic_html_tags_no_longer_allowed_in_product_label
FIX 12.0 - XSS protection too stringent -> replace 'alphanohtml' with 'restricthtml'
2020-12-08 22:09:27 +01:00
Laurent Destailleur
70b772cf74 Kit must show details on PDF. 2020-12-08 21:56:48 +01:00
Laurent Destailleur
c26efd756f FIX #15704 #15565 #15694 2020-12-08 20:53:42 +01:00
Laurent Destailleur
769a8886b9 Debug notification on events 2020-12-08 20:32:37 +01:00
Laurent Destailleur
bfa813e1b0 Load langs 2020-12-08 20:16:41 +01:00
Laurent Destailleur
5b031473ff Fix hide table if empty 2020-12-08 20:08:14 +01:00
Laurent Destailleur
bb6f23d81b CSS 2020-12-08 19:32:43 +01:00
Regis Houssin
3836e5685a FIX same context of others 2020-12-08 19:30:40 +01:00
Regis Houssin
724d03c754 NEW add hook "loginCheckSecurityAccess" (eg for external captcha) 2020-12-08 19:26:24 +01:00
Laurent Destailleur
be249538ee Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
2020-12-08 18:17:02 +01:00
Laurent Destailleur
34e7943d09 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/fourn/class/paiementfourn.class.php
2020-12-08 18:14:56 +01:00
Laurent Destailleur
4e72543fde Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/fourn/paiement/card.php
2020-12-08 18:11:39 +01:00
Laurent Destailleur
cc1db8aec2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-08 18:03:20 +01:00
Laurent Destailleur
a0b1bd3eca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expedition/card.php
	htdocs/product/class/product.class.php
2020-12-08 18:03:01 +01:00
Laurent Destailleur
0234df6224
Merge pull request #15705 from StephaneLesage/fix-boxes-thirdparty
Fix boxes third-parties information
2020-12-08 17:58:09 +01:00
Laurent Destailleur
791d129c9c
Merge pull request #15699 from hregis/fix_bcc_only_if_not_exists
FIX add autocopy to if not already exists in $to
2020-12-08 17:56:04 +01:00
Laurent Destailleur
111d6aa621
Merge pull request #15695 from aspangaro/10_p57
FIX : Export FEC - Remove line at zero
2020-12-08 17:55:31 +01:00
Laurent Destailleur
ad0a0460ac
Merge pull request #15706 from FHenry/develop
fix survey module
2020-12-08 17:54:08 +01:00
Laurent Destailleur
aaf1910c25 Fix stock amount can be a decimal 2020-12-08 17:53:12 +01:00
Laurent Destailleur
996e01fe6a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-08 17:52:01 +01:00
Laurent Destailleur
485fe0fc62 FIX Can receipt of a product that required lot after disabling stock and
lot module
2020-12-08 17:51:26 +01:00
Laurent Destailleur
0f2a8d0262 Fix timestamp field 2020-12-08 17:20:45 +01:00
Laurent Destailleur
240648d540 css 2020-12-08 17:09:48 +01:00
Stephane Lesage
376e4d150a Third-party details in comm action lists 2020-12-08 15:56:42 +01:00
Stephane Lesage
e25862ec8d Third-party details in Lists in comm index 2020-12-08 15:47:34 +01:00
Stephane Lesage
5d8dfadd09 Third-party details in Lists in project index 2020-12-08 15:47:22 +01:00
Stephane Lesage
3161f35971 Fix boxes third-parties information 2020-12-08 14:08:32 +01:00
Florian HENRY
eed7f57f98 fix survey module 2020-12-08 12:54:14 +01:00
Florian HENRY
b3dd456a37 fix survey module 2020-12-08 12:53:13 +01:00
Laurent Destailleur
8491be2572 Fix look and feel v13 2020-12-08 11:58:47 +01:00
Laurent Destailleur
e7d24796f1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-08 11:18:19 +01:00
Laurent Destailleur
657592695b Try to fix internal link 2020-12-08 11:18:08 +01:00
Laurent Destailleur
f9f31b7d7b
Merge pull request #15697 from StephaneLesage/export-warehouses
Export warehouses
2020-12-08 11:09:30 +01:00
Laurent Destailleur
dc27fd8061
Merge pull request #15701 from dolibit-ut/patch-56
Update README.md
2020-12-08 11:05:42 +01:00
Laurent Destailleur
7031a598bc Link to forum portal page 2020-12-08 11:05:09 +01:00
Laurent Destailleur
5b50cd00dd
Merge pull request #15703 from dolibit-ut/patch-57
Update CONTRIBUTING.md
2020-12-08 11:03:19 +01:00
UT from dolibit
97e23269db
Update CONTRIBUTING.md 2020-12-08 09:56:51 +01:00
UT from dolibit
930062428c
Update README.md
text to reference to guideline contributes
2020-12-08 09:44:53 +01:00
Florian Mortgat
617c9f7ea9 FIX: enable HTML in product labels depending on conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML 2020-12-08 09:30:31 +01:00
Regis Houssin
fc34c97666 FIX add autocopy to if not already exists in $to 2020-12-08 08:49:06 +01:00