Commit Graph

71333 Commits

Author SHA1 Message Date
Laurent Destailleur
bdf0219941 Missing link to create contact
Fix css
2019-11-13 18:18:45 +01:00
Alexandre SPANGARO
85e2546019 Missing language key 2019-11-13 15:25:23 +01:00
Francis Appels
5d42ef323e Fix Printsheet product selector 2019-11-13 15:13:56 +01:00
Alexandre SPANGARO
0497c399d7 Missing language key 2019-11-13 14:59:07 +01:00
Cédric
c4c463fb96
camelCaps 2019-11-13 11:36:42 +01:00
Laurent Destailleur
74239d48bf Fix translation of extrafields when $extralabels not loaded 2019-11-13 11:11:08 +01:00
Laurent Destailleur
39229b7a99 Fix css 2019-11-13 02:21:23 +01:00
Laurent Destailleur
ec0d5602f8 Fix log 2019-11-13 02:05:11 +01:00
Laurent Destailleur
4340f85e3c Add warning 2019-11-13 01:22:13 +01:00
Laurent Destailleur
56c2dc2614 Reduce need of translations 2019-11-12 22:29:36 +01:00
Frédéric FRANCE
bb4fd0d5c0
timing is varchar in db 2019-11-12 22:06:22 +01:00
Frédéric FRANCE
e7d51d4ec7
do not trim int 2019-11-12 22:01:53 +01:00
Francis Appels
9efcdc78f9 Cleanup interface_90_modSociete_ContactRoles 2019-11-12 21:56:05 +01:00
Laurent Destailleur
89bf35a8bf Fix default value show must match the theme selected 2019-11-12 21:54:41 +01:00
Frédéric FRANCE
7ce297c6cc
doxygen 2019-11-12 21:53:17 +01:00
Frédéric FRANCE
4f90fe0fd2
Update 10.0.0-11.0.0.sql 2019-11-12 21:34:45 +01:00
Frédéric FRANCE
422d893ecc
Update llx_c_action_trigger.sql 2019-11-12 21:33:42 +01:00
ptibogxiv
24bac213aa
Update paymentmodes.php 2019-11-12 18:39:39 +01:00
ptibogxiv
e33d969178
Fix php error on stripe account display
convert non object in full array in order to avoid php error message.
2019-11-12 18:38:23 +01:00
stickler-ci
fcb50841cc Fixing style errors. 2019-11-12 17:10:20 +00:00
Cédric
480ac1a926
API New link/unlink products with categories
Need it for V11 please :)
2019-11-12 18:08:09 +01:00
Laurent Destailleur
453ffad9e8 Look and feel v11 2019-11-12 18:01:16 +01:00
Laurent Destailleur
2a67dd0f66 Look and feel v11 2019-11-12 17:43:27 +01:00
Laurent Destailleur
e79ac7081a Look and feel v11 2019-11-12 17:37:05 +01:00
Daniel Seichter
0e450b2acf remove duplicate entries 2019-11-12 16:17:23 +01:00
Laurent Destailleur
1153b81e6f Update templates 2019-11-12 16:08:03 +01:00
Daniel Seichter
45b5bdfdc6 Merge remote-tracking branch 'upstream/develop' into develop 2019-11-12 15:44:42 +01:00
andreubisquerra
34b8325079
Update list.php 2019-11-12 14:21:49 +01:00
Laurent Destailleur
2c826d73bd Fix translation 2019-11-12 14:07:56 +01:00
Laurent Destailleur
2c718af26c Missing container type 'menu'
Fix: Add security if container is not a page
2019-11-12 13:55:46 +01:00
andreubisquerra
4f3d4950e1
Check if draft exists in TakePOS customer list
Check if draft invoice already exists, if not create it
2019-11-12 13:01:16 +01:00
Daniel Seichter
c4a6108acf #12408 using MAIN_DURATION_OF_WORKDAY during creation of invoices 2019-11-12 12:49:38 +01:00
Laurent Destailleur
528823140d Fix phpcs 2019-11-12 12:05:06 +01:00
Laurent Destailleur
6afc84fe72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-12 10:20:55 +01:00
Laurent Destailleur
944a15d06b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-11-12 10:20:16 +01:00
Laurent Destailleur
f8e8d15606 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-12 10:19:01 +01:00
Laurent Destailleur
f65ce1d5d0 Fix var not declared 2019-11-12 10:17:46 +01:00
Laurent Destailleur
3430a88c72 Fix $conf not defined 2019-11-12 10:13:22 +01:00
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
Laurent Destailleur
9fc1c98192
Merge pull request #12407 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
2019-11-12 09:47:54 +01:00
Laurent Destailleur
df03041dba Fix phpcs 2019-11-12 09:47:39 +01: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
gauthier
e2680f7637 FIX : limit 20 prevent to see all products/services 2019-11-12 09:42:27 +01:00
Laurent Destailleur
dc77a58a73 Work on MO 2019-11-12 01:48:12 +01:00
Laurent Destailleur
94d63a4c44 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-12 00:44:10 +01:00
Laurent Destailleur
9fbdfb74d5
Merge pull request #12405 from Dolibarr/scrutinizer-patch-2
Scrutinizer Auto-Fixes
2019-11-12 00:43:57 +01:00
Laurent Destailleur
03e35623c6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-12 00:43:37 +01:00
Laurent Destailleur
8be0a6d470 Fix: Can set savingdocmask by caller. Fix permissions names.
Fix: Disable crop on svg images.
2019-11-12 00:43:26 +01:00
Scrutinizer Auto-Fixer
df664e790b Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 23:15:34 +00:00
Laurent Destailleur
855c89fe3c
Merge pull request #12403 from frederic34/cssindex
css
2019-11-12 00:15:31 +01:00
Scrutinizer Auto-Fixer
038bda254d Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 22:59:36 +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
79cc3f189d Work on BOM 2019-11-11 20:56:28 +01:00
Frédéric FRANCE
2148d6ed05
css 2019-11-11 20:33:34 +01:00
Laurent Destailleur
4f7b698e92 Fix filter on sell/purchase status 2019-11-11 19:42:54 +01:00
Laurent Destailleur
814dce5b55 Fix var not defined 2019-11-11 19:26:19 +01:00
Laurent Destailleur
2ccef4e469 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2019-11-11 19:10:35 +01:00
Laurent Destailleur
5ae5b87b60 Fix get bad default value for accounting for sales export 2019-11-11 19:07:22 +01:00
Laurent Destailleur
8976bd7c9b Fix setup of accounting account 2019-11-11 19:05:42 +01:00
Laurent Destailleur
f62f73f5cb FIX Bad value suggested in default product account setup 2019-11-11 19:05:06 +01:00
Laurent Destailleur
40d66489ad Trans 2019-11-11 13:47:17 +01:00
Laurent Destailleur
77bec70e1a CSS 2019-11-11 13:37:29 +01:00
Laurent Destailleur
b4d40da768 Clean params 2019-11-11 13:32:36 +01:00
Laurent Destailleur
5eb03cf6ad Avoid false positive. 2019-11-11 13:26:48 +01:00
Laurent Destailleur
6a4ba74ee7 Fix regression introduced by 991e1b2747 2019-11-11 13:17:36 +01:00
Laurent Destailleur
0a607d697f More log 2019-11-11 00:34:05 +01:00
Laurent Destailleur
0bcd4c630d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-10 18:14:07 +01:00
Laurent Destailleur
2b63e2963a Set autofocus 2019-11-10 18:13:55 +01:00
Laurent Destailleur
27fb9e0c7f
Merge pull request #12401 from grandoc/new_branch_10_11_2019
add some comment
2019-11-10 18:07:13 +01:00
Laurent Destailleur
0a824db6d3 Remove useless call 2019-11-10 17:48:50 +01:00
Laurent Destailleur
197bf61cfd Fix security. Login check must be done if action=login only. 2019-11-10 14:01:59 +01:00
Laurent Destailleur
7cd8d82636 Fix log 2019-11-10 13:56:56 +01:00
Laurent Destailleur
2bbeecea2f Fix missing the action= into log of login 2019-11-10 13:53:41 +01:00
Laurent Destailleur
6990732c71 Fix missing action in POST 2019-11-10 13:49:04 +01:00
Laurent Destailleur
3054177e79 Fix type of tickets 2019-11-10 12:28:30 +01:00
stickler-ci
278e3a7076 Fixing style errors. 2019-11-10 11:23:37 +00:00
Laurent Destailleur
880ecda098 Fix name of tables 2019-11-10 12:23:21 +01:00
Philippe GRAND
067c35d905 Merge remote-tracking branch 'origin/new_branch_10_11_2019' into new_branch_10_11_2019 2019-11-10 12:22:48 +01:00
Philippe GRAND
9b0debfd08 add some comment 2019-11-10 12:22:24 +01:00
stickler-ci
10eb351877 Fixing style errors. 2019-11-10 11:20:38 +00:00
Philippe GRAND
81a5d853d0 add some comment 2019-11-10 12:20:11 +01:00
stickler-ci
b892ed05ba Fixing style errors. 2019-11-10 11:17:19 +00:00
Philippe GRAND
d907f36bb6 add some comment 2019-11-10 12:16:51 +01:00
Philippe GRAND
f13f148d7f add some comment 2019-11-10 12:14:39 +01:00
stickler-ci
3df87a419c Fixing style errors. 2019-11-10 11:12:42 +00:00
Philippe GRAND
098ffd4827 add some comment 2019-11-10 12:12:14 +01:00
Philippe GRAND
69e1d0480a add some comment 2019-11-10 12:10:13 +01:00
stickler-ci
491fe4bdff Fixing style errors. 2019-11-10 11:09:09 +00:00
Philippe GRAND
18d06a1c20 add some comment 2019-11-10 12:08:41 +01:00
stickler-ci
d4b7950d87 Fixing style errors. 2019-11-10 11:06:12 +00:00
Philippe GRAND
e22ca90a3f add some comment 2019-11-10 12:05:45 +01:00
stickler-ci
d8267fee4a Fixing style errors. 2019-11-10 11:00:19 +00:00
Philippe GRAND
a0de5bf7cb add some comment 2019-11-10 12:01:34 +01:00
stickler-ci
3e3e0e99f8 Fixing style errors. 2019-11-10 10:58:54 +00:00
Philippe GRAND
3cae9d3651 add some comment 2019-11-10 11:58:28 +01:00
stickler-ci
f8138c22a3 Fixing style errors. 2019-11-10 10:12:10 +00:00
Philippe GRAND
9bf4347371 add some comment 2019-11-10 11:11:43 +01:00
Philippe GRAND
a401b6776d Merge remote-tracking branch 'origin/new_branch_10_11_2019' into new_branch_10_11_2019 2019-11-10 11:08:25 +01:00
Philippe GRAND
2eade41de9 add some comment 2019-11-10 11:07:47 +01:00
Philippe GRAND
b0d68a6de1 add some comment 2019-11-10 11:05:30 +01:00
stickler-ci
fae5d56d34 Fixing style errors. 2019-11-10 10:04:11 +00:00
stickler-ci
4dda9edeb6 Fixing style errors. 2019-11-10 10:01:28 +00:00
Philippe GRAND
f960191671 add some comment 2019-11-10 11:02:44 +01:00
stickler-ci
bb74d2f8bd Fixing style errors. 2019-11-10 10:00:07 +00:00
Philippe GRAND
6e0c028d51 add some comment 2019-11-10 10:59:44 +01:00
Philippe GRAND
bb352a5004 add some comment 2019-11-10 10:55:37 +01:00
stickler-ci
11f29df93d Fixing style errors. 2019-11-10 09:52:03 +00:00
Philippe GRAND
762b70fab7 add some comment 2019-11-10 10:51:16 +01:00
Laurent Destailleur
4add52d852 Fix phpcs 2019-11-09 21:09:19 +01:00
Laurent Destailleur
eb378b45a4 Work on BOM - MO module 2019-11-09 20:35:45 +01:00
Laurent Destailleur
ef1e7e3e96 Debug mrp 2019-11-09 20:23:31 +01:00
Laurent Destailleur
b33a99e5b2 Debug BOM 2019-11-09 20:16:13 +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
59d83fce59 Debug MRP module 2019-11-09 19:57:38 +01:00
Laurent Destailleur
5b6ace387e Debug BOM and MO module 2019-11-09 19:47:49 +01:00
Laurent Destailleur
274ddaa1be Fix mandatory field 2019-11-09 19:01:03 +01:00
Laurent Destailleur
ea39ec21bb
Merge pull request #12393 from c3do/patch-1
NEW API to post documents for "product" and Delete document
2019-11-09 18:50:45 +01:00
Laurent Destailleur
84f5502b67
Merge pull request #12400 from grandoc/new_branch_09_11_2019
internationalization
2019-11-09 18:45:01 +01:00
Laurent Destailleur
431337e9e8
Merge pull request #12398 from c3do/patch-2
Fix issue #12397
2019-11-09 18:43:24 +01:00
Laurent Destailleur
771f304c79 Fix typo 2019-11-09 18:40:08 +01:00
Laurent Destailleur
db614159c0 Add php version 2019-11-09 18:37:07 +01:00
Laurent Destailleur
35c7e36790 Add country 2019-11-09 18:27:16 +01:00
Laurent Destailleur
6233f8e1c5 Fix visibility = 3 2019-11-09 18:19:04 +01:00
Laurent Destailleur
94fce39562 Fix visibility on modulebuilder 2019-11-09 18:13:59 +01:00
Philippe GRAND
d760b799d9 internationalization 2019-11-09 16:26:57 +01:00
Philippe GRAND
ab267cdf0c internationalization 2019-11-09 16:23:06 +01:00
Philippe GRAND
1ac4bf54d2 internationalization 2019-11-09 16:16:16 +01:00
Philippe GRAND
0690467b15 internationalization 2019-11-09 16:11:37 +01:00
Philippe GRAND
86c826bd87 internationalization 2019-11-09 15:54:09 +01:00
Cédric
df4bcdcb94
Edit updateProperties to inject $user 2019-11-09 14:13:14 +01:00
Cédric
4dbf151b15
Inject $user in ProductCombination::updateProperties 2019-11-09 13:29:12 +01:00
Laurent Destailleur
5ebd5a401c Fix avoid error on lang not defined when calling trigger 2019-11-09 13:09:05 +01:00
Laurent Destailleur
ab26356e92 Fix avoid error on lang not defined when calling trigger 2019-11-09 13:08:30 +01:00
Laurent Destailleur
fcf983ee23 Fix decimal separator according to lang setup
Conflicts:
	htdocs/core/actions_addupdatedelete.inc.php
2019-11-09 12:56:34 +01:00
Laurent Destailleur
75e2d412ac Fix decimal separator according to lang setup 2019-11-09 12:54:11 +01:00
Laurent Destailleur
c0abb725cb Fix price2num needs lang loaded when it may not exists 2019-11-09 12:46:45 +01:00
Laurent Destailleur
f9869dbfed Fix price2num need langs when lang is not necessarly loaded. 2019-11-09 12:46:11 +01:00
Laurent Destailleur
917c8df225 Add type of db driver in stats 2019-11-09 12:24:18 +01:00
Laurent Destailleur
dcdcd7c67e Look and feel v11 2019-11-09 12:03:11 +01:00
Cédric
9cc1f1db75
replace "/delete" by "/" 2019-11-09 11:52:03 +01:00
Laurent Destailleur
e1f676f2f7 Fix css fro website 2019-11-09 11:30:08 +01:00
stickler-ci
e53ce81f23 Fixing style errors. 2019-11-08 23:48:46 +00:00
Cédric
1e5fe3f31c
API New delete document 2019-11-09 00:47:03 +01:00
stickler-ci
8dc67d9530 Fixing style errors. 2019-11-08 18:58:49 +00:00
Cédric
21454aa597
API New link documents to products (pictures) 2019-11-08 19:54:38 +01:00
Laurent Destailleur
8f35c24b62 Add quick hack by hidden const as solution when numbering is locked. 2019-11-08 16:37:25 +01:00
Laurent Destailleur
89ecd6a72a
Merge pull request #12389 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
2019-11-08 15:53:57 +01:00
Laurent Destailleur
4fce0d3e7a Fix not transversable 2019-11-08 15:52:57 +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
2fa82d1bfb Fix sql error 2019-11-08 13:46:49 +01:00
Laurent Destailleur
83090629fe Fix join into left join 2019-11-08 13:43:26 +01:00
Laurent Destailleur
cb1e5954f6 Fix regression 2019-11-08 13:10:41 +01:00
Laurent Destailleur
a67e96d9e7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-08 13:05:00 +01:00
Laurent Destailleur
cb3fd5728b Fix color for not busy events 2019-11-08 13:04:49 +01:00
Laurent Destailleur
28b10e4610
Merge pull request #12379 from altatof/dispatch_force_qty_input
NEW : add constant DISPATCH_FORCE_QTY_INPUT
2019-11-08 11:38:57 +01:00
Laurent Destailleur
52e90a8d91
Update dispatch.php 2019-11-08 11:38:08 +01:00
Laurent Destailleur
e513917d12 Fix phpcs 2019-11-08 11:34:14 +01:00
Laurent Destailleur
f259685058
Merge pull request #12388 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
2019-11-08 11:33:41 +01:00
Laurent Destailleur
dc84d7e844 Code comment 2019-11-08 11:29:56 +01:00
Laurent Destailleur
34564ea084
Merge pull request #12381 from TobiasSekan/FixIcalExportAlwaysSameUser
Fix ICAL export add a user to all events
2019-11-08 11:26:57 +01:00
Laurent Destailleur
b9bf07fddb
Merge pull request #12382 from ptibogxiv/patch-276
FIX socialnetworks API if module not active
2019-11-08 10:56:12 +01:00
Scrutinizer Auto-Fixer
2ecfe41810 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 09:53:31 +00:00
Laurent Destailleur
ad2ff551fa Fix trans 2019-11-08 10:35:34 +01:00
Laurent Destailleur
d1c49c7021 Fix trans 2019-11-08 10:24:03 +01:00
Laurent Destailleur
f11943126a Fix scrutinizer 2019-11-08 09:42:39 +01:00
ptibogxiv
4145d7c825
Update api_setup.class.php 2019-11-07 17:18:39 +01:00
stickler-ci
a3878d82e9 Fixing style errors. 2019-11-07 16:06:58 +00:00
ptibogxiv
a641c81d92
FIX socialnetworks API if module not active 2019-11-07 17:05:30 +01:00
Laurent Destailleur
ba1f4f0ac6 Fix look and feel v11 2019-11-07 16:40:59 +01:00
Laurent Destailleur
34beca0758 Fix var not not consistent 2019-11-07 16:33:11 +01:00
Laurent Destailleur
8318db85a3 Fix typo 2019-11-07 16:32:44 +01:00
Tobias Sekan
3677855ebc
Fix ICAL export add a user to all events 2019-11-07 15:45:34 +01:00
Laurent Destailleur
8793fdfe63 Fix not working feature 2019-11-07 15:25:57 +01:00
Laurent Destailleur
e671a119ce
Merge branch 'develop' into patch-243 2019-11-07 15:12:37 +01:00
Laurent Destailleur
c0b8684475
Merge pull request #12341 from inoveaconseil/bankStatementDocument
NEW add upload for account statement
2019-11-07 15:06:47 +01:00
Laurent Destailleur
1f0cee2139
Merge pull request #12376 from TobiasSekan/FixNotDeactivatedCommercialButton
Fix not deactivated commercial menu button
2019-11-07 15:05:26 +01:00
Laurent Destailleur
c7e261a973 FIX #11907 2019-11-07 14:40:26 +01:00
altairis
c574f5990f add constant DISPATCH_FORCE_QTY_INPUT 2019-11-07 14:31:30 +01:00
Laurent Destailleur
a901ce932d Repair 2019-11-07 14:19:52 +01:00
Laurent Destailleur
3b44760e65 FIX #12356 2019-11-07 14:10:07 +01:00
Laurent Destailleur
f84087ba70 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-07 14:08:01 +01:00
Laurent Destailleur
1fa61077a0 FIX #12356 2019-11-07 14:07:50 +01:00
Tobias Sekan
7dc94f1761
Fix not deactivated commercial menu button 2019-11-07 13:50:25 +01:00
Laurent Destailleur
5a4a421a8e FIX #12372 2019-11-07 13:07:40 +01:00
Scrutinizer Auto-Fixer
0b406172fd Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-07 11:59:59 +00:00
Laurent Destailleur
2aac4b382f
Merge pull request #12372 from OPEN-DSI/fix-admin-dict-transkey-not-defined
FIX var transkey not defined in input hidden
2019-11-07 12:56:21 +01:00
Laurent Destailleur
0a0343fed8
Merge pull request #12373 from frederic34/cleaning
fix phpcs
2019-11-07 12:55:29 +01:00
Laurent Destailleur
f1ebfb1ba7
Merge pull request #12369 from TobiasSekan/FixAccessMainMenu
Fix main menu access for only shipment rights
2019-11-07 12:55:11 +01:00
Laurent Destailleur
cd5c359b83 Fix regression 2019-11-07 12:53:26 +01:00
Frédéric FRANCE
001010d5e3
fix phpcs 2019-11-07 12:43:33 +01:00
Laurent Destailleur
4c44f3c109
Merge pull request #12366 from aspangaro/11.0_a3
NEW VAT list - Add date start & date end
2019-11-07 11:53:16 +01:00
Laurent Destailleur
26e95c9161
Merge pull request #12359 from TobiasSekan/FixMixedEventsWithSameTime
Fix mixed order of events with same time
2019-11-07 11:43:39 +01:00
Laurent Destailleur
f29a176423
Merge pull request #12357 from frederic34/patch-19
can't edit socialnetwork dict
2019-11-07 11:41:57 +01:00
Laurent Destailleur
92fa184701
Merge pull request #12354 from frederic34/patch-18
Update list.php
2019-11-07 11:41:33 +01:00
Laurent Destailleur
b419e923c7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-07 11:41:11 +01:00
Laurent Destailleur
89105fdd36 Fix code according to modulebuilder 2019-11-07 11:40:35 +01:00
VESSILLER
146fa461c1 FIX var transkey not defined in input hidden 2019-11-07 11:36:17 +01:00
Laurent Destailleur
3fcc72f504
Merge pull request #12353 from frederic34/patch-17
can't have static and $this at same time
2019-11-07 11:32:55 +01:00