[IMP] portal,portal_sale: polish/cleanup acquirer settings
bzr revid: odo@openerp.com-20121113164435-ids77maq6h13crob
This commit is contained in:
parent
d47d5f202d
commit
5e4c4fe06e
|
@ -23,7 +23,6 @@ import logging
|
||||||
from urllib import quote as quote
|
from urllib import quote as quote
|
||||||
|
|
||||||
from openerp.osv import osv, fields
|
from openerp.osv import osv, fields
|
||||||
from openerp.tools import ustr
|
|
||||||
from openerp.tools.translate import _
|
from openerp.tools.translate import _
|
||||||
from openerp.tools import float_repr
|
from openerp.tools import float_repr
|
||||||
|
|
||||||
|
@ -41,7 +40,7 @@ class acquirer(osv.Model):
|
||||||
_columns = {
|
_columns = {
|
||||||
'name': fields.char('Name', required=True),
|
'name': fields.char('Name', required=True),
|
||||||
'form_template': fields.text('Payment form template (HTML)', translate=True, 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 = {
|
_default = {
|
||||||
|
|
|
@ -54,14 +54,12 @@
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
<!-- Acquirers list action is visible in Invoicing Settings -->
|
||||||
<record model="ir.actions.act_window" id="action_acquirer_list">
|
<record model="ir.actions.act_window" id="action_acquirer_list">
|
||||||
<field name="name">Payment Acquirers</field>
|
<field name="name">Payment Acquirers</field>
|
||||||
<field name="res_model">portal.payment.acquirer</field>
|
<field name="res_model">portal.payment.acquirer</field>
|
||||||
</record>
|
</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>
|
</data>
|
||||||
</openerp>
|
</openerp>
|
||||||
|
|
|
@ -25,8 +25,8 @@ class sale_portal_config_settings(osv.TransientModel):
|
||||||
_inherit = 'account.config.settings'
|
_inherit = 'account.config.settings'
|
||||||
|
|
||||||
_columns = {
|
_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',
|
implied_group='portal_sale.group_payment_options',
|
||||||
help="Show online payment options to all employees on Sale Orders and Customer Invoices. "
|
help="Show online payment options on Sale Orders and Customer Invoices to employees. "
|
||||||
"If not enabled, these options will only be visible to portal users"),
|
"If not checked, these options are only visible to portal users."),
|
||||||
}
|
}
|
|
@ -11,6 +11,8 @@
|
||||||
<div>
|
<div>
|
||||||
<field name="group_payment_options" class="oe_inline"/>
|
<field name="group_payment_options" class="oe_inline"/>
|
||||||
<label for="group_payment_options"/>
|
<label for="group_payment_options"/>
|
||||||
|
<button name='%(portal.action_acquirer_list)d' type="action"
|
||||||
|
string="Configure payment acquiring methods" class="oe_link"/>
|
||||||
</div>
|
</div>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
|
|
Loading…
Reference in New Issue