banking-addons-team team mailing list archive

["Stefan Rijnhart \(Therp\)" <stefan@xxxxxxxx>]

Stefan Rijnhart (Therp) has proposed merging lp:~therp-nl/banking-addons/ba70-fix_payment_order_improvements into lp:banking-addons.

Requested reviews:
  Banking Addons Core Editors (banking-addons-team)

For more details, see:
https://code.launchpad.net/~therp-nl/banking-addons/ba70-fix_payment_order_improvements/+merge/204485

Follow up of https://code.launchpad.net/~ruchir.shukla/banking-addons/banking-addons-payment-order-improvment/+merge/198501
-- 
https://code.launchpad.net/~therp-nl/banking-addons/ba70-fix_payment_order_improvements/+merge/204485
Your team Banking Addons Core Editors is requested to review the proposed merge of lp:~therp-nl/banking-addons/ba70-fix_payment_order_improvements into lp:banking-addons.

=== modified file 'account_banking_payment/model/payment_order_create.py'
--- account_banking_payment/model/payment_order_create.py	2013-12-05 09:18:43 +0000
+++ account_banking_payment/model/payment_order_create.py	2014-02-03 13:31:18 +0000
@@ -194,6 +194,7 @@
                              or line.journal_id.currency.id
                              or line.journal_id.company_id.currency_id.id),
                 }, context=context)
+        # Force reload of payment order view as a workaround for lp:1155525
         return {'name': _('Payment Orders'),
                 'context': context,
                 'view_type': 'form',

=== modified file 'account_payment_shortcut/__init__.py'
--- account_payment_shortcut/__init__.py	2013-05-28 13:41:42 +0000
+++ account_payment_shortcut/__init__.py	2014-02-03 13:31:18 +0000
@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-import payment_order
+from . import payment_order

=== modified file 'account_payment_shortcut/__openerp__.py'
--- account_payment_shortcut/__openerp__.py	2013-12-05 09:18:03 +0000
+++ account_payment_shortcut/__openerp__.py	2014-02-03 13:31:18 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 {
     'name': 'Account Payment Invoice Selection Shortcut',
-    'version': '6.1.1.134',
+    'version': '1.134',
     'license': 'AGPL-3',
     'author': 'Smile / Therp BV',
     'website': 'https://launchpad.net/banking-addons',

=== modified file 'account_payment_shortcut/payment_order.py'
--- account_payment_shortcut/payment_order.py	2013-05-28 13:41:42 +0000
+++ account_payment_shortcut/payment_order.py	2014-02-03 13:31:18 +0000
@@ -22,7 +22,7 @@
 #
 ##############################################################################
 
-from osv import orm
+from openerp.osv import orm
 
 class payment_order_create(orm.TransientModel):
     _inherit = 'payment.order.create'