From 8812d8cd158fbeba8a3392c03fbe90e66f2b8c46 Mon Sep 17 00:00:00 2001 From: AjmalCybro Date: Thu, 7 Dec 2023 10:02:53 +0530 Subject: [PATCH] Dec 7 : [FIX] Bug Fixed 'mobile_service_shop' --- mobile_service_shop/__manifest__.py | 1 + mobile_service_shop/data/mobile_service_data.xml | 3 +-- .../data/mobile_service_email_template.xml | 2 +- mobile_service_shop/doc/RELEASE_NOTES.md | 5 +++++ mobile_service_shop/models/mobile_service.py | 12 +++++++----- mobile_service_shop/models/product_template.py | 4 +--- mobile_service_shop/models/service_ticket.py | 2 +- .../reports/mobile_service_email_template.xml | 4 ++-- mobile_service_shop/static/description/index.html | 2 +- mobile_service_shop/views/mobile_service_views.xml | 4 ++-- 10 files changed, 22 insertions(+), 17 deletions(-) diff --git a/mobile_service_shop/__manifest__.py b/mobile_service_shop/__manifest__.py index 629527777..3f532243a 100644 --- a/mobile_service_shop/__manifest__.py +++ b/mobile_service_shop/__manifest__.py @@ -39,6 +39,7 @@ 'views/brand_models_views.xml', 'views/mobile_brand_views.xml', 'wizard/mobile_create_invoice_views.xml', + 'reports/mobile_service_email_template.xml', 'reports/mobile_service_ticket.xml', 'data/mobile_service_data.xml', 'data/mobile_service_email_template.xml'], diff --git a/mobile_service_shop/data/mobile_service_data.xml b/mobile_service_shop/data/mobile_service_data.xml index 25d4c4a75..9c4e68f92 100644 --- a/mobile_service_shop/data/mobile_service_data.xml +++ b/mobile_service_shop/data/mobile_service_data.xml @@ -19,5 +19,4 @@ service - - \ No newline at end of file + diff --git a/mobile_service_shop/data/mobile_service_email_template.xml b/mobile_service_shop/data/mobile_service_email_template.xml index 24724d4d1..0460f60bf 100644 --- a/mobile_service_shop/data/mobile_service_email_template.xml +++ b/mobile_service_shop/data/mobile_service_email_template.xml @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/mobile_service_shop/doc/RELEASE_NOTES.md b/mobile_service_shop/doc/RELEASE_NOTES.md index 056bdabec..19d2251c8 100755 --- a/mobile_service_shop/doc/RELEASE_NOTES.md +++ b/mobile_service_shop/doc/RELEASE_NOTES.md @@ -4,3 +4,8 @@ #### Version 17.0.1.0.0 #### ADD Initial Commit for Mobile Service Management + +### 24.11.2023 +#### Version 17.0.1.0.1 +#### UPDT +Bug fix diff --git a/mobile_service_shop/models/mobile_service.py b/mobile_service_shop/models/mobile_service.py index df2e01875..941d4b718 100644 --- a/mobile_service_shop/models/mobile_service.py +++ b/mobile_service_shop/models/mobile_service.py @@ -26,6 +26,7 @@ import pytz class MobileService(models.Model): + """Creates the model mobile.service""" _name = 'mobile.service' _rec_name = 'name' _description = "Mobile Service" @@ -135,12 +136,13 @@ class MobileService(models.Model): string="Picking Id", help='Stock picking ID information.') picking_transfer_id = fields.Many2one('stock.picking.type', - 'Deliver To', + string='Deliver To', required=True, default=_default_picking_transfer, help="This will determine picking " "type of outgoing shipment.") - picking_count = fields.Integer() + picking_count = fields.Integer(string="Picking Count", + help='Number of outgoing shipment') @api.onchange('return_date') def check_date(self): @@ -283,7 +285,8 @@ class MobileService(models.Model): self.picking_count = len(picking) moves = order.filtered( lambda r: r.product_id.type in ['product', - 'consu'])._create_stock_moves_transfer(picking) + 'consu'])._create_stock_moves_transfer( + picking) move_ids = moves._action_confirm() move_ids._action_assign() if order.product_uom_qty < order.qty_stock_move: @@ -359,5 +362,4 @@ class MobileService(models.Model): 'complaint_description': description_text, 'mobile_brand': self.brand_name.brand_name, 'model_name': self.model_name.mobile_brand_models} - return (self.env.ref('mobile_service_shop.mobile_service_ticket'). - report_action(self, data=data)) + return self.env.ref('mobile_service_shop.mobile_service_ticket').report_action(self, data=data) diff --git a/mobile_service_shop/models/product_template.py b/mobile_service_shop/models/product_template.py index 94e20c087..e2de2351b 100644 --- a/mobile_service_shop/models/product_template.py +++ b/mobile_service_shop/models/product_template.py @@ -23,14 +23,12 @@ from odoo import fields, models class ProductTemplate(models.Model): - - # Inherited to add custom fields + """Inherits the model product.template to extend and add fields""" _inherit = 'product.template' is_a_parts = fields.Boolean( 'Is a Mobile Part', default=False, help="Specify if the product is a mobile part or not.") - brand_name = fields.Many2one('mobile.brand', string="Brand", help="Select a mobile brand for the part.") model_name = fields.Many2one('brand.model', string="Model Name", diff --git a/mobile_service_shop/models/service_ticket.py b/mobile_service_shop/models/service_ticket.py index aaee67447..37b8f11e1 100755 --- a/mobile_service_shop/models/service_ticket.py +++ b/mobile_service_shop/models/service_ticket.py @@ -27,7 +27,7 @@ class MobileServiceTicket(models.AbstractModel): _name = 'report.mobile_service_shop.mobile_service_ticket_template' @api.model - def _get_report_values(self, data): + def _get_report_values(self, docids, data): """Returns the data file for the report""" terms = self.env['terms.conditions'].search([]) return { diff --git a/mobile_service_shop/reports/mobile_service_email_template.xml b/mobile_service_shop/reports/mobile_service_email_template.xml index 27e920a53..be5718eb4 100644 --- a/mobile_service_shop/reports/mobile_service_email_template.xml +++ b/mobile_service_shop/reports/mobile_service_email_template.xml @@ -10,8 +10,8 @@

Service Ticket

- - +
+ diff --git a/mobile_service_shop/static/description/index.html b/mobile_service_shop/static/description/index.html index 2ce53ea6b..058630a88 100644 --- a/mobile_service_shop/static/description/index.html +++ b/mobile_service_shop/static/description/index.html @@ -1,4 +1,4 @@ - + diff --git a/mobile_service_shop/views/mobile_service_views.xml b/mobile_service_shop/views/mobile_service_views.xml index d893b2637..89ad7d2ab 100644 --- a/mobile_service_shop/views/mobile_service_views.xml +++ b/mobile_service_shop/views/mobile_service_views.xml @@ -264,7 +264,7 @@ - - \ No newline at end of file +
Ref no :