[MERGE]merged with trunk-survey-layout-tta

bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg

5 files changed, 166 insertions, 162 deletions

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 543f9636f7c..dc4eadbada9 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -141,7 +141,7 @@ class membership_line(osv.osv):
     _name = 'membership.membership_line'
     _columns = {
         'partner': fields.many2one('res.partner', 'Partner', ondelete='cascade', select=1),
-        'membership_id': fields.many2one('product.product', string="Membership Product", required=True),
+        'membership_id': fields.many2one('product.product', string="Membership", required=True),
         'date_from': fields.date('From', readonly=True),
         'date_to': fields.date('To', readonly=True),
         'date_cancel': fields.date('Cancel date'),
diff --git a/addons/membership/membership_data.xml b/addons/membership/membership_data.xml
index d0b9beceebd..60c21fc6cf6 100644
--- a/addons/membership/membership_data.xml
+++ b/addons/membership/membership_data.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data noupdate="1">
+    <data noupdate="1">
 
-	<!--
-	Price type
-	-->
-		<record model="product.price.type" id="product_price_type_memberprice" >
-			<field name="name">Member Price</field>
-			<field name="field">member_price</field>
-		</record>
+    <!--
+    Price type
+    -->
+        <record model="product.price.type" id="product_price_type_memberprice" >
+            <field name="name">Member Price</field>
+            <field name="field">member_price</field>
+        </record>
 
-	<!--
-	Price list
-	-->
-	<record model="product.pricelist" id="list1m">
-		<field name="name">Member Sale Pricelist</field>
-		<field name="type">sale</field>
-	</record>
-	<record model="product.pricelist.version" id="ver1m">
-		<field name="pricelist_id" ref="list1m"/>
-		<field name="name">Member Sale Pricelist Version</field>
-	</record>
-	<record model="product.pricelist.item" id="item1m">
-		<field name="price_version_id" ref="ver1m"/>
-		<field name="base" ref="product_price_type_memberprice" />
-		<field name="name">Member Sale Pricelist Line</field>
-	</record>
+    <!--
+    Price list
+    -->
+    <record model="product.pricelist" id="list1m">
+        <field name="name">Member Sale Pricelist</field>
+        <field name="type">sale</field>
+    </record>
+    <record model="product.pricelist.version" id="ver1m">
+        <field name="pricelist_id" ref="list1m"/>
+        <field name="name">Member Sale Pricelist Version</field>
+    </record>
+    <record model="product.pricelist.item" id="item1m">
+        <field name="price_version_id" ref="ver1m"/>
+        <field name="base" ref="product_price_type_memberprice" />
+        <field name="name">Member Sale Pricelist Line</field>
+    </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 15645294bb7..0f2ad6836c8 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -241,8 +241,11 @@
                         <group>
                             <group>
                                 <field name="free_member"/>
-                                <field colspan="4" name="membership_state"/>
-                                <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" icon="gtk-apply"/>
+                                <label for="membership_state"/>
+                                <div>
+                                    <field name="membership_state" class="oe_inline"/>
+                                    <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
+                                </div>
                             </group>
                             <group>
                                 <field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
@@ -254,7 +257,7 @@
                         <field name="member_lines" nolabel="1" colspan="4" readonly="1">
                             <tree string="Memberships">
                                 <field name="date"/>
-                                <field name="membership_id" string="Membership"/>
+                                <field name="membership_id"/>
                                 <field name="member_price"/>
                                 <field name="account_invoice_id"/>
                                 <field name="state"/>
diff --git a/addons/membership/process/membership_process.xml b/addons/membership/process/membership_process.xml
index 730f01bd36b..d67ee864b34 100644
--- a/addons/membership/process/membership_process.xml
+++ b/addons/membership/process/membership_process.xml
@@ -1,134 +1,134 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-
-		<!--
-			Process
-		-->
-
-		<record id="process_process_membershipprocess0" model="process.process">
-			<field eval="&quot;&quot;&quot;Membership Process&quot;&quot;&quot;" name="name"/>
-			<field name="model_id" ref="base.model_res_partner"/>
-			<field eval="1" name="active"/>
-		</record>
-
-		<!--
-			Process Node
-		-->
-
-		<record id="process_node_membershipproduct0" model="process.node">
-			<field name="menu_id" ref="membership.menu_membership_products"/>
-			<field name="model_id" ref="product.model_product_product"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Define membership product.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Membership product&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_membershipprocess0"/>
-			<field eval="1" name="flow_start"/>
-		</record>
-
-		<record id="process_node_waitingmember0" model="process.node">
-			<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
-			<field name="model_id" ref="account.model_account_invoice"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Draft invoice for membership.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Waiting member&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_membershipprocess0"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-
-		<record id="process_node_invoicedmember0" model="process.node">
-			<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
-			<field name="model_id" ref="account.model_account_invoice"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Open invoice.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Invoiced member&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_membershipprocess0"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-
-		<record id="process_node_paidmember0" model="process.node">
-			<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
-			<field name="model_id" ref="account.model_account_invoice"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Membership invoice paid.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Paid member&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_membershipprocess0"/>
-			<field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-
-		<record id="process_node_setassociation0" model="process.node">
-			<field name="menu_id" ref="membership.menu_members"/>
-			<field name="model_id" ref="base.model_res_partner"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Set an associate member of partner.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Set association&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_membershipprocess0"/>
-			<field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-
-		<record id="process_node_associatedmember0" model="process.node">
-			<field name="menu_id" ref="membership.menu_members"/>
-			<field name="model_id" ref="base.model_res_partner"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Member is associated.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Associated member&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_membershipprocess0"/>
-			<field eval="&quot;&quot;&quot;object.state=='associated'&quot;&quot;&quot;" name="model_states"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-
-		<!--
-			Process Transition
-		-->
-
-		<record id="process_transition_producttomember0" model="process.transition">
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Product to member&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Define product for membership.&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_waitingmember0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_membershipproduct0"/>
-		</record>
-
-		<record id="process_transition_waitingtoinvoice0" model="process.transition">
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Waiting to invoice&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Draft invoice is now open.&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_invoicedmember0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_waitingmember0"/>
-		</record>
-
-		<record id="process_transition_action_create0" model="process.transition.action">
-			<field eval="&quot;&quot;&quot;invoice_open&quot;&quot;&quot;" name="action"/>
-			<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-			<field eval="&quot;&quot;&quot;Create&quot;&quot;&quot;" name="name"/>
-			<field name="transition_id" ref="process_transition_waitingtoinvoice0"/>
-		</record>
-
-		<record id="process_transition_invoicetopaid0" model="process.transition">
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Invoice to paid&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Invoice is be paid.&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_paidmember0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_invoicedmember0"/>
-		</record>
-
-		<record id="process_transition_invoicetoassociate0" model="process.transition">
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;invoice to associate&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Invoiced member may be Associated member.&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_associatedmember0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_invoicedmember0"/>
-		</record>
-
-		<record id="process_transition_associationpartner0" model="process.transition">
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Association Partner&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Associated partner.&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_associatedmember0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_setassociation0"/>
-		</record>
-
-	</data>
+    <data>
+
+        <!--
+            Process
+        -->
+
+        <record id="process_process_membershipprocess0" model="process.process">
+            <field eval="&quot;&quot;&quot;Membership Process&quot;&quot;&quot;" name="name"/>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field eval="1" name="active"/>
+        </record>
+
+        <!--
+            Process Node
+        -->
+
+        <record id="process_node_membershipproduct0" model="process.node">
+            <field name="menu_id" ref="membership.menu_membership_products"/>
+            <field name="model_id" ref="product.model_product_product"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Define membership product.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Membership product&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="process_process_membershipprocess0"/>
+            <field eval="1" name="flow_start"/>
+        </record>
+
+        <record id="process_node_waitingmember0" model="process.node">
+            <field name="menu_id" ref="account.menu_action_invoice_tree1"/>
+            <field name="model_id" ref="account.model_account_invoice"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Draft invoice for membership.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Waiting member&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="process_process_membershipprocess0"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+
+        <record id="process_node_invoicedmember0" model="process.node">
+            <field name="menu_id" ref="account.menu_action_invoice_tree1"/>
+            <field name="model_id" ref="account.model_account_invoice"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Open invoice.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Invoiced member&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="process_process_membershipprocess0"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+
+        <record id="process_node_paidmember0" model="process.node">
+            <field name="menu_id" ref="account.menu_action_invoice_tree1"/>
+            <field name="model_id" ref="account.model_account_invoice"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Membership invoice paid.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Paid member&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="process_process_membershipprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+
+        <record id="process_node_setassociation0" model="process.node">
+            <field name="menu_id" ref="membership.menu_members"/>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Set an associate member of partner.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Set association&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="process_process_membershipprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+
+        <record id="process_node_associatedmember0" model="process.node">
+            <field name="menu_id" ref="membership.menu_members"/>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Member is associated.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Associated member&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="process_process_membershipprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state=='associated'&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+
+        <!--
+            Process Transition
+        -->
+
+        <record id="process_transition_producttomember0" model="process.transition">
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Product to member&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Define product for membership.&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_waitingmember0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_membershipproduct0"/>
+        </record>
+
+        <record id="process_transition_waitingtoinvoice0" model="process.transition">
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Waiting to invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Draft invoice is now open.&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_invoicedmember0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_waitingmember0"/>
+        </record>
+
+        <record id="process_transition_action_create0" model="process.transition.action">
+            <field eval="&quot;&quot;&quot;invoice_open&quot;&quot;&quot;" name="action"/>
+            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
+            <field eval="&quot;&quot;&quot;Create&quot;&quot;&quot;" name="name"/>
+            <field name="transition_id" ref="process_transition_waitingtoinvoice0"/>
+        </record>
+
+        <record id="process_transition_invoicetopaid0" model="process.transition">
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Invoice to paid&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Invoice is be paid.&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_paidmember0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_invoicedmember0"/>
+        </record>
+
+        <record id="process_transition_invoicetoassociate0" model="process.transition">
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;invoice to associate&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Invoiced member may be Associated member.&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_associatedmember0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_invoicedmember0"/>
+        </record>
+
+        <record id="process_transition_associationpartner0" model="process.transition">
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Association Partner&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Associated partner.&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_associatedmember0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_setassociation0"/>
+        </record>
+
+    </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
index e29ef87f141..7c26f5486ce 100644
--- a/addons/membership/wizard/membership_invoice_view.xml
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -9,8 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Membership Invoice" version="7.0">
                     <header>
-                        <button  icon="gtk-apply" string="Join" name="membership_invoice" type="object"/>
-                        <button  icon="gtk-close" special="cancel" string="Close"/>
+                        <button string="Join" name="membership_invoice" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <field name="product_id" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/>