Pull Request for Issue #15629 .
Original issue desctiption

Steps to reproduce the issue

after update from 3.6.5 to 3.7.0, the modules menu shows the following error:
Unknown column 'client_id' in 'where clause
Expected result

no error
debug log

Unknown column 'client_id' in 'where clause'
Call stack
Function Location

1 JError::raise() JROOT\libraries\legacy\error\error.php:299
2 JError::raiseWarning() JROOT\administrator\components\com_menus\helpers\menus.php:269
3 MenusHelper::getMenuLinks() JROOT\libraries\cms\form\field\menuitem.php:174
4 JFormFieldMenuitem->getGroups() JROOT\libraries\joomla\form\fields\groupedlist.php:162
5 JFormFieldGroupedList->getInput() JROOT\libraries\joomla\form\field.php:414
6 JFormField->__get() JROOT\libraries\cms\form\field\menuitem.php:93
7 JFormFieldMenuitem->__get() JROOT\layouts\joomla\searchtools\default\filters.php:27
8 include() JROOT\libraries\cms\layout\file.php:121
9 JLayoutFile->render() JROOT\libraries\cms\layout\file.php:661
10 JLayoutFile->sublayout() JROOT\layouts\joomla\searchtools\default.php:99
11 include() JROOT\libraries\cms\layout\file.php:121
12 JLayoutFile->render() JROOT\libraries\cms\layout\helper.php:72
13 JLayoutHelper::render() JROOT\administrator\components\com_modules\views\modules\tmpl\default.php:37
14 include() JROOT\libraries\legacy\view\legacy.php:694
15 JViewLegacy->loadTemplate() JROOT\libraries\legacy\view\legacy.php:229
16 JViewLegacy->display() JROOT\administrator\components\com_modules\views\modules\view.html.php:73
17 ModulesViewModules->display() JROOT\libraries\legacy\controller\legacy.php:671
18 JControllerLegacy->display() JROOT\administrator\components\com_modules\controller.php:79
19 ModulesController->display() JROOT\libraries\legacy\controller\legacy.php:709
20 JControllerLegacy->execute() JROOT\administrator\components\com_modules\modules.php:23
21 require_once() JROOT\libraries\cms\component\helper.php:394
22 JComponentHelper::executeComponent() JROOT\libraries\cms\component\helper.php:369
23 JComponentHelper::renderComponent() JROOT\libraries\cms\application\administrator.php:98
24 JApplicationAdministrator->dispatch() JROOT\libraries\cms\application\administrator.php:156
25 JApplicationAdministrator->doExecute() JROOT\libraries\cms\application\cms.php:265
26 JApplicationCms->execute() JROOT\administrator\index.php:51
Actual result
System information (as much as possible)
Additional comments

Summary of Changes

Try to fix #15629 and for future consistency of the columns.

Testing Instructions

If you have a isue described in #15629 then make a backup of your site then:

• repkace coresponding file from PR with file in your indtallation
• go to Extensions > Database and click the Fix button.

Test if nafing ibroken for updates

• install a Joomla! 3.6.5
• apply paych
• run Joomla! update

Expected result

No issue described in #15629 for bouth test cases.

Actual result

You mey have a issue described in #15629

Documentation Changes Required

N/A