From: Joe Hunt Date: Wed, 9 Dec 2015 12:53:15 +0000 (+0100) Subject: Also remove report classes when disabling Manufacturing or Fixed Assets. X-Git-Tag: v2.4.2~19^2~107 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=aa5014284ace0afac2a5ce70ca0f49470fa50b68;p=fa-stable.git Also remove report classes when disabling Manufacturing or Fixed Assets. --- diff --git a/reporting/reports_main.php b/reporting/reports_main.php index 87efba81..f79c7f52 100644 --- a/reporting/reports_main.php +++ b/reporting/reports_main.php @@ -280,36 +280,41 @@ $reports->addReport(RC_INVENTORY, 309,_('Item &Sales Summary Report'), _('Comments') => 'TEXTBOX', _('Orientation') => 'ORIENTATION', _('Destination') => 'DESTINATION')); - -$reports->addReportClass(_('Manufacturing'), RC_MANUFACTURE); -$reports->addReport(RC_MANUFACTURE, 401, _('&Bill of Material Listing'), - array( _('From product') => 'ITEMS', - _('To product') => 'ITEMS', - _('Comments') => 'TEXTBOX', - _('Orientation') => 'ORIENTATION', - _('Destination') => 'DESTINATION')); -$reports->addReport(RC_MANUFACTURE, 402, _('Work Order &Listing'), - array( _('Items') => 'ITEMS_ALL', - _('Location') => 'LOCATIONS', - _('Outstanding Only') => 'YES_NO', - _('Comments') => 'TEXTBOX', - _('Orientation') => 'ORIENTATION', - _('Destination') => 'DESTINATION')); -$reports->addReport(RC_MANUFACTURE, 409, _('Print &Work Orders'), - array( _('From') => 'WORKORDER', - _('To') => 'WORKORDER', - _('Email Locations') => 'YES_NO', - _('Comments') => 'TEXTBOX', - _('Orientation') => 'ORIENTATION')); -$reports->addReportClass(_('Fixed Assets'), RC_FIXEDASSETS); -$reports->addReport(RC_FIXEDASSETS, 451, _('&Fixed Assets Valuation'), - array( _('End Date') => 'DATE', - _('Fixed Assets Class') => 'FCLASS', - _('Fixed Assets Location') => 'FLOCATIONS', - _('Summary Only') => 'YES_NO', - _('Comments') => 'TEXTBOX', - _('Orientation') => 'ORIENTATION', - _('Destination') => 'DESTINATION')); +if (get_company_pref('use_manufacturing')) +{ + $reports->addReportClass(_('Manufacturing'), RC_MANUFACTURE); + $reports->addReport(RC_MANUFACTURE, 401, _('&Bill of Material Listing'), + array( _('From product') => 'ITEMS', + _('To product') => 'ITEMS', + _('Comments') => 'TEXTBOX', + _('Orientation') => 'ORIENTATION', + _('Destination') => 'DESTINATION')); + $reports->addReport(RC_MANUFACTURE, 402, _('Work Order &Listing'), + array( _('Items') => 'ITEMS_ALL', + _('Location') => 'LOCATIONS', + _('Outstanding Only') => 'YES_NO', + _('Comments') => 'TEXTBOX', + _('Orientation') => 'ORIENTATION', + _('Destination') => 'DESTINATION')); + $reports->addReport(RC_MANUFACTURE, 409, _('Print &Work Orders'), + array( _('From') => 'WORKORDER', + _('To') => 'WORKORDER', + _('Email Locations') => 'YES_NO', + _('Comments') => 'TEXTBOX', + _('Orientation') => 'ORIENTATION')); +} +if (get_company_pref('use_fixed_assets')) +{ + $reports->addReportClass(_('Fixed Assets'), RC_FIXEDASSETS); + $reports->addReport(RC_FIXEDASSETS, 451, _('&Fixed Assets Valuation'), + array( _('End Date') => 'DATE', + _('Fixed Assets Class') => 'FCLASS', + _('Fixed Assets Location') => 'FLOCATIONS', + _('Summary Only') => 'YES_NO', + _('Comments') => 'TEXTBOX', + _('Orientation') => 'ORIENTATION', + _('Destination') => 'DESTINATION')); +} $reports->addReportClass(_('Dimensions'), RC_DIMENSIONS); if ($dim > 0) {