[MERGE] merged from openobject-addons branch

bzr revid: hmo@tinyerp.com-20101027053819-if1wltlbyizl4n5r

10 files changed, 162 insertions, 145 deletions

diff --git a/addons/account_reporting/__init__.py b/addons/account_reporting/__init__.py
index 65ca37b6d51..2e6645ed66e 100644
--- a/addons/account_reporting/__init__.py
+++ b/addons/account_reporting/__init__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 import report
-import account
+import account_reporting
 import wizard
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_reporting/__openerp__.py b/addons/account_reporting/__openerp__.py
index fb05e755ac2..b5bbaa3bf3f 100644
--- a/addons/account_reporting/__openerp__.py
+++ b/addons/account_reporting/__openerp__.py
@@ -31,9 +31,8 @@
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
-        'account_view.xml',
-        'account_report.xml',
-        'account_data.xml',
+        'account_reporting_view.xml',
+        'account_reporting_data.xml',
         'wizard/account_reporting_balance_report_view.xml',
     ],
     'demo_xml': ['account_reporting_demo.xml'],
diff --git a/addons/account_reporting/account_report.xml b/addons/account_reporting/account_report.xml
deleted file mode 100644
index ebfe70e4c50..00000000000
--- a/addons/account_reporting/account_report.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-	<data>
-
-	</data>
-</openerp>
diff --git a/addons/account_reporting/account.py b/addons/account_reporting/account_reporting.py
index 7fc08401496..ec1f370e05b 100644
--- a/addons/account_reporting/account.py
+++ b/addons/account_reporting/account_reporting.py
@@ -18,19 +18,19 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
+
 import netsvc
 from osv import fields, osv
-
 from tools.misc import currency
 
-
 class color_rml(osv.osv):
     _name = "color.rml"
     _description = "Rml Color"
     _columns = {
         'name': fields.char('Name', size=64, required=True),
-        'code': fields.char('code',size=64,required=True),
+        'code': fields.char('code', size=64, required=True),
         }
 
 color_rml()
@@ -39,44 +39,44 @@ class account_report_bs(osv.osv):
     _name = "account.report.bs"
     _description = "Account reporting for Balance Sheet"
     _font = [
-             ('',''),
-             ('Courier','Courier'),
-             ('Courier-Bold','Courier-Bold'),
-             ('Courier-BoldOblique','Courier-BoldOblique'),
-             ('Courier-Oblique','Courier-Oblique'),
-             ('Helvetica','Helvetica'),
-             ('Helvetica-Bold','Helvetica-Bold'),
-             ('Helvetica-Oblique','Helvetica-Oblique'),
-             ('Times-Bold','Times-Bold'),
-             ('Times-BoldItalic','Times-BoldItalic'),
-             ('Times-Italic','Times-Italic'),
-             ('Times-Roman','Times-Roman'),
+             ('', ''),
+             ('Courier', 'Courier'),
+             ('Courier-Bold', 'Courier-Bold'),
+             ('Courier-BoldOblique', 'Courier-BoldOblique'),
+             ('Courier-Oblique', 'Courier-Oblique'),
+             ('Helvetica', 'Helvetica'),
+             ('Helvetica-Bold', 'Helvetica-Bold'),
+             ('Helvetica-Oblique', 'Helvetica-Oblique'),
+             ('Times-Bold', 'Times-Bold'),
+             ('Times-BoldItalic', 'Times-BoldItalic'),
+             ('Times-Italic', 'Times-Italic'),
+             ('Times-Roman', 'Times-Roman'),
             ]
     _color = [
             ('', ''),
-            ('green','Green'),
-            ('red','Red'),
-            ('pink','Pink'),
-            ('blue','Blue'),
-            ('yellow','Yellow'),
-            ('cyan','Cyan'),
-            ('lightblue','Light Blue'),
-            ('orange','Orange'),
+            ('green', 'Green'),
+            ('red', 'Red'),
+            ('pink', 'Pink'),
+            ('blue', 'Blue'),
+            ('yellow', 'Yellow'),
+            ('cyan', 'Cyan'),
+            ('lightblue', 'Light Blue'),
+            ('orange', 'Orange'),
             ]
     _style = [
             ('', ''),
-            ('h1','Header 1'),
-            ('h2','Header 2'),
-            ('h3','Header 3'),
+            ('h1', 'Header 1'),
+            ('h2', 'Header 2'),
+            ('h3', 'Header 3'),
             ]
 
     def onchange_parent_id(self, cr, uid, ids, parent_id):
-        v={}
+        v = {}
         if parent_id:
-            acc=self.pool.get('account.report.report').browse(cr, uid, parent_id)
-            v['type']=acc.type
+            acc = self.pool.get('account.report.report').browse(cr, uid, parent_id)
+            v['type'] = acc.type
             if int(acc.style) < 6:
-                v['style'] = str(int(acc.style)+1)
+                v['style'] = str(int(acc.style) + 1)
         return {'value': v}
 
     _columns = {
@@ -85,36 +85,35 @@ class account_report_bs(osv.osv):
         'code': fields.char('Code', size=64, required=True),
         'account_id': fields.many2many('account.account', 'account_report_rel', 'report_id', 'account_id', 'Accounts'),
         'note': fields.text('Note'),
-        'color_font' : fields.many2one('color.rml','Font Color'),
-        'color_back' : fields.many2one('color.rml','Back Color'),
-        'font_style' : fields.selection(_font, 'Font'),
+        'color_font': fields.many2one('color.rml', 'Font Color'),
+        'color_back': fields.many2one('color.rml', 'Back Color'),
+        'font_style': fields.selection(_font, 'Font'),
         'parent_id': fields.many2one('account.report.bs', 'Parent'),
         'child_id': fields.one2many('account.report.bs', 'parent_id', 'Children'),
-        'report_type' : fields.selection([('only_obj', 'Report Objects Only'),('with_account', 'Report Objects With Accounts'),('acc_with_child', 'Report Objects With Accounts and child of Accounts')],"Report Type")
+        'report_type': fields.selection([('only_obj', 'Report Objects Only'), ('with_account', 'Report Objects With Accounts'), ('acc_with_child', 'Report Objects With Accounts and child of Accounts')], "Report Type")
     }
     _defaults = {
-        'report_type': lambda *a :'only_obj',
-        'color_font': lambda *a :'',
-        'color_back': lambda *a :'',
-        'font_style': lambda *a :'',
+        'report_type': 'only_obj',
+        'color_font': '',
+        'color_back': '',
+        'font_style': '',
     }
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
-            args=[]
+            args = []
         if not context:
-            context={}
+            context = {}
         ids = []
         if name:
-            ids = self.search(cr, user, [('code','=',name)]+ args, limit=limit, context=context)
+            ids = self.search(cr, user, [('code', '=', name)]+ args, limit=limit, context=context)
             if not ids:
-                ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
+                ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit, context=context)
         else:
             ids = self.search(cr, user, args, limit=limit, context=context)
         return self.name_get(cr, user, ids, context=context)
 
 account_report_bs()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_reporting/account_data.xml b/addons/account_reporting/account_reporting_data.xml
index c4e2dac819b..c4e2dac819b 100644
--- a/addons/account_reporting/account_data.xml
+++ b/addons/account_reporting/account_reporting_data.xml
diff --git a/addons/account_reporting/account_view.xml b/addons/account_reporting/account_reporting_view.xml
index f02ed221e42..b12217f84e5 100644
--- a/addons/account_reporting/account_view.xml
+++ b/addons/account_reporting/account_reporting_view.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
+    <data>
 
-    <record model="ir.ui.view" id="view_account_report_bs_form">
-        <field name="name">account.report.bs.form</field>
-        <field name="model">account.report.bs</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Account reporting">
-                <notebook>
-                <page string="General">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="parent_id" select="1"/>
-                    <field name="sequence"/>
-                    <field name="color_font"/>
-                    <field name="color_back"/>
-                    <field name="font_style"/>
-                    <field name="report_type"/>
-                    <newline/>
-                    <separator string="Accounts" colspan="4"/>
-                        <field name="account_id" colspan="4" nolabel="1"/>
-                </page>
-                <page string="Notes">
-                    <field name="note" nolabel="1" colspan="4"/>
-                </page>
-                </notebook>
-            </form>
-        </field>
-    </record>
+        <record model="ir.ui.view" id="view_account_report_bs_form">
+            <field name="name">account.report.bs.form</field>
+            <field name="model">account.report.bs</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account reporting">
+                    <notebook>
+                    <page string="General">
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="parent_id" select="1"/>
+                        <field name="sequence"/>
+                        <field name="color_font"/>
+                        <field name="color_back"/>
+                        <field name="font_style"/>
+                        <field name="report_type"/>
+                        <newline/>
+                        <separator string="Accounts" colspan="4"/>
+                            <field name="account_id" colspan="4" nolabel="1"/>
+                    </page>
+                    <page string="Notes">
+                        <field name="note" nolabel="1" colspan="4"/>
+                    </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
 
         <record model="ir.ui.view" id="view_account_report_tree_bs">
             <field name="name">account.report.report.tree.bs</field>
@@ -42,6 +42,7 @@
             </tree>
             </field>
         </record>
+
         <record model="ir.actions.act_window" id="action_account_tree_bs">
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.report.bs</field>
@@ -49,6 +50,7 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_account_report_tree_bs"/>
         </record>
+
         <menuitem name="Balance Sheet Report" id="menu_finan_config_BSheet" parent="account.menu_finance_configuration"/>
         <menuitem name="Balance Sheet Report" id="action_account_report_bs_form" action="action_account_tree_bs" parent="menu_finan_config_BSheet"/>
 
@@ -58,9 +60,8 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_account_report_bs_form"/>
         </record>
-        <menuitem name="Balance Sheet Report Form" id="bs_report_action_form" action="acc_bs_report_action_form" parent="menu_finan_config_BSheet"/>
-
 
+        <menuitem name="Balance Sheet Report Form" id="bs_report_action_form" action="acc_bs_report_action_form" parent="menu_finan_config_BSheet"/>
 
-</data>
+    </data>
 </openerp>
diff --git a/addons/account_reporting/i18n/sr.po b/addons/account_reporting/i18n/sr.po
index 38289723f44..733e84d3ca4 100644
--- a/addons/account_reporting/i18n/sr.po
+++ b/addons/account_reporting/i18n/sr.po
@@ -7,17 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 09:23+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-26 08:38+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
+#: model:ir.model,name:account_reporting.model_color_rml
+msgid "Rml Color"
+msgstr "Rml Boja"
+
+#. module: account_reporting
 #: field:color.rml,code:0
 msgid "code"
 msgstr "kod"
@@ -56,11 +61,26 @@ msgid "Balance Sheet Report"
 msgstr "Izvještaj Liste Salda"
 
 #. module: account_reporting
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
+#. module: account_reporting
+#: view:account.reporting.balance.report:0
+msgid "Print"
+msgstr "Štampaj"
+
+#. module: account_reporting
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Pogrešno ime modela u definiciji akcije."
 
 #. module: account_reporting
+#: field:account.report.bs,font_style:0
+msgid "Font"
+msgstr "Font"
+
+#. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Courier"
 msgstr "Pošiljka"
@@ -71,12 +91,7 @@ msgid "Courier-BoldOblique"
 msgstr "Courier-BoldOblique"
 
 #. module: account_reporting
-#: wizard_button:account.account.balancesheet.report,init,report:0
-msgid "Print BalanceSheet"
-msgstr "Ispis ListeSalda"
-
-#. module: account_reporting
-#: help:account.account.balancesheet.report,init,periods:0
+#: help:account.reporting.balance.report,periods:0
 msgid "All periods if empty"
 msgstr "Ako je prazno, sva razdoblja"
 
@@ -161,11 +176,6 @@ msgid "Report Objects Only"
 msgstr "Izveštaj samo objekata"
 
 #. module: account_reporting
-#: model:ir.model,name:account_reporting.model_color_rml
-msgid "Rml Colors"
-msgstr "Rml Boje"
-
-#. module: account_reporting
 #: model:ir.module.module,shortdesc:account_reporting.module_meta_information
 msgid "Reporting of Balancesheet for accounting"
 msgstr "Izveštavanje liste salda za računovostvo"
@@ -181,6 +191,11 @@ msgid "Parent"
 msgstr "Roditelj"
 
 #. module: account_reporting
+#: view:account.reporting.balance.report:0
+msgid "Select Dates Period"
+msgstr "Selektuj Datume razdoblja"
+
+#. module: account_reporting
 #: field:account.report.bs,sequence:0
 msgid "Sequence"
 msgstr "Sekvenca"
@@ -191,12 +206,19 @@ msgid "Times-Bold"
 msgstr "Times-Bold"
 
 #. module: account_reporting
+#: help:account.report.bs,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of account reporting for "
+"balance sheet."
+msgstr ""
+
+#. module: account_reporting
 #: view:account.report.bs:0
 msgid "General"
 msgstr "Opšte"
 
 #. module: account_reporting
-#: wizard_field:account.account.balancesheet.report,init,fiscalyear:0
+#: field:account.reporting.balance.report,fiscalyear:0
 msgid "Fiscal year"
 msgstr "Fiskalna Godina"
 
@@ -207,7 +229,8 @@ msgid "Accounts"
 msgstr "Nalozi"
 
 #. module: account_reporting
-#: wizard_field:account.account.balancesheet.report,init,periods:0
+#: view:account.reporting.balance.report:0
+#: field:account.reporting.balance.report,periods:0
 msgid "Periods"
 msgstr "Razdoblja"
 
@@ -217,12 +240,7 @@ msgid "Back Color"
 msgstr "Pozadinska Boja"
 
 #. module: account_reporting
-#: field:account.report.bs,child_id:0
-msgid "Children"
-msgstr "Podređeni"
-
-#. module: account_reporting
-#: wizard_button:account.account.balancesheet.report,init,end:0
+#: view:account.reporting.balance.report:0
 msgid "Cancel"
 msgstr "Otkaži"
 
@@ -237,11 +255,20 @@ msgid "Helvetica-Oblique"
 msgstr "Helvetica-Oblique"
 
 #. module: account_reporting
-#: field:account.report.bs,font_style:0
-msgid "Font"
-msgstr "Font"
+#: model:ir.model,name:account_reporting.model_account_reporting_balance_report
+msgid "Account balance report"
+msgstr ""
 
 #. module: account_reporting
-#: wizard_view:account.account.balancesheet.report,init:0
-msgid "Customize Report"
-msgstr "Prilagodi Izvestaj"
+#: field:account.report.bs,child_id:0
+msgid "Children"
+msgstr "Podređeni"
+
+#~ msgid "Print BalanceSheet"
+#~ msgstr "Ispis ListeSalda"
+
+#~ msgid "Rml Colors"
+#~ msgstr "Rml Boje"
+
+#~ msgid "Customize Report"
+#~ msgstr "Prilagodi Izvestaj"
diff --git a/addons/account_reporting/report/account_report_bs.py b/addons/account_reporting/report/account_report_bs.py
index 22628224306..d21bfbf4f37 100644
--- a/addons/account_reporting/report/account_report_bs.py
+++ b/addons/account_reporting/report/account_report_bs.py
@@ -20,14 +20,12 @@
 ##############################################################################
 
 import time
-import pooler
-import locale
-from report import report_sxw
 
+from report import report_sxw
 
 parents = {
-    'tr':1,
-    'li':1,
+    'tr': 1,
+    'li': 1,
     'story': 0,
     'section': 0
 }
@@ -42,18 +40,17 @@ class account_report_bs(report_sxw.rml_parse):
         self.context = context
 
 
-    def line_total(self,line_id,ctx):
+    def line_total(self, line_id, ctx):
         _total = 0
-        bsline= self.pool.get('account.report.bs').browse(self.cr,self.uid,[line_id])[0]
-        bsline_accids = bsline.account_id
-        res =self.pool.get('account.report.bs').read(self.cr,self.uid,[line_id],['account_id','child_id'])[0]
+        bsline = self.pool.get('account.report.bs').browse(self.cr, self.uid, [line_id])[0]
+        res = self.pool.get('account.report.bs').read(self.cr, self.uid, [line_id], ['account_id', 'child_id'])[0]
         for acc_id in res['account_id']:
-            acc = self.pool.get('account.account').browse(self.cr,self.uid,[acc_id],ctx)[0]
+            acc = self.pool.get('account.account').browse(self.cr, self.uid, [acc_id], ctx)[0]
             _total += acc.balance
         bsline_reportbs = res['child_id']
 
         for report in bsline_reportbs:
-            _total +=self.line_total(report,ctx)
+            _total += self.line_total(report,ctx)
         return  _total
 
     def lines(self, form, ids={}, done=None, level=1, object=False):
@@ -64,14 +61,14 @@ class account_report_bs(report_sxw.rml_parse):
         if not ids:
             return []
         if not done:
-            done={}
+            done = {}
         result = []
         ctx = self.context.copy()
         ctx['fiscalyear'] = form['fiscalyear']
         ctx['periods'] = form['periods']
         report_objs = self.pool.get('account.report.bs').browse(self.cr, self.uid, ids)
         title_name = False
-        if level==1:
+        if level == 1:
             title_name = report_objs[0].name
         def cmp_code(x, y):
             return cmp(x.code, y.code)
@@ -92,41 +89,41 @@ class account_report_bs(report_sxw.rml_parse):
                 'name': report_obj.name,
                 'level': level,
                 'balance': self.line_total(report_obj.id,ctx),
-                'parent_id':False,
-                'color_font':color_font,
-                'color_back':color_back,
-                'font_style' : report_obj.font_style
+                'parent_id': False,
+                'color_font': color_font,
+                'color_back': color_back,
+                'font_style': report_obj.font_style
             }
             result.append(res)
             report_type = report_obj.report_type
             if report_type != 'only_obj':
-                account_ids = self.pool.get('account.report.bs').read(self.cr,self.uid,[report_obj.id],['account_id'])[0]['account_id']
+                account_ids = self.pool.get('account.report.bs').read(self.cr, self.uid, [report_obj.id], ['account_id'])[0]['account_id']
                 if report_type == 'acc_with_child':
-                    acc_ids = self.pool.get('account.account')._get_children_and_consol(self.cr, self.uid, account_ids )
+                    acc_ids = self.pool.get('account.account')._get_children_and_consol(self.cr, self.uid, account_ids)
                     account_ids = acc_ids
-                account_objs = self.pool.get('account.account').browse(self.cr,self.uid,account_ids,ctx)
+                account_objs = self.pool.get('account.account').browse(self.cr, self.uid, account_ids, ctx)
                 for acc_obj in account_objs:
-                    res1={}
+                    res1 = {}
                     res1 = {
                         'code': acc_obj.code,
                         'name': acc_obj.name,
                         'level': level+1,
                         'balance': acc_obj.balance,
-                        'parent_id':acc_obj.parent_id,
-                        'color_font' : 'black',
-                        'color_back' :'white',
-                        'font_style' : 'Helvetica',
+                        'parent_id': acc_obj.parent_id,
+                        'color_font': 'black',
+                        'color_back': 'white',
+                        'font_style': 'Helvetica',
                         }
                     if acc_obj.parent_id:
                         for r in result:
-                            if r['name']== acc_obj.parent_id.name:
+                            if r['name'] == acc_obj.parent_id.name:
                                 res1['level'] = r['level'] + 1
                                 break
                     result.append(res1)
             if report_obj.child_id:
-                ids2 = [(x.code,x.id) for x in report_obj.child_id]
+                ids2 = [(x.code, x.id) for x in report_obj.child_id]
                 ids2.sort()
-                result += self.lines(form,[x[1] for x in ids2], done, level+1,object=False)
+                result += self.lines(form, [x[1] for x in ids2], done, level+1, object=False)
 
         return result
 
diff --git a/addons/account_reporting/wizard/account_reporting_balance_report.py b/addons/account_reporting/wizard/account_reporting_balance_report.py
index 3f67c64b64b..d6461a8b9dc 100644
--- a/addons/account_reporting/wizard/account_reporting_balance_report.py
+++ b/addons/account_reporting/wizard/account_reporting_balance_report.py
@@ -18,8 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
-from tools.translate import _
 
 class account_reporting_balance_report(osv.osv_memory):
 
@@ -33,7 +33,7 @@ class account_reporting_balance_report(osv.osv_memory):
     _description = 'Account balance report'
     _columns = {
         'fiscalyear': fields.many2one('account.fiscalyear', 'Fiscal year', required=True),
-        'periods': fields.many2many('account.period', 'acc_reporting_relation', 'acc_id','period_id', 'Periods', help='All periods if empty'),
+        'periods': fields.many2many('account.period', 'acc_reporting_relation', 'acc_id', 'period_id', 'Periods', help='All periods if empty'),
             }
     _defaults = {
         'fiscalyear' : _get_fiscalyear,
@@ -45,7 +45,7 @@ class account_reporting_balance_report(osv.osv_memory):
             context = {}
         data = self.read(cr, uid, ids)[0]
         datas = {
-             'ids': context.get('active_ids',[]),
+             'ids': context.get('active_ids', []),
              'model': 'account.report.bs',
              'form': data
             }
diff --git a/addons/account_reporting/wizard/account_reporting_balance_report_view.xml b/addons/account_reporting/wizard/account_reporting_balance_report_view.xml
index 5d7ef7dfbdb..31444e17e4e 100644
--- a/addons/account_reporting/wizard/account_reporting_balance_report_view.xml
+++ b/addons/account_reporting/wizard/account_reporting_balance_report_view.xml
@@ -7,8 +7,8 @@
              <field name="model">account.reporting.balance.report</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-	             <form string="Select Dates Period">
-                 	<field name="fiscalyear" colspan="4"/>
+	             <form string="Account Report Balance Sheet">
+                 	<field name="fiscalyear" colspan="4" widget="selection"/>
                  	<newline/>
                  	<separator string="Periods" colspan="4"/>
 					<field name="periods" nolabel="1" colspan="4"/>