[IMP] portal,portal_sale: polish/cleanup acquirer settings

bzr revid: odo@openerp.com-20121113164435-ids77maq6h13crob

diff --git a/addons/portal/acquirer.py b/addons/portal/acquirer.py
index 3217b49..1361d62 100644 (file)
--- a/addons/portal/acquirer.py
+++ b/addons/portal/acquirer.py
@@ -23,7 +23,6 @@ import logging
 from urllib import quote as quote
 
 from openerp.osv import osv, fields
-from openerp.tools import ustr
 from openerp.tools.translate import _
 from openerp.tools import float_repr
 
@@ -41,7 +40,7 @@ class acquirer(osv.Model):
     _columns = {
         'name': fields.char('Name', required=True),
         'form_template': fields.text('Payment form template (HTML)', translate=True, required=True), 
-        'visible': fields.boolean('Visible', help="Whether this payment acquirer is currently displayed in portal forms"),
+        'visible': fields.boolean('Visible', help="Make this payment acquirer available in portal forms (Customer invoices, etc.)"),
     }
 
     _default = {

diff --git a/addons/portal/acquirer_view.xml b/addons/portal/acquirer_view.xml
index 0e88d47..f9be996 100644 (file)
--- a/addons/portal/acquirer_view.xml
+++ b/addons/portal/acquirer_view.xml
@@ -54,14 +54,12 @@
             </field>
         </record>
 
+        <!--  Acquirers list action is visible in Invoicing Settings  -->
         <record model="ir.actions.act_window" id="action_acquirer_list">
             <field name="name">Payment Acquirers</field>
             <field name="res_model">portal.payment.acquirer</field>
         </record>
 
-        <menuitem id="menu_acquirers" parent="portal_menu" action="action_acquirer_list"/>
-        <menuitem id="menu_acquirers2" parent="menu_acquirers" action="action_acquirer_list"/>
-        <menuitem id="menu_acquirers3" parent="menu_acquirers2" action="action_acquirer_list"/>
 
     </data>
 </openerp>

diff --git a/addons/portal_sale/res_config.py b/addons/portal_sale/res_config.py
index 09382c9..d96a63f 100644 (file)
--- a/addons/portal_sale/res_config.py
+++ b/addons/portal_sale/res_config.py
@@ -25,8 +25,8 @@ class sale_portal_config_settings(osv.TransientModel):
     _inherit = 'account.config.settings'
 
     _columns = {
-        'group_payment_options': fields.boolean('Show payment buttons',
+        'group_payment_options': fields.boolean('Show payment buttons to employees too',
             implied_group='portal_sale.group_payment_options',
-            help="Show online payment options to all employees on Sale Orders and Customer Invoices. "
-                 "If not enabled, these options will only be visible to portal users"),
+            help="Show online payment options on Sale Orders and Customer Invoices to employees. "
+                 "If not checked, these options are only visible to portal users."),
     }
\ No newline at end of file

diff --git a/addons/portal_sale/res_config_view.xml b/addons/portal_sale/res_config_view.xml
index 50664a4..ce33a1a 100644 (file)
--- a/addons/portal_sale/res_config_view.xml
+++ b/addons/portal_sale/res_config_view.xml
@@ -11,6 +11,8 @@
                         <div>
                             <field name="group_payment_options" class="oe_inline"/>
                             <label for="group_payment_options"/>
+                            <button name='%(portal.action_acquirer_list)d' type="action"
+                                    string="Configure payment acquiring methods" class="oe_link"/>
                         </div>
                     </xpath>
                 </field>