diff --git a/manufacturing_reports/README.rst b/manufacturing_reports/README.rst index a19ae24d8..79995ecda 100644 --- a/manufacturing_reports/README.rst +++ b/manufacturing_reports/README.rst @@ -1,35 +1,29 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: https://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 - -Manufacturing Reports -===================== -Provides an option to print XLSX and PDF report for the Manufacturing module. +Invoice From Stock Picking +========================== +* Enables the option for creating invoice from stock picking Installation ============ -- www.odoo.com/documentation/15.0/setup/install.html +- www.odoo.com/documentation/14.0/setup/install.html - Install our custom addon -Company +License ------- -* `Cybrosys Techno Solutions `__ +GNU AFFERO GENERAL PUBLIC LICENSE, Version 3 (AGPLv3) +(http://www.gnu.org/licenses/agpl.html) -License +Company ------- -Affero General Public License v3.0 (AGPL v3) -(https://www.gnu.org/licenses/agpl-3.0-standalone.html) +* `Cybrosys Techno Solutions `__ Credits ------- -* Developer: (V9) Cybrosys Technologies. - (V14) Javid A - (V15) Javid A +* Developer: + V14 Javid A Contacts -------- * Mail Contact : odoo@cybrosys.com -* Website : https://cybrosys.com Bug Tracker ----------- @@ -37,13 +31,10 @@ Bugs are tracked on GitHub Issues. In case of trouble, please check there if you Maintainer ========== -.. image:: https://cybrosys.com/images/logo.png - :target: https://cybrosys.com - This module is maintained by Cybrosys Technologies. -For support and more information, please visit `Our Website `__ +For support and more information, please visit https://www.cybrosys.com Further information =================== -HTML Description: ``__ \ No newline at end of file +HTML Description: ``__ diff --git a/manufacturing_reports/__init__.py b/manufacturing_reports/__init__.py index 756356f89..dc6987a52 100644 --- a/manufacturing_reports/__init__.py +++ b/manufacturing_reports/__init__.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- -############################################################################### +############################################################################# # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2023-TODAY Cybrosys Technologies() -# Author: Javid A (odoo@cybrosys.com) +# Copyright (C) 2023-TODAY Cybrosys Technologies(). +# Author: Javid A() # # You can modify it under the terms of the GNU AFFERO # GENERAL PUBLIC LICENSE (AGPL v3), Version 3. @@ -18,6 +18,6 @@ # (AGPL v3) along with this program. # If not, see . # -############################################################################### +############################################################################# +from . import wizards from . import controllers -from . import wizard diff --git a/manufacturing_reports/__manifest__.py b/manufacturing_reports/__manifest__.py index fa53c0262..1af20fd6a 100644 --- a/manufacturing_reports/__manifest__.py +++ b/manufacturing_reports/__manifest__.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- -############################################################################### +############################################################################# # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2023-TODAY Cybrosys Technologies() -# Author: Javid A (odoo@cybrosys.com) +# Copyright (C) 2023-TODAY Cybrosys Technologies(). +# Author: Javid A() # # You can modify it under the terms of the GNU AFFERO # GENERAL PUBLIC LICENSE (AGPL v3), Version 3. @@ -18,16 +18,13 @@ # (AGPL v3) along with this program. # If not, see . # -############################################################################### +############################################################################# { 'name': 'Manufacturing Reports', - 'version': '15.0.1.0.0', - 'category': 'Manufacturing', + 'version': '14.0.1.0.0', 'summary': 'PDF & XLS Reports For Manufacturing Module', - 'description': """This module crafted by Cybrosys Technologies provides - an option to print PDF & XLS report for MRP systems, - also you can view the product image in the report. This - works well for large and small business MRP systems.""", + 'description': 'PDF & XLS reports for manufacturing module with advanced filters.', + 'category': 'Manufacturing', 'author': 'Cybrosys Techno Solutions', 'website': "http://www.cybrosys.com", 'company': 'Cybrosys Techno Solutions', @@ -35,16 +32,12 @@ 'depends': ['base', 'mrp'], 'data': [ 'security/ir.model.access.csv', - 'reports/mrp_report_templates.xml', - 'reports/mrp_report_views.xml', - 'wizard/mrp_report_views.xml', - 'views/manufacturing_report_menus.xml', + 'views/action_manager.xml', + 'wizards/mrp_wizard_view.xml', + 'reports/mrp_report_template.xml', + 'reports/mrp_report.xml', + 'views/menu_items.xml', ], - 'assets': { - 'web.assets_backend': [ - 'manufacturing_reports/static/src/js/action_manager.js', - ] - }, 'images': ['static/description/banner.png'], 'license': 'AGPL-3', 'installable': True, diff --git a/manufacturing_reports/controllers/__init__.py b/manufacturing_reports/controllers/__init__.py index 5e45e82c9..ae3ce9c0d 100644 --- a/manufacturing_reports/controllers/__init__.py +++ b/manufacturing_reports/controllers/__init__.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- -############################################################################### +############################################################################# # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2023-TODAY Cybrosys Technologies() -# Author: Javid A (odoo@cybrosys.com) +# Copyright (C) 2023-TODAY Cybrosys Technologies(). +# Author: Javid A() # # You can modify it under the terms of the GNU AFFERO # GENERAL PUBLIC LICENSE (AGPL v3), Version 3. @@ -18,5 +18,5 @@ # (AGPL v3) along with this program. # If not, see . # -############################################################################### +############################################################################# from . import main diff --git a/manufacturing_reports/controllers/main.py b/manufacturing_reports/controllers/main.py index 9de857ff8..0c3902cc3 100644 --- a/manufacturing_reports/controllers/main.py +++ b/manufacturing_reports/controllers/main.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- -############################################################################### +############################################################################# # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2023-TODAY Cybrosys Technologies() -# Author: Javid A (odoo@cybrosys.com) +# Copyright (C) 2023-TODAY Cybrosys Technologies(). +# Author: Javid A() # # You can modify it under the terms of the GNU AFFERO # GENERAL PUBLIC LICENSE (AGPL v3), Version 3. @@ -18,7 +18,7 @@ # (AGPL v3) along with this program. # If not, see . # -############################################################################### +############################################################################# import json from odoo import http from odoo.http import content_disposition, request @@ -27,15 +27,11 @@ from odoo.tools import html_escape class XLSXReportController(http.Controller): - """Class for the controller class XLSXReportController. - Contains the function to print XLSX report.""" - @http.route('/xlsx_reports', type='http', auth='user', methods=['POST'], - csrf=False) - def get_report_xlsx(self, model, options, output_format, report_name): + @http.route('/xlsx_reports', type='http', auth='user', methods=['POST'], csrf=False) + def get_report_xlsx(self, model, options, output_format, token, report_name, **kw): uid = request.session.uid report_obj = request.env[model].with_user(uid) options = json.loads(options) - token = 'dummy-because-api-expects-one' try: if output_format == 'xlsx': response = request.make_response( diff --git a/manufacturing_reports/doc/RELEASE_NOTES.md b/manufacturing_reports/doc/RELEASE_NOTES.md index 9cd0835d9..4562c396c 100644 --- a/manufacturing_reports/doc/RELEASE_NOTES.md +++ b/manufacturing_reports/doc/RELEASE_NOTES.md @@ -1,11 +1,6 @@ ## Module #### 17.02.2023 -#### Version 15.0.1.0.0 +#### Version 14.0.1.0.0 ##### ADD -- Initial commit for Manufacturing Reports - -#### 10.07.2023 -#### Version 15.0.1.0.0 -#### UPDT -- Bug Fix for the xlsx report not printing issue in Manufacturing Reports \ No newline at end of file +- Initial commit diff --git a/manufacturing_reports/reports/mrp_report_views.xml b/manufacturing_reports/reports/mrp_report.xml similarity index 91% rename from manufacturing_reports/reports/mrp_report_views.xml rename to manufacturing_reports/reports/mrp_report.xml index 2c743c0d4..ca8905da3 100644 --- a/manufacturing_reports/reports/mrp_report_views.xml +++ b/manufacturing_reports/reports/mrp_report.xml @@ -1,6 +1,6 @@ - + Manufacturing Report mrp.report @@ -9,4 +9,5 @@ manufacturing_reports.report_mrp_order report + \ No newline at end of file diff --git a/manufacturing_reports/reports/mrp_report_template.xml b/manufacturing_reports/reports/mrp_report_template.xml new file mode 100644 index 000000000..8e00e5211 --- /dev/null +++ b/manufacturing_reports/reports/mrp_report_template.xml @@ -0,0 +1,44 @@ + + + + + + \ No newline at end of file diff --git a/manufacturing_reports/reports/mrp_report_templates.xml b/manufacturing_reports/reports/mrp_report_templates.xml deleted file mode 100644 index d4f09ddd7..000000000 --- a/manufacturing_reports/reports/mrp_report_templates.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - \ No newline at end of file diff --git a/manufacturing_reports/security/ir.model.access.csv b/manufacturing_reports/security/ir.model.access.csv index a21f91726..fb7bc75fe 100644 --- a/manufacturing_reports/security/ir.model.access.csv +++ b/manufacturing_reports/security/ir.model.access.csv @@ -1,2 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_mrp_report,access.mrp.report,model_mrp_report,base.group_user,1,1,1,1 + +access_mrp_report,access.mrp.report,model_mrp_report,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/manufacturing_reports/static/description/assets/screenshots/14_1.png b/manufacturing_reports/static/description/assets/screenshots/14_1.png index e3e6d92ab..87bf1c657 100644 Binary files a/manufacturing_reports/static/description/assets/screenshots/14_1.png and b/manufacturing_reports/static/description/assets/screenshots/14_1.png differ diff --git a/manufacturing_reports/static/description/assets/screenshots/14_2.png b/manufacturing_reports/static/description/assets/screenshots/14_2.png index 26cfd50cf..9ed7395ef 100644 Binary files a/manufacturing_reports/static/description/assets/screenshots/14_2.png and b/manufacturing_reports/static/description/assets/screenshots/14_2.png differ diff --git a/manufacturing_reports/static/description/banner.png b/manufacturing_reports/static/description/banner.png index bea96ebc8..c6397ae09 100644 Binary files a/manufacturing_reports/static/description/banner.png and b/manufacturing_reports/static/description/banner.png differ diff --git a/manufacturing_reports/static/description/index.html b/manufacturing_reports/static/description/index.html index 94e74026b..46a90839b 100644 --- a/manufacturing_reports/static/description/index.html +++ b/manufacturing_reports/static/description/index.html @@ -29,14 +29,17 @@

Manufacturing Reports

- PDF & XLSX Reports For Manufacturing Module

+ PDF & XLS Reports For Manufacturing Module

+ + +
Manufacturing Reports is a free Cybrosys MRP software which helps to generate advanced report for MRP module(Material requirements planning).This allows both PDF & XLS report - for MRP systems, also you can view the product image in the report. This works well for + for MRP systems. Also you can view the product image in the report. This works well for large and small business MRP systems.
@@ -124,29 +127,29 @@
- Filter manufacturing orders by product. + Community Support
- Filter manufacturing orders by start date. + Filter manufacturing orders based on Product
- Filter manufacturing orders by responsible person. + Set start to print the orders from that date
- Filter orders based on the status of the production. + Filter orders based on the status of the production
- Compatible with Community, Enterprise and Odoo.sh. + Enable filter based on the responsible person for production
@@ -177,17 +180,21 @@ Start Date and Responsible Person

+

PDF report with images.

+

XLS report

+ + @@ -265,7 +272,8 @@ class="carousel-control-prev-icon"> - + @@ -273,6 +281,7 @@ +
@@ -281,6 +290,7 @@

Our Services

+
@@ -292,6 +302,7 @@ Odoo Customization
+
@@ -301,6 +312,7 @@ Odoo Implementation
+
@@ -310,6 +322,8 @@ Odoo Support
+ +
@@ -320,6 +334,7 @@ Odoo Developer
+
@@ -329,6 +344,7 @@ Odoo Integration
+
@@ -338,6 +354,8 @@ Odoo Migration
+ +
@@ -347,6 +365,7 @@ Odoo Consultancy
+
@@ -356,6 +375,7 @@ Odoo Implementation
+
@@ -366,10 +386,13 @@ Licensing Consultancy
+
- + + +
@@ -379,6 +402,7 @@ Industries
+
@@ -394,6 +418,7 @@ sell your products

+
@@ -407,6 +432,7 @@ and convivial experience

+
@@ -419,6 +445,7 @@ educational management

+
@@ -431,6 +458,7 @@ schedule your operations

+
@@ -444,6 +472,7 @@ awe-inspiring product pages

+
@@ -456,6 +485,7 @@ services and invoice

+
@@ -468,6 +498,7 @@ restaurant methodically

+
@@ -483,7 +514,8 @@
- + +
diff --git a/manufacturing_reports/static/src/js/action_manager.js b/manufacturing_reports/static/src/js/action_manager.js index 2503b9eed..5663b890f 100644 --- a/manufacturing_reports/static/src/js/action_manager.js +++ b/manufacturing_reports/static/src/js/action_manager.js @@ -1,23 +1,31 @@ -/** @odoo-module */ -import { registry } from "@web/core/registry"; -import { download } from "@web/core/network/download"; -import framework from 'web.framework'; -import session from 'web.session'; +odoo.define('manufacturing_reports .action_manager', function (require) { +"use strict"; /** - * @override - * Add 'xlsx' report type to the report handler + * The purpose of this file is to add the actions of type + * 'ir_actions_xlsx_download' to the ActionManager. */ -registry.category("ir.actions.report handlers").add("xlsx", async (action) => { - if (action.report_type === 'xlsx') { - framework.blockUI(); - var def = $.Deferred(); - session.get_file({ - url: '/xlsx_reports', - data: action.data, - success: def.resolve.bind(def), - error: (error) => this.call('crash_manager', 'rpc_error', error), - complete: framework.unblockUI, - }); - return def; - } -}); \ No newline at end of file +var ActionManager = require('web.ActionManager'); +var framework = require('web.framework'); +var session = require('web.session'); +ActionManager.include({ + _executexlsxReportDownloadAction: function (action) { + framework.blockUI(); + var def = $.Deferred(); + session.get_file({ + url: '/xlsx_reports', + data: action.data, + success: def.resolve.bind(def), + error: (error) => this.call('crash_manager', 'rpc_error', error), + complete: framework.unblockUI, + }); + return def; + }, + _handleAction: function (action, options) { + if (action.report_type === 'xlsx') { + return this._executexlsxReportDownloadAction(action, options); + } + return this._super.apply(this, arguments); + +}, + }); + }); \ No newline at end of file diff --git a/manufacturing_reports/views/action_manager.xml b/manufacturing_reports/views/action_manager.xml new file mode 100644 index 000000000..3b3a05647 --- /dev/null +++ b/manufacturing_reports/views/action_manager.xml @@ -0,0 +1,10 @@ + + + +