diff --git a/inventory_report_generator/README.rst b/inventory_report_generator/README.rst index faa27e1bd..526bfb577 100644 --- a/inventory_report_generator/README.rst +++ b/inventory_report_generator/README.rst @@ -4,7 +4,7 @@ Inventory All In One Report Generator Installation ============ - - www.odoo.com/documentation/15.0/setup/install.html + - www.odoo.com/documentation/16.0/setup/install.html - Install our custom addon License diff --git a/inventory_report_generator/__init__.py b/inventory_report_generator/__init__.py index ae81acf51..795256c80 100644 --- a/inventory_report_generator/__init__.py +++ b/inventory_report_generator/__init__.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2022-TODAY Cybrosys Technologies(). +# Copyright (C) 2023-TODAY Cybrosys Technologies(). # # You can modify it under the terms of the GNU AFFERO # GENERAL PUBLIC LICENSE (AGPL v3), Version 3. diff --git a/inventory_report_generator/__manifest__.py b/inventory_report_generator/__manifest__.py index c58a1cb87..d1ae5823b 100644 --- a/inventory_report_generator/__manifest__.py +++ b/inventory_report_generator/__manifest__.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2022-TODAY Cybrosys Technologies(). +# Copyright (C) 2023-TODAY Cybrosys Technologies(). # # You can modify it under the terms of the GNU AFFERO # GENERAL PUBLIC LICENSE (AGPL v3), Version 3. diff --git a/inventory_report_generator/controllers/__init__.py b/inventory_report_generator/controllers/__init__.py index 38e203392..6fdc086b9 100644 --- a/inventory_report_generator/controllers/__init__.py +++ b/inventory_report_generator/controllers/__init__.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2022-TODAY Cybrosys Technologies(). +# Copyright (C) 2023-TODAY Cybrosys Technologies(). # # You can modify it under the terms of the GNU AFFERO # GENERAL PUBLIC LICENSE (AGPL v3), Version 3. diff --git a/inventory_report_generator/controllers/main.py b/inventory_report_generator/controllers/main.py index b83592258..c39b45794 100644 --- a/inventory_report_generator/controllers/main.py +++ b/inventory_report_generator/controllers/main.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2022-TODAY Cybrosys Technologies(). +# Copyright (C) 2023-TODAY Cybrosys Technologies(). # # You can modify it under the terms of the GNU AFFERO # GENERAL PUBLIC LICENSE (AGPL v3), Version 3. diff --git a/inventory_report_generator/models/__init__.py b/inventory_report_generator/models/__init__.py index dcab515ab..ae54ad4de 100644 --- a/inventory_report_generator/models/__init__.py +++ b/inventory_report_generator/models/__init__.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2022-TODAY Cybrosys Technologies(). +# Copyright (C) 2023-TODAY Cybrosys Technologies(). # # You can modify it under the terms of the GNU AFFERO # GENERAL PUBLIC LICENSE (AGPL v3), Version 3. diff --git a/inventory_report_generator/models/inventory_report.py b/inventory_report_generator/models/inventory_report.py index 8267a53b6..85f71e35a 100644 --- a/inventory_report_generator/models/inventory_report.py +++ b/inventory_report_generator/models/inventory_report.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2022-TODAY Cybrosys Technologies(). +# Copyright (C) 2023-TODAY Cybrosys Technologies(). # # You can modify it under the terms of the GNU AFFERO # GENERAL PUBLIC LICENSE (AGPL v3), Version 3. @@ -32,7 +32,7 @@ except ImportError: class DynamicInventoryReport(models.Model): _name = "dynamic.inventory.report" - purchase_report = fields.Char(string="Purchase Report") + purchase_report = fields.Char(string="Inventory Report") date_from = fields.Datetime(string="Date From") date_to = fields.Datetime(string="Date to") report_type = fields.Selection([ @@ -260,7 +260,7 @@ class DynamicInventoryReport(models.Model): txt_v = workbook.add_format( {'align': 'right', 'font_size': '10px', 'border': 1}) sheet.merge_range('A2:H3', - 'Purchase Report', + 'Inventory Report', head) date_head = workbook.add_format({'align': 'center', 'bold': True, 'font_size': '10px'}) diff --git a/inventory_report_generator/report/__init__.py b/inventory_report_generator/report/__init__.py index 7cee049b6..c51c2db32 100644 --- a/inventory_report_generator/report/__init__.py +++ b/inventory_report_generator/report/__init__.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2022-TODAY Cybrosys Technologies(). +# Copyright (C) 2023-TODAY Cybrosys Technologies(). # # You can modify it under the terms of the GNU AFFERO # GENERAL PUBLIC LICENSE (AGPL v3), Version 3. diff --git a/inventory_report_generator/report/inventory_pdf_report.py b/inventory_report_generator/report/inventory_pdf_report.py index 28f0cb31b..a7792903e 100644 --- a/inventory_report_generator/report/inventory_pdf_report.py +++ b/inventory_report_generator/report/inventory_pdf_report.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2022-TODAY Cybrosys Technologies(). +# Copyright (C) 2023-TODAY Cybrosys Technologies(). # # You can modify it under the terms of the GNU AFFERO # GENERAL PUBLIC LICENSE (AGPL v3), Version 3. diff --git a/inventory_report_generator/report/inventory_pdf_report.xml b/inventory_report_generator/report/inventory_pdf_report.xml index 6333d6c07..aedd7f159 100644 --- a/inventory_report_generator/report/inventory_pdf_report.xml +++ b/inventory_report_generator/report/inventory_pdf_report.xml @@ -58,7 +58,7 @@ - + @@ -139,7 +139,7 @@
ReferenceReference Scheduled Date
- +
CategoryCategory Product Name Create Date Product Cost @@ -155,7 +155,7 @@ - + @@ -208,7 +208,7 @@ - + diff --git a/inventory_report_generator/static/description/assets/screenshots/12.png b/inventory_report_generator/static/description/assets/screenshots/12.png new file mode 100644 index 000000000..be89497b4 Binary files /dev/null and b/inventory_report_generator/static/description/assets/screenshots/12.png differ diff --git a/inventory_report_generator/static/description/assets/screenshots/13.png b/inventory_report_generator/static/description/assets/screenshots/13.png new file mode 100644 index 000000000..1d74c484e Binary files /dev/null and b/inventory_report_generator/static/description/assets/screenshots/13.png differ diff --git a/inventory_report_generator/static/description/assets/screenshots/14.png b/inventory_report_generator/static/description/assets/screenshots/14.png new file mode 100644 index 000000000..b0cad275d Binary files /dev/null and b/inventory_report_generator/static/description/assets/screenshots/14.png differ diff --git a/inventory_report_generator/static/description/assets/screenshots/15.png b/inventory_report_generator/static/description/assets/screenshots/15.png new file mode 100644 index 000000000..ecce3c94c Binary files /dev/null and b/inventory_report_generator/static/description/assets/screenshots/15.png differ diff --git a/inventory_report_generator/static/description/icon .png b/inventory_report_generator/static/description/icon.png similarity index 100% rename from inventory_report_generator/static/description/icon .png rename to inventory_report_generator/static/description/icon.png diff --git a/inventory_report_generator/static/description/index.html b/inventory_report_generator/static/description/index.html index 3e9c9d4c0..298bea0d7 100644 --- a/inventory_report_generator/static/description/index.html +++ b/inventory_report_generator/static/description/index.html @@ -185,19 +185,19 @@ Generates Report for a specific date range.

All In One Inventory Report Menu

- +

Inventory Report Based On Categories

- +

- Inventory Report Based On Product

- + Inventory Report Based On Location +
diff --git a/inventory_report_generator/static/src/css/inventory_report.css b/inventory_report_generator/static/src/css/inventory_report.css index 55c212770..ff4d63008 100644 --- a/inventory_report_generator/static/src/css/inventory_report.css +++ b/inventory_report_generator/static/src/css/inventory_report.css @@ -44,3 +44,17 @@ tr.table_pr_head th { font-size: 18px; text-align: center; } +.btn-secondary { + color: #000000; + background-color: #FFFFFF; + border-color: #FFFFFF; + color: #66598f; + PADDING: 0PX; +} +.table_view_pr { + overflow-y: scroll; + position: relative; + height: 800px; + max-width: 100%; + +} diff --git a/inventory_report_generator/static/src/xml/inventory_report_view.xml b/inventory_report_generator/static/src/xml/inventory_report_view.xml index b7019c92a..2cc0af9f6 100644 --- a/inventory_report_generator/static/src/xml/inventory_report_view.xml +++ b/inventory_report_generator/static/src/xml/inventory_report_view.xml @@ -58,7 +58,7 @@ t-att-name="prefix"/>
+ data-toggle="datetimepicker" style="pointer-events: none;">
+ data-toggle="datetimepicker" style="pointer-events: none;"> - -
@@ -170,7 +168,7 @@ aria-expanded="false"> - +
WarehouseWarehouse Date Company Location - + @@ -308,7 +306,7 @@ - + diff --git a/inventory_report_generator/views/inventory_report.xml b/inventory_report_generator/views/inventory_report.xml index bd239f410..d0e8acad1 100644 --- a/inventory_report_generator/views/inventory_report.xml +++ b/inventory_report_generator/views/inventory_report.xml @@ -5,7 +5,7 @@ inv_r -