Merge lp:~dorian-kemps/unifield-server/US-5952 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_cross_docking/cross_docking_view.xml'
--- bin/addons/msf_cross_docking/cross_docking_view.xml	2018-11-05 10:49:58 +0000
+++ bin/addons/msf_cross_docking/cross_docking_view.xml	2019-06-18 12:13:56 +0000
@@ -34,20 +34,20 @@
                     <xpath expr="//tree[@string='Stock Moves']//field[@name='location_id']" position="after" >
                         <field name="product_type" invisible="1" />
                         <button name="button_cross_docking" string="Cross docking" type="object" icon="gtk-select-color"
-                        attrs="{'invisible':['|', '|', '|', ('product_type', 'in', ['consu', 'service_recep']), ('allocation_setup', '=', 'unallocated'),('move_cross_docking_ok','=', True), ('state', 'in', ('done','cancel'))]}"
+                        attrs="{'invisible':['|', '|', '|', ('product_type', 'in', ['consu', 'service_recep']), ('allocation_setup', '=', 'unallocated'),('move_cross_docking_ok','=', True), ('state', 'in', ('done','delivered','cancel'))]}"
                         context="{'from_button': True}"  />
                         <button name="button_stock" string="Stock" type="object" icon="gtk-media-play"
-                        attrs="{'invisible':['|', '|', ('product_type', 'in', ['consu', 'service_recep']), ('move_cross_docking_ok','=', False), ('state', 'in', ('done','cancel'))]}"
+                        attrs="{'invisible':['|', '|', ('product_type', 'in', ['consu', 'service_recep']), ('move_cross_docking_ok','=', False), ('state', 'in', ('done','delivered','cancel'))]}"
                         context="{'from_button': True}"  />
                         <field name="move_cross_docking_ok" invisible='1'/>
                         <field name="allocation_setup" invisible="1" />
                     </xpath>
                     <xpath expr="/form/notebook/page[@string='Products']/group/field[@name='state']" position="after" >
                         <button name="button_cross_docking_all" string="Cross docking" type="object" icon="gtk-select-color"
-                        attrs="{'invisible':['|', '|', ('allocation_setup', '=', 'unallocated'), ('cross_docking_ok','=', True), ('state', 'in', ('done','cancel'))]}"
+                        attrs="{'invisible':['|', '|', ('allocation_setup', '=', 'unallocated'), ('cross_docking_ok','=', True), ('state', 'in', ('done','delivered','cancel'))]}"
                         context="{'from_button': True}" />
                         <button name="button_stock_all" string="Stock" type="object" icon="gtk-media-play"
-                        attrs="{'invisible':['|', ('cross_docking_ok','=', False), ('state', 'in', ('done','cancel'))]}"
+                        attrs="{'invisible':['|', ('cross_docking_ok','=', False), ('state', 'in', ('done','delivered','cancel'))]}"
                         context="{'from_button': True}"  />
                         <field name="allocation_setup" invisible="1" />
                     </xpath>

=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2019-05-10 13:59:15 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2019-06-18 12:13:56 +0000
@@ -1801,12 +1801,12 @@
             # gather the corresponding packing and trigger the corresponding function
             packing_ids = pick_obj.search(cr, uid, [('shipment_id', '=', shipment.id), ('state', '=', 'done')], context=context)
             # set delivered all packings
-            pick_obj.set_delivered(cr, uid, packing_ids, context=context)
+            # TODO: Rework after the out_step module removal
+            pick_obj.write(cr, uid, packing_ids, {'delivered': True}, context=context)
 
         return True
 
 
-
 shipment()
 
 

=== modified file 'bin/addons/msf_outgoing/msf_outgoing_view.xml'
--- bin/addons/msf_outgoing/msf_outgoing_view.xml	2019-04-02 15:58:15 +0000
+++ bin/addons/msf_outgoing/msf_outgoing_view.xml	2019-06-18 12:13:56 +0000
@@ -217,7 +217,7 @@
 						<group colspan="2" col="2">
 							<field name="date" readonly="1"/>
 							<field name="stock_journal_id" widget="selection" invisible="True" />
-							<field name="min_date" string="Expected Pick Date" attrs="{'readonly': [('state', 'in', ['done', 'cancel'])]}"
+							<field name="min_date" string="Expected Pick Date" attrs="{'readonly': [('state', 'in', ['done', 'cancel', 'delivered'])]}"
 								   on_change="change_min_date()" required="1" />
                             <field name="min_date_manually" invisible="1" />
 							<field name="sale_id" invisible="True" />

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2019-04-09 12:51:41 +0000
+++ bin/addons/msf_profile/data/patches.xml	2019-06-18 12:13:56 +0000
@@ -416,5 +416,10 @@
             <field name="method">us_5771_allow_all_cc_in_default_dest</field>
         </record>
 
+        <!-- UF14.0 -->
+        <record id="us_5952_delivered_closed_outs_to_delivered_state" model="patch.scripts">
+            <field name="method">us_5952_delivered_closed_outs_to_delivered_state</field>
+        </record>
+
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-06-04 19:13:17 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-06-18 12:13:56 +0000
@@ -83812,12 +83812,14 @@
 msgid "B7  21  88 x 125 mm"
 msgstr "B7  21  88 x 125 mm"
 
-#. modules: out_step, msf_outgoing, sale
+#. modules: out_step, msf_outgoing, sale, stock_forecast, stock
 #: view:shipment:0
 #: view:stock.picking:0
 #: field:stock.picking,delivered:0
 #: selection:stock.picking,state_hidden:0
 #: field:sale.order,shipped:0
+#: selection:stock.picking,state:0
+#: selection:stock.forecast.line,state:0
 msgid "Delivered"
 msgstr "Livré"
 
@@ -95852,14 +95854,16 @@
 "* Available: products reserved, simply waiting for confirmation.\n"
 "* Available Shipped: products already shipped at supplier, simply waiting for arrival confirmation.\n"
 "* Waiting: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)\n"
-"* Closed: has been processed, can't be modified or cancelled anymore\n"
+"* Done: has been processed, can't be modified or cancelled anymore. Can still be processed to Delivered if the document is an OUT\n"
+"* Delivered: has been delivered, only for a closed OUT\n"
 "* Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr "* Brouillon: pas encore confirmé et ne sera pas planifié avant confirmation\n"
 "* Confirmé: encore en attente de la disponibilité produits\n"
 "* Disponible: produits reservé,  simplement en attente de confirmation.\n"
 "* Disponible Expédié: produits déjà envoyés au fourniseur, simplement en attente de confirmation d'arrivée.\n"
 "* En attente: attendant l'exécution d'un autre mouvement avant de devenir automatiquement disponible (ex: flux A Commander)\n"
-"* Fermé: a été exécuté, ne peut plus être modifié ou annulé\n"
+"* Fermé: a été exécuté, ne peut plus être modifié ou annulé. Peut toujours être changé en Livré si le document est un OUT\n"
+"* Livré: a été livré, seulement pour un OUT fermé\n"
 "* Annulé: a été annulé, ne peut plus être confirmé"
 
 #. module: delivery_mechanism
@@ -106827,3 +106831,8 @@
 msgid "Stop report"
 msgstr "Arrêter le rapport"
 
+#. module: stock
+#: code:addons/stock/stock.py:1780
+#, python-format
+msgid "is delivered."
+msgstr "est livré."

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2019-04-09 12:51:41 +0000
+++ bin/addons/msf_profile/msf_profile.py	2019-06-18 12:13:56 +0000
@@ -69,6 +69,18 @@
                     err_msg,
                 )
 
+    # UF1340
+    def us_5952_delivered_closed_outs_to_delivered_state(self, cr, uid, *a, **b):
+        """
+        Set the OUT pickings in 'Done' state with delivered = True to the 'Delivered' state
+        """
+        cr.execute('''
+            UPDATE stock_picking SET state = 'delivered' 
+            WHERE state = 'done' AND type = 'out' AND subtype = 'standard' AND delivered = 't'
+        ''')
+
+        return True
+
     # UF13.0
     def us_5771_allow_all_cc_in_default_dest(self, cr, uid, *a, **b):
         """

=== modified file 'bin/addons/out_step/out_step.py'
--- bin/addons/out_step/out_step.py	2015-11-10 13:23:06 +0000
+++ bin/addons/out_step/out_step.py	2019-06-18 12:13:56 +0000
@@ -56,7 +56,7 @@
             result[obj.id] = {}
             for f in fields:
                 result[obj.id].update({f:False,})
-                
+
             # delivered_hidden
             result[obj.id]['delivered_hidden'] = obj.delivered
             # state_hidden
@@ -71,11 +71,11 @@
         'delivered_hidden': fields.function(_vals_get_out_step, method=True, type='boolean', string='Delivered Hidden', multi='get_vals_out_step',),
         'state_hidden': fields.function(_vals_get_out_step, method=True, type='selection', selection=PICKING_STATE, string='State', multi='get_vals_out_step',),
     }
-    
+
     _defaults = {
         'delivered': False,
     }
-    
+
     def copy_data(self, cr, uid, id, default=None, context=None):
         '''
         set delivered to False
@@ -87,12 +87,13 @@
         default.update(delivered=False)
         res = super(stock_picking, self).copy_data(cr, uid, id, default=default, context=context)
         return res
-    
-    def set_delivered(self, cr, uid, ids, context=None):
-        '''
-        set the delivered flag
-        '''
-        self.write(cr, uid, ids, {'delivered': True,}, context=context)
-        return True
+
+    # TODO: Remove after full implamentation of 'Delivered' state
+    # def set_delivered(self, cr, uid, ids, context=None):
+    #     '''
+    #     set the delivered flag
+    #     '''
+    #     self.write(cr, uid, ids, {'delivered': True,}, context=context)
+    #     return True
      
 stock_picking()

=== modified file 'bin/addons/out_step/out_step_view.xml'
--- bin/addons/out_step/out_step_view.xml	2016-11-04 12:57:37 +0000
+++ bin/addons/out_step/out_step_view.xml	2019-06-18 12:13:56 +0000
@@ -39,8 +39,8 @@
 
                     <filter name="done" position="replace">
                         <!-- <separator orientation="vertical"/> -->
-                        <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done'), ('delivered', '=', False)]" help="Delivery orders already processed"/>
-                        <filter icon="gtk-yes" name="delivered" string="Delivered" domain="[('state', '=', 'done'), ('delivered', '=', True)]" help="Delivered Delivery Orders" />
+                        <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]" help="Delivery orders already processed"/>
+                        <filter icon="gtk-yes" name="delivered" string="Delivered" domain="[('state', '=', 'delivered')]" help="Delivered Delivery Orders" />
                         <!-- <filter icon="gtk-no" name="not_delivered" string="Not Delivered" domain="[('state', '=', 'done'), ('delivered', '=', False)]" help="Not Delivered Delivery Orders" /> -->
                         <separator orientation="vertical"/>
 					</filter>

=== modified file 'bin/addons/stock/stock.py'
--- bin/addons/stock/stock.py	2019-05-10 14:40:57 +0000
+++ bin/addons/stock/stock.py	2019-06-18 12:13:56 +0000
@@ -680,13 +680,15 @@
             ('confirmed', 'Confirmed'),
             ('assigned', 'Available'),
             ('done', 'Done'),
+            ('delivered', 'Delivered'),
             ('cancel', 'Cancelled'),
         ], 'State', readonly=True, select=True,
             help="* Draft: not confirmed yet and will not be scheduled until confirmed\n"\
                  "* Confirmed: still waiting for the availability of products\n"\
                  "* Available: products reserved, simply waiting for confirmation.\n"\
                  "* Waiting: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)\n"\
-                 "* Done: has been processed, can't be modified or cancelled anymore\n"\
+                 "* Done: has been processed, can't be modified or cancelled anymore. Can be processed to Delivered if the document is an OUT\n"\
+                 "* Delivered: has been delivered, only for a closed OUT\n"\
                  "* Cancelled: has been cancelled, can't be confirmed anymore"),
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
                                     method=True, store=True, type='datetime', string='Expected Date', select=1, help="Expected date for the picking to be processed"),
@@ -1775,6 +1777,7 @@
                 'assigned': _('is ready to process.'),
                 'cancel': _('is cancelled.'),
                 'done': _('is done.'),
+                'delivered': _('is delivered.'),
                 'draft':_('is in draft state.'),
             }
             state_list = self._hook_state_list(cr, uid, state_list=state_list, msg=msg)
@@ -1794,8 +1797,23 @@
                 self.infolog(cr, uid, message)
         return True
 
+    def set_delivered(self, cr, uid, ids, context=None):
+        '''
+        Set the picking and its moves to delivered
+        '''
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        self.write(cr, uid, ids, {'state': 'delivered'}, context=context)
+
+        return True
+
+
 stock_picking()
 
+
 class stock_production_lot(osv.osv):
 
     def name_get(self, cr, uid, ids, context=None):

=== modified file 'bin/addons/stock/stock_view.xml'
--- bin/addons/stock/stock_view.xml	2019-05-24 14:05:06 +0000
+++ bin/addons/stock/stock_view.xml	2019-06-18 12:13:56 +0000
@@ -849,7 +849,7 @@
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="action_process" states="assigned" string="Process"  groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
-                                <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl" />
+                                <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','!=', 'done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl" />
                             </group>
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -913,7 +913,7 @@
             <field name="type">tree</field>
             <field name="priority">21</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Delivery Orders">
+                <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done', 'delivered') and date &lt; current_date" string="Delivery Orders">
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="destinations_list"/>
@@ -1045,7 +1045,7 @@
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
                                 <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
-                                <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl"/>
+                                <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','not in',['done','delivered']),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl"/>
                             </group>
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -1271,7 +1271,7 @@
                                 <group colspan="1" states="done">
                                     <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
                                 </group>
-                                    <button states="done" name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" />
+                                    <button states="done,delivered" name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','!=','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" />
                             </group>
                         </page>
                         <page string="Additional Info" groups="base.group_extended,base.group_multi_company">

=== modified file 'bin/addons/stock_override/stock.py'
--- bin/addons/stock_override/stock.py	2019-05-10 14:31:04 +0000
+++ bin/addons/stock_override/stock.py	2019-06-18 12:13:56 +0000
@@ -305,6 +305,7 @@
             ('shipped', 'Available Shipped'),  # UF-1617: new state of IN for partial shipment
             ('updated', 'Available Updated'),
             ('done', 'Closed'),
+            ('delivered', 'Delivered'),
             ('cancel', 'Cancelled'),
             ('import', 'Import in progress'),
         ], 'State', readonly=True, select=True,
@@ -313,7 +314,8 @@
                  "* Available: products reserved, simply waiting for confirmation.\n"\
                  "* Available Shipped: products already shipped at supplier, simply waiting for arrival confirmation.\n"\
                  "* Waiting: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)\n"\
-                 "* Closed: has been processed, can't be modified or cancelled anymore\n"\
+                 "* Closed: has been processed, can't be modified or cancelled anymore. Can still be processed to Delivered if the document is an OUT\n"
+                 "* Delivered: has been delivered, only for a closed OUT\n"\
                  "* Cancelled: has been cancelled, can't be confirmed anymore"),
         'address_id': fields.many2one('res.partner.address', 'Delivery address', help="Address of partner", readonly=False, states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}, domain="[('partner_id', '=', partner_id)]"),
         'partner_id2': fields.many2one('res.partner', 'Partner', required=False),

=== modified file 'bin/addons/stock_override/stock_view.xml'
--- bin/addons/stock_override/stock_view.xml	2019-05-07 09:15:36 +0000
+++ bin/addons/stock_override/stock_view.xml	2019-06-18 12:13:56 +0000
@@ -381,7 +381,7 @@
                                     <field name="inactive_error" attrs="{'invisible': [('inactive_product', '=', False)]}" />
                                     <button name="call_cancel_wizard" icon="gtk-del" string="Cancel &amp; Resource" type="object" 
                                             confirm="Do you really want to delete selected record ?"
-                                            attrs="{'invisible': ['|', ('from_wkf', '=', False), ('fake_state', 'in', ('cancel', 'done'))]}" 
+                                            attrs="{'invisible': ['|', ('from_wkf', '=', False), ('fake_state', 'in', ('cancel', 'done'))]}"
                                             context="{'from_int': 1, 'from_button': True}"/>
                                 </tree>
 
@@ -489,7 +489,7 @@
                                 <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward" context="{'from_button': True}"/>
                                 <field name="certificate_donation" invisible="1"/>
                                 <button name="print_certificate" string="Print certificate" type="object" icon="gtk-print" attrs="{'invisible': [('certificate_donation', '=', False)]}"/>
-                                <button name="%(stock.action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl"/>
+                                <button name="%(stock.action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','!=','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl"/>
                             </group>
                         </page>
                         <page string="Additional info">
@@ -759,7 +759,7 @@
                                 <group colspan="1" states="done">
                                     <button name="%(stock.act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
                                 </group>
-                                <button states="done" name="%(stock.action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl"/>
+                                <button states="done" name="%(stock.action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','!=','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl"/>
                             </group>
                         </page>
                         <page string="Additional Info">
@@ -880,7 +880,7 @@
                         </group>
                         <group colspan="2" col="2">
                             <field name="date" attrs="{'readonly': [('state', 'not in', ['draft', 'auto', 'assigned', 'confirmed'])]}"/>
-                            <field name="min_date" string="Expected Shipped Date" attrs="{'readonly': [('state', 'in', ['done', 'cancel'])]}"
+                            <field name="min_date" string="Expected Shipped Date" attrs="{'readonly': [('state', 'in', ['done', 'cancel', 'delivered'])]}"
                             on_change="change_min_date()" required="1" />
                             <field name="min_date_manually" invisible="1" />
                             <field name="warehouse_id"
@@ -1021,16 +1021,15 @@
                             </field>
                             <group col="12" colspan="4">
                                 <field name="state" invisible="True"/>
-                                <field name="delivered" invisible="True"/>
                                 <field name="state_hidden"/>
                                 <field name="is_company" invisible="1" />
                                 <button name="set_delivered"
                                         icon="gtk-apply"
                                         type="object"
                                         string="Confirm Delivery"
-                                        attrs="{'invisible': ['|', '|', '|', '|', '|',
+                                        attrs="{'invisible': ['|', '|', '|', '|',
                                                               ('type', '!=', 'out'), ('subtype', '!=', 'standard'),
-                                                              ('state', '!=', 'done'), ('delivered', '=', True),
+                                                              ('state', '!=', 'done'),
                                                               ('partner_type', 'not in', ['internal', 'intermission', 'section']),
                                                               ('is_company', '=', True),
                                                               ]}"
@@ -1040,9 +1039,9 @@
                                         icon="gtk-apply"
                                         type="object"
                                         string="Confirm Delivery"
-                                        attrs="{'invisible': ['|', '|', '|', '|',
+                                        attrs="{'invisible': ['|', '|', '|',
                                                               ('type', '!=', 'out'), ('subtype', '!=', 'standard'),
-                                                              ('state', '!=', 'done'), ('delivered', '=', True),
+                                                              ('state', '!=', 'done'),
                                                               '&amp;',
                                                               ('partner_type', 'in', ['internal', 'intermission', 'section']),
                                                               ('is_company', '=', False),
@@ -1058,7 +1057,7 @@
                                 <field name="certificate_donation" invisible="1"/>
                                 <button name="print_certificate" string="Print certificate" type="object" icon="gtk-print" attrs="{'invisible': [('certificate_donation', '=', False)]}"/>
                                 <button name="%(stock.act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
-                                <button name="%(stock.action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl"/>
+                                <button name="%(stock.action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','not in',['done','delivered']),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl"/>
                             </group>
                         </page>
                         <page string="Additional info">

=== modified file 'bin/addons/sync_so/picking.py'
--- bin/addons/sync_so/picking.py	2018-06-08 14:22:21 +0000
+++ bin/addons/sync_so/picking.py	2019-06-18 12:13:56 +0000
@@ -741,15 +741,15 @@
                     return "Recovery: the reference to " + in_name + " at " + source + " will be set to void."
 
         elif 'OUT' in out_doc_name:
-            ship_ids = self.search(cr, uid, [('name', '=', out_doc_name), ('state', '=', 'done')], context=context)
-            if ship_ids:
+            out_ids = self.search(cr, uid, [('name', '=', out_doc_name), ('state', '=', 'done')], context=context)
+            if out_ids:
                 # set the Shipment to become delivered
                 context['InShipOut'] = "OUT"  # asking OUT object to be logged (model stock.picking)
-                self.set_delivered(cr, uid, ship_ids, context=context)
+                self.set_delivered(cr, uid, out_ids, context=context)
                 message = "The OUTcoming " + out_doc_name + " has been well delivered to its partner " + source + ": " + out_info.name
             else:
-                ship_ids = self.search(cr, uid, [('name', '=', out_doc_name), ('state', '=', 'delivered')], context=context)
-                if ship_ids:
+                out_ids = self.search(cr, uid, [('name', '=', out_doc_name), ('state', '=', 'delivered')], context=context)
+                if out_ids:
                     message = "The OUTcoming " + out_doc_name + " has been MANUALLY confirmed as delivered."
                 elif context.get('restore_flag'):
                     # UF-1830: Create a message to remove the invalid reference to the inexistent document