diff --git a/invoice_stock_move/models/invoice_stock.py b/invoice_stock_move/models/invoice_stock.py
index de242e7a2..ea7fd74c9 100644
--- a/invoice_stock_move/models/invoice_stock.py
+++ b/invoice_stock_move/models/invoice_stock.py
@@ -36,15 +36,22 @@ class InvoiceStockMove(models.Model):
         for line in self.invoice_line_ids:
             if line.product_id:
                 if line.product_id.type == 'product':
-                    transfer_state = 'not_done'
+                    transfer_state = 'not_initiated'
                     break
         self.transfer_state = transfer_state
         domain=[('id','=',0)]
-        if transfer_state == 'not_done':
+        if transfer_state == 'not_initiated':
             if self.type in ['out_invoice','out_receipt']:
                 domain=[('code','=','outgoing')]
+                if self._fields.get('team_id',False) and self.team_id: # is a invoice from sale order 
+                    transfer_state = 'make_the_transfer_from_sale'
+                    return
+            
             elif self.type in ['in_invoice','in_receipt']:
                 domain=[('code','=','incoming')]
+                if self._fields.get('purchase_id',False) and self.purchase_id: # is a invoice from purchase order
+                    transfer_state = 'make_the_transfer_from_purchase'
+                    return
             if not self.picking_type_id:
                 type_obj = self.env['stock.picking.type']
                 company_id = self.env.context.get('company_id') or self.env.user.company_id.id
@@ -53,22 +60,16 @@ class InvoiceStockMove(models.Model):
     #            types = type_obj.search([('code', '=', 'incoming'), ('warehouse_id', '=', False)])
         return {'domain': {'picking_type_id': domain}}
 
-    transfer_state = fields.Selection([('not_done','not_done'),('nothing_to_transfer','nothing_to_transfer'),('done','done')],help='If the tranfer form invoice was done or not')
+    transfer_state = fields.Selection([('not_initiated','not_initiated'),
+                                       ('nothing_to_transfer','nothing_to_transfer'),
+                                       ('transfered','transfered'),
+                                       ('waiting_transfer','waiting_transfer'),
+                                       ('make_the_transfer_from_purchase','make_the_transfer_from_purchase'),
+                                       ('make_the_transfer_from_sale','make_the_transfer_from_sale'),
+                                       ],string='Stock Transfer State',help='If the transfer form invoice was done or not',copy=False)
     invoice_picking_id = fields.Many2one('stock.picking', string="Picking Id",copy=False)
     picking_type_id = fields.Many2one('stock.picking.type', 'Picking Type', required=False,
                                       help="This will determine picking type of incoming shipment",copy=False)
-#     picking_transfer_id = fields.Many2one('stock.picking.type', 'Deliver To', required=True,
-#                                           help="This will determine picking type of outgoing shipment",copy=False)
-#     state = fields.Selection([
-#         ('draft', 'Draft'),
-#         ('proforma', 'Pro-forma'),
-#         ('proforma2', 'Pro-forma'),
-#         ('posted', 'Posted'),
-#         ('post', 'Post'),
-#         ('cancel', 'Cancelled'),
-#         ('done', 'Received'),
-#     ], string='Status', index=True, readonly=True, default='draft',
-#         track_visibility='onchange', copy=False)
 
     def action_stock_move(self):
         "will be executed at the pressing of transfer button"
@@ -94,7 +95,7 @@ class InvoiceStockMove(models.Model):
                 }
                 picking = self.env['stock.picking'].create(pick)
                 self.invoice_picking_id = picking.id
-                self.transfer_state = 'done'
+                self.transfer_state = 'transfered'
                 moves = order.invoice_line_ids.filtered(lambda r: r.product_id.type in ['product'])._create_stock_moves(picking)
                 #, 'consu'
                 move_ids = moves._action_confirm()
diff --git a/invoice_stock_move/views/invoice_stock_move_view.xml b/invoice_stock_move/views/invoice_stock_move_view.xml
index a34db501d..95d568888 100644
--- a/invoice_stock_move/views/invoice_stock_move_view.xml
+++ b/invoice_stock_move/views/invoice_stock_move_view.xml
@@ -8,17 +8,17 @@
         <field name="arch" type="xml">
             <xpath expr="//header" position="inside">
                 <button name="action_stock_move" string="Transfer" type="object"  class="oe_highlight"
-                     attrs="{'invisible':['|',('state', '=', 'draft'),('transfer_state', '!=', 'not_done')]}"/>
+                     attrs="{'invisible':['|',('state', '=', 'draft'),('transfer_state', '!=', 'not_initiated')]}"/>
             </xpath>
             <xpath expr="//field[@name='invoice_date']" position="after">
-                <field name="picking_type_id" attrs="{'invisible':[('transfer_state','=','nothing_to_transfer')],'readonly':[('state','not in',['draft'])]}"/>
-                <field name="transfer_state" invisible="1"/>
+                <field name="picking_type_id" attrs="{'invisible':[('transfer_state','!=','not_initiated')],'readonly':[('state','not in',['draft'])]}"/>
+                <field name="transfer_state" invisible="0" readonly="1" force_save="1"/>
             </xpath>
             <xpath expr="//field[@name='name']" position="before">
                 <div class="oe_button_box" name="button_box">
                     <button type="object"
                         name="action_view_picking" states="open,paid"
-                        class="oe_stat_button" attrs="{'invisible':['|',('state','=','draft'),('transfer_state', '!=', 'done')]}"
+                        class="oe_stat_button" attrs="{'invisible':['|',('state','=','draft'),('transfer_state', '!=', 'transfered')]}"
                         icon="fa-truck">
 <!--                         <field name="transfer_state"  string="Shipment" widget="statinfo"/>
  -->                    </button>