[MERGE] merge from trunk addons

[odoo/odoo.git] / addons / lunch / __openerp__.py

diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
old mode 100644 (file)
new mode 100755 (executable)
index 831bc45..dd439aa
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -21,7 +21,7 @@
 
 {
     "name": "Lunch Module",
 
 {
     "name": "Lunch Module",

-    "author": "Tiny",
+    "author": "OpenERP SA",

     "Description": """
     The lunch module is for keeping record of the order placed and payment of the orders.
     The products are defined under categories and the payment records are maintained user wise
     "Description": """
     The lunch module is for keeping record of the order placed and payment of the orders.
     The products are defined under categories and the payment records are maintained user wise

@@ -29,8 +29,8 @@
 
     """,
     "version": "0.1",
 
     """,
     "version": "0.1",

-    "depends": ["base"],
-    "category" : "Generic Modules/Others",
+    "depends": ["base_tools"],
+    "category" : "Tools",

     'description': """
     The base module to manage lunch
 
     'description': """
     The base module to manage lunch
 

@@ -39,20 +39,18 @@
     """,
     "init_xml": [],
     "update_xml": [
     """,
     "init_xml": [],
     "update_xml": [

+        'security/lunch_security.xml',

         'security/ir.model.access.csv',
         'wizard/lunch_order_cancel_view.xml',
         'wizard/lunch_order_confirm_view.xml',
         'wizard/lunch_cashbox_clean_view.xml',
         'lunch_view.xml',
         'lunch_report.xml',
         'security/ir.model.access.csv',
         'wizard/lunch_order_cancel_view.xml',
         'wizard/lunch_order_confirm_view.xml',
         'wizard/lunch_cashbox_clean_view.xml',
         'lunch_view.xml',
         'lunch_report.xml',

-        #'process/lunch_process.xml'
+        'report/report_lunch_order_view.xml',

     ],
     ],

-    "demo_xml": ['lunch_demo.xml',
-                 ],
-    "test": ['test/test_lunch.yml'
-             ],             
+    "demo_xml": ['lunch_demo.xml'],
+    "test": ['test/test_lunch.yml', 'test/lunch_report.yml'],

     "installable": True,
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
     "installable": True,
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

-