From 9e228b95cebe981e5022e25ddc25cc82a98239e7 Mon Sep 17 00:00:00 2001
From: sonal arora <sonal.arora@apagen.com>
Date: Fri, 25 Sep 2020 14:53:51 +0530
Subject: [PATCH] work on laundary mgt

---
 laundary_mgt/data/ir_sequence_data.xml        |   2 +-
 .../models/__pycache__/sale.cpython-36.pyc    | Bin 2295 -> 2789 bytes
 laundary_mgt/models/sale.py                   |  20 +++-
 laundary_mgt/security/ir.model.access.csv     |   2 +
 laundary_mgt/views/sale_views.xml             |  87 ++++++++++++++++++
 5 files changed, 107 insertions(+), 4 deletions(-)

diff --git a/laundary_mgt/data/ir_sequence_data.xml b/laundary_mgt/data/ir_sequence_data.xml
index 451160e..18b7a66 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">Trac</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 a461ce34ef6df75ddccab3708dc2f2ce5c46abed..fbcb6f0dc76b3ce1b257d319cf513ab30f39293c 100644
GIT binary patch
delta 842
zcmb_Z&ubGw6rQ)4o&C|>%_eOs4T-5l5+gB6>knvcDa2avP$*R>3lc+SwZ^6?lOP(R
zA{B2v$ov)JNfi7GJhXp84kCzn(t{VTzS)LoJ$dND`}VzWX5M_?n_r2qsr;<#+Rpn{
z?Ttam7xLFfF<-*y{CJh$Kf6M>&l4{QPlQ%8y&DToB9r9f$czt}9G_SxrPSM>4`B+M
z5r$D!4ela5y3;4u$n6dJT+3OP`_QCVmE~(K<2_-0(lq<*1nKKF>)pPV2e9S$*o{fL
zU2la0w=3$62luz{)f#OcmJGQ<E3}9`WtYxQc$g5dfq{eQKn8k6`7~CPpXoA`WkJ6V
zT(<Pn%ZxK_aD7h;%usJKZgPv;d~7ckSXkTK!8HiRFn73%D<1B2vGRC)7lJtV(Og0v
z=xf<Vd#f!f-N!rOK(DI2XE(Om-OY%SQ|yeq#d1ksoI_=zqTsxO3-To^r}gM`aCo8?
z8Kl+Cx)4SAk<I63aOWwEj*nmh1*&=Afsf8S5Hm7s?5rQ{JJ6#p;-b1k&0SnkP*9LL
z3RzXoAt*f^^*)C;h&k-L^vsIP+(ch!XymbHNA$Gf#XO!Vfk@$RwPgP5@G8>(tz!W<
zU&8pKgKA=7C`65OC}cEQ6r%ED7qW;Vl&_Hx8-*xxwKOfi83(?4lW1&0X%>s}gIR#I
O{A5lV@uZhzN%k8T39A+W

delta 465
zcmY+AJxc>Y5QcBgz0KWuce#s3{ET8G5RD%(2oVtk#lj*Wg2<tSkPXK85!i?brV(ok
znZnvaw6aO#KM)0bNh|&UD?4!(8(o-(eRpQx8RjGY6(n=6Yqzcsi;G;--nBo6(S3=c
z@p6@X=EC35(m|^SPN0t}H5JP$yG=OVY-%goP62QAVJp*w8Y4A|ulgWs8b!19r6&O_
z9AIm{dn`-k{k@~zV!19VX^v-X3Ln^P)FB@YY~bJ!9sFc<n81>;3R`$@jLn;Zi-<5U
z_0XyqHB(rmY|(ky5!$3Xg+tn<tV7Bb-UWo7h|<hH27DdQd8)e&*>s1DQybZ<&_lpG
zJ{*h6jM9?|Qwr1g#xq@PxmuE;T|THESBpob!-`B{BC;@)rIHbfhDR`g0n<J3z^9N|
z{5F^HF)}m$-?DA|I^^h!j3~?z+DzGEV8#dXB-H>7wb)-%soo0d1U^|WTs4(>ys=aL
WYHpvl<miLYO>G_UnWM+NnEL~OK3U%Y

diff --git a/laundary_mgt/models/sale.py b/laundary_mgt/models/sale.py
index 304d3c8..35125c2 100644
--- a/laundary_mgt/models/sale.py
+++ b/laundary_mgt/models/sale.py
@@ -26,7 +26,8 @@ class SaleOrder(models.Model):
             company_id = default=lambda self: self.env.company
             seq_date = fields.Datetime.now()
             for line in order.order_line:
-                line.tracking_code = self.env['ir.sequence'].next_by_code('sale.order.line', sequence_date=seq_date) or _('New')
+                tracking_code = self.env['ir.sequence'].next_by_code('sale.order.line', sequence_date=seq_date) or _('New')
+                line.tracking_code = self.name + tracking_code
 
 
 class SaleOrderLine(models.Model):
@@ -34,8 +35,9 @@ class SaleOrderLine(models.Model):
     _description = 'Sales Order Line'
     
     wash_type = fields.Many2one('wash.type', string='Wash Type')
-    cloth_name = fields.Char(string='Cloth Name',copy=False)
-    tracking_code = fields.Char(string='Tracking Code',copy=False,readonly="1")
+    color = fields.Many2one('color.type', string='Color')
+    cloth_name = fields.Many2one('cloth.type',string='Cloth Name',copy=False)
+    tracking_code = fields.Char(string='Tracking Code',)
     remark = fields.Text('Remark',copy=False)
     upload_image = fields.Image("Upload Image")
 
@@ -46,4 +48,16 @@ class WashType(models.Model):
     _name = 'wash.type'
     _description = 'Wash Type'
 
+    name = fields.Char(string='Name')
+
+class ColorType(models.Model):
+    _name = 'color.type'
+    _description = 'Color Type'
+
+    name = fields.Char(string='Name')
+
+class ClothType(models.Model):
+    _name = 'cloth.type'
+    _description = 'Cloth Type'
+
     name = fields.Char(string='Name')
\ No newline at end of file
diff --git a/laundary_mgt/security/ir.model.access.csv b/laundary_mgt/security/ir.model.access.csv
index 643a646..57480db 100644
--- a/laundary_mgt/security/ir.model.access.csv
+++ b/laundary_mgt/security/ir.model.access.csv
@@ -1,2 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_wash_type,wash.type,model_wash_type,sales_team.group_sale_salesman,1,1,1,1
+access_color_type,color.type,model_color_type,sales_team.group_sale_salesman,1,1,1,1
+access_cloth_type,cloth.type,model_cloth_type,sales_team.group_sale_salesman,1,1,1,1
diff --git a/laundary_mgt/views/sale_views.xml b/laundary_mgt/views/sale_views.xml
index 239402a..ef74960 100644
--- a/laundary_mgt/views/sale_views.xml
+++ b/laundary_mgt/views/sale_views.xml
@@ -12,11 +12,98 @@
                 <xpath expr = "//notebook/page/field[@name = 'order_line']/tree/field[@name = 'name']"  position = "after">
                     <field name="cloth_name"/>
                     <field name="wash_type"/>
+                    <field name="color"/>
                     <field name="tracking_code"/>
                 </xpath>
                 <xpath expr = "//notebook/page/field[@name='order_line']/tree/field[@name='price_subtotal']"  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">
+           <field name="name">cloth.type.tree</field>
+           <field name="model">cloth.type</field>
+           <field name="priority" eval="8"/>
+           <field name="arch" type="xml">
+               <tree string="Cloth Type" editable="bottom">
+                   <field name="name" required="1"/>
+               </tree>
+           </field>
+       </record>
+       <record model="ir.actions.act_window" id="action_view_cloth_type_tree">
+           <field name="name">Cloth Type</field>
+           <field name="res_model">cloth.type</field>
+           <field name="view_mode">tree,kanban,form</field>
+           <field name="domain">[]</field>
+           <field name="help" type="html">
+               <p class="oe_view_no_content_create">Cloth type
+               </p>
+           </field>
+       </record>
+       <menuitem id="menu_action_view_cloth_type_tree"
+        name="Cloth Type Master"
+        parent="sale.menu_sale_config"
+        sequence="6"
+        action="action_view_cloth_type_tree"/>
+        <!-- END -->
+         <!-- Wash type Master -->
+        <record id="view_wash_type_tree" model="ir.ui.view">
+           <field name="name">wash.type.tree</field>
+           <field name="model">wash.type</field>
+           <field name="priority" eval="8"/>
+           <field name="arch" type="xml">
+               <tree string="Wash Type" editable="bottom">
+                   <field name="name" required="1"/>
+               </tree>
+           </field>
+       </record>
+       <record model="ir.actions.act_window" id="action_view_wash_type_tree">
+           <field name="name">Wash Type</field>
+           <field name="res_model">wash.type</field>
+           <field name="view_mode">tree,kanban,form</field>
+           <field name="domain">[]</field>
+           <field name="help" type="html">
+               <p class="oe_view_no_content_create">Wash type
+               </p>
+           </field>
+       </record>
+       <menuitem id="menu_action_view_wash_type_tree"
+        name="Wash Master"
+        parent="sale.menu_sale_config"
+        sequence="7"
+        action="action_view_wash_type_tree"/>
+        <!-- END -->
+
+        <!-- Color type Master -->
+        <record id="view_color_type_tree" model="ir.ui.view">
+           <field name="name">color.type.tree</field>
+           <field name="model">color.type</field>
+           <field name="priority" eval="8"/>
+           <field name="arch" type="xml">
+               <tree string="Color Master" editable="bottom">
+                   <field name="name" required="1"/>
+               </tree>
+           </field>
+       </record>
+       <record model="ir.actions.act_window" id="action_view_color_type_tree">
+           <field name="name">Color Type</field>
+           <field name="res_model">color.type</field>
+           <field name="view_mode">tree,form</field>
+           <field name="domain">[]</field>
+           <field name="help" type="html">
+               <p class="oe_view_no_content_create">Create new Color
+               </p>
+           </field>
+       </record>
+       <menuitem id="menu_action_view_color_type_tree"
+        name="Color Master"
+        parent="sale.menu_sale_config"
+        sequence="8"
+        action="action_view_color_type_tree"/>
+        <!-- END -->
+
+       
 </odoo>