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

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

2 files changed, 137 insertions, 137 deletions

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 6df675552b0..dd89a3ab57d 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -14,7 +14,7 @@
                     <field name="date_value"/>
                     <field name="name"/>
                     <field name="ref"/>
-                    <field domain="[('type','=','normal'), ('parent_id','!=',False)]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
+                    <field domain="[('type','in',['normal','contract']), ('parent_id','!=',False)]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
                     <field name="unit_amount"/>
                     <field name="unit_quantity"/>
                     <field name="total_amount" sum="Total"/>
@@ -66,10 +66,10 @@
             <field name="arch" type="xml">
                 <form string="Expenses Sheet" version="7.0">
                 <header>
-                    <button name="confirm" states="draft" string="Submit to Manager" type="workflow"/>
-                    <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
-                    <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user"/>
-                    <button name="invoice" states="accepted" string="Invoice" type="object" groups="base.group_hr_user"/>
+                    <button name="confirm" states="draft" string="Submit to Manager" type="workflow" class="oe_highlight"/>
+                    <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
+                    <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
+                    <button name="invoice" states="accepted" string="Invoice" type="object" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
@@ -97,7 +97,7 @@
                                     </group>
                                     <group colspan="2" col="2" groups="analytic.group_analytic_accounting">
                                         <separator string="Customer Project" colspan="2"/>
-                                        <field domain="[('type','=','normal')]" name="analytic_account"/>
+                                        <field domain="[('type','in',['normal','contract'])]" name="analytic_account"/>
                                     </group>
                                     <group colspan="2" col="2">
                                         <separator string="References" colspan="2"/>
diff --git a/addons/hr_expense/process/hr_expense_process.xml b/addons/hr_expense/process/hr_expense_process.xml
index bcb9649be4c..242fe6393c2 100644
--- a/addons/hr_expense/process/hr_expense_process.xml
+++ b/addons/hr_expense/process/hr_expense_process.xml
@@ -1,103 +1,103 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-
-		<!--
-			Process
-		-->
-
-		<record id="process_process_expenseprocess0" model="process.process">
-			<field eval="1" name="active"/>
-			<field name="model_id" ref="model_hr_expense_expense"/>
-			<field eval="&quot;&quot;&quot;Expense&quot;&quot;&quot;" name="name"/>
-		</record>
-
-		<!--
-			Process Node
-		-->
-
-		<record id="process_node_draftexpenses0" model="process.node">
-			<field name="menu_id" ref="menu_expense_all"/>
-			<field name="model_id" ref="model_hr_expense_expense"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Draft Expenses&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Employee encode all his expenses&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_expenseprocess0"/>
-			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
-			<field eval="1" name="flow_start"/>
-		</record>
-
-		<record id="process_node_confirmedexpenses0" model="process.node">
-			<field name="menu_id" ref="menu_expense_all"/>
-			<field name="model_id" ref="model_hr_expense_expense"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Confirmed Expenses&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;The employee validates his expense sheet&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_expenseprocess0"/>
-			<field eval="&quot;&quot;&quot;object.state=='confirm'&quot;&quot;&quot;" name="model_states"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-
-		<record id="process_node_refused0" model="process.node">
-			<field name="menu_id" ref="menu_expense_all"/>
-			<field name="model_id" ref="model_hr_expense_expense"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Refused&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;The direct manager refuses the sheet.Reset as draft.&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_expenseprocess0"/>
-			<field eval="&quot;&quot;&quot;object.state=='canceled'&quot;&quot;&quot;" name="model_states"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-
-		<record id="process_node_approved0" model="process.node">
-			<field name="menu_id" ref="menu_expense_all"/>
-			<field name="model_id" ref="model_hr_expense_expense"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Approved&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;The direct manager approves the sheet&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_expenseprocess0"/>
-			<field eval="&quot;&quot;&quot;object.state=='accepted'&quot;&quot;&quot;" name="model_states"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-
-		<record id="process_node_supplierinvoice0" model="process.node">
-			<field name="menu_id" ref="account.menu_action_invoice_tree2"/>
-			<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;Supplier Invoice&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;The accoutant validates the sheet&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_expenseprocess0"/>
-			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-
-		<record id="process_node_reimbursement0" model="process.node">
-			<field name="menu_id" ref="account.menu_action_invoice_tree2"/>
-			<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;Reimbursement&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;The accoutant reimburse the expenses&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_expenseprocess0"/>
-			<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_reinvoicing0" 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;Reinvoicing&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Some costs may be reinvoices to the customer&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_expenseprocess0"/>
-			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-
-		<!--
-			Process Transition
-		-->
-
-		<record id="process_transition_confirmexpense0" model="process.transition">
+    <data>
+
+        <!--
+            Process
+        -->
+
+        <record id="process_process_expenseprocess0" model="process.process">
+            <field eval="1" name="active"/>
+            <field name="model_id" ref="model_hr_expense_expense"/>
+            <field eval="&quot;&quot;&quot;Expense&quot;&quot;&quot;" name="name"/>
+        </record>
+
+        <!--
+            Process Node
+        -->
+
+        <record id="process_node_draftexpenses0" model="process.node">
+            <field name="menu_id" ref="menu_expense_all"/>
+            <field name="model_id" ref="model_hr_expense_expense"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Draft Expenses&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Employee encode all his expenses&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="process_process_expenseprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
+            <field eval="1" name="flow_start"/>
+        </record>
+
+        <record id="process_node_confirmedexpenses0" model="process.node">
+            <field name="menu_id" ref="menu_expense_all"/>
+            <field name="model_id" ref="model_hr_expense_expense"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Confirmed Expenses&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The employee validates his expense sheet&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="process_process_expenseprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state=='confirm'&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+
+        <record id="process_node_refused0" model="process.node">
+            <field name="menu_id" ref="menu_expense_all"/>
+            <field name="model_id" ref="model_hr_expense_expense"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Refused&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The direct manager refuses the sheet.Reset as draft.&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="process_process_expenseprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state=='canceled'&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+
+        <record id="process_node_approved0" model="process.node">
+            <field name="menu_id" ref="menu_expense_all"/>
+            <field name="model_id" ref="model_hr_expense_expense"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Approved&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The direct manager approves the sheet&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="process_process_expenseprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state=='accepted'&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+
+        <record id="process_node_supplierinvoice0" model="process.node">
+            <field name="menu_id" ref="account.menu_action_invoice_tree2"/>
+            <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;Supplier Invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The accoutant validates the sheet&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="process_process_expenseprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+
+        <record id="process_node_reimbursement0" model="process.node">
+            <field name="menu_id" ref="account.menu_action_invoice_tree2"/>
+            <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;Reimbursement&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The accoutant reimburse the expenses&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="process_process_expenseprocess0"/>
+            <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_reinvoicing0" 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;Reinvoicing&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Some costs may be reinvoices to the customer&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="process_process_expenseprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+
+        <!--
+            Process Transition
+        -->
+
+        <record id="process_transition_confirmexpense0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirm expense&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Expense is confirmed.&quot;&quot;&quot;" name="note"/>
@@ -113,7 +113,7 @@
             <field model="process.node" name="source_node_id" ref="process_node_confirmedexpenses0"/>
         </record>
 
-		<record id="process_transition_approveexpense0" model="process.transition">
+        <record id="process_transition_approveexpense0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Approve expense&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Expense is approved.&quot;&quot;&quot;" name="note"/>
@@ -146,36 +146,36 @@
         </record>
 
         <!--
-			Process Transition Action
-		-->
-
-		<record id="process_transition_action_confirm0" model="process.transition.action">
-			<field eval="&quot;&quot;&quot;expense_confirm&quot;&quot;&quot;" name="action"/>
-			<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-			<field eval="&quot;&quot;&quot;Confirm&quot;&quot;&quot;" name="name"/>
-			<field name="transition_id" ref="process_transition_confirmexpense0"/>
-		</record>
-
-		<record id="process_transition_action_refuse0" model="process.transition.action">
-			<field eval="&quot;&quot;&quot;expense_canceled&quot;&quot;&quot;" name="action"/>
-			<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-			<field eval="&quot;&quot;&quot;Refuse&quot;&quot;&quot;" name="name"/>
-			<field name="transition_id" ref="process_transition_refuseexpense0"/>
-		</record>
-
-		<record id="process_transition_action_accept0" model="process.transition.action">
-			<field eval="&quot;&quot;&quot;expense_accept&quot;&quot;&quot;" name="action"/>
-			<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-			<field eval="&quot;&quot;&quot;Accept&quot;&quot;&quot;" name="name"/>
-			<field name="transition_id" ref="process_transition_approveexpense0"/>
-		</record>
-
-		<record id="process_transition_action_supplierinvoice0" model="process.transition.action">
-			<field eval="&quot;&quot;&quot;action_invoice_create&quot;&quot;&quot;" name="action"/>
-			<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-			<field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
-			<field name="transition_id" ref="process_transition_approveinvoice0"/>
-		</record>
-
-	</data>
+            Process Transition Action
+        -->
+
+        <record id="process_transition_action_confirm0" model="process.transition.action">
+            <field eval="&quot;&quot;&quot;expense_confirm&quot;&quot;&quot;" name="action"/>
+            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
+            <field eval="&quot;&quot;&quot;Confirm&quot;&quot;&quot;" name="name"/>
+            <field name="transition_id" ref="process_transition_confirmexpense0"/>
+        </record>
+
+        <record id="process_transition_action_refuse0" model="process.transition.action">
+            <field eval="&quot;&quot;&quot;expense_canceled&quot;&quot;&quot;" name="action"/>
+            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
+            <field eval="&quot;&quot;&quot;Refuse&quot;&quot;&quot;" name="name"/>
+            <field name="transition_id" ref="process_transition_refuseexpense0"/>
+        </record>
+
+        <record id="process_transition_action_accept0" model="process.transition.action">
+            <field eval="&quot;&quot;&quot;expense_accept&quot;&quot;&quot;" name="action"/>
+            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
+            <field eval="&quot;&quot;&quot;Accept&quot;&quot;&quot;" name="name"/>
+            <field name="transition_id" ref="process_transition_approveexpense0"/>
+        </record>
+
+        <record id="process_transition_action_supplierinvoice0" model="process.transition.action">
+            <field eval="&quot;&quot;&quot;action_invoice_create&quot;&quot;&quot;" name="action"/>
+            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
+            <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
+            <field name="transition_id" ref="process_transition_approveinvoice0"/>
+        </record>
+
+    </data>
 </openerp>
\ No newline at end of file