Apr 3 : [UPDT] Updated 'inventory_report_generator'

2 years ago · 237036bc89
19 changed files with 40 additions and 28 deletions
--- 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
--- 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(<https://www.cybrosys.com>).
+#    Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
 #
 #    You can modify it under the terms of the GNU AFFERO
 #    GENERAL PUBLIC LICENSE (AGPL v3), Version 3.
--- 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(<https://www.cybrosys.com>).
+# Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
 #
 #    You can modify it under the terms of the GNU AFFERO
 #    GENERAL PUBLIC LICENSE (AGPL v3), Version 3.
--- 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(<https://www.cybrosys.com>).
+# Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
 #
 #    You can modify it under the terms of the GNU AFFERO
 #    GENERAL PUBLIC LICENSE (AGPL v3), Version 3.
--- 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(<https://www.cybrosys.com>).
+#    Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
 #
 #    You can modify it under the terms of the GNU AFFERO
 #    GENERAL PUBLIC LICENSE (AGPL v3), Version 3.
--- 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(<https://www.cybrosys.com>).
+#    Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
 #
 #    You can modify it under the terms of the GNU AFFERO
 #    GENERAL PUBLIC LICENSE (AGPL v3), Version 3.
--- 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(<https://www.cybrosys.com>).
+#    Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
 #
 #    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'})
--- 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(<https://www.cybrosys.com>).
+#    Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
 #
 #    You can modify it under the terms of the GNU AFFERO
 #    GENERAL PUBLIC LICENSE (AGPL v3), Version 3.
--- 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(<https://www.cybrosys.com>).
+#    Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
 #
 #    You can modify it under the terms of the GNU AFFERO
 #    GENERAL PUBLIC LICENSE (AGPL v3), Version 3.
--- a/inventory_report_generator/report/inventory_pdf_report.xml
+++ b/inventory_report_generator/report/inventory_pdf_report.xml
@ -58,7 +58,7 @@
                <table class="table table-sm table-reports">
                    <thead>
                        <tr>
-                            <th class="text-left">Reference</th>
+                            <th colspan="6" class="text-left">Reference</th>
                            <th colspan="6" class="text-center">Scheduled
                                Date
                            </th>
@ -139,7 +139,7 @@
                <table class="table table-sm table-reports">
                    <thead>
                        <tr class="text-left">
-                            <th>Category</th>
+                            <th colspan="6">Category</th>
                            <th colspan="6">Product Name</th>
                            <th colspan="6" class="text-right">Create Date</th>
                            <th colspan="6" class="text-center">Product Cost
@ -155,7 +155,7 @@
                                    <span t-esc="main['category']"/>
                                </td>
                                <td colspan="6">
-                                    <span t-esc="main['name']"/>
+                                    <span t-esc="main['name']['en_US']"/>
                                </td>
                                <td colspan="6">
                                    <span t-esc="main['create_date']"/>
@ -208,7 +208,7 @@
                <table class="table table-sm table-reports">
                    <thead>
                        <tr>
-                            <th class="text-left">Warehouse</th>
+                            <th colspan="6" class="text-left">Warehouse</th>
                            <th colspan="6" class="text-center">Date</th>
                            <th colspan="6" class="text-right">Company</th>
                            <th colspan="6" class="text-right">Location</th>
--- a/inventory_report_generator/static/description/assets/screenshots/12.png
+++ b/inventory_report_generator/static/description/assets/screenshots/12.png
--- a/inventory_report_generator/static/description/assets/screenshots/13.png
+++ b/inventory_report_generator/static/description/assets/screenshots/13.png
--- a/inventory_report_generator/static/description/assets/screenshots/14.png
+++ b/inventory_report_generator/static/description/assets/screenshots/14.png
--- a/inventory_report_generator/static/description/assets/screenshots/15.png
+++ b/inventory_report_generator/static/description/assets/screenshots/15.png
--- a/inventory_report_generator/static/description/icon.png
+++ b/inventory_report_generator/static/description/icon.png
--- 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.</span>
        <div style="display: block; margin: 30px auto;">
            <h3 style="font-family: 'Montserrat', sans-serif; font-size: 18px; font-weight: bold;">
                All In One Inventory Report Menu</h3>
-            <img src="assets/screenshots/1.png" class="img-thumbnail">
+            <img src="assets/screenshots/15.png" class="img-thumbnail">
        </div>

        <div style="display: block; margin: 30px auto;">
            <h3 style="font-family: 'Montserrat', sans-serif; font-size: 18px; font-weight: bold;">
                Inventory Report Based On Categories</h3>
-            <img src="assets/screenshots/2.png" class="img-thumbnail">
+            <img src="assets/screenshots/13.png" class="img-thumbnail">
        </div>

        <div style="display: block; margin: 30px auto;">
            <h3 style="font-family: 'Montserrat', sans-serif; font-size: 18px; font-weight: bold;">
-                Inventory Report Based On Product</h3>
-            <img src="assets/screenshots/3.png" class="img-thumbnail">
+                Inventory Report Based On Location</h3>
+            <img src="assets/screenshots/14.png" class="img-thumbnail">
        </div>

    </div>
--- 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%;
+
+}
--- 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"/>
                                <div class="input-group-append"
                                     data-target="#date_from"
-                                     data-toggle="datetimepicker">
+                                     data-toggle="datetimepicker" style="pointer-events: none;">
                                    <span class="input-group-text"
                                          style="justify-content:center;padding-bottom: 10px;padding-top: 5px;">
                                        <span class="fa fa-calendar" role="img"
@ -77,7 +77,7 @@
                                       t-att-name="prefix"/>
                                <div class="input-group-append"
                                     data-target="#date_to"
-                                     data-toggle="datetimepicker">
+                                     data-toggle="datetimepicker" style="pointer-events: none;">
                                    <span class="input-group-text"
                                          style="justify-content:center;padding-bottom: 10px;padding-top: 5px;">
                                        <span class="fa fa-calendar" role="img"
@ -105,7 +105,7 @@
                        <select id="selection"
                                class="dropdown-menu report_type"
                                name="states[]">
-                            <div role="separator" class="dropdown-divider"/>
+                                <div role="separator" class="dropdown-divider"/>
                            <option value="report_by_transfers" selected="">
                                Report By Transfers
                            </option>
@ -131,9 +131,7 @@
                        Apply
                    </button>
                </div>
-
            </div>
-
        </div>
    </t>

@ -170,7 +168,7 @@
                                               aria-expanded="false">
                                                <span class="caret"/>
                                                <span>
-                                                    <t t-esc="dynamic_inventory_report['name']"/>
+                                                    <t t-esc="dynamic_inventory_report['name']['en_US']"/>
                                                </span>
                                            </a>
                                            <ul class="dropdown-menu"
@ -253,7 +251,7 @@
                                </td>
                                <td style="text-align:center;">
                                    <span>
-                                        <t t-esc="dynamic_inventory_report['name']"/>
+                                        <t t-esc="dynamic_inventory_report['name']['en_US']"/>
                                    </span>
                                </td>
                                <td style="text-align:center;">
@ -308,7 +306,7 @@
                                    <i class="fa fa-caret-down" role="img"
                                       aria-label="Unfolded" title="Unfolded"/>
                                    <span>
-                                        <t t-esc="dynamic_inventory_report['name']"/>
+                                        <t t-esc="dynamic_inventory_report['name']['en_US']"/>
                                    </span>
                                </td>
                                <td style="text-align:center;">
--- a/inventory_report_generator/views/inventory_report.xml
+++ b/inventory_report_generator/views/inventory_report.xml
@ -5,7 +5,7 @@
    <field name="tag">inv_r</field>
 </record>

-    <menuitem action="inventory_all_report_action" parent="stock.menu_valuation"
+    <menuitem action="inventory_all_report_action" parent="stock.menu_warehouse_report"
              id="inventory_report_sub_menu"
              name="All In One Inventory Report"/>