From 1ef52485d17e5bf0c172219f7c2435c2bdfb4554 Mon Sep 17 00:00:00 2001
From: sonal arora <sonal.arora@apagen.com>
Date: Fri, 25 Sep 2020 19:10:31 +0530
Subject: [PATCH] work on laundary mgt

---
 laundary_mgt/__manifest__.py                  |   4 +++-
 laundary_mgt/data/ir_sequence_data.xml        |   2 +-
 .../models/__pycache__/sale.cpython-36.pyc    | Bin 2789 -> 3312 bytes
 laundary_mgt/models/sale.py                   |  11 ++++++++++-
 laundary_mgt/views/project_task_view.xml      |  18 ++++++++++++++++++
 laundary_mgt/views/sale_views.xml             |  17 +++++++++++++++++
 6 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 laundary_mgt/views/project_task_view.xml

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/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 @@
         <record id="seq_sale_order_line" model="ir.sequence">
             <field name="name">Sales Order Line</field>
             <field name="code">sale.order.line</field>
-            <field name="prefix"></field>
+            <field name="prefix">/</field>
             <field name="padding">3</field>
             <field name="company_id" eval="False"/>
         </record>
diff --git a/laundary_mgt/models/__pycache__/sale.cpython-36.pyc b/laundary_mgt/models/__pycache__/sale.cpython-36.pyc
index fbcb6f0dc76b3ce1b257d319cf513ab30f39293c..4674b85b7059eec571e6a6ab2a8703df687bb5ac 100644
GIT binary patch
delta 726
zcmaJ;&ubG=5Z<@R{!F&U#7)!EKmx@!2NR+GtYS?gdJ7eM+C!IR=V6m<lJa&zT#z30
zs#4w`Al|%+;N6qnym{EGc=I557iU%x<H5JQkNM{NX7(}j#r?LjzU4S}@B7q$YbnZS
z<*!r3_$J<1VJGWf8+Q~q1MU+ATyBk59~Zn9)bA;s<u`S9qOnZA()Vha^&p53{p8^h
z&$MtJ%|#|l#u}=d#;4LnY$gnXZTZ}4vz~ly)g-fa<Ri1qcH|4QS)m__MPt+LW0G>Q
zj$pDPE2^R|f0*I_igwX^?VqAu`Al0mKENzjJO+xV0`m&IIMzUg0u(`eTJZFo>tKMH
zb0g;#*ig#3iQIxRILK7bMpl9)I0Y3rjn!qS;#6u`X-~|@JWTe3c#@Wnevxj1te@Ip
zG*1q@G^W%ZP}~{@Q=TrzLB#!NG~@mVy1B`pq0mu<i*L>h!J{DIAm17F<Fvlu{xf*&
zPJ_?8i!Cfms|&_lO`Uxagp<+ierqrXo~|xflHZyiq9!h2kK1W&!6EqFX&@%}um-B)
z7Q(ROh;u}`1U-WD1o^@*QFN8yGQkysZGsH~T9ddg1Fg{>U`XqZ%Luq?wZiCIVuF-m
er!C)GA1gO77Gx8&WigO1?Xzr6ez2QrRsRVWiL(6w

delta 287
zcmew$`BYTJn3tD}XG?DUYIX*O#|%h-1;};);^KD<6II@@rHBMGXo_yuV4TRx7&Unp
zTYzvBXL(|AMtn(SLFz5m<oulcqNvHT>@q-EEB0&LCP1x4Kr<PN%qK78lohoCGW9{m
zu>lDVMixdErXs7!0-R2h`#BUDttW5fkQJ~2DM#063lua((`XCSn2bl0v>i}`HJT=n
tn4hM?<kQ^exk0We0-0Q7H(7y0T;LXmO>TZlX-=vg$lJwIlP~hf0svNkIH&*s

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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+ <record id="view_sale_service_inherit_form2" model="ir.ui.view">
+            <field name="name">sale.service.form.view.inherit</field>
+            <field name="model">project.task</field>
+            <field name="groups_id" eval="[(4, ref('base.group_user'))]"/>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+                <field name="date_deadline" position="before">
+                    <field name="cloth_name"  attrs="{'invisible': ['|', ('partner_id', '=', False), '&amp;', ('sale_order_id', '!=', False), ('sale_line_id', '=', False)]}" options='{"no_open": True}' readonly="1" context="{'create': False, 'edit': False, 'delete': False}"/>
+                    <field name="wash_type"  attrs="{'invisible': ['|', ('partner_id', '=', False), '&amp;', ('sale_order_id', '!=', False), ('sale_line_id', '=', False)]}" options='{"no_open": True}' readonly="1" context="{'create': False, 'edit': False, 'delete': False}"/>
+                    <field name="color"  attrs="{'invisible': ['|', ('partner_id', '=', False), '&amp;', ('sale_order_id', '!=', False), ('sale_line_id', '=', False)]}" options='{"no_open": True}' readonly="1" context="{'create': False, 'edit': False, 'delete': False}"/>
+                    <field name="tracking_code" attrs="{'invisible': ['|', ('partner_id', '=', False), '&amp;', ('sale_order_id', '!=', False), ('sale_line_id', '=', False)]}" options='{"no_open": True}' readonly="1" context="{'create': False, 'edit': False, 'delete': False}"/>
+                    <field name="remark" attrs="{'invisible': ['|', ('partner_id', '=', False), '&amp;', ('sale_order_id', '!=', False), ('sale_line_id', '=', False)]}" options='{"no_open": True}' readonly="1" context="{'create': False, 'edit': False, 'delete': False}"/>
+                </field>
+            </field>
+        </record>       
+</odoo>
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 @@
                 </xpath>
             </field>
         </record>
+        <record id="sale_order_line_view_form_readonly_inherit" model="ir.ui.view">
+            <field name="name">sale.order.line.inherit</field>
+            <field name="model">sale.order.line</field>
+            <field name="inherit_id" ref="sale.sale_order_line_view_form_readonly"/>
+            <field name="arch" type="xml">
+                <xpath expr = "//field[@name='name']"  position = "after">
+                    <field name="cloth_name"/>
+                    <field name="wash_type"/>
+                    <field name="color"/>
+                    <field name="tracking_code"/>
+                </xpath>
+                <xpath expr = "//field[@name='price_total']"  position = "after">
+                    <field name="remark"/>
+                    <field name="upload_image"/>
+                </xpath>
+            </field>
+        </record>
 
         <!-- cloth type Master -->
         <record id="view_cloth_type_tree" model="ir.ui.view">