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

[FIX] small fixes and imp 

bzr revid: fp@tinyerp.com-20111230111938-c4k5h0f22oo15vt9
This commit is contained in:
Fabien Pinckaers 2011-12-30 12:19:38 +01:00
parent 39139eec24
commit c04a3aed07
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/account/account.py
View File

@ -3208,6 +3208,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'default_credit_account_id': _get_default_account(journal_type, 'credit'), 'default_credit_account_id': _get_default_account(journal_type, 'credit'),
'default_debit_account_id': _get_default_account(journal_type, 'debit'), 'default_debit_account_id': _get_default_account(journal_type, 'debit'),
} }
print 'VALS', vals, journal_type
journal_data.append(vals) journal_data.append(vals)
return journal_data return journal_data

2
addons/product/product_view.xml
View File

@ -442,7 +442,7 @@
</field> </field>
</record> </record>
<record id="product_uom_categ_form_action" model="ir.actions.act_window"> <record id="product_uom_categ_form_action" model="ir.actions.act_window">
<field name="name">Units of Measure Categories</field> <field name="name">UoM Categories</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">product.uom.categ</field> <field name="res_model">product.uom.categ</field>
<field name="view_type">form</field> <field name="view_type">form</field>

12
addons/resource/resource_view.xml
View File

@ -32,7 +32,7 @@
</field> </field>
</record> </record>
<record id="view_resource_calendar_search" model="ir.ui.view"> <record id="view_resource_calendar_search" model="ir.ui.view">
<field name="name">resource.calendar.search</field> <field name="name">resource.calendar.search</field>
<field name="model">resource.calendar</field> <field name="model">resource.calendar</field>
<field name="type">search</field> <field name="type">search</field>
@ -174,10 +174,10 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Resource"> <form string="Resource">
<group col="6" colspan="4"> <group col="6" colspan="4">
<field name="name" colspan="4"/> <field name="name" colspan="4"/>
<field name="active"/> <field name="active"/>
<newline/> <newline/>
<field name="user_id" attrs="{'required':[('resource_type','=','user')], 'readonly':[('resource_type','=','material')]}"/> <field name="user_id" attrs="{'required':[('resource_type','=','user')], 'readonly':[('resource_type','=','material')]}"/>
<field name="resource_type" /> <field name="resource_type" />
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
<newline/> <newline/>
@ -257,7 +257,7 @@
<field name="view_mode">tree,form,calendar</field> <field name="view_mode">tree,form,calendar</field>
<field name="search_view_id" ref="view_resource_calendar_leaves_search"/> <field name="search_view_id" ref="view_resource_calendar_leaves_search"/>
</record> </record>
<menuitem id="menu_resource_config" name="Resource" parent="base.menu_base_config" sequence="5" groups="base.group_extended"/> <menuitem id="menu_resource_config" name="Resource" parent="base.next_id_4" sequence="5" groups="base.group_extended"/>
<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search" parent="menu_resource_config" sequence="1"/> <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search" parent="menu_resource_config" sequence="1"/>
</data> </data>
</openerp> </openerp>