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

[FIX]: fix a recurring configuration form and menu 

bzr revid: mga@tinyerp.com-20100801124508-c1388j4plkkcio1a
This commit is contained in:
Mantavya Gajjar 2010-08-01 18:15:08 +05:30
parent 4b39993267
commit ab3d1179f6
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
addons/account/account_view.xml
View File

@ -1659,7 +1659,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_model_form" id="menu_action_model_form" parent="account.menu_configuration_misc"/> <menuitem action="action_model_form" id="menu_action_model_form" sequence="5" parent="account.menu_configuration_misc"/>
<!-- <!--
# Payment Terms # Payment Terms
@ -1789,39 +1789,46 @@
<field name="model">account.subscription</field> <field name="model">account.subscription</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Entry Subscription"> <form string="Recurring">
<field name="name" select="1"/> <group col="6" colspan="4">
<field name="ref" select="1"/> <field name="name" select="1"/>
<field name="model_id"/>
<separator colspan="4" string="Subscription Periods"/> <field name="ref" select="1"/>
<field name="date_start" select="1"/> </group>
<field name="period_total"/> <group col="2" colspan="2">
<separator colspan="4" string="Starts on"/>
<field name="period_nbr"/> <field name="date_start" select="1"/>
<field name="period_type"/> <field name="period_total"/>
<field name="model_id"/>
</group>
<group col="2" colspan="2">
<separator colspan="4" string="Valid Up to"/>
<field name="period_nbr"/>
<field name="period_type"/>
</group>
<group col="2" colspan="2"> <group col="2" colspan="2">
<button name="compute" states="draft,running" string="Compute" type="object" icon="terp-stock_format-scientific"/>
<button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
</group> </group>
<separator colspan="4" string="Subscription Lines"/> <separator colspan="4" string="Subscription Lines"/>
<field colspan="4" name="lines_id" widget="one2many_list" nolabel="1"/> <field colspan="4" name="lines_id" widget="one2many_list" nolabel="1"/>
<separator colspan="4" string="State"/> <group col="6" colspan="4">
<field name="state"/> <field name="state"/>
<group col="1" colspan="2">
<button name="state_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" /> <button name="state_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" />
<button name="compute" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
<button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
</group> </group>
</form> </form>
</field> </field>
</record> </record>
<record id="action_subscription_form" model="ir.actions.act_window"> <record id="action_subscription_form" model="ir.actions.act_window">
<field name="name">Subscription Entries</field> <field name="name">Recurring Lines</field>
<field name="res_model">account.subscription</field> <field name="res_model">account.subscription</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<!-- <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="account.menu_finance_recurrent_entries"/>--> <menuitem action="action_subscription_form" id="menu_action_subscription_form" sequence="5" parent="account.menu_configuration_misc"/>
<record id="action_subscription_form_running" model="ir.actions.act_window"> <record id="action_subscription_form_running" model="ir.actions.act_window">
<field name="name">Running Subscriptions</field> <field name="name">Running Subscriptions</field>