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

[IMP] improved the views of Periodical Processing/Recurring Entries/ Define Recurring Entries and Genereate entries menus 

bzr revid: bde@tinyerp.com-20120625133353-6ncjph9hijgpsxop
This commit is contained in:
Bharat Devnani (OpenERP) 2012-06-25 19:03:53 +05:30
parent 0a22debf5f
commit fb838181da
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account.py
View File

@ -2347,7 +2347,7 @@ class account_subscription(osv.osv):
'ref': fields.char('Reference', size=16),
'model_id': fields.many2one('account.model', 'Model', required=True),
'date_start': fields.date('Start Date', required=True),
'period_total': fields.integer('Number of Periods', required=True),
'period_total': fields.integer('Number of Period(s)', required=True),
'period_nbr': fields.integer('Period', required=True),
'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status', required=True, readonly=True),

11
addons/account/account_view.xml
View File

@ -1830,22 +1830,19 @@
</header>
<sheet>
<group>
<group>
<group col="2">
<field name="name"/>
<field name="model_id"/>
<field name="ref"/>
</group>
<newline/>
<group string="Starts on">
<group col="2">
<field name="date_start"/>
<field name="period_type"/>
<field name="period_nbr"/>
<field name="period_total"/>
</group>
<group string="Valid Up to">
<field name="period_nbr"/>
<field name="period_type"/>
</group>
</group>
<separator string="Subscription Lines"/>
<field name="lines_id" widget="one2many_list"/>

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

@ -28,7 +28,7 @@ class account_subscription_generate(osv.osv_memory):
_name = "account.subscription.generate"
_description = "Subscription Compute"
_columns = {
'date': fields.date('Date', required=True),
'date': fields.date('Generate Entries Before', required=True),
}
_defaults = {
'date': lambda *a: time.strftime('%Y-%m-%d'),

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

@ -9,12 +9,9 @@
<field name="arch" type="xml">
<form string="Subscription Compute" version="7.0">
<header>
<button icon="gtk-cancel" special="cancel" string="Cancel" />
<button icon="gtk-execute" string="Generate Entries"
name="action_generate" type="object" />
</header>
<separator string="Generate Entries before:"/>
<label string ="Automatically generate entries based on what has been entered in the system before a specific date."/>
<group>
<field name="date"/>
</group>