[MERGE]merge with parent branch

bzr revid: sgo@tinyerp.com-20120605133220-rakt5glcgv0fc3wk

addons/account/account_installer.xml

@@ -13,9 +13,11 @@
                 <separator string="title" position="attributes">
                     <attribute name="string">Configure Your Chart of Accounts</attribute>
                 </separator>
-                <xpath expr="//label[@string='description']" position="attributes">
-                    <attribute name="string">The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default.</attribute>
-                </xpath>
+                <!-- Removed description from main view.-->
+                
+                <!--<xpath expr="//label[@string='description']" position="attributes">-->
+                <!--    <attribute name="string">The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default.</attribute>-->
+                <!--</xpath>-->
                 <xpath expr="//button[@string='Install Modules']" position="attributes">
                     <attribute name="string">Configure</attribute>
                 </xpath>

addons/idea/idea_view.xml

@@ -100,20 +100,20 @@
         <field name="value" eval="'ir.actions.act_window,'+str(action_idea_idea_categ_open)" />
     </record>
 
- <!-- Idea statistics Form View -->
-<!--
-    <record model="ir.ui.view" id="view_idea_stat_form">
-        <field name="name">idea.stat.form</field>
-        <field name="model">idea.stat</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="stat">
-                <field name="avgscore" />
-                <field name="nbr_comments" />
-                <field name="nbr_votes" />
-            </form>
-        </field>
-    </record> -->
+<!-- Idea statistics Form View [where is python class for this view ?]-->
+
+    <!--<record model="ir.ui.view" id="view_idea_stat_form">-->
+    <!--    <field name="name">idea.stat.form</field>-->
+    <!--    <field name="model">idea.stat</field>-->
+    <!--    <field name="type">form</field>-->
+    <!--    <field name="arch" type="xml">-->
+    <!--        <form string="stat">-->
+    <!--            <field name="avgscore" />-->
+    <!--            <field name="nbr_comments" />-->
+    <!--            <field name="nbr_votes" />-->
+    <!--        </form>-->
+    <!--    </field>-->
+    <!--</record>-->
 
 <!--Vote For Idea Tree View -->
 

addons/point_of_sale/wizard/pos_box_entries.py

@@ -34,7 +34,7 @@ def get_journal(self, cr, uid, context=None):
          @param context: A standard dictionary
          @return :Return the list of journal
     """
-
+    
     journal_obj = self.pool.get('account.journal')
     statement_obj = self.pool.get('account.bank.statement')
 
@@ -42,7 +42,7 @@ def get_journal(self, cr, uid, context=None):
     obj_ids = statement_obj.search(cr, uid, [('state', '=', 'open'), ('user_id', '=', uid), ('journal_id', 'in', j_ids)], context=context)
     res = statement_obj.read(cr, uid, obj_ids, ['journal_id'], context=context)
     res = [(r['journal_id']) for r in res]
-    if not len(res):
+    if not len(res) and context:
         raise osv.except_osv(_('Error !'), _('You do not have any open cash register. You must create a payment method or open a cash register.'))
     return res