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

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

5 files changed, 161 insertions, 182 deletions

diff --git a/addons/base_calendar/base_calendar_data.xml b/addons/base_calendar/base_calendar_data.xml
index a69a2f6cd9d..3c20bf5fad5 100644
--- a/addons/base_calendar/base_calendar_data.xml
+++ b/addons/base_calendar/base_calendar_data.xml
@@ -1,138 +1,138 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">
-	
-	 <record model="res.request.link" id="request_link_meeting">
-	        <field name="name">Event</field>
-	        <field name="object">calendar.event</field>
-	    </record>
-
-		<record model="res.alarm" id="alarm1">
-			<field name="name">1 minute before</field>
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="1" />
-			<field name="trigger_interval">minutes</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm2">
-			<field name="name">5 minutes before</field>
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="5" />
-			<field name="trigger_interval">minutes</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm3">
-			<field name="name">10 minutes before</field>
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="10" />
-			<field name="trigger_interval">minutes</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm4">
-			<field name="name">15 minutes before</field>
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="15" />
-			<field name="trigger_interval">minutes</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm5">
-			<field name="name">30 minutes before</field>
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="30" />
-			<field name="trigger_interval">minutes</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm6">
-			<field name="name">45 minutes before</field>
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="45" />
-			<field name="trigger_interval">minutes</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm7">
-			<field name="name">1 hour before</field>
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="1" />
-			<field name="trigger_interval">hours</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm8">
-			<field name="name">2 hours before</field>
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="2" />
-			<field name="trigger_interval">hours</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm9">
-			<field name="name">3 hours before</field>
-
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="3" />
-			<field name="trigger_interval">hours</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm10">
-			<field name="name">4 hours before</field>
-
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="4" />
-			<field name="trigger_interval">hours</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm11">
-			<field name="name">5 hours before</field>
-
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="5" />
-			<field name="trigger_interval">hours</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm12">
-			<field name="name">18 hours before</field>
-
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="18" />
-			<field name="trigger_interval">hours</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-
-		<!-- Scheduler for Event Alarm-->
-		<record forcecreate="True" id="ir_cron_scheduler_alarm"
-			model="ir.cron">
-			<field name="name">Run Event Reminder</field>
-			<field eval="True" name="active" />
-			<field name="user_id" ref="base.user_root" />
-			<field name="interval_number">1</field>
-			<field name="interval_type">minutes</field>
-			<field name="numbercall">-1</field>
-			<field eval="False" name="doall" />
-			<field eval="'calendar.alarm'" name="model" />
-			<field eval="'do_run_scheduler'" name="function" />
-			<field eval="'(False,)'" name="args" />
-		</record>
-	</data>
+    <data noupdate="1">
+    
+     <record model="res.request.link" id="request_link_meeting">
+            <field name="name">Event</field>
+            <field name="object">calendar.event</field>
+        </record>
+
+        <record model="res.alarm" id="alarm1">
+            <field name="name">1 minute before</field>
+            <field name="active" eval="1" />
+            <field name="trigger_duration" eval="1" />
+            <field name="trigger_interval">minutes</field>
+            <field name="trigger_occurs">before</field>
+            <field name="trigger_related">start</field>
+        </record>
+
+        <record model="res.alarm" id="alarm2">
+            <field name="name">5 minutes before</field>
+            <field name="active" eval="1" />
+            <field name="trigger_duration" eval="5" />
+            <field name="trigger_interval">minutes</field>
+            <field name="trigger_occurs">before</field>
+            <field name="trigger_related">start</field>
+        </record>
+
+        <record model="res.alarm" id="alarm3">
+            <field name="name">10 minutes before</field>
+            <field name="active" eval="1" />
+            <field name="trigger_duration" eval="10" />
+            <field name="trigger_interval">minutes</field>
+            <field name="trigger_occurs">before</field>
+            <field name="trigger_related">start</field>
+        </record>
+
+        <record model="res.alarm" id="alarm4">
+            <field name="name">15 minutes before</field>
+            <field name="active" eval="1" />
+            <field name="trigger_duration" eval="15" />
+            <field name="trigger_interval">minutes</field>
+            <field name="trigger_occurs">before</field>
+            <field name="trigger_related">start</field>
+        </record>
+
+        <record model="res.alarm" id="alarm5">
+            <field name="name">30 minutes before</field>
+            <field name="active" eval="1" />
+            <field name="trigger_duration" eval="30" />
+            <field name="trigger_interval">minutes</field>
+            <field name="trigger_occurs">before</field>
+            <field name="trigger_related">start</field>
+        </record>
+
+        <record model="res.alarm" id="alarm6">
+            <field name="name">45 minutes before</field>
+            <field name="active" eval="1" />
+            <field name="trigger_duration" eval="45" />
+            <field name="trigger_interval">minutes</field>
+            <field name="trigger_occurs">before</field>
+            <field name="trigger_related">start</field>
+        </record>
+
+        <record model="res.alarm" id="alarm7">
+            <field name="name">1 hour before</field>
+            <field name="active" eval="1" />
+            <field name="trigger_duration" eval="1" />
+            <field name="trigger_interval">hours</field>
+            <field name="trigger_occurs">before</field>
+            <field name="trigger_related">start</field>
+        </record>
+
+        <record model="res.alarm" id="alarm8">
+            <field name="name">2 hours before</field>
+            <field name="active" eval="1" />
+            <field name="trigger_duration" eval="2" />
+            <field name="trigger_interval">hours</field>
+            <field name="trigger_occurs">before</field>
+            <field name="trigger_related">start</field>
+        </record>
+
+        <record model="res.alarm" id="alarm9">
+            <field name="name">3 hours before</field>
+
+            <field name="active" eval="1" />
+            <field name="trigger_duration" eval="3" />
+            <field name="trigger_interval">hours</field>
+            <field name="trigger_occurs">before</field>
+            <field name="trigger_related">start</field>
+        </record>
+
+        <record model="res.alarm" id="alarm10">
+            <field name="name">4 hours before</field>
+
+            <field name="active" eval="1" />
+            <field name="trigger_duration" eval="4" />
+            <field name="trigger_interval">hours</field>
+            <field name="trigger_occurs">before</field>
+            <field name="trigger_related">start</field>
+        </record>
+
+        <record model="res.alarm" id="alarm11">
+            <field name="name">5 hours before</field>
+
+            <field name="active" eval="1" />
+            <field name="trigger_duration" eval="5" />
+            <field name="trigger_interval">hours</field>
+            <field name="trigger_occurs">before</field>
+            <field name="trigger_related">start</field>
+        </record>
+
+        <record model="res.alarm" id="alarm12">
+            <field name="name">18 hours before</field>
+
+            <field name="active" eval="1" />
+            <field name="trigger_duration" eval="18" />
+            <field name="trigger_interval">hours</field>
+            <field name="trigger_occurs">before</field>
+            <field name="trigger_related">start</field>
+        </record>
+
+
+        <!-- Scheduler for Event Alarm-->
+        <record forcecreate="True" id="ir_cron_scheduler_alarm"
+            model="ir.cron">
+            <field name="name">Run Event Reminder</field>
+            <field eval="True" name="active" />
+            <field name="user_id" ref="base.user_root" />
+            <field name="interval_number">1</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall" />
+            <field eval="'calendar.alarm'" name="model" />
+            <field eval="'do_run_scheduler'" name="function" />
+            <field eval="'(False,)'" name="args" />
+        </record>
+    </data>
 </openerp>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index da58c54cd73..76bb0c24cb5 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -10,20 +10,10 @@
             <field name="arch" type="xml">
                 <form string="Invitation details" version="7.0">
                     <header>
-                        <button name="do_tentative"
-                            states="needs-action,declined,accepted"
-                            string="Uncertain" type="object"/>
-                        <button name="do_accept" string="Accept"
-                            states="needs-action,tentative,declined"
-                            type="object" />
-                        <button
-                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                            string="Delegate" type="action"
-                            states="needs-action,tentative,declined,accepted"
-                            context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-                        <button name="do_decline" string="Decline"
-                            states="needs-action,tentative,accepted"
-                            type="object" />
+                        <button name="do_tentative" states="needs-action,declined,accepted" string="Uncertain" type="object" class="oe_highlight"/>
+                        <button name="do_accept" string="Accept" states="needs-action,tentative,declined" type="object" class="oe_highlight"/>
+                        <button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" string="Delegate" type="action" states="needs-action,tentative,declined,accepted" context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                        <button name="do_decline" string="Decline" states="needs-action,tentative,accepted" type="object" class="oe_highlight"/>
                         <field name="state" widget="statusbar"
                             statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
                     </header>
@@ -55,10 +45,10 @@
                             </group>
                         </group>
                         <group>
-                            <group string="Delegrated From">
+                            <group string="Delegated From">
                                 <field name="parent_ids" readonly="1" nolabel="1" />
                             </group>
-                            <group string="Delegrated To" >
+                            <group string="Delegated To" >
                                 <field name="child_ids" readonly="1" nolabel="1" />
                             </group>
                         </group>
@@ -216,21 +206,9 @@
             <field name="arch" type="xml">
                 <form string="Events" version="7.0">
                 <header>
-                    <button name="do_confirm"
-                        string="Confirm"
-                        states="tentative,cancelled"
-                        type="object"
-                        />
-                    <button name="do_tentative"
-                        states="confirmed,cancelled"
-                        string="Uncertain"
-                        type="object"
-                        />
-                    <button name="do_cancel"
-                        string="Cancel"
-                        states="tentative,confirmed"
-                        type="object"
-                        />
+                    <button name="do_confirm" string="Confirm" states="tentative,cancelled" type="object" class="oe_highlight"/>
+                    <button name="do_tentative" states="confirmed,cancelled" string="Uncertain" type="object" class="oe_highlight"/>
+                    <button name="do_cancel" string="Cancel" states="tentative,confirmed" type="object" />
                     <field name="state" widget="statusbar"
                         statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
@@ -272,7 +250,7 @@
                             icon="terp-partner" type="action"
                             context="{'model' : 'calendar.event', 'attendee_field':'attendee_ids'}" colspan="2"/>
                         <field name="attendee_ids" colspan="4"
-                            nolabel="1" widget="one2many" mode="tree,form">
+                            nolabel="1" widget="one2many" mode="tree">
                             <tree string="Invitation details" editable="top">
                                 <field name="sent_by_uid" string="From"/>
                                 <field name="user_id" string="To"/>
diff --git a/addons/base_calendar/i18n/nl.po b/addons/base_calendar/i18n/nl.po
index 291406b829c..7a619918c25 100644
--- a/addons/base_calendar/i18n/nl.po
+++ b/addons/base_calendar/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:08+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-06-28 12:45+0000\n"
+"Last-Translator: Erwin <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:12+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-29 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -1109,7 +1109,7 @@ msgstr "Details herinnering"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "To Review"
-msgstr "Na te kijken"
+msgstr "Ter controle"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
diff --git a/addons/base_calendar/security/calendar_security.xml b/addons/base_calendar/security/calendar_security.xml
index 5fe8918e05b..dbc493c73f4 100644
--- a/addons/base_calendar/security/calendar_security.xml
+++ b/addons/base_calendar/security/calendar_security.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
    <data noupdate="0">
-	   <record model="res.groups" id="base.group_survey_user">
-        	<field name="name">Survey / User</field>
+       <record model="res.groups" id="base.group_survey_user">
+            <field name="name">Survey / User</field>
             <field name="users" eval="[(4, ref('base.user_root'))]"/>
-	   </record>
+       </record>
    </data>
 </openerp>
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
index 985bab8bf6b..a16715e0d52 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -9,7 +9,12 @@
             <field name="model">base_calendar.invite.attendee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invite People">
+                <form string="Invite People" version="7.0">
+                    <header>
+                        <button name="do_invite" string="Invite" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </header>
                     <separator string="Invite People" colspan="4"/>
                     <field name="type"/>
                     <field name="send_mail"/>
@@ -20,21 +25,17 @@
                             </group>
                             <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'internal')]}">
                                 <separator string="Users" colspan="4"/>
-                                <field name="user_ids" select="1" colspan="4" nolabel="1"  height="180"/>
+                                <field name="user_ids"  colspan="4" nolabel="1"  height="180"/>
                                 <newline/>
                             </group>
                             <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'partner')]}">
                                 <field name="partner_id" colspan="2" on_change="onchange_partner_id(partner_id)" attrs="{'required': [('type', '=', 'partner')]}"/>
                                 <newline/>
                                 <separator string="Partner Contacts" colspan="6"/>
-                                <field name="contact_ids" select="1" colspan="4" nolabel="1" domain="[('id', 'child_of', [partner_id])]" attrs="{'readonly': [('type', '!=', 'partner')]}"/>
+                                <field name="contact_ids"  colspan="4" nolabel="1" domain="[('id', 'child_of', [partner_id])]" attrs="{'readonly': [('type', '!=', 'partner')]}"/>
                             </group>
                         </page>
                     </notebook>
-                    <group col="4" colspan="4">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button name="do_invite" string="Invite" type="object" icon="gtk-ok"/>
-                    </group>
                 </form>
             </field>
         </record>