Merge lp:~toolpart/openobject-addons/project_messages_members into lp:openobject-addons/6.0

[ViktorNagy]

Extended the domain restriction to allow project members the posting of project messages.

Unmerged revisions

4854. By ViktorNagy on 2011-09-29

Extended the domain filter to allow project members to post messages too. Previously only the project admin could post a message.

4853. By ViktorNagy on 2011-09-27

A small fix to allow for bom less production (provided fully by other addons)

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2011-04-04 11:25:26 +0000
+++ mrp/mrp.py	2011-09-29 08:19:25 +0000
@@ -832,7 +832,7 @@
             routing_loc = None
             pick_type = 'internal'
             address_id = False
-            if production.bom_id.routing_id and production.bom_id.routing_id.location_id:
+            if production.bom_id and production.bom_id.routing_id and production.bom_id.routing_id.location_id:
                 routing_loc = production.bom_id.routing_id.location_id
                 if routing_loc.usage <> 'internal':
                     pick_type = 'out'

=== modified file 'project_messages/project_messages_view.xml'
--- project_messages/project_messages_view.xml	2011-01-14 00:11:01 +0000
+++ project_messages/project_messages_view.xml	2011-09-29 08:19:25 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-		<record id="view_phase_project_form1" model="ir.ui.view">
+	<record id="view_phase_project_form1" model="ir.ui.view">
             <field name="name">phase.project.form1</field>
             <field name="model">project.project</field>
             <field name="type">form</field>
@@ -16,14 +16,14 @@
 		                     	<field name="to_id" attrs="{'readonly':[('from_id', '!=', uid)]}"/>
                    			</tree>
                    			<form>
-                   				<group attrs="{'readonly':[('from_id', '!=', uid)]}">
+	           				<group attrs="{'readonly':[('from_id', '!=', uid)]}">
 	                   				<field name="from_id"/>
-			                        <field name="to_id"/>
-			                        <newline/>
-			                        <separator colspan="4" string="Message"/>
-			                     	<field nolabel="1" name="message" colspan="4"/>
-		                     	</group>
-                   			</form>
+				                        <field name="to_id"/>
+				                        <newline/>
+				                        <separator colspan="4" string="Message"/>
+				                     	<field nolabel="1" name="message" colspan="4"/>
+		            	         	</group>
+                   		    	</form>
                    		</field>
                    	</page>
                	</xpath>
@@ -37,7 +37,7 @@
             <field name="arch" type="xml">
                 <form string="Messages">
                 	<group attrs="{'readonly':[('from_id', '!=', uid)]}">
-                        <field name="project_id" select="1" domain="[('user_id','=',uid)]"/>
+                        <field name="project_id" select="1" domain="['|', ('user_id','=',uid), ('members', '=', uid)]"/>
                         <newline/>
                         <field name="from_id" select="1"/>
                         <field name="to_id" select="1"/>