Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-periodical-processing-bde
into lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-periodical-processing-bde/+merge/112034
Hello Sir,
I have improved views of menus under Periodical Processing
from useability point of view.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-periodical-processing-bde/+merge/112034
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-periodical-processing-bde
into lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp.
=== modified file 'account/account.py'
--- account/account.py 2012-06-19 14:57:28 +0000
+++ account/account.py 2012-06-26 09:21:55 +0000
@@ -2347,7 +2347,7 @@
'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),
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2012-06-22 10:29:59 +0000
+++ account/account_view.xml 2012-06-26 09:21:55 +0000
@@ -105,13 +105,20 @@
</header>
<sheet>
<group col="4">
- <field name="name"/>
- <field name="code"/>
- <field name="date_start"/>
- <field name="date_stop"/>
- <field name="company_id" widget="selection" groups="base.group_multi_company"/>
- <field name="fiscalyear_id" widget="selection"/>
- <field name="special"/>
+ <group>
+ <field name="name"/>
+ <field name="fiscalyear_id" widget="selection"/>
+ <label for="date_start" string="Duration"/>
+ <div>
+ <field name="date_start"/>-
+ <field name="date_stop" nolabel="1"/>
+ </div>
+ </group>
+ <group>
+ <field name="code"/>
+ <field name="special"/>
+ <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+ </group>
</group>
</sheet>
</form>
@@ -1830,22 +1837,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"/>
=== modified file 'account/wizard/account_fiscalyear_close_state.py'
--- account/wizard/account_fiscalyear_close_state.py 2011-03-15 14:53:57 +0000
+++ account/wizard/account_fiscalyear_close_state.py 2012-06-26 09:21:55 +0000
@@ -29,7 +29,7 @@
_description = "Fiscalyear Close state"
_columns = {
'fy_id': fields.many2one('account.fiscalyear', \
- 'Fiscal Year to close', required=True, help="Select a fiscal year to close"),
+ 'Fiscal Year to Close', required=True, help="Select a fiscal year to close"),
}
def data_save(self, cr, uid, ids, context=None):
=== modified file 'account/wizard/account_fiscalyear_close_state.xml'
--- account/wizard/account_fiscalyear_close_state.xml 2012-06-09 13:50:41 +0000
+++ account/wizard/account_fiscalyear_close_state.xml 2012-06-26 09:21:55 +0000
@@ -8,10 +8,8 @@
<field name="arch" type="xml">
<form string="Close states of Fiscal year and periods" version="7.0">
<header>
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
- <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
+ <button icon="terp-locked" string="Close Fiscal Year" name="data_save" type="object"/>
</header>
- <separator string="Close states of Fiscal year and periods"/>
<label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/>
<group>
<field name="fy_id" domain="[('state','=','draft')]"/>
=== modified file 'account/wizard/account_fiscalyear_close_view.xml'
--- account/wizard/account_fiscalyear_close_view.xml 2012-06-09 22:28:49 +0000
+++ account/wizard/account_fiscalyear_close_view.xml 2012-06-26 09:21:55 +0000
@@ -9,9 +9,7 @@
<form string="Generate Fiscal Year Opening Entries" version="7.0">
<header>
<button icon="gtk-execute" string="Create" name="data_save" type="object"/>
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
</header>
- <separator 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."/>
<newline/>
<group col="4">
=== modified file 'account/wizard/account_open_closed_fiscalyear_view.xml'
--- account/wizard/account_open_closed_fiscalyear_view.xml 2012-06-09 22:28:49 +0000
+++ account/wizard/account_open_closed_fiscalyear_view.xml 2012-06-26 09:21:55 +0000
@@ -8,7 +8,6 @@
<field name="arch" type="xml">
<form string="Choose Fiscal Year " version="7.0">
<header>
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
</header>
<group>
=== modified file 'account/wizard/account_subscription_generate.py'
--- account/wizard/account_subscription_generate.py 2011-04-29 08:49:48 +0000
+++ account/wizard/account_subscription_generate.py 2012-06-26 09:21:55 +0000
@@ -28,7 +28,7 @@
_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'),
=== modified file 'account/wizard/account_subscription_generate_view.xml'
--- account/wizard/account_subscription_generate_view.xml 2012-06-09 22:28:49 +0000
+++ account/wizard/account_subscription_generate_view.xml 2012-06-26 09:21:55 +0000
@@ -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>
=== modified file 'account/wizard/account_use_model_view.xml'
--- account/wizard/account_use_model_view.xml 2012-06-09 22:28:49 +0000
+++ account/wizard/account_use_model_view.xml 2012-06-26 09:21:55 +0000
@@ -10,12 +10,10 @@
<form string="Create Entries From Models" version="7.0">
<header>
<button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
</header>
- <separator string="This wizard will create recurring accounting entries"/>
<label string="Create manual recurring entries in a chosen journal."/>
<group>
- <field name="model"/>
+ <field name="model" nolabel="1"/>
</group>
</form>
</field>
=== modified file 'account/wizard/account_validate_move_view.xml'
--- account/wizard/account_validate_move_view.xml 2012-06-09 23:09:29 +0000
+++ account/wizard/account_validate_move_view.xml 2012-06-26 09:21:55 +0000
@@ -11,9 +11,7 @@
<form string="Post Journal Entries" version="7.0">
<header>
<button icon="terp-camera_test" string="Approve" name="validate_move" type="object"/>
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
</header>
- <separator string="Post Journal Entries of a Journal"/>
<label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
<group>
<field name="journal_id"/>
@@ -24,7 +22,7 @@
</record>
<record id="action_validate_account_move" model="ir.actions.act_window">
- <field name="name">Open Journal</field>
+ <field name="name">Post Journal Entries</field>
<field name="res_model">validate.account.move</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
=== modified file 'account_asset/wizard/wizard_asset_compute_view.xml'
--- account_asset/wizard/wizard_asset_compute_view.xml 2012-06-09 22:28:49 +0000
+++ account_asset/wizard/wizard_asset_compute_view.xml 2012-06-26 09:21:55 +0000
@@ -9,10 +9,7 @@
<form string="Compute Asset" version="7.0">
<header>
<button icon="gtk-execute" string="Compute" name="asset_compute" type="object"/>
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
</header>
- <separator string="Post Depreciation Lines"/>
- <label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/>
<group>
<field name="period_id"/>
</group>
=== modified file 'account_followup/wizard/account_followup_print.py'
--- account_followup/wizard/account_followup_print.py 2012-03-30 05:09:55 +0000
+++ account_followup/wizard/account_followup_print.py 2012-06-26 09:21:55 +0000
@@ -31,7 +31,7 @@
_description = 'Print Followup & Send Mail to Customers'
_columns = {
'date': fields.date('Follow-up Sending Date', required=True, help="This field allow you to select a forecast date to plan your follow-ups"),
- 'followup_id': fields.many2one('account_followup.followup', 'Follow-up', required=True),
+ 'followup_id': fields.many2one('account_followup.followup', 'Follow-Up', required=True),
}
def _get_followup(self, cr, uid, context=None):
@@ -121,10 +121,10 @@
_description = 'Print Followup & Send Mail to Customers'
_columns = {
'partner_ids': fields.many2many('account_followup.stat.by.partner', 'partner_stat_rel', 'osv_memory_id', 'partner_id', 'Partners', required=True),
- 'email_conf': fields.boolean('Send email confirmation'),
+ 'email_conf': fields.boolean('Send Email Confirmation'),
'email_subject': fields.char('Email Subject', size=64),
'partner_lang': fields.boolean('Send Email in Partner Language', help='Do not change message text, if you want to send email in partner language, or configure from company'),
- 'email_body': fields.text('Email body'),
+ 'email_body': fields.text('Email Body'),
'summary': fields.text('Summary', required=True, readonly=True),
'test_print': fields.boolean('Test Print', help='Check if you want to print followups without changing followups level.')
}
=== modified file 'account_followup/wizard/account_followup_print_view.xml'
--- account_followup/wizard/account_followup_print_view.xml 2012-06-14 11:29:13 +0000
+++ account_followup/wizard/account_followup_print_view.xml 2012-06-26 09:21:55 +0000
@@ -7,13 +7,10 @@
<field name="model">account.followup.print</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Send followups" version="7.0">
+ <form string="Send Follow-Ups" version="7.0">
<header>
<button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
- <button special="cancel" string="Cancel" icon='gtk-cancel'/>
</header>
- <separator string="Send Follow-Ups"/>
- <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
<group col="4">
<field name="followup_id"/>
<field name="date"/>
@@ -23,7 +20,7 @@
</record>
<record id="action_account_followup_print" model="ir.actions.act_window">
- <field name="name">Send followups</field>
+ <field name="name">Send Follow-Ups</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.followup.print</field>
<field name="view_type">form</field>
@@ -75,11 +72,10 @@
<field name="model">account.followup.print.all</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Send followups" version="7.0">
+ <form string="Send Follow-Ups" version="7.0">
<header>
<button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute"/>
- <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print"/>
- <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+ <button name="do_print" string="Print Follow-Ups" colspan="1" type="object" icon="gtk-print"/>
</header>
<notebook>
<page string="Partner Selection">
@@ -91,7 +87,6 @@
<field name="partner_lang" colspan="4"/>
<field name="test_print" colspan="4"/>
<field name="email_subject" colspan="4"/>
- <separator string="Email Body" colspan="4" />
<field name="email_body" colspan="4" nolabel="1"/>
</group>
<group string="Legend">
@@ -126,7 +121,7 @@
</record>
<record id="action_account_followup_print_all" model="ir.actions.act_window">
- <field name="name">Send followups</field>
+ <field name="name">Send Follow-Ups</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.followup.print.all</field>
<field name="view_type">form</field>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
