odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] sale config: use model sale.config.settings instead of res.config.settings 

bzr revid: rco@openerp.com-20120320135002-0gsazmlgock4gmnl
This commit is contained in:
Raphael Collet 2012-03-20 14:50:02 +01:00
parent 07e94deba6
commit 0e526bd329
12 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/base_setup/base_setup_views.xml
View File

@ -142,7 +142,7 @@
<field name="sequence">1</field>
</record>
<record id="base.sale_settings_form_view" model="ir.ui.view">
<record id="base.view_sale_config_settings" model="ir.ui.view">
<field name="name">sale.config.settings</field>
<field name="model">sale.config.settings</field>
<field name="type">form</field>
@ -151,8 +151,8 @@
<group name="sales" colspan="4">
</group>
<group name="crm" colspan="4">
</group>
<group name="plugins" colspan="4">
<group name="plugin" colspan="4">
</group>
</group>
</form>
</field>
@ -162,7 +162,7 @@
<field name="name">Configure Sales &amp; CRM</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.config.settings</field>
<field name="view_id" ref="base.sale_settings_form_view"/>
<field name="view_id" ref="base.view_sale_config_settings"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>
</record>

6
addons/crm/res_config.py
View File

@ -22,7 +22,7 @@
from osv import fields, osv
class crm_configuration(osv.osv_memory):
_inherit = 'res.config.settings'
_inherit = 'sale.config.settings'
_columns = {
'module_crm_caldav' : fields.boolean("Caldav Synchronization",
@ -129,6 +129,4 @@ class crm_configuration(osv.osv_memory):
server_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Leads'),('state','=','done')])
fetchmail_obj.set_draft(cr, uid, server_ids, context=None)
crm_configuration()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/crm/res_config_view.xml
View File

@ -4,7 +4,7 @@
<record id="view_sales_config_crm" model="ir.ui.view">
<field name="name">Sales Application</field>
<field name="model">res.config.settings</field>
<field name="model">sale.config.settings</field>
<field name="type">form</field>
<field name="inherit_id" ref="mail.view_sales_config_plugin"/>
<field name="arch" type="xml">
@ -57,4 +57,4 @@
<menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config" sequence="1" action="base.action_sale_config"/>
</data>
</openerp>
</openerp>

2
addons/delivery/test/delivery_cost.yml
View File

@ -67,6 +67,6 @@
-
I set default delivery policy.
-
!record {model: res.config.settings, id: default_delivery_policy}:
!record {model: sale.config.settings, id: default_delivery_policy}:
{}

4
addons/mail/res_config.py
View File

@ -22,7 +22,7 @@
from osv import fields, osv
class plugin_configuration(osv.osv_memory):
_inherit = 'res.config.settings'
_inherit = 'sale.config.settings'
_columns = {
'module_plugin_thunderbird': fields.boolean('Thunderbird plugin',
@ -44,6 +44,4 @@ class plugin_configuration(osv.osv_memory):
"""),
}
plugin_configuration()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/mail/res_config_view.xml
View File

@ -3,9 +3,9 @@
<record id="view_sales_config_plugin" model="ir.ui.view">
<field name="name">Sales Application</field>
<field name="model">res.config.settings</field>
<field name="model">sale.config.settings</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_res_config_settings"/>
<field name="inherit_id" ref="base.view_sale_config_settings"/>
<field name="arch" type="xml">
<xpath expr="//form/group[@name='crm']/group[@name='plugin']" position="inside">
<group col="4" colspan="2" name="plugins">

2
addons/plugin_outlook/plugin_outlook.xml
View File

@ -51,7 +51,7 @@
<!-- Sales Configuration -->
<record id="view_config_outlook_installer" model="ir.ui.view">
<field name="name">Sales Application</field>
<field name="model">res.config.settings</field>
<field name="model">sale.config.settings</field>
<field name="type">form</field>
<field name="inherit_id" ref="mail.view_sales_config_plugin"/>
<field name="arch" type="xml">

2
addons/plugin_thunderbird/plugin_thunderbird.xml
View File

@ -58,7 +58,7 @@
<!-- Sales Configuration -->
<record id="view_config_thunderbird_installer" model="ir.ui.view">
<field name="name">Sales Application</field>
<field name="model">res.config.settings</field>
<field name="model">sale.config.settings</field>
<field name="type">form</field>
<field name="inherit_id" ref="mail.view_sales_config_plugin"/>
<field name="arch" type="xml">

6
addons/product/res_config.py
View File

@ -21,8 +21,8 @@
from osv import fields, osv
class product_groups_configuration(osv.osv_memory):
_inherit = 'res.config.settings'
class sale_config_settings(osv.osv_memory):
_inherit = 'sale.config.settings'
_columns = {
'group_sale_pricelist_per_customer':fields.boolean("Pricelist per Customer",
@ -44,5 +44,3 @@ class product_groups_configuration(osv.osv_memory):
help=""" Allows you to create and manage your packaging dimensions and types you want to be maintained in your system.
It assigns the "Packaging" group to employee."""),
}
product_groups_configuration()

6
addons/sale/res_config.py
View File

@ -24,7 +24,7 @@ import pooler
from tools.translate import _
class sale_configuration(osv.osv_memory):
_inherit = 'res.config.settings'
_inherit = 'sale.config.settings'
_columns = {
'sale_orders': fields.boolean('Based on Sales Orders',
@ -211,6 +211,4 @@ class sale_configuration(osv.osv_memory):
ir_values_obj.set(cr, uid, 'default', False, 'tax_id', ['sale.order.line'], taxes)
ir_values_obj.set(cr, uid, 'default', False, 'taxes_id', ['product.product'], taxes)
sale_configuration()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/sale/res_config_view.xml
View File

@ -4,9 +4,9 @@
<record id="view_sales_config" model="ir.ui.view">
<field name="name">Sales Application</field>
<field name="model">res.config.settings</field>
<field name="model">sale.config.settings</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_res_config_settings"/>
<field name="inherit_id" ref="base.view_sale_config_settings"/>
<field name="arch" type="xml">
<group name="sales" position="inside">
<separator string="Picking and Invoice Policy" colspan="4"/>

4
addons/sale/test/manual_order_policy.yml
View File

@ -82,8 +82,8 @@
-
I set order policy "Deliver & invoice on demand" as default policy.
-
!record {model: res.config.settings, id: sale_configuration_0}:
!record {model: sale.config.settings, id: sale_configuration_0}:
default_order_policy: 'manual'
-
!python {model: res.config.settings}: |
!python {model: sale.config.settings}: |
self.execute(cr, uid, [ref("sale_configuration_0")], {})