Merge

bzr revid: fp@tinyerp.com-20080902145453-4qkc072iyx28wxpo

addons/account_analytic_plans/wizard/create_model.py

@@ -37,7 +37,7 @@ class create_model(wizard.interface):
         },
         'endit': {
             'actions': [],
-            'result': {'type':'form', 'arch':'', 'fields':{}, 'state':'end'}
+            'result': {'type':'form', 'arch':'', 'fields':{}, 'state':[('end','OK')]} #FIXME: check
         },
     }
 create_model('create.model')

addons/event/event_wizard.xml

@@ -19,13 +19,13 @@
 			name="wizard_event_registration"
 			id="wizard_event_registration"/>
 
-		<wizard
+		<!--<wizard
 			string="New child event"
 			model="event.event"
 			name="wizard_event_new"
 			keyword="client_action_multi"
 			menu="False"
-			id="wizard_event_new"/>
+			id="wizard_event_new"/>-->
 
 		<wizard
 			string="List Register Partners"
@@ -38,7 +38,8 @@
 					name="event.reg_make_invoice"
 					id="event_reg_invoice"
 					menu="True"
-		/>
+					/>
+		<!--
 		<record model="ir.values" id="ir_open_new_event">
 			<field name="key2">tree_but_open</field>
 			<field name="model">event.event</field>
@@ -46,6 +47,6 @@
 			<field name="value" eval="'ir.actions.wizard,%d'%wizard_event_new"/>
 			<field name="object" eval="True"/>
 		</record>
-
+		-->
 	</data>
 </terp>

addons/mrp/mrp_view.xml

@@ -300,7 +300,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.bom</field>
             <field name="view_type">form</field>
-            <field name="domain">[('bom_id','&lt;&gt;',False)]</field>
+            <field name="domain">[('bom_id','!=',False)]</field>
         </record>
         <menuitem action="mrp_bom_form_action2" id="menu_mrp_bom_form_action2" parent="menu_mrp_configuration"/>
 

addons/point_of_sale/pos_wizard.xml

@@ -8,14 +8,14 @@
 		<wizard string="Payment" model="pos.order"
 				name="pos.payment" id="pos_payment" menu="False"/>
 
-		<wizard string="Create Invoices" model="pos.order"
-				name="pos.create_invoice" id="pos_invoice" multi="True"/>
+			<!--<wizard string="Create Invoices" model="pos.order"
+				name="pos.create_invoice" id="pos_invoice" multi="True"/>-->
 
 		<wizard string="Add products" model="pos.order"
 				name="pos.add_product" id="pos_add_product"  menu="False"/>
 
-		<wizard string="Cancel" model="pos.order"
-				name="pos.cancel" id="pos_cancel" multi="True"/>
+			<!--<wizard string="Cancel" model="pos.order"
+				name="pos.cancel" id="pos_cancel" multi="True"/>-->
 
 		<wizard string="Confirm" model="pos.order"
 				name="pos.confirm" id="pos_confirm" multi="True"/>

addons/report_project/__terp__.py

@@ -31,7 +31,7 @@
     "version" : "1.0",
     "author" : "Tiny",
     "website" : "http://tinyerp.com/module_project.html",
-    "depends" : ["project"],
+    "depends" : ["project", "report_task"],
     "category" : "Generic Modules/Sales & Purchases",
     "description": "A module that adds some reports on the sales",
     "init_xml" : [],