Divyesh Makwana(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-10_clicks_end_of_periods-mdi into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-10_clicks_end_of_periods-mdi/+merge/133182
Hello
I have improved the Cancel Opening Entries Wizard.
Thanks,
Divyesh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-10_clicks_end_of_periods-mdi/+merge/133182
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-10_clicks_end_of_periods-mdi.
=== modified file 'account/wizard/account_open_closed_fiscalyear.py'
--- account/wizard/account_open_closed_fiscalyear.py 2012-08-07 11:31:37 +0000
+++ account/wizard/account_open_closed_fiscalyear.py 2012-11-07 04:50:27 +0000
@@ -27,7 +27,7 @@
_description = "Choose Fiscal Year"
_columns = {
'fyear_id': fields.many2one('account.fiscalyear', \
- 'Fiscal Year to Open', required=True, help='Select Fiscal Year which you want to remove entries for its End of year entries journal'),
+ 'Fiscal Year', required=True, help='Select Fiscal Year which you want to remove entries for its End of year entries journal'),
}
def remove_entries(self, cr, uid, ids, context=None):
@@ -36,7 +36,7 @@
data = self.browse(cr, uid, ids, context=context)[0]
period_journal = data.fyear_id.end_journal_period_id or False
if not period_journal:
- raise osv.except_osv(_('Error!'), _('You have to set the end of the fiscal year for this journal.'))
+ raise osv.except_osv(_('Error!'), _("You have to set the 'End of Year Entries Journal' for this Fiscal Year which is set after generating opening entries from 'Generate Opening Entries'."))
ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
if ids_move:
=== modified file 'account/wizard/account_open_closed_fiscalyear_view.xml'
--- account/wizard/account_open_closed_fiscalyear_view.xml 2012-08-08 10:59:07 +0000
+++ account/wizard/account_open_closed_fiscalyear_view.xml 2012-11-07 04:50:27 +0000
@@ -5,9 +5,11 @@
<field name="name">account.open.closed.fiscalyear.form</field>
<field name="model">account.open.closed.fiscalyear</field>
<field name="arch" type="xml">
- <form string="Choose Fiscal Year " version="7.0">
+ <form string="Cancel Fiscal Year Opening Entries" version="7.0">
+ <separator string="Cancel Fiscal Year Opening Entries"/>
+ <label string="This wizard will remove the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year."/>
<group>
- <field name="fyear_id" domain="[('state','=','draft')]"/>
+ <field name="fyear_id" domain="[('state','=','draft'), ('end_journal_period_id', '!=', False)]"/>
</group>
<footer>
<button string="Open" name="remove_entries" type="object" class="oe_highlight"/>
_______________________________________________
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
