pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]

Browse Source 
bzr revid: olt@tinyerp.com-20090707132153-q6eraozjczmnxt3i
This commit is contained in:
Olivier Laurent
2009-07-07 15:21:53 +02:00
parent 4f8b39e6d1 57362423c6
commit 9f9ef384bb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_invoice_view.xml
+4 -4
View File
@@ -482,7 +482,7 @@
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','!=','draft'),('reconciled','=',False),('type','=','out_invoice')]</field>
<field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_invoice')]</field>
<field name="context">{'type':'out_invoice'}</field>
</record>
<record id="action_invoice_tree7_view1" model="ir.actions.act_window.view">
@@ -526,7 +526,7 @@
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','!=','draft'),('reconciled','=',False),('type','=','in_invoice')]</field>
<field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_invoice')]</field>
<field name="context">{'type':'in_invoice'}</field>
</record>
<record id="action_invoice_tree9_view1" model="ir.actions.act_window.view">
@@ -570,7 +570,7 @@
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','!=','draft'),('reconciled','=',False),('type','=','out_refund')]</field>
<field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_refund')]</field>
<field name="context">{'type':'out_refund'}</field>
</record>
<record id="action_invoice_tree11_view1" model="ir.actions.act_window.view">
@@ -614,7 +614,7 @@
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','!=','draft'),('reconciled','=',False),('type','=','in_refund')]</field>
<field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_refund')]</field>
<field name="context">{'type':'in_refund'}</field>
</record>
<record id="action_invoice_tree13_view1" model="ir.actions.act_window.view">
addons/account/account_move_line.py
+1 -1
View File
@@ -837,7 +837,7 @@ class account_move_line(osv.osv):
if journal.type_control_ids:
type = account.user_type
for t in journal.type_control_ids:
if type==t.code:
if type.code == t.code:
ok = True
break
if journal.account_control_ids and not ok: