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

bugfix 

bzr revid: fp@tinyerp.com-20090116111235-rptb5au9o34j05et
This commit is contained in:
Fabien Pinckaers 2009-01-16 12:12:35 +01:00
parent c1856af9f0
commit 034ca90c52
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account.py
View File

@ -584,7 +584,7 @@ class account_period(osv.osv):
if obj_period.fiscalyear_id.date_stop < obj_period.date_stop or obj_period.fiscalyear_id.date_stop < obj_period.date_start or obj_period.fiscalyear_id.date_start > obj_period.date_start or obj_period.fiscalyear_id.date_start > obj_period.date_stop:
return False
pids = self.search(cr, uid, [('date_stop','>=',obj_period.date_start),('date_stop','<=',obj_period.date_start),('special','=',False),('id','<>',obj_period.id)])
pids = self.search(cr, uid, [('date_stop','>=',obj_period.date_start),('date_start','<=',obj_period.date_stop),('special','=',False),('id','<>',obj_period.id)])
for period in self.browse(cr, uid, pids):
if period.fiscalyear_id.company_id.id==obj_period.fiscalyear_id.company_id.id:
return False

3
addons/account/account_view.xml
View File

@ -25,6 +25,7 @@
<field name="code" select="1"/>
<field name="date_start"/>
<field name="date_stop"/>
<field name="special"/>
</form>
</field>
<separator colspan="4" string="States"/>
@ -75,6 +76,7 @@
<field name="date_start"/>
<field name="date_stop"/>
<field name="fiscalyear_id"/>
<field name="special"/>
<separator colspan="4" string="States"/>
<field name="state" select="1"/>
<button name="action_draft" states="done" string="Set to Draft" type="object"/>
@ -91,6 +93,7 @@
<field name="name"/>
<field name="date_start"/>
<field name="date_stop"/>
<field name="special"/>
<field name="state"/>
</tree>
</field>