[FIX] account_payment: improve error message and do not freeze workflow on 'done...

bzr revid: xal@openerp.com-20120306135827-uo4xpkjcnpf7su7k

diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 5da18e7..c97c754 100644 (file)
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -127,8 +127,9 @@ class payment_order(osv.osv):
             for line in order.line_ids:
                 if line.bank_statement_line_id:
                     raise osv.except_osv(_('Warning !'),
-                    _('Payment order line "%s" is already imported in Bank statement "%s".')\
-                    %(line.name, line.bank_statement_line_id.statement_id.name,))
+                        _("Payment order line '%s' is already imported in Bank statement '%s' (id: %s).") % (
+                            line.name, line.bank_statement_line_id.statement_id.name,
+                            line.bank_statement_line_id.statement_id.id))
         self.write(cr, uid, ids, {'state': 'cancel'})
         return True
 

diff --git a/addons/account_payment/account_payment_workflow.xml b/addons/account_payment/account_payment_workflow.xml
index ea88f8a..0934b39 100644 (file)
--- a/addons/account_payment/account_payment_workflow.xml
+++ b/addons/account_payment/account_payment_workflow.xml
@@ -26,6 +26,7 @@ write({'state':'open'})</field>
             <field name="wkf_id" ref="wkf_payment_order"/>
             <field name="action">write({'state':'done'})</field>
             <field name="kind">function</field>
+            <field name="flow_stop" eval="False"/>
         </record>
         <record id="act_cancel" model="workflow.activity">
             <field name="name">cancel</field>