From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 10 Jun 2010 09:28:02 +0000 (+0530)
Subject: [MERGE] atp branch for yaml hr modules (has some problems will be solved)
X-Git-Tag: 6.0.0-rc1-addons~768
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=c9e2f6a493aceaa54deec218aca1f04b1d057834;p=odoo%2Fodoo.git

[MERGE] atp branch for yaml hr modules (has some problems will be solved)

bzr revid: mra@mra-laptop-20100610092802-bgs4ula327mt6ydc
---

c9e2f6a493aceaa54deec218aca1f04b1d057834
diff --cc addons/hr_evaluation/__openerp__.py
index 6a10f87,f4d0f4a..84d4ea6
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@@ -33,15 -33,16 +33,16 @@@
                        in which various surveys can be created and it can be defined which
                        level of employee hierarchy fills what and final review and evaluation
                        is done by the manager.Every evaluation filled by the employees can be viewed
 -                      in the form of   """,
 +                      in the form of.Implements a dashboard for My Current Evaluations   """,
      "init_xml" : [],
-     "demo_xml" : ["hr_evaluation_demo.xml"],
+     "demo_xml" : ["hr_evaluation_demo.xml",
+                  ],
      "update_xml" : [
                      "security/ir.model.access.csv",
                      "wizard/hr_evaluation_mail_view.xml",
                      "hr_evaluation_view.xml",
-                     "report/hr_evaluation_report_view.xml",
-                     'board_hr_evaluation_view.xml',],
+                     "report/hr_evaluation_report_view.xml"],
 -    "test": ["test/test_hr_evaluation.yml"],                
++    "test": ["test/test_hr_evaluation.yml"],
      "active": False,
      "installable": True
  }
diff --cc addons/hr_timesheet/__openerp__.py
index 8641843,66bcfe4..930877b
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@@ -48,9 -48,9 +48,10 @@@ to set up a management by affair
          'wizard/hr_timesheet_print_employee_view.xml',
          'wizard/hr_timesheet_print_users_view.xml',
          'wizard/hr_timesheet_sign_in_out_view.xml',
 +       
      ],
      'demo_xml': ['hr_timesheet_demo.xml'],
+     'test': ['test/test_hr_timesheet.yml'],
      'installable': True,
      'active': False,
      'certificate': '0071405533469',
diff --cc addons/hr_timesheet_invoice/__openerp__.py
index a81168a,9e4d418..0b96cc9
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@@ -43,9 -43,10 +43,11 @@@ reports, eso."""
          'wizard/hr_timesheet_analytic_profit_view.xml',
          'wizard/hr_timesheet_invoice_create_view.xml',
          'wizard/hr_timesheet_invoice_create_final_view.xml',
 +        'board_hr_timesheet_invoice.xml',
      ],
-     'demo_xml': ['hr_timesheet_invoice_demo.xml'],
+     'demo_xml': ['hr_timesheet_invoice_demo.xml',
+                  ],
+     'test': ['test/test_hr_timesheet_invoice.yml'],             
      'installable': True,
      'active': False,
      'certificate': '0056091842381',
diff --cc addons/hr_timesheet_sheet/__openerp__.py
index efc8a65,fb1d469..9163219
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@@ -54,9 -54,11 +54,12 @@@ The validation can be configured in th
          'hr_timesheet_workflow.xml',
          'process/hr_timesheet_sheet_process.xml',
          'report/timesheet_report_view.xml',
 +        'board_hr_timesheet_view.xml',
      ],
-     'demo_xml': ['hr_timesheet_sheet_demo.xml'],
+     'demo_xml': ['hr_timesheet_sheet_demo.xml',
+                 
+                  ],
+     'test':['test/test_hr_timesheet_sheet.yml'],
      'installable': True,
      'active': False,
      'certificate': '0073297700829',