[MERGE]: Merge with lp:openobject-addons-trunk

bzr revid: ksa@tinyerp.co.in-20100917044047-2zjgnscicpxriz98

diff --cc addons/account/account_view.xml
Simple merge

diff --cc addons/account_voucher/voucher_sales_purchase_view.xml
Simple merge

diff --cc addons/idea/test/test_idea.yml
index e967144,4f6ea4b..0fbeabd
--- 1/addons/idea/test/test_idea.yml
--- 2/addons/idea/test/test_idea.yml
+++ b/addons/idea/test/test_idea.yml
@@@ -8,11 -8,10 +8,10 @@@
      name: Technical
  - |
    I create a New Idea of "Technical  presentation for 1 hours in every day" and specify category "Technical".
 -- 
 -  !record {model: idea.idea, id: idea_idea_0}: 
 +-
 +  !record {model: idea.idea, id: idea_idea_0}:
      category_id: idea_category_technical0
-     comment_ids: That is fine.
-     created_date: '05/13/2010 19:16:26'
+     created_date: '2010-05-13 19:16:26'
      description: I want that Technical presentation are arranged for 1 hours in every
        day.\nso, on that presentation, we can know all things what improvement and development
        are done in our company.\n\n\n\n\n
@@@ -23,18 -22,17 +22,18 @@@
    I check that the idea is in draft state.
  -
    !assert {model: idea.idea, id: idea_idea_0}:
 -    - state == 'draft'  
 -    
 +    - state == 'draft'
 +
  - |
    I open this idea by clicking on the "Open" button.
 -- 
 +-
    !workflow {model: idea.idea, action: idea_open, ref: idea_idea_0}
 -  
 +
  - |
    In order to check voting statistics in real systems I will create 2 new Users "test_idea_user1".
 -- 
 -  !record {model: res.users, id: test_idea_user1}: 
 +
- - 
-   !record {model: res.users, id: test_idea_user1}: 
++-
++  !record {model: res.users, id: test_idea_user1}:
      company_id: base.main_company
      context_lang: en_US
      login: test_idea_user1
@@@ -42,8 -40,8 +41,8 @@@
      password: test_idea_user1
      groups_id: [ base.group_tool_user, ]
  - |
--  And I will also create user2.    
--- 
++  And I will also create user2.
++-
    !record {model: res.users, id: test_idea_user2}:
      company_id: base.main_company
      context_lang: en_US
@@@ -72,8 -70,8 +71,8 @@@
    !python {model: idea.post.vote}: |
      uid2 = ref('test_idea_user2')
      new_id = self.create(cr, uid2, {'vote': 100, 'note': 'We can learn many things from technical presentation'}, {"active_ids": [ref("idea_idea_0")]})
--    self.do_vote(cr, uid2, [new_id], {'active_ids': [ref('idea_idea_0')]})  
--        
++    self.do_vote(cr, uid2, [new_id], {'active_ids': [ref('idea_idea_0')]})
++
  - |
    I can see that the Average score changed in "Average score" field with value 75
  -