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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-04-20 07:09:56 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-04-23 15:25:51 +0000
@@ -2655,8 +2655,8 @@
 
 #. module: purchase_override
 #: view:purchase.order.cancel.wizard:0
-msgid "Please confirm that you want to cancel all lines of this PO"
-msgstr "Please confirm that you want to cancel all lines of this PO"
+msgid "Please confirm that you want to cancel all non-confirmed lines of this PO"
+msgstr "Veuillez confirmer que vous voulez annuler toutes les lignes non-confirmées du BC"
 
 #. module: register_accounting
 #: view:wizard.transfer.with.change:0

=== modified file 'bin/addons/purchase/purchase_order_line.py'
--- bin/addons/purchase/purchase_order_line.py	2018-04-03 12:31:40 +0000
+++ bin/addons/purchase/purchase_order_line.py	2018-04-23 15:25:51 +0000
@@ -390,7 +390,6 @@
             res[line.id] = a
         return res
 
-
     _columns = {
         'block_resourced_line_creation': fields.boolean(string='Block resourced line creation', help='Set as true to block resourced line creation in case of cancelled-r line'),
         'set_as_sourced_n': fields.boolean(string='Set as Sourced-n', help='Line has been created further and has to be created back in preceding documents'),

=== modified file 'bin/addons/purchase/purchase_view.xml'
--- bin/addons/purchase/purchase_view.xml	2017-12-07 10:07:55 +0000
+++ bin/addons/purchase/purchase_view.xml	2018-04-23 15:25:51 +0000
@@ -242,7 +242,7 @@
                                     <button string="Validate" icon="terp-check" name="validated" type="workflow" attrs="{'invisible': [('fake_state', '!=', 'draft')]}" header="True"/>
                                     <button string="Confirm" icon="terp-check" name="button_confirmed" type="object" attrs="{'invisible': [('fake_state', 'not in', ['validated', 'validated_n'])]}" header="True"/>
                                     <button string="Validate reception" icon="terp-camera_test" name="done" type="workflow" attrs="{'invisible': ['|', ('fake_state', '!=', 'confirmed'), ('order_type', '!=', 'direct')]}"/>
-                                    <button string="Cancel" icon="gtk-del" type="object" name="ask_unlink" attrs="{'invisible': [('fake_state', 'not in', ['draft', 'validated', 'validated_n'])]}"/>
+                                    <button string="Cancel" icon="gtk-del" type="object" name="ask_unlink" attrs="{'invisible': ['|', '&amp;', ('fake_state', '!=', 'draft'), ('partner_type', 'not in', ['external', 'esc']), '&amp;', ('fake_state', 'not in', ['draft', 'validated', 'validated_n']), ('partner_type', 'in', ['external', 'esc'])]}"/>
                                 </tree>
                                 <!-- default form view -->
                             </field>
@@ -375,7 +375,7 @@
                     <group colspan="4" col="16">
                         <field name="state" readonly="1"/>
                         <button name="close_lines" type="object" string="Validate the reception" icon="terp-camera_test" attrs="{'invisible': ['|', ('state', '!=', 'confirmed'), ('order_type', '!=', 'direct')]}"/>
-                        <button name="purchase_cancel" type="object" attrs="{'invisible': [('state', 'not in', ['draft']), ('partner_type', 'not in', ('external', 'esc'))]}" string="Cancel" icon="gtk-cancel"/>
+                        <button name="purchase_cancel" type="object" attrs="{'invisible': ['|', '&amp;', ('state', 'not in', ['draft', 'draft_p']), ('partner_type', 'not in', ['external', 'esc']), '&amp;', ('state', 'not in', ['draft', 'draft_p', 'validated', 'validated_p']), ('partner_type', 'in', ['external', 'esc'])]}" string="Cancel" icon="gtk-cancel"/>
                         <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert" attrs="{'invisible': ['|', '|', '|', '|', '|', ('canceled_end', '=', True), ('po_from_fo', '=', True), ('po_from_ir', '=', True), ('po_from_rr', '=', True), ('tender_id', '!=', False), ('state', '!=', 'cancel')]}"/>
                         <button name="validate_lines" states="draft,draft_p" string="Validate lines" type="object" icon="gtk-go-forward"/>
                         <button name="confirm_lines" states="validated,validated_p" string="Confirm lines" icon="gtk-go-forward" type="object"/>

=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2017-12-12 09:31:02 +0000
+++ bin/addons/purchase_override/purchase.py	2018-04-23 15:25:51 +0000
@@ -420,17 +420,19 @@
         for wiz in self.browse(cr, uid, ids, context=context):
             po = wiz.order_id
 
-        # cancel all lines:
+        # cancel all non-confirmed lines:
         if po.rfq_ok:
             self.pool.get('purchase.order').cancel_rfq(cr, uid, [po.id], context=context)
         else:
             for pol in po.order_line:
-                if pol.has_pol_been_synched:
-                    continue
-                signal = 'cancel' 
-                if resource and pol.linked_sol_id:
-                    signal = 'cancel_r'
-                wf_service.trg_validate(uid, 'purchase.order.line', pol.id, signal, cr)
+                if (pol.order_id.partner_type in ('external', 'esc') and pol.state in ('draft', 'validated', 'validated_n'))\
+                        or (pol.order_id.partner_type not in ('external', 'esc') and pol.state == 'draft'):
+                    if pol.has_pol_been_synched:
+                        continue
+                    signal = 'cancel'
+                    if resource and pol.linked_sol_id:
+                        signal = 'cancel_r'
+                    wf_service.trg_validate(uid, 'purchase.order.line', pol.id, signal, cr)
 
         return {'type': 'ir.actions.act_window_close'}
 

=== modified file 'bin/addons/purchase_override/purchase_view.xml'
--- bin/addons/purchase_override/purchase_view.xml	2017-10-16 12:08:12 +0000
+++ bin/addons/purchase_override/purchase_view.xml	2018-04-23 15:25:51 +0000
@@ -119,7 +119,7 @@
                     <field name="has_linked_line" invisible="1" />
                     <group colspan="4" col="1">
                         <html>
-                            <h3 style="text-align: center; margin: 13px"><translate>Please confirm that you want to cancel all lines of this PO</translate></h3>
+                            <h3 style="text-align: center; margin: 13px"><translate>Please confirm that you want to cancel all non-confirmed lines of this PO</translate></h3>
                         </html>
                     </group>
                     <group colspan="4" col="1" attrs="{'invisible': [('has_linked_line', '=', False)]}">

=== modified file 'bin/addons/tender_flow/tender_flow.py'
--- bin/addons/tender_flow/tender_flow.py	2018-04-03 12:39:47 +0000
+++ bin/addons/tender_flow/tender_flow.py	2018-04-23 15:25:51 +0000
@@ -1624,7 +1624,9 @@
             if not rfq.rfq_ok:
                 continue
             for rfq_line in rfq.order_line:
-                wf_service.trg_validate(uid, 'purchase.order.line', rfq_line.id, 'cancel', cr)
+                if (rfq_line.order_id.partner_type in ('external', 'esc') and rfq_line.state in ('draft', 'validated', 'validated_n'))\
+                        or (rfq_line.order_id.partner_type not in ('external', 'esc') and rfq_line.state == 'draft'):
+                    wf_service.trg_validate(uid, 'purchase.order.line', rfq_line.id, 'cancel', cr)
 
             self.write(cr, uid, [rfq.id], {'rfq_state': 'cancel'}, context=context)