Merge pull request #385 from HarshK-SerpentCS/13_sale_report_hide_price

[13.0] [MIG] sale_report_hide_price: Migrated the module in v13.

sale_report_hide_price/__manifest__.py

@@ -6,7 +6,7 @@
     'maintainer': 'Serpent Consulting Services Pvt. Ltd.',
     'category': 'Sales Management',
     'website': 'http://www.serpentcs.com',
-    'version': '12.0.1.0.1',
+    'version': '13.0.1.0.1',
     'license': 'AGPL-3',
     'summary': 'Hide price/discount in Sale Order Report',
     'depends': [

sale_report_hide_price/models/sale.py

@@ -13,4 +13,4 @@ class SaleOrder(models.Model):
     show_discount = fields.Boolean(
         'Show Discount',
         help="If checked, you can see the discount"
-            " in report of Sales Order/Quotation.")
+            " in report of Sales Order/Quotation.")

sale_report_hide_price/static/description/index.html

@@ -20,15 +20,15 @@ <h4 class="oe_slogan" style="font-family:times new roman;color:#8a8a8a;margin-bo
                 Based on the choices on the fields, the relevant fields would be shown in the report.
             </p>
             <div>
-                <img class="oe_demo oe_picture oe_screenshot" width="700px" src="price_and_discount_in_sale_order.png"/>
+                <img class="oe_demo oe_picture oe_screenshot" width="700px" src="show.png"/>
             </div>
         </div>
     </section>
 
     <section class="oe_container">
 	    <div class="oe_row oe_spaced" style="background:#f3f0f0;padding-top:2px;padding-bottom:10px;margin-top:20px;margin-bottom:20px;">
             <h2 class="oe_slogan" style="font-family:times new roman;color:#875A7B;margin-top:20px;margin-bottom:20px;">
-                <span class="label" style="background:#875A7B;">
+                <span class="label">
                     Reports
                 </span>
             </h2>
@@ -39,23 +39,23 @@ <h2 class="oe_slogan" style="font-family:times new roman;color:#875A7B;margin-to
 	            </p>
 	        </div>
             <div>
-                <img class="oe_demo oe_picture oe_screenshot" width="700px" src="price_and_discount_in_report.jpg"/>
+                <img class="oe_demo oe_picture oe_screenshot" width="700px" src="report.png"/>
             </div>
             <div>
 	            <p class="oe_mt32 text-justify" style="font-size: 18px;font-family:times new roman;margin-left:65px;margin-right:65px;">
 	                When Show Price is checked then it will show Unit Price and Price in sales order report.
 	            </p>
 	        </div>
             <div>
-                <img class="oe_demo oe_picture oe_screenshot" width="700px" src="price_in_report.jpg"/>
+                <img class="oe_demo oe_picture oe_screenshot" width="700px" src="price.png"/>
             </div>
             <div>
 	            <p class="oe_mt32 text-justify" style="font-size: 18px;font-family:times new roman;margin-left:65px;margin-right:65px;">
 	                When Show Discount is checked then it will show discount in sales order report.
 	            </p>
 	        </div>
             <div>
-                <img class="oe_demo oe_picture oe_screenshot" width="700px" src="discount_in_report.jpg"/>
+                <img class="oe_demo oe_picture oe_screenshot" width="700px" src="discount.png"/>
             </div>
 	    </div>
 	</section>

sale_report_hide_price/views/report_saleorder.xml

@@ -5,12 +5,12 @@
         <!-- Discount fields hides from sale quotation report if show and hide price from Quotation -->
         <td t-if="display_discount" position="replace">
             <t t-if="doc.show_discount">
-                <td t-if="display_discount" class="text-right" groups="sale.group_discount_per_so_line">
+                <td t-if="display_discount" class="text-right" groups="product.group_discount_per_so_line">
                     <span t-field="line.discount" />
                 </td>
             </t>
             <t t-if="not doc.show_discount">
-                <td class="text-right" groups="sale.group_discount_per_so_line">-N.A.-</td>
+                <td class="text-right" groups="product.group_discount_per_so_line">-N.A.-</td>
             </t>
         </td>
         <xpath expr="//table[hasclass('table-sm')]/tbody/t[2]/tr/t/td[3]" position="replace">
@@ -26,8 +26,8 @@
         <xpath expr="//table[hasclass('table-sm')]/tbody/t[2]/tr/t/td[last()]" position="replace">
             <t t-if="doc.show_price">
                 <td class="text-right" groups="account.group_show_line_subtotals_tax_excluded">
-                     <span t-field="line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
-                     <span t-field="line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
+                    <span t-field="line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
+                    <span t-field="line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
                 </td>
             </t>
             <t t-if="not doc.show_price">