[MERGE] merge from trunk addons3

bzr revid: pso@tinyerp.com-20101118085221-j05wjc0enfq2m8vt

addons/hr_holidays/hr_holidays_view.xml

@@ -253,8 +253,12 @@
                     <field name="user_id" invisible="1"/>
                     <!--field name="type"/-->
                     <field name="state"/>
+                    <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
                     <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
+                    <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                 </tree>
             </field>
         </record>

addons/l10n_ch/demo/dta_demo.xml

@@ -55,12 +55,12 @@
 
 
   <!-- Define a payment mode -->
-  <!--
+
   <record model="payment.mode" id="payment_mode_dta">
 	<field name="name">DTA</field>
 	<field name="bank_id" ref="main_bank"/>
 	<field name="journal" model="account.journal" search="[('type','=','cash')]"/>
   </record>
-	-->
+
 </data>
 </openerp>