[MERGE]: Merge with lp:openobject-addons-trunk
authorksa (Open ERP) <ksa@tinyerp.co.in>
Sat, 11 Sep 2010 05:34:48 +0000 (11:04 +0530)
committerksa (Open ERP) <ksa@tinyerp.co.in>
Sat, 11 Sep 2010 05:34:48 +0000 (11:04 +0530)
bzr revid: ksa@tinyerp.co.in-20100911053448-4xnbt4689ezjdtch

1  2 
addons/account/account_view.xml
addons/account_analytic_default/i18n/tr.po
addons/account_voucher/voucher_sales_purchase_view.xml
addons/idea/test/test_idea.yml
addons/lunch/test/test_lunch.yml
addons/project/test/test_project.yml
addons/stock/i18n/pt_BR.po
addons/stock/i18n/tr.po

                  </tree>
              </field>
          </record>
 -        
++
+         <record id="view_account_period_search" model="ir.ui.view">
+             <field name="name">account.period.search</field>
+             <field name="model">account.period</field>
+             <field name="type">search</field>
+             <field name="arch" type="xml">
+                 <search string="Search Period">
+                     <group>
+                         <filter string="Draft" name="draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                         <separator orientation="vertical"/>
+                         <field name="code"/>
+                         <field name="name"/>
+                     </group>
+                 </search>
+             </field>
+         </record>
 -        
++
          <record id="action_account_period_form" model="ir.actions.act_window">
              <field name="name">Periods</field>
              <field name="res_model">account.period</field>
@@@ -7,13 -7,13 +7,21 @@@ msgstr "
  "Project-Id-Version: OpenERP Server 6.0dev\n"
  "Report-Msgid-Bugs-To: support@openerp.com\n"
  "POT-Creation-Date: 2009-08-28 16:01+0000\n"
++<<<<<<< TREE
 +"PO-Revision-Date: 2010-08-30 08:09+0000\n"
++=======
+ "PO-Revision-Date: 2010-09-04 08:45+0000\n"
++>>>>>>> MERGE-SOURCE
  "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
  "Language-Team: \n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
++<<<<<<< TREE
 +"X-Launchpad-Export-Date: 2010-08-31 03:58+0000\n"
++=======
+ "X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
++>>>>>>> MERGE-SOURCE
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: account_analytic_default
@@@ -33,9 -43,9 +43,9 @@@
                                  <group col="2" colspan="1">
                                      <separator string="Payment Options" colspan="2"/>
                                      <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
--                                    <field name="account_id" 
++                                    <field name="account_id"
                                           attrs="{'invisible':[('pay_now','!=','pay_now')]}"
-                                           domain="[('user_type.report_type','=','asset')]"/>
+                                           domain="[('user_type.report_type','=','asset'), ('type','=','other')]"/>
                                           <!-- should select income accounts only. Or use the journal for this ? -->
                                      <field name="reference"
                                           attrs="{'invisible':[('pay_now','!=','pay_now')]}"
@@@ -68,7 -79,7 +79,7 @@@
                  </form>
              </field>
          </record>
--        
++
          <!-- Sales Voucher -->
          <record id="action_sale_receipt" model="ir.actions.act_window">
              <field name="name">Sales Receipt</field>
@@@ -80,8 -91,8 +91,8 @@@
              <field name="target">new</field>
          </record>
          <menuitem id="menu_action_sale_receipt" icon="STOCK_JUSTIFY_FILL"
-         action="action_sale_receipt" parent="account.menu_finance_receivables" sequence="14"/>
-         
+         action="action_sale_receipt" parent="account.menu_finance_receivables" sequence="10"/>
 -        
++
          <!--  Purchase Vouchers -->
          <record model="ir.ui.view" id="view_purchase_receipt_form">
              <field name="name">account.voucher.purchase.form</field>
              <field name="view_id" ref="account_open_vouchers_view"/>
              <field name="target">new</field>
          </record>
--        <menuitem id="menu_action_purchase_receipt" icon="STOCK_JUSTIFY_FILL" 
-         action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="14"/>        
-         
 -        action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"/>        
 -        
++        <menuitem id="menu_action_purchase_receipt" icon="STOCK_JUSTIFY_FILL"
++        action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"/>
++
      </data>
  </openerp>
      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
-     title: Technical  presentation for 1 hours in every day
+     name: Technical  presentation for 1 hours in every day
      user_id: base.user_root
 -    
 +
  - |
    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 "user1".
+   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: res_users_user0}:
++  !record {model: res.users, id: test_idea_user1}:
      company_id: base.main_company
      context_lang: en_US
-     login: user1
-     name: user1
-     password: user1
+     login: test_idea_user1
+     name: Idea test user1
+     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: res_users_user1}:
+   !record {model: res.users, id: test_idea_user2}:
      company_id: base.main_company
      context_lang: en_US
-     login: user2
-     name: user2
-     password: user2
+     login: test_idea_user2
+     name: Idea test user2
+     password: test_idea_user2
+     groups_id: [ base.group_tool_user, ]
  - |
-   In order to post vote I connect as user1 and open the idea page
+   In order to post vote I connect as test_idea_user1 and open the idea page
    I click on  "Submit Vote" wizard  button and vote the idea as "Normal"
 -    
 -- 
 +
 +-
    !python {model: idea.post.vote}: |
-     uid = ref('res_users_user0')
-     new_id = self.create(cr, uid, {'vote': 50}, {"active_ids": [ref("idea_idea_0")]})
-     self.do_vote(cr, uid, [new_id], {"active_ids": [ref("idea_idea_0")]})
+     uid2 = ref('test_idea_user1')
+     new_id = self.create(cr, uid2, {'vote': 50}, {"active_ids": [ref("idea_idea_0")]})
+     self.do_vote(cr, uid2, [new_id], {"active_ids": [ref("idea_idea_0")]})
 -    
 +
  - |
-   To add other vote I connect as user2 and open the idea page.
+   To add other vote I connect as test_idea_user2 and open the idea page.
 -  
 +
    I click on "Submit Vote" wizard button and vote the idea as "Very Good".
 -   
 +
    and put comment "We can learn many things from technical presentation".
 -  
 +
  -
    !python {model: idea.post.vote}: |
-     uid = ref('res_users_user1')
-     new_id = self.create(cr, uid, {'vote': 100, 'note': 'We can learn many things from technical presentation'}, {"active_ids": [ref("idea_idea_0")]})
-     self.do_vote(cr, uid, [new_id], {'active_ids': [ref('idea_idea_0')]})
+     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
  -
    I check that the Total on the "Employee Cashbox" is -5.50
  -
    !assert {model: lunch.cashbox, id: lunch_cashbox_cashbox0}:
 -    - sum_remain == -5.50  
 +    - sum_remain == -5.50
+ - |
+   I cancel the order "LU002"
 -- 
++-
+   !record {model: lunch.order.cancel, id: lunch_order_cancel_0}:
+     {}
+ - |
 -  I click on "Yes" button of this wizard for cancel order. 
 -      
++  I click on "Yes" button of this wizard for cancel order.
++
+ -
+   !python {model: lunch.order.cancel}: |
+     self.cancel(cr, uid, [ref('lunch_order_cancel_0')], {'active_ids': [ref('lunch_order_1')]})
 -      
++
+ - |
+   I test that the Cash Moves record have been removed for the order LU002.
+ -
 -  !assert {model: lunch.order, id: lunch_order_1}: 
++  !assert {model: lunch.order, id: lunch_order_1}:
+     - cashmove.id == False
 -    
++
+ - |
+   I check that the Total on the "Employee Cashbox" is -2.75
+ -
+   !assert {model: lunch.cashbox, id: lunch_cashbox_cashbox0}:
+     - sum_remain == -2.75
  - |
    I reset the "Employee Cashbox" to zero using the "Set CashBox to Zero" wizard.
 -- 
 +-
    !record {model: lunch.cashbox.clean, id: lunch_cashbox_clean_0}:
      {}
  -
  -
    !python {model: lunch.cashbox.clean, id: lunch_cashbox_clean_0}: |
      self.set_to_zero(cr, uid, [ref('lunch_cashbox_clean_0')], {'active_ids': [ref('lunch_cashbox_cashbox0')]})
 -                
 +
  - |
 -  I check that the Total on the "Employee Cashbox" is 0.0
 +  I cancel the order
  -
-   !record {model: lunch.order.cancel, id: lunch_order_cancel_0}:
-     {}
- - |
-   I click on "Yes" button of this wizard for cancel order.
- -
-   !python {model: lunch.order.cancel}: |
-     self.cancel(cr, uid, [ref('lunch_order_cancel_0')], {'active_ids': [ref('lunch_order_1')]})
+   !assert {model: lunch.cashbox, id: lunch_cashbox_cashbox0}:
+     - sum_remain == 0.00
 -        
 +
- -
         - remaining_hours == 30
         - delay_hours == 0.0
         - total_hours == 30
 -       - effective_hours == 0.0     
 -- 
 +       - effective_hours == 0.0
 +-
    Make a work task entry 'Training on OpenERP modules, models and classes' of 10 hours
 -- 
 +-
-   !record {model: project.task, id: project_task_technicaltraining0}:
+   !record {model: project.task, id: project_task_technicaltraining0, context: {'withoutemployee': True}}:
      work_ids:
        - date: '2010-05-31 15:04:22'
          hours: 10.0
         - remaining_hours == 20
         - effective_hours == 10.0
         - total_hours == effective_hours + remaining_hours
 -       - delay_hours == total_hours - planned_hours    
 -- 
 +       - delay_hours == total_hours - planned_hours
 +-
    Make a work task entry 'Training on OpenERP xml views' of 10 hours
 -- 
 +-
-   !record {model: project.task, id: project_task_technicaltraining0}:
+   !record {model: project.task, id: project_task_technicaltraining0, context: {'withoutemployee': True}}:
      work_ids:
        - date: '2010-06-01 15:04:46'
          hours: 10.0
         - remaining_hours == 10
         - effective_hours == 20.0
         - total_hours == effective_hours + remaining_hours
 -       - delay_hours == total_hours - planned_hours           
 -- 
 -  Make a work task entry 'Training on workflows' of 10 hours        
 -- 
 +       - delay_hours == total_hours - planned_hours
 +-
 +  Make a work task entry 'Training on workflows' of 10 hours
 +-
-   !record {model: project.task, id: project_task_technicaltraining0}:
+   !record {model: project.task, id: project_task_technicaltraining0, context: {'withoutemployee': True}}:
      work_ids:
        - date: '2010-06-02 15:05:24'
          hours: 10.0
         - remaining_hours == 0
         - effective_hours == 30.0
         - total_hours == effective_hours + remaining_hours
 -       - delay_hours == total_hours - planned_hours       
 -- 
 -  Set remaining hours of 10 hours for reevaluating the task  
 -- 
 +       - delay_hours == total_hours - planned_hours
 +-
 +  Set remaining hours of 10 hours for reevaluating the task
 +-
-   !record {model: config.compute.remaining, id: config_compute_remaining_0}:
+   !record {model: project.task.reevaluate, id: config_compute_remaining_0}:
      remaining_hours: 10.0
  -
    Reevaluate the task
 -- 
 +-
-   !python {model: config.compute.remaining}: |
+   !python {model: project.task.reevaluate}: |
      self.compute_hours(cr, uid, [ref("config_compute_remaining_0")], {"lang": "en_US",
        "project_id": False, "tz": False, "active_model": "project.task", "search_default_project_id":
        False, "search_default_user_id": 1, "search_default_current": 1, "active_ids":
         - remaining_hours == 10.0
         - effective_hours == 30.0
         - total_hours == effective_hours + remaining_hours
 -       - delay_hours == total_hours - planned_hours       
 -- 
 +       - delay_hours == total_hours - planned_hours
 +-
    Make a work task entry 'Training on reports and wizards' of 10 hours
 -- 
 +-
-   !record {model: project.task, id: project_task_technicaltraining0}:
+   !record {model: project.task, id: project_task_technicaltraining0, context: {'withoutemployee': True}}:
      work_ids:
        - date: '2010-05-31 15:08:40'
          hours: 10.0
         - effective_hours == 40.0
         - total_hours == effective_hours + remaining_hours
         - delay_hours == total_hours - planned_hours
 -- 
 +-
    Close the task
 -- 
 +-
    !python {model: project.task}: |
      self.do_close(cr, uid, [ref("project_task_technicaltraining0")], {'mail_send': False})
 -- 
 +-
    Check if task in done state
 -- 
 +-
    !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: Task is in done state}:
 -       - state == "done"  
 -       
 -       
 +       - state == "done"
 +-
 +  Test for task reactivation
  -
 -  Test for task reactivation      
 +  Reactivate task
  -
-   !record {model: config.compute.remaining, id: config_compute_remaining_1}:
 -  Reactivate task       
 -- 
+   !record {model: project.task.reevaluate, id: config_compute_remaining_1}:
 -    remaining_hours: 10.0   
 -- 
 +    remaining_hours: 10.0
 +-
    Reevaluate the task with 10 hours remaining
 -- 
 +-
-   !python {model: config.compute.remaining}: |
+   !python {model: project.task.reevaluate}: |
      self.compute_hours(cr, uid, [ref("config_compute_remaining_1")], {"lang": "en_US",
        "project_id": False, "tz": False, "button_reactivate": True, "active_model":
        "project.task", "search_default_project_id": False, "search_default_user_id":
         - remaining_hours == 10.0
         - effective_hours == 40.0
         - total_hours == effective_hours + remaining_hours
 -       - delay_hours == total_hours - planned_hours           
 -- 
 +       - delay_hours == total_hours - planned_hours
 +-
    Make a work task entry 'Training on yml' of 5 hours
 -- 
 +-
-   !record {model: project.task, id: project_task_technicaltraining0}:
+   !record {model: project.task, id: project_task_technicaltraining0, context: {'withoutemployee': True}}:
      work_ids:
        - date: '2010-05-31 16:55:27'
          hours: 5.0
@@@ -360,24 -359,26 +359,38 @@@ msgstr "Mover Linhas
  #. module: stock
  #: wizard_field:stock.fill_inventory,init,recursive:0
  msgid "Include all childs for the location"
+ msgstr "Incluir todas as dependências para o local"
+ #. module: stock
+ #: code:addons/stock/stock.py:0
+ #, python-format
+ msgid "Bad Lot Assignation !"
+ msgstr ""
+ #. module: stock
+ #: code:addons/stock/stock.py:0
+ #, python-format
+ msgid "You are moving %.2f products but only %.2f available in this lot."
  msgstr ""
+ "Você está movimentando %.2f produtos mas há somente %.2f disponíveis neste "
+ "lote."
  
  #. module: stock
 +#: code:addons/stock/stock.py:0
 +#, python-format
 +msgid "Bad Lot Assignation !"
 +msgstr ""
 +
 +#. module: stock
 +#: code:addons/stock/stock.py:0
 +#, python-format
 +msgid "You are moving %.2f products but only %.2f available in this lot."
 +msgstr ""
 +
 +#. module: stock
  #: field:product.template,property_stock_procurement:0
  msgid "Procurement Location"
- msgstr ""
+ msgstr "Localização de obtenção"
  
  #. module: stock
  #: model:ir.actions.act_window,name:stock.action_production_lot_form
@@@ -7,13 -7,13 +7,21 @@@ msgstr "
  "Project-Id-Version: OpenERP Server 6.0dev\n"
  "Report-Msgid-Bugs-To: support@openerp.com\n"
  "POT-Creation-Date: 2009-08-28 16:01+0000\n"
++<<<<<<< TREE
 +"PO-Revision-Date: 2010-08-30 13:12+0000\n"
++=======
+ "PO-Revision-Date: 2010-09-04 08:53+0000\n"
++>>>>>>> MERGE-SOURCE
  "Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
  "Language-Team: \n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
++<<<<<<< TREE
 +"X-Launchpad-Export-Date: 2010-08-31 03:56+0000\n"
++=======
+ "X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
++>>>>>>> MERGE-SOURCE
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: stock