diff --git a/laundary_mgt/__manifest__.py b/laundary_mgt/__manifest__.py index da96006..acf6984 100644 --- a/laundary_mgt/__manifest__.py +++ b/laundary_mgt/__manifest__.py @@ -9,11 +9,13 @@ 'description': """ This module contains all the common features of Laundary Management. """, - 'depends': ['sale'], + 'depends': ['sale','sale_timesheet'], 'data': [ 'security/ir.model.access.csv', 'data/ir_sequence_data.xml', 'views/sale_views.xml', + 'views/sale_views.xml', + 'views/project_task_view.xml', ], 'demo': [ ], diff --git a/laundary_mgt/__pycache__/__init__.cpython-36.pyc b/laundary_mgt/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..f096223 Binary files /dev/null and b/laundary_mgt/__pycache__/__init__.cpython-36.pyc differ diff --git a/laundary_mgt/data/ir_sequence_data.xml b/laundary_mgt/data/ir_sequence_data.xml index 18b7a66..7c1b15c 100644 --- a/laundary_mgt/data/ir_sequence_data.xml +++ b/laundary_mgt/data/ir_sequence_data.xml @@ -6,7 +6,7 @@ Sales Order Line sale.order.line - + / 3 diff --git a/laundary_mgt/models/sale.py b/laundary_mgt/models/sale.py index 35125c2..1c11539 100644 --- a/laundary_mgt/models/sale.py +++ b/laundary_mgt/models/sale.py @@ -60,4 +60,13 @@ class ClothType(models.Model): _name = 'cloth.type' _description = 'Cloth Type' - name = fields.Char(string='Name') \ No newline at end of file + name = fields.Char(string='Name') + +class ProjectTask(models.Model): + _inherit = "project.task" + + cloth_name = fields.Many2one('cloth.type', string='Cloth Name',related='sale_line_id.cloth_name') + wash_type = fields.Many2one('wash.type', string='Wash Type',related='sale_line_id.wash_type') + color = fields.Many2one('color.type', string='Color', related='sale_line_id.color') + tracking_code = fields.Char(string='Tracking Code',related='sale_line_id.tracking_code') + remark = fields.Text('Remark',copy=False, related='sale_line_id.remark') \ No newline at end of file diff --git a/laundary_mgt/views/project_task_view.xml b/laundary_mgt/views/project_task_view.xml new file mode 100644 index 0000000..c81d78b --- /dev/null +++ b/laundary_mgt/views/project_task_view.xml @@ -0,0 +1,18 @@ + + + + sale.service.form.view.inherit + project.task + + + + + + + + + + + + + diff --git a/laundary_mgt/views/sale_views.xml b/laundary_mgt/views/sale_views.xml index ef74960..9d5b917 100644 --- a/laundary_mgt/views/sale_views.xml +++ b/laundary_mgt/views/sale_views.xml @@ -21,6 +21,23 @@ + + sale.order.line.inherit + sale.order.line + + + + + + + + + + + + + +