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

[IMP] Improve view of account wizard 

bzr revid: ara@tinyerp.com-20101014091155-lfzcu4fct83r4loy
This commit is contained in:
ARA (OpenERP) 2010-10-14 14:41:55 +05:30
parent 039deb8db4
commit 8e2271abcd
5 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/wizard/account_fiscalyear_close.py
View File

@ -30,14 +30,14 @@ class account_fiscalyear_close(osv.osv_memory):
_description = "Fiscalyear Close"
_columns = {
'fy_id': fields.many2one('account.fiscalyear', \
'Fiscal Year to close', required=True),
'Fiscal Year to close', required=True, help="Select a Fiscal year to close"),
'fy2_id': fields.many2one('account.fiscalyear', \
'New Fiscal Year', required=True),
'journal_id': fields.many2one('account.journal', \
'Opening Entries Journal', required=True, help='The best practice here is to use a journal dedicated to contain the opening entries of all fiscal years. Note that you should define it with default debit/credit accounts and with a centralized counterpart.'),
'period_id': fields.many2one('account.period', \
'Opening Entries Period', required=True),
'report_name': fields.char('Name of new entries',size=64, required=True),
'report_name': fields.char('Name of new entries',size=64, required=True, help="Give name of the new entries"),
}
_defaults = {
'report_name':'End of Fiscal Year Entry',

2
addons/account/wizard/account_fiscalyear_close_state.py
View File

@ -31,7 +31,7 @@ class account_fiscalyear_close_state(osv.osv_memory):
_description = "Fiscalyear Close state"
_columns = {
'fy_id': fields.many2one('account.fiscalyear', \
'Fiscal Year to close', required=True),
'Fiscal Year to close', required=True, help="Select a fiscal year to close"),
}
def data_save(self, cr, uid, ids, context=None):

17
addons/account/wizard/account_fiscalyear_close_state.xml
View File

@ -7,13 +7,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Close states of Fiscal year and periods">
<label string ="This wizard will definitelly close a fiscal year and its related periods. That means that no one will be able to create or modify journal entries in it." colspan="4"/>
<field name="fy_id" domain = "[('state','=','draft')]" colspan="4"/>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
</group>
<group height="160" width="310">
<label string ="This wizard will definitelly close a fiscal year and its related periods. That means that no one will be able to create or modify journal entries in it." colspan="4"/>
<separator colspan="4" />
<field name="fy_id" domain = "[('state','=','draft')]" colspan="4"/>
<separator colspan="4" />
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
</group>
</group>
</form>
</field>
</record>

25
addons/account/wizard/account_fiscalyear_close_view.xml
View File

@ -7,17 +7,20 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Generate Fiscal Year Opening Entries">
<label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones." colspan="4"/>
<field name="fy_id" domain = "[('state','=','draft')]"/>
<field name="fy2_id" domain = "[('state','=','draft')]"/>
<field name="journal_id"/>
<field name="period_id" domain ="[('fiscalyear_id','=',fy2_id)]"/>
<field name="report_name" colspan="4"/>
<separator string="" colspan="4"/>
<group colspan="4" col="6">
<label string="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-execute" string="Create" name="data_save" type="object"/>
<group height="220" width="680">
<label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones." colspan="4"/>
<separator colspan="4"/>
<field name="fy_id" domain = "[('state','=','draft')]"/>
<field name="fy2_id" domain = "[('state','=','draft')]"/>
<field name="journal_id"/>
<field name="period_id" domain ="[('fiscalyear_id','=',fy2_id)]" />
<field name="report_name" colspan="4"/>
<separator colspan="4"/>
<group colspan="4" col="6">
<label string="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-execute" string="Create" name="data_save" type="object"/>
</group>
</group>
</form>
</field>

18
addons/account/wizard/account_subscription_generate_view.xml
View File

@ -8,17 +8,17 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Subscription Compute">
<group colspan="4" >
<group colspan="4" height="120" width="225">
<separator string="Generate entries before:" colspan="4"/>
<field name="date"/>
</group>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel" />
<button icon="gtk-execute" string="Generate Entries"
name="action_generate" type="object" />
</group>
<separator colspan="4" />
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel" />
<button icon="gtk-execute" string="Generate Entries"
name="action_generate" type="object" />
</group>
</group>
</form>
</field>
</record>