[FIX]: fix a small problem in checking condition, fix journla name in report

bzr revid: mga@tinyerp.com-20100914135856-szlljw9opp8k0jep

diff --git a/addons/account_voucher/report/report_voucher.rml b/addons/account_voucher/report/report_voucher.rml
index ee40fb2..e19019f 100755 (executable)
--- a/addons/account_voucher/report/report_voucher.rml
+++ b/addons/account_voucher/report/report_voucher.rml
@@ -167,7 +167,7 @@
           <para style="terp_tblheader_Details">Journal:</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ voucher.type ]]</para>
+          <para style="terp_default_9">[[ voucher.journal_id.name ]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Number:</para>

diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 4215c08..52734ac 100644 (file)
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -268,9 +268,9 @@ class account_voucher(osv.osv):
             'value':{},
         }
         
-        if not journal_id or not journal_id:
+        if not partner_id or not journal_id:
             return default
-            
+        
         partner_pool = self.pool.get('res.partner')
         journal_pool = self.pool.get('account.journal')
 

diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index f8de8ba..39c6202 100644 (file)
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -42,8 +42,8 @@
                                     <field name="account_id"/>
                                     <field name="name"/>
                                     <field name="amount" sum="Total Amount"/>
-                                    <field name="type"/>
-                                    <field name="account_analytic_id" domain="[('parent_id','!=',False)]"/>
+                                    <field name="type" groups="base.group_extended"/>
+                                    <field name="account_analytic_id" domain="[('parent_id','!=',False)]" groups="base.group_extended"/>
                                 </tree>
                             </field>
                             
@@ -52,8 +52,8 @@
                                     <field name="account_id"/>
                                     <field name="name"/>
                                     <field name="amount" sum="Total Amount"/>
-                                    <field name="type"/>
-                                    <field name="account_analytic_id" domain="[('parent_id','!=',False)]"/>
+                                    <field name="type" groups="base.group_extended"/>
+                                    <field name="account_analytic_id" domain="[('parent_id','!=',False)]" groups="base.group_extended"/>
                                 </tree>
                             </field>
                             <group col="2" colspan="3">