From 8085156454ed92a5d31fa6bbc348ee5064ebb620 Mon Sep 17 00:00:00 2001
From: "Amit (OpenERP)" <apa@tinyerp.com>
Date: Tue, 6 Mar 2012 12:19:02 +0530
Subject: [PATCH 01/43] [ADD]:event:added kanban view for event and realted
 changes for that.

bzr revid: apa@tinyerp.com-20120306064902-rdx250ihctkpjph8
---
 addons/event/__openerp__.py           |  1 +
 addons/event/event.py                 | 54 ++++++++++++++++-
 addons/event/event_view.xml           | 71 ++++++++++++++++++++++-
 addons/event/static/src/css/event.css | 83 +++++++++++++++++++++++++++
 4 files changed, 207 insertions(+), 2 deletions(-)
 create mode 100644 addons/event/static/src/css/event.css

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 06252001c83..ea0e4316ef5 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -53,6 +53,7 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
+    'css': ['static/src/css/event.css'],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/event.py b/addons/event/event.py
index 133d29281f1..1b92b995239 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -148,8 +148,30 @@ class event_event(osv.osv):
                     number = reg_done
                 elif field == 'register_prospect':
                     number = reg_draft
+                elif field == 'register_avail':
+                    number = event.register_max-reg_open
                 res[event.id][field] = number
         return res
+    
+    def _subscribe_fnc(self, cr, uid, ids, fields, args, context=None):
+        """Get Confirm or uncofirm register value.
+        @param ids: List of Event registration type's id
+        @param fields: List of function fields(register_current and register_prospect).
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary of function fields value.
+        """
+        register_pool = self.pool.get('event.registration')
+        res = {}
+        for event in self.browse(cr, uid, ids, context=context):
+            curr_reg_id = register_pool.search(cr,uid,[('user_id','=',uid),('event_id','=',event.id)])
+            if not curr_reg_id:res[event.id] = False
+            if curr_reg_id:
+                for reg in register_pool.browse(cr,uid,curr_reg_id,context=context):
+                    if not reg.subscribe:
+                        res[event.id]=False
+                    else:
+                        res[event.id]=True
+        return res 
 
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
@@ -158,6 +180,7 @@ class event_event(osv.osv):
         'register_max': fields.integer('Maximum Registrations', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
         'register_min': fields.integer('Minimum Registrations', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
         'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers'),
+        'register_avail': fields.function(_get_register, string='Available Registrations', multi='register_numbers',type='integer'),
         'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers'),
         'register_attended': fields.function(_get_register, string='Attended Registrations', multi='register_numbers'), 
         'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
@@ -182,6 +205,7 @@ class event_event(osv.osv):
                     type='many2one', relation='res.country', string='Country', readonly=False, states={'done': [('readonly', True)]}),
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
+        'subscribe' : fields.function(_subscribe_fnc, type="boolean", string='Subscribe'),
     }
 
     _defaults = {
@@ -189,6 +213,33 @@ class event_event(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'event.event', context=c),
         'user_id': lambda obj, cr, uid, context: uid,
     }
+    
+    def subscribe_to_event(self,cr,uid,ids,context=None):
+        register_pool = self.pool.get('event.registration')
+        curr_reg_id = register_pool.search(cr,uid,[('user_id','=',uid),('event_id','=',ids[0])])
+        if not curr_reg_id:
+            register_pool.create(cr, uid, {'state':'open',
+                                           'event_id':ids[0],
+                                           'subscribe':True,
+                                           })
+        else:
+            register_pool.write(cr, uid, curr_reg_id,{'state':'open','subscribe':True,
+                            'event_id':ids[0],
+                            })
+        
+        self.write(cr,uid,ids,{'subscribe':True})
+        return True
+    
+    def unsubscribe_to_event(self,cr,uid,ids,context=None):
+        register_pool = self.pool.get('event.registration')
+        curr_reg_id = register_pool.search(cr,uid,[('user_id','=',uid),('event_id','=',ids[0])])
+        if curr_reg_id:
+            register_pool.write(cr, uid, curr_reg_id,{'state':'draft',
+                                                      'event_id':ids[0],
+                                                      'subscribe':False
+                                                     })
+        self.write(cr,uid,ids,{'subscribe':False})
+        return True
 
     def _check_closing_date(self, cr, uid, ids, context=None):
         for event in self.browse(cr, uid, ids, context=context):
@@ -239,7 +290,8 @@ class event_registration(osv.osv):
                                     ('open', 'Confirmed'),
                                     ('cancel', 'Cancelled'),
                                     ('done', 'Attended')], 'State',
-                                    size=16, readonly=True)
+                                    size=16, readonly=True),
+        'subscribe': fields.boolean('Subscribe'),
     }
 
     _defaults = {
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 88be188080e..5aacf7a2845 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -156,6 +156,70 @@
                 </tree>
             </field>
         </record>
+        
+        <!-- Event Kanban View -->
+	
+	<record model="ir.ui.view" id="view_event_kanban">
+            <field name="name">event.event.kanban</field>
+            <field name="model">event.event</field>
+            <field name="type">kanban</field>
+            <field name="arch" type="xml">
+                <kanban>
+                    <field name="register_max"/>
+                    <field name="type"/>
+                    <field name="user_id"/>
+                    <field name="register_current"/>
+		    <field name="subscribe"/>
+                    <field name="country_id"/>
+		    <field name="date_begin"/>
+		    <field name="register_avail"/>
+		    <templates>
+			<t t-name="kanban-box">
+			    <div class="oe_module_vignette">
+				<a type="edit" class="oe_module_icon">
+				    <div class="oe_event_date "><t t-esc="record.date_begin.raw_value.getDate()"/></div>
+				    <div class="oe_event_month_year">
+					<t t-esc="record.date_begin.raw_value.toString('MMM')"/>
+					<t t-esc="record.date_begin.raw_value.getFullYear()"/>
+				    </div>
+				    <div class="oe_event_time"><t t-esc="record.date_begin.raw_value.toString('hh:mm tt')"/></div>
+				</a>
+				<div class="oe_module_desc">
+				    <h4><a type="edit"><field name="name"/></a></h4>
+				    <p>
+					<t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t>
+					<t t-if="record.user_id.raw_value">Organized by <field name="user_id"/><br/></t>
+					<t t-if="record.register_avail.raw_value lte 10">
+					    <t t-if="record.register_avail.raw_value != 0">
+						<i><b><field name="register_avail"/></b></i>
+						<i>
+						    <t t-if="record.register_avail.raw_value > 1">seats </t>
+						    <t t-if="record.register_avail.raw_value == 1 || !record.register_avail.raw_value > 1">seat </t>available.
+						</i>
+					    </t>
+					</t>
+				    </p>
+				    <t t-if="record.register_avail.raw_value != 0">
+					<t t-if="!record.subscribe.raw_value">
+					    <button type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
+						<span>Subscribe</span>
+						<span class="subscribe">UnSubscribe</span>
+					    </button>
+					</t>
+				    </t>
+				    <t t-if="record.subscribe.raw_value">
+					<button type="object" name="unsubscribe_to_event" class="unsubscribe_button oe_event_button_unsubscribe">
+					    <span>UnSubscribe</span>
+					    <span class="unsubscribe">Subscribe</span>
+					</button>
+				    </t>
+				</div>
+			    </div>
+			</t>
+                  </templates>
+                </kanban>
+            </field>
+        </record>
 
       <!-- Events  Calendar  View -->
 
@@ -199,6 +263,10 @@
                         <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
                         <separator orientation="vertical"/>
+                        <filter icon="terp-go-today" string="Up Coming"
+				name="upcoming"
+				domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
+				help="Up Coming Events" />
                         <field name="name"/>
                         <field name="type" widget="selection"/>
                         <field name="user_id" widget="selection">
@@ -229,7 +297,8 @@
            <field name="type">ir.actions.act_window</field>
            <field name="res_model">event.event</field>
            <field name="view_type">form</field>
-           <field name="view_mode">calendar,tree,form,graph</field>
+           <field name="view_mode">kanban,calendar,tree,form,graph</field>
+	   <field name="context">{"search_default_upcoming":1}</field>
            <field name="search_view_id" ref="view_event_search"/>
            <field name="help">Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events.</field>
        </record>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
new file mode 100644
index 00000000000..f3d60fcee26
--- /dev/null
+++ b/addons/event/static/src/css/event.css
@@ -0,0 +1,83 @@
+.oe_event_date{
+  border-top-left-radius:3px;
+  border-top-right-radius:3px;
+  font-size: 48px;
+  height: auto;
+  font-weight: bold;
+  text-align: center;
+  margin-bottom:-7px;
+  color: #FFFFFF;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+  background-color: #8A89BA;
+}
+.oe_event_time{
+  border-bottom-left-radius:3px;
+  border-bottom-right-radius:3px;
+  font-size: 12px;
+  text-align: center;
+  font-weight: bold;
+  color: #8A89BA;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+  background-color: #FFFFFF;
+}
+.oe_event_month_year{
+  border-bottom-left-radius:3px;
+  border-bottom-right-radius:3px;
+  font-size: 12px;
+  text-align: center;
+  font-weight: bold;
+  color: #FFFFFF;
+  background-color: #8A89BA;
+}
+div.oe_fold_column{
+  padding:0px !important;
+}
+.oe_event_button_subscribe{
+    display: block;
+    border: 1px solid #404040;
+    color: #404040;
+    font-size: 10px;
+    text-align: center;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    -o-border-radius: 3px;
+    -ms-border-radius: 3px;
+    border-radius: 3px;
+}
+.oe_event_button_unsubscribe{
+    display: block;
+    border: 1px solid #404040;
+    color: #FFFFFF;
+    background-color:#DC5F59;
+    font-size: 10px;
+    text-align: center;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    -o-border-radius: 3px;
+    -ms-border-radius: 3px;
+    border-radius: 3px;
+}
+.oe_event_button_subscribe:hover {
+  cursor: pointer;
+  background-color: #DC5F59;
+}
+.oe_event_button_unsubscribe:hover {
+  cursor: pointer;
+  background-color: #404040;
+}
+.subscribe, .subscribe_button:hover span {
+  display: none;
+  background-color: #DC5F59;
+}
+.subscribe_button:hover .subscribe {
+  display: inline;
+  background-color: #DC5F59;
+}
+.unsubscribe, .unsubscribe_button:hover span {
+  display: none;
+}
+.unsubscribe_button:hover .unsubscribe {
+  display: inline;
+  background-color: #404040;
+}
+

From 43c887aff7c7cd0b991decc23420589b1785d62e Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 7 Mar 2012 12:30:04 +0530
Subject: [PATCH 02/43] [IMP]changes in css for buttons

bzr revid: dhr@tinyerp.com-20120307070004-wvmtqmqu8ybj0uz3
---
 addons/event/event_view.xml           | 11 ++--
 addons/event/static/src/css/event.css | 92 ++++++++++++++++++---------
 2 files changed, 68 insertions(+), 35 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 5aacf7a2845..79e8193134c 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -189,7 +189,7 @@
 				    <p>
 					<t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t>
 					<t t-if="record.user_id.raw_value">Organized by <field name="user_id"/><br/></t>
-					<t t-if="record.register_avail.raw_value lte 10">
+					<t t-if="record.register_avail.raw_value lte 10"><i>Only</i></t>
 					    <t t-if="record.register_avail.raw_value != 0">
 						<i><b><field name="register_avail"/></b></i>
 						<i>
@@ -197,20 +197,19 @@
 						    <t t-if="record.register_avail.raw_value == 1 || !record.register_avail.raw_value > 1">seat </t>available.
 						</i>
 					    </t>
-					</t>
+					
 				    </p>
 				    <t t-if="record.register_avail.raw_value != 0">
 					<t t-if="!record.subscribe.raw_value">
 					    <button type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
-						<span>Subscribe</span>
-						<span class="subscribe">UnSubscribe</span>
+						<span >Subscribe</span>
 					    </button>
 					</t>
 				    </t>
 				    <t t-if="record.subscribe.raw_value">
 					<button type="object" name="unsubscribe_to_event" class="unsubscribe_button oe_event_button_unsubscribe">
-					    <span>UnSubscribe</span>
-					    <span class="unsubscribe">Subscribe</span>
+					    <span>Subscribed</span>
+					    <span class="unsubscribe">Unsubscribe</span>
 					</button>
 				    </t>
 				</div>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index f3d60fcee26..61ea2da3be3 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -32,52 +32,86 @@
 div.oe_fold_column{
   padding:0px !important;
 }
-.oe_event_button_subscribe{
-    display: block;
-    border: 1px solid #404040;
+.oe_event_button_subscribe {
+    display: inline-block;
+    border: 1px solid #ababab;
     color: #404040;
-    font-size: 10px;
+    font-size: 12px;
+    padding: 3px 10px;
     text-align: center;
+    -o-background-size: 100% 100%;
+    -moz-background-size: 100% 100%;
+    -webkit-background-size: auto auto !important;
+    background-size: 100% 100%;
+    background: #d8d8d8 none;
+    background: none, -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
+    background: none, -webkit-linear-gradient(#efefef, #d8d8d8);
+    background: none, -moz-linear-gradient(#efefef, #d8d8d8);
+    background: none, -o-linear-gradient(top, #efefef, #d8d8d8);
+    background: none, -khtml-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
+    background: -ms-linear-gradient(top, #efefef, #d8d8d8);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#efefef', endColorstr='#d8d8d8',GradientType=0 );
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
     -o-border-radius: 3px;
     -ms-border-radius: 3px;
     border-radius: 3px;
+    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+    -o-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
+    -webkit-font-smoothing: antialiased;
+    outline: none;
 }
-.oe_event_button_unsubscribe{
-    display: block;
-    border: 1px solid #404040;
-    color: #FFFFFF;
-    background-color:#DC5F59;
-    font-size: 10px;
+.oe_event_button_unsubscribe {
+	display: inline-block;
+    border: 1px solid #ababab;
+    color: #404040;
+    font-size: 12px;
+    padding: 3px 10px;
     text-align: center;
+    -o-background-size: 100% 100%;
+    -moz-background-size: 100% 100%;
+    -webkit-background-size: auto auto !important;
+    background-size: 100% 100%;
+    background: #8A89BA none;
+    background: none, -webkit-gradient(linear, left top, left bottom, from(#8A89BA), to(#8A89BA));
+    background: none, -webkit-linear-gradient(#8A89BA, #8A89BA);
+    background: none, -moz-linear-gradient(#8A89BA, #8A89BA);
+    background: none, -o-linear-gradient(top, #8A89BA, #8A89BA);
+    background: none, -khtml-gradient(linear, left top, left bottom, from(#8A89BA), to(#8A89BA));
+    background: -ms-linear-gradient(top, #8A89BA, #8A89BA);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#8A89BA, endColorstr='#8A89BA',GradientType=0 );
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
     -o-border-radius: 3px;
     -ms-border-radius: 3px;
     border-radius: 3px;
+    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+    -o-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
+    -webkit-font-smoothing: antialiased;
+    outline: none;
 }
 .oe_event_button_subscribe:hover {
   cursor: pointer;
-  background-color: #DC5F59;
+  background-size: 100% 100%;
+  background: #DC5F59 none;
 }
 .oe_event_button_unsubscribe:hover {
-  cursor: pointer;
-  background-color: #404040;
-}
-.subscribe, .subscribe_button:hover span {
-  display: none;
-  background-color: #DC5F59;
-}
-.subscribe_button:hover .subscribe {
-  display: inline;
-  background-color: #DC5F59;
-}
-.unsubscribe, .unsubscribe_button:hover span {
-  display: none;
-}
-.unsubscribe_button:hover .unsubscribe {
-  display: inline;
-  background-color: #404040;
-}
+   cursor: pointer;
+   background-size: 100% 100%;
+   background: #DC5F59 none;
+ }
+ .unsubscribe, .unsubscribe_button:hover span {
+   display: none;
+   background-color: #DC5F59
+ }
+ .unsubscribe_button:hover .unsubscribe {
+   display: inline;
+   background-color: #DC5F59;
+ }
 

From 456b417f0bd3650d145f9cb94ec8e6f13faf179a Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 7 Mar 2012 14:14:18 +0530
Subject: [PATCH 03/43] [IMP]

bzr revid: dhr@tinyerp.com-20120307084418-uaemwhxf24f95fkw
---
 addons/event/event_view.xml           |  9 ++++++---
 addons/event/static/src/css/event.css | 18 +++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 79e8193134c..21c2e020098 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -172,6 +172,7 @@
 		    <field name="subscribe"/>
                     <field name="country_id"/>
 		    <field name="date_begin"/>
+		    <field name="state"/>
 		    <field name="register_avail"/>
 		    <templates>
 			<t t-name="kanban-box">
@@ -187,14 +188,16 @@
 				<div class="oe_module_desc">
 				    <h4><a type="edit"><field name="name"/></a></h4>
 				    <p>
+				    <t t-if="record.state.raw_value">Status: <field name="state"/><br/></t>
 					<t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t>
 					<t t-if="record.user_id.raw_value">Organized by <field name="user_id"/><br/></t>
-					<t t-if="record.register_avail.raw_value lte 10"><i>Only</i></t>
+					<t t-if="record.register_avail.raw_value lte 10 and record.register_avail.raw_value gt 0"><i>Only</i></t>
+					     <t t-if="record.register_avail.raw_value == 0"><i>No ticket available.</i></t>
 					    <t t-if="record.register_avail.raw_value != 0">
 						<i><b><field name="register_avail"/></b></i>
 						<i>
-						    <t t-if="record.register_avail.raw_value > 1">seats </t>
-						    <t t-if="record.register_avail.raw_value == 1 || !record.register_avail.raw_value > 1">seat </t>available.
+						    <t t-if="record.register_avail.raw_value > 1">tickets </t>
+						    <t t-if="record.register_avail.raw_value == 1 || !record.register_avail.raw_value > 1">ticket </t>available.
 						</i>
 					    </t>
 					
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index 61ea2da3be3..bd73d67f20a 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -66,7 +66,7 @@ div.oe_fold_column{
 }
 .oe_event_button_unsubscribe {
 	display: inline-block;
-    border: 1px solid #ababab;
+    border: 1px solid #AAA;
     color: #404040;
     font-size: 12px;
     padding: 3px 10px;
@@ -75,14 +75,14 @@ div.oe_fold_column{
     -moz-background-size: 100% 100%;
     -webkit-background-size: auto auto !important;
     background-size: 100% 100%;
-    background: #8A89BA none;
-    background: none, -webkit-gradient(linear, left top, left bottom, from(#8A89BA), to(#8A89BA));
-    background: none, -webkit-linear-gradient(#8A89BA, #8A89BA);
-    background: none, -moz-linear-gradient(#8A89BA, #8A89BA);
-    background: none, -o-linear-gradient(top, #8A89BA, #8A89BA);
-    background: none, -khtml-gradient(linear, left top, left bottom, from(#8A89BA), to(#8A89BA));
-    background: -ms-linear-gradient(top, #8A89BA, #8A89BA);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#8A89BA, endColorstr='#8A89BA',GradientType=0 );
+    background: #AAA none;
+    background: none, -webkit-gradient(linear, left top, left bottom, from(#AAA), to(#AAA));
+    background: none, -webkit-linear-gradient(#AAA, #AAA);
+    background: none, -moz-linear-gradient(#AAA, #AAA);
+    background: none, -o-linear-gradient(top, #AAA, #AAA);
+    background: none, -khtml-gradient(linear, left top, left bottom, from(#AAA), to(#AAA));
+    background: -ms-linear-gradient(top, #AAA, #AAA);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#AAA, endColorstr='#AAA',GradientType=0 );
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
     -o-border-radius: 3px;

From 5bc638ec841424fc23d48bd1b254cab4b06c80ac Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 7 Mar 2012 15:23:36 +0530
Subject: [PATCH 04/43] [IMP]:event:removed status from kanban view.

bzr revid: apa@tinyerp.com-20120307095336-c2w2o2dg7i81m38c
---
 addons/event/event_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 21c2e020098..0b9c893b881 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -188,8 +188,7 @@
 				<div class="oe_module_desc">
 				    <h4><a type="edit"><field name="name"/></a></h4>
 				    <p>
-				    <t t-if="record.state.raw_value">Status: <field name="state"/><br/></t>
-					<t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t>
+				    	<t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t>
 					<t t-if="record.user_id.raw_value">Organized by <field name="user_id"/><br/></t>
 					<t t-if="record.register_avail.raw_value lte 10 and record.register_avail.raw_value gt 0"><i>Only</i></t>
 					     <t t-if="record.register_avail.raw_value == 0"><i>No ticket available.</i></t>

From ce5483e4c447494f92b9b42852a37c93e3785ff6 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Fri, 16 Mar 2012 12:29:27 +0530
Subject: [PATCH 05/43] [IMP] mail: add a feature to call _hook_message_sent
 method of the related module with will trigger the workflow and set state
 accordingly

bzr revid: psi@tinyerp.com-20120316065927-1m4ns7gpe5bwr4pk
---
 addons/mail/mail_message.py                      | 4 +++-
 addons/mail/wizard/mail_compose_message.py       | 5 +++--
 addons/mail/wizard/mail_compose_message_view.xml | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index b41f1213791..66d8441e564 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -517,7 +517,9 @@ class mail_message(osv.osv):
                     message.write({'state':'sent', 'message_id': res})
                 else:
                     message.write({'state':'exception'})
-
+                model_pool = self.pool.get(message.model)
+                if hasattr(model_pool, '_hook_message_sent'):
+                    model_pool._hook_message_sent(cr, uid, message.res_id, context=context)
                 # if auto_delete=True then delete that sent messages as well as attachments
                 message.refresh()
                 if message.state == 'sent' and message.auto_delete:
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index e68bd70a739..2010d7d0f5a 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -100,6 +100,7 @@ class mail_compose_message(osv.osv_memory):
         if not result.get('email_from'):
             current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
             result['email_from'] = current_user.user_email or False
+        result['subtype'] = 'html'
         return result
 
     _columns = {
@@ -158,8 +159,9 @@ class mail_compose_message(osv.osv_memory):
                 if not (subject.startswith('Re:') or subject.startswith(re_prefix)):
                     subject = "%s %s" % (re_prefix, subject)
             result.update({
-                    'subtype' : 'plain', # default to the text version due to quoting
+                    'subtype' : message_data.subtype or 'plain', # default to the text version due to quoting
                     'body_text' : body,
+                    'body_html' : message_data.body_html,
                     'subject' : subject,
                     'attachment_ids' : [],
                     'model' : message_data.model or False,
@@ -238,7 +240,6 @@ class mail_compose_message(osv.osv_memory):
                     subtype=mail.subtype, headers=headers, context=context)
                 # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
                 mail_message.send(cr, uid, [msg_id], context=context)
-
         return {'type': 'ir.actions.act_window_close'}
 
     def render_template(self, cr, uid, template, model, res_id, context=None):
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index d559d679c8b..3a44b040139 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -23,6 +23,7 @@
                     <notebook colspan="4">
                         <page string="Body">
                             <field name="body_text" colspan="4" nolabel="1" height="300" width="300"/>
+                            <field name="body_html" invisible="1"/>
                         </page>
                         <page string="Attachments">
                             <field name="attachment_ids" colspan="4" nolabel="1"/>

From 00f7fbe5504f7a1b2783072f4e7b7f542fc08017 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 20 Mar 2012 15:52:17 +0530
Subject: [PATCH 06/43] [IMP]:event:remove mouse hover for subscribe button.

bzr revid: apa@tinyerp.com-20120320102217-80icy0kj5ronpfq4
---
 addons/event/static/src/css/event.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index bd73d67f20a..4a54d6cbe9e 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -99,7 +99,7 @@ div.oe_fold_column{
 .oe_event_button_subscribe:hover {
   cursor: pointer;
   background-size: 100% 100%;
-  background: #DC5F59 none;
+  /*background: #DC5F59 none;*/
 }
 .oe_event_button_unsubscribe:hover {
    cursor: pointer;

From 4606fe32b7729583228124f8a29f6718eeef9002 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 20 Mar 2012 15:54:54 +0530
Subject: [PATCH 07/43] [IMP]help changed.

bzr revid: kbh@tinyerp.com-20120320102454-4q2hvlbg2rsouj1r
---
 addons/event/event_view.xml           | 6 +++---
 addons/event/static/src/css/event.css | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 0b9c893b881..6f80299f02c 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -265,9 +265,9 @@
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Up Coming"
-				name="upcoming"
-				domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-				help="Up Coming Events" />
+        name="upcoming"
+        domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
+        help="Up Coming Events form today" />
                         <field name="name"/>
                         <field name="type" widget="selection"/>
                         <field name="user_id" widget="selection">
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index bd73d67f20a..4a0a286140d 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -99,7 +99,6 @@ div.oe_fold_column{
 .oe_event_button_subscribe:hover {
   cursor: pointer;
   background-size: 100% 100%;
-  background: #DC5F59 none;
 }
 .oe_event_button_unsubscribe:hover {
    cursor: pointer;

From 57c3460598edf0467755cdcc1c46f2b50936ab50 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 20 Mar 2012 16:14:34 +0530
Subject: [PATCH 08/43] [IMP]

bzr revid: kbh@tinyerp.com-20120320104434-1tkt040qzvukmsgc
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6f80299f02c..c766201805e 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -267,7 +267,7 @@
                         <filter icon="terp-go-today" string="Up Coming"
         name="upcoming"
         domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-        help="Up Coming Events form today" />
+        help="Up coming events form today" />
                         <field name="name"/>
                         <field name="type" widget="selection"/>
                         <field name="user_id" widget="selection">

From 7f982abc8581b60a45727fb60922b3ab37a3f4dc Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 20 Mar 2012 16:41:58 +0530
Subject: [PATCH 09/43] [IMP]

bzr revid: apa@tinyerp.com-20120320111158-4w449qdomaa29oqa
---
 addons/event/event_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index c766201805e..a6c00934fa5 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -265,9 +265,9 @@
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Up Coming"
-        name="upcoming"
-        domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-        help="Up coming events form today" />
+                                name="upcoming"
+                                domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
+                                help="Up coming events form today" />
                         <field name="name"/>
                         <field name="type" widget="selection"/>
                         <field name="user_id" widget="selection">

From 15249d4ce1eed0db3b0fd94006ddf5c3a6174707 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 21 Mar 2012 10:51:26 +0530
Subject: [PATCH 10/43] [IMP]

bzr revid: apa@tinyerp.com-20120321052126-j5p0itn5ij5gdnia
---
 addons/event/event.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 1b92b995239..340719e99a8 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -216,10 +216,15 @@ class event_event(osv.osv):
     
     def subscribe_to_event(self,cr,uid,ids,context=None):
         register_pool = self.pool.get('event.registration')
+        user_pool = self.pool.get('res.users')
         curr_reg_id = register_pool.search(cr,uid,[('user_id','=',uid),('event_id','=',ids[0])])
+        user = user_pool.browse(cr,uid,uid,context)
+        print user.user_email
         if not curr_reg_id:
             register_pool.create(cr, uid, {'state':'open',
                                            'event_id':ids[0],
+                                           'email':user.user_email,
+                                           'name':user.name,
                                            'subscribe':True,
                                            })
         else:
@@ -234,7 +239,7 @@ class event_event(osv.osv):
         register_pool = self.pool.get('event.registration')
         curr_reg_id = register_pool.search(cr,uid,[('user_id','=',uid),('event_id','=',ids[0])])
         if curr_reg_id:
-            register_pool.write(cr, uid, curr_reg_id,{'state':'draft',
+            register_pool.write(cr, uid, curr_reg_id,{'state':'cancel',
                                                       'event_id':ids[0],
                                                       'subscribe':False
                                                      })

From 94c68ff9382b5a9ead79e2f00240861a68b3f9cc Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 21 Mar 2012 11:13:56 +0530
Subject: [PATCH 11/43] [IMP]

bzr revid: apa@tinyerp.com-20120321054356-t3t96j0kunsi4924
---
 addons/event/event.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 340719e99a8..82b06bc8d48 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -221,17 +221,20 @@ class event_event(osv.osv):
         user = user_pool.browse(cr,uid,uid,context)
         print user.user_email
         if not curr_reg_id:
-            register_pool.create(cr, uid, {'state':'open',
-                                           'event_id':ids[0],
-                                           'email':user.user_email,
-                                           'name':user.name,
-                                           'subscribe':True,
-                                           })
+            curr_reg_id = register_pool.create(cr, uid, {'event_id':ids[0],
+                                                    'email':user.user_email,
+                                                    'name':user.name,
+                                                    'subscribe':True,
+                                                    })
+            
+            
         else:
             register_pool.write(cr, uid, curr_reg_id,{'state':'open','subscribe':True,
                             'event_id':ids[0],
                             })
-        
+        if isinstance(curr_reg_id, (int, long)):
+            curr_reg_id = [curr_reg_id]
+        register_pool.confirm_registration(cr,uid,curr_reg_id,context)
         self.write(cr,uid,ids,{'subscribe':True})
         return True
     
@@ -239,11 +242,13 @@ class event_event(osv.osv):
         register_pool = self.pool.get('event.registration')
         curr_reg_id = register_pool.search(cr,uid,[('user_id','=',uid),('event_id','=',ids[0])])
         if curr_reg_id:
-            register_pool.write(cr, uid, curr_reg_id,{'state':'cancel',
-                                                      'event_id':ids[0],
+            if isinstance(curr_reg_id, (int, long)):
+                curr_reg_id = [curr_reg_id]
+            register_pool.write(cr, uid, curr_reg_id,{'event_id':ids[0],
                                                       'subscribe':False
                                                      })
-        self.write(cr,uid,ids,{'subscribe':False})
+            register_pool.button_reg_cancel(cr,uid,curr_reg_id,context)
+            self.write(cr,uid,ids,{'subscribe':False})
         return True
 
     def _check_closing_date(self, cr, uid, ids, context=None):

From a1f79bde2a20981cec417e3ce3cd91ffdeece4b5 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 21 Mar 2012 12:34:08 +0530
Subject: [PATCH 12/43] [IMP]

bzr revid: apa@tinyerp.com-20120321070408-gy02ke9mzh6xzkl0
---
 addons/event/event.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 82b06bc8d48..7d2c18a01bc 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -219,7 +219,6 @@ class event_event(osv.osv):
         user_pool = self.pool.get('res.users')
         curr_reg_id = register_pool.search(cr,uid,[('user_id','=',uid),('event_id','=',ids[0])])
         user = user_pool.browse(cr,uid,uid,context)
-        print user.user_email
         if not curr_reg_id:
             curr_reg_id = register_pool.create(cr, uid, {'event_id':ids[0],
                                                     'email':user.user_email,

From 7f8b27131b658b2936e26777d996e5f2b96012ea Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 21 Mar 2012 15:33:57 +0530
Subject: [PATCH 13/43] [IMP]

bzr revid: apa@tinyerp.com-20120321100357-0u42rph6fovo3cth
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index a6c00934fa5..338c2dd9ba8 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -267,7 +267,7 @@
                         <filter icon="terp-go-today" string="Up Coming"
                                 name="upcoming"
                                 domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                                help="Up coming events form today" />
+                                help="Up coming events from today" />
                         <field name="name"/>
                         <field name="type" widget="selection"/>
                         <field name="user_id" widget="selection">

From 0d59afa455ef124252a865b22cbd82b30191bd8a Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 21 Mar 2012 18:24:58 +0530
Subject: [PATCH 14/43] [IMP]

bzr revid: apa@tinyerp.com-20120321125458-4qu5opgtlogtpq2h
---
 addons/event/event.py       | 11 ++++++-----
 addons/event/event_demo.xml |  3 ---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 7d2c18a01bc..baa14de9bbe 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -221,9 +221,10 @@ class event_event(osv.osv):
         user = user_pool.browse(cr,uid,uid,context)
         if not curr_reg_id:
             curr_reg_id = register_pool.create(cr, uid, {'event_id':ids[0],
-                                                    'email':user.user_email,
-                                                    'name':user.name,
-                                                    'subscribe':True,
+                                                         'email':user.user_email,
+                                                         'name':user.name,
+                                                         'user_id':uid,
+                                                         'subscribe':True,
                                                     })
             
             
@@ -293,7 +294,7 @@ class event_registration(osv.osv):
         'log_ids': fields.one2many('mail.message', 'res_id', 'Logs', domain=[('email_from', '=', False),('model','=',_name)]),
         'event_end_date': fields.related('event_id','date_end', type='datetime', string="Event End Date", readonly=True),
         'event_begin_date': fields.related('event_id', 'date_begin', type='datetime', string="Event Start Date", readonly=True),
-        'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
+        'user_id': fields.many2one('res.users', 'Attendee', states={'done': [('readonly', True)]}),
         'company_id': fields.related('event_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'Unconfirmed'),
                                     ('open', 'Confirmed'),
@@ -306,7 +307,7 @@ class event_registration(osv.osv):
     _defaults = {
         'nb_register': 1,
         'state': 'draft',
-        'user_id': lambda self, cr, uid, ctx: uid,
+        #'user_id': lambda self, cr, uid, ctx: uid,
     }
     _order = 'name, create_date desc'
 
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 0dfbbf6de18..5b4654342c9 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -32,7 +32,6 @@
         <field name="name">Concert of Bon Jovi</field>
         <field eval="time.strftime('%Y-%m-01 19:05:15')" name="date_begin"/>
         <field eval="time.strftime('%Y-%m-01 23:05:15')" name="date_end"/>
-        <field name="user_id" ref="base.user_root"/>
         <field name="register_max">500</field>
         <field name="type" ref="event_type_1"/>
     </record>
@@ -42,7 +41,6 @@
         <field eval="time.strftime('%Y-%m-05 18:00:00')" name="date_begin"/>
         <field eval="time.strftime('%Y-%m-05 21:00:00')" name="date_end"/>
         <field name="type" ref="event_type_1"/>
-        <field name="user_id" ref="base.user_root"/>
         <field name="register_min">50</field>
         <field name="register_max">350</field>
     </record>
@@ -52,7 +50,6 @@
         <field eval="time.strftime('%Y-%m-05 16:30:00')" name="date_end"/>
         <field name="type" ref="event_type_2"/>
         <field name="register_max">200</field>
-        <field name="user_id" ref="base.user_root"/>
     </record>
     <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
     <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>

From ef409154e6ad620c287c7bd3971993328742d497 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 22 Mar 2012 11:15:23 +0530
Subject: [PATCH 15/43] [IMP]

bzr revid: apa@tinyerp.com-20120322054523-650x1m4vynflsfii
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 338c2dd9ba8..48fa1b9cc8b 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -264,7 +264,7 @@
                         <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-today" string="Up Coming"
+                        <filter icon="terp-go-today" string="Upcoming"
                                 name="upcoming"
                                 domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
                                 help="Up coming events from today" />

From 9f137659c4ca5405a0a3f42fc8e606822bb44ce7 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 22 Mar 2012 15:23:52 +0530
Subject: [PATCH 16/43] [FIX]:ValueError: No such external ID currently defined
 in the system: event.event_type_4

bzr revid: apa@tinyerp.com-20120322095352-duinua5esddclxw5
---
 addons/event_sale/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index f92a9eb5617..d8f689986e2 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -37,8 +37,8 @@ It defines a new kind of service products that offers you the possibility to cho
     'depends': ['event','sale','sale_crm'],
     'update_xml': [
         'event_sale_view.xml',
-        'event_demo.xml',
     ],
+    'demo_xml': ['event_demo.xml'],
     'test':['test/confirm.yml'],
     'installable': True,
     'active': False,

From 3dbea7ec59865cb1d9034c61d0e698ae9fd8f0df Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 23 Mar 2012 10:25:55 +0530
Subject: [PATCH 17/43] [IMP]

bzr revid: apa@tinyerp.com-20120323045555-qab1wjnq4dbymwbq
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 8032bd7a504..4b4f2b1e44d 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -299,7 +299,7 @@
            <field name="res_model">event.event</field>
            <field name="view_type">form</field>
            <field name="view_mode">kanban,calendar,tree,form,graph</field>
-	   <field name="context">{"search_default_upcoming":1,"search_default_section_id": section_id}</field>
+	   <field name="context">{"search_default_upcoming":1}</field>
            <field name="search_view_id" ref="view_event_search"/>
            <field name="help">Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events.</field>
        </record>

From 388b85c751826aefde73b9afae9d19a9f60342fa Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Mon, 26 Mar 2012 15:26:51 +0530
Subject: [PATCH 18/43] [IMP] base:-corrected typo-dashboard

bzr revid: mtr@tinyerp.com-20120326095651-47a4xwmoun01qjp8
---
 openerp/addons/base/base_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index c3ad5982f28..050b1e5adf1 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -28,7 +28,7 @@
              />
 
         <menuitem id="base.menu_reporting" name="Reporting" sequence="45" groups="base.group_extended"/>
-        <menuitem id="base.menu_dasboard" name="Dashboards" sequence="0" parent="base.menu_reporting" groups="base.group_extended"/>
+        <menuitem id="base.menu_reporting_dashboard" name="Dashboards" sequence="0" parent="base.menu_reporting" groups="base.group_extended"/>
         <menuitem id="menu_audit" name="Audit" parent="base.menu_reporting" sequence="50"/>
         <menuitem id="base.menu_reporting_config" name="Configuration" parent="base.menu_reporting" sequence="100"/>
 

From 7c354067b22a3181c4775c576d9fcc23578a6fd1 Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Mon, 26 Mar 2012 15:45:14 +0530
Subject: [PATCH 19/43] [IMP]
 account,auction,crm,document,event,hr,mrp,project_*,purchase,sale,stock:-improved
 the parent menu name for dashboard menus

bzr revid: mtr@tinyerp.com-20120326101514-mkfubco6ngi9lzr0
---
 addons/account/board_account_view.xml             | 2 +-
 addons/auction/board_auction_view.xml             | 2 +-
 addons/crm/board_crm_statistical_view.xml         | 4 ++--
 addons/document/board_document_view.xml           | 2 +-
 addons/event/board_association_view.xml           | 2 +-
 addons/hr/hr_board.xml                            | 2 +-
 addons/mrp/board_manufacturing_view.xml           | 2 +-
 addons/project/board_project_view.xml             | 6 +++---
 addons/project_issue/board_project_issue_view.xml | 2 +-
 addons/project_planning/project_planning_view.xml | 4 ++--
 addons/project_scrum/board_project_scrum_view.xml | 2 +-
 addons/purchase/board_purchase_view.xml           | 2 +-
 addons/sale/board_sale_view.xml                   | 4 ++--
 addons/stock/board_warehouse_view.xml             | 2 +-
 14 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 0ec75e7b5c8..6417bb99d88 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -61,7 +61,7 @@
             <field name="view_id" ref="board_account_form"/>
         </record>
 
-        <menuitem id="menu_dashboard_acc" name="Accounting" sequence="30" parent="base.menu_dasboard" groups="group_account_user,group_account_manager"/>
+        <menuitem id="menu_dashboard_acc" name="Accounting" sequence="30" parent="base.menu_reporting_dashboard" groups="group_account_user,group_account_manager"/>
         <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
         <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="14" action="open_board_account"/>
 
diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml
index cb5ed07804c..360d8f38116 100644
--- a/addons/auction/board_auction_view.xml
+++ b/addons/auction/board_auction_view.xml
@@ -93,7 +93,7 @@
             <field name="view_id" ref="board_auction_form1"/>
         </record>
 
-        <menuitem name="Auction" id="menu_board_auction" parent="base.menu_dasboard" sequence="40"/>
+        <menuitem name="Auction" id="menu_board_auction" parent="base.menu_reporting_dashboard" sequence="40"/>
 
         <menuitem
             name="Auction DashBoard"
diff --git a/addons/crm/board_crm_statistical_view.xml b/addons/crm/board_crm_statistical_view.xml
index 69c4f0bfb9e..b1b9ec93784 100644
--- a/addons/crm/board_crm_statistical_view.xml
+++ b/addons/crm/board_crm_statistical_view.xml
@@ -107,10 +107,10 @@
             <field name="view_id" ref="board_crm_statistical_form"/>
         </record>
 
-	    <menuitem id="board.menu_sales_dasboard" name="Sales" sequence="1" parent="base.menu_dasboard"/>
+	    <menuitem id="board.menu_sales_dashboard" name="Sales" sequence="1" parent="base.menu_reporting_dashboard"/>
 
         <menuitem
-            name="CRM Dashboard" parent="board.menu_sales_dasboard"
+            name="CRM Dashboard" parent="board.menu_sales_dashboard"
             action="open_board_statistical_dash"
             sequence="0"
             id="menu_board_statistics_dash"
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index ee6fc61f896..4412423c97b 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -37,7 +37,7 @@
          <menuitem
             name="Knowledge"
             id="menu_reports_document"
-            parent="base.menu_dasboard"
+            parent="base.menu_reporting_dashboard"
             sequence="45"
             groups="base.group_system"/>
 
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index b9187227b1c..96db3db6781 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -63,7 +63,7 @@
             <field name="view_id" ref="board_associations_manager_form"/>
         </record>
         <menuitem id="menus_event_dashboard" name="Events"
-            parent="base.menu_dasboard" sequence="25"/>
+            parent="base.menu_reporting_dashboard" sequence="25"/>
         <menuitem
             name="Event Dashboard" parent="menus_event_dashboard"
             action="open_board_associations_manager"
diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml
index 555312afb6b..6b541f5a557 100644
--- a/addons/hr/hr_board.xml
+++ b/addons/hr/hr_board.xml
@@ -26,7 +26,7 @@
 
     <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" action="open_board_hr"/>
     <menuitem id="menu_hr_reporting" parent="base.menu_reporting" name="Human Resources" sequence="40" />
-    <menuitem id="menu_hr_dashboard" parent="base.menu_dasboard"  name="Human Resources" sequence="35"/>
+    <menuitem id="menu_hr_dashboard" parent="base.menu_reporting_dashboard"  name="Human Resources" sequence="35"/>
     <menuitem id="menu_hr_dashboard_user" parent="menu_hr_dashboard" action="open_board_hr" icon="terp-graph" sequence="4"/>
 
     <!-- This board view will be complete by other hr_* modules-->
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index 1815c4ceb12..cb81d51d439 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -29,7 +29,7 @@
         </record>
 
         <menuitem id="menus_dash_mrp" name="Manufacturing"
-            parent="base.menu_dasboard" sequence="15"/>
+            parent="base.menu_reporting_dashboard" sequence="15"/>
         <menuitem
             action="open_board_manufacturing" icon="terp-graph"
             id="menu_board_manufacturing" parent="menus_dash_mrp"
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 34de37fd9a7..f4a855283ba 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -104,17 +104,17 @@
         </record>
 
         <menuitem
-            id="menu_project_dasboard"
+            id="menu_project_dashboard"
             name="Project"
             sequence="20"
-            parent="base.menu_dasboard"
+            parent="base.menu_reporting_dashboard"
             />
 
         <menuitem
             action="open_board_project"
             icon="terp-graph"
             id="menu_board_project"
-            parent="menu_project_dasboard"
+            parent="menu_project_dashboard"
             sequence="1"/>
 
         <menuitem
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index bcb73456b88..ff33793d8e8 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -79,7 +79,7 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_project_issue_form"/>
         </record>
-        <menuitem id="menu_deshboard_project_issue" name="Project Issue Dashboard" parent="project.menu_project_dasboard"
+        <menuitem id="menu_dashboard_project_issue" name="Project Issue Dashboard" parent="project.menu_project_dashboard"
              icon="terp-graph"
             action="open_board_project_issue"/>
 
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 3beb5ad39a9..d12b62dbf18 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -292,11 +292,11 @@
             <!-- <field name="context">{"search_default_user_id":uid}</field> -->
             <field name="search_view_id" ref="account_analytic_planning_stat_view_search"/>
         </record>
-		
+
             <menuitem  action="action_account_analytic_planning_stat_form"
                        icon="terp-graph"
                        id="menu_board_planning"
-                       parent="project.menu_project_dasboard"/>
+                       parent="project.menu_project_dashboard"/>
 
 <!--        Analytic account Form -->
 
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index 7d993dd90c9..924a1cbf5cc 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -98,7 +98,7 @@
         </record>
         <menuitem
             id="menu_deshboard_scurm"
-            name="Scrum Dashboard" parent="project.menu_project_dasboard"
+            name="Scrum Dashboard" parent="project.menu_project_dashboard"
             icon="terp-graph"
             action="open_board_project_scrum"/>
 
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 74f34a45cb6..4c9e776b96b 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -5,7 +5,7 @@
         <menuitem
             id="menu_purchase_deshboard"
             name="Purchase"
-            parent="base.menu_dasboard" sequence="5"/>
+            parent="base.menu_reporting_dashboard" sequence="5"/>
 
         <record id="purchase_draft" model="ir.actions.act_window">
             <field name="name">Request for Quotations</field>
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 57eee7f184b..8a6caf1a849 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -30,8 +30,8 @@
             <field name="view_id" ref="board_sales_manager_form"/>
         </record>
 
-        <menuitem id="board.menu_sales_dasboard" name="Sales" sequence="1" parent="base.menu_dasboard"/>
-        <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_sales_dasboard" sequence="0" groups="base.group_sale_manager"/>
+        <menuitem id="board.menu_sales_dashboard" name="Sales" sequence="1" parent="base.menu_reporting_dashboard"/>
+        <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_sales_dashboard" sequence="0" groups="base.group_sale_manager"/>
 
 
     <record id="action_quotation_for_sale" model="ir.actions.act_window">
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 5c52c6412f3..b8de9cf445e 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -68,7 +68,7 @@
             <field name="view_id" ref="board_warehouse_form"/>
         </record>
 
-        <menuitem id="menu_dashboard_stock" name="Warehouse"  sequence="10" parent="base.menu_dasboard"/>
+        <menuitem id="menu_dashboard_stock" name="Warehouse"  sequence="10" parent="base.menu_reporting_dashboard"/>
         <menuitem action="open_board_warehouse" icon="terp-graph"  groups="group_stock_manager"  id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
         <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5"  groups="group_stock_manager" action="open_board_warehouse"/>
 

From 15296eb4586fd987937c58e989d758c83279f6a7 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 26 Mar 2012 16:01:01 +0530
Subject: [PATCH 20/43] [IMP]:improved code

bzr revid: apa@tinyerp.com-20120326103101-bupq777xei3h8ilv
---
 addons/event/event.py | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index baa14de9bbe..1bdbade2e46 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -154,9 +154,9 @@ class event_event(osv.osv):
         return res
     
     def _subscribe_fnc(self, cr, uid, ids, fields, args, context=None):
-        """Get Confirm or uncofirm register value.
+        """Get Subscribe or Unsubscribe registration value.
         @param ids: List of Event registration type's id
-        @param fields: List of function fields(register_current and register_prospect).
+        @param fields: List of function fields(subscribe).
         @param context: A standard dictionary for contextual values
         @return: Dictionary of function fields value.
         """
@@ -167,10 +167,8 @@ class event_event(osv.osv):
             if not curr_reg_id:res[event.id] = False
             if curr_reg_id:
                 for reg in register_pool.browse(cr,uid,curr_reg_id,context=context):
-                    if not reg.subscribe:
-                        res[event.id]=False
-                    else:
-                        res[event.id]=True
+                    res[event.id] = False
+                    if reg.subscribe:res[event.id]= True
         return res 
 
     _columns = {
@@ -229,26 +227,18 @@ class event_event(osv.osv):
             
             
         else:
-            register_pool.write(cr, uid, curr_reg_id,{'state':'open','subscribe':True,
-                            'event_id':ids[0],
-                            })
-        if isinstance(curr_reg_id, (int, long)):
-            curr_reg_id = [curr_reg_id]
+            register_pool.write(cr, uid, curr_reg_id,{'subscribe':True})
+        if isinstance(curr_reg_id, (int, long)):curr_reg_id = [curr_reg_id]
         register_pool.confirm_registration(cr,uid,curr_reg_id,context)
-        self.write(cr,uid,ids,{'subscribe':True})
         return True
     
     def unsubscribe_to_event(self,cr,uid,ids,context=None):
         register_pool = self.pool.get('event.registration')
         curr_reg_id = register_pool.search(cr,uid,[('user_id','=',uid),('event_id','=',ids[0])])
         if curr_reg_id:
-            if isinstance(curr_reg_id, (int, long)):
-                curr_reg_id = [curr_reg_id]
-            register_pool.write(cr, uid, curr_reg_id,{'event_id':ids[0],
-                                                      'subscribe':False
-                                                     })
+            if isinstance(curr_reg_id, (int, long)):curr_reg_id = [curr_reg_id]
+            register_pool.write(cr, uid, curr_reg_id,{'subscribe':False})
             register_pool.button_reg_cancel(cr,uid,curr_reg_id,context)
-            self.write(cr,uid,ids,{'subscribe':False})
         return True
 
     def _check_closing_date(self, cr, uid, ids, context=None):

From ef54b4df2e50e479e61cd69a47b569120260730d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 26 Mar 2012 16:02:12 +0530
Subject: [PATCH 21/43] [IMP]:improved code

bzr revid: apa@tinyerp.com-20120326103212-hdqu509fxbocjvil
---
 addons/event/event.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 1bdbade2e46..6cd42843194 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -222,10 +222,7 @@ class event_event(osv.osv):
                                                          'email':user.user_email,
                                                          'name':user.name,
                                                          'user_id':uid,
-                                                         'subscribe':True,
-                                                    })
-            
-            
+                                                         'subscribe':True})
         else:
             register_pool.write(cr, uid, curr_reg_id,{'subscribe':True})
         if isinstance(curr_reg_id, (int, long)):curr_reg_id = [curr_reg_id]

From 035e9c9ee081afba130735aca356a02b131b8c8d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 26 Mar 2012 16:15:31 +0530
Subject: [PATCH 22/43] [ADD]:added event share module

bzr revid: apa@tinyerp.com-20120326104531-nzsg2lyy6up8ost7
---
 addons/event_share/__init__.py            | 24 ++++++++++++
 addons/event_share/__openerp__.py         | 35 +++++++++++++++++
 addons/event_share/wizard/__init__.py     | 24 ++++++++++++
 addons/event_share/wizard/wizard_share.py | 47 +++++++++++++++++++++++
 4 files changed, 130 insertions(+)
 create mode 100644 addons/event_share/__init__.py
 create mode 100644 addons/event_share/__openerp__.py
 create mode 100644 addons/event_share/wizard/__init__.py
 create mode 100644 addons/event_share/wizard/wizard_share.py

diff --git a/addons/event_share/__init__.py b/addons/event_share/__init__.py
new file mode 100644
index 00000000000..8dbeda71145
--- /dev/null
+++ b/addons/event_share/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/event_share/__openerp__.py b/addons/event_share/__openerp__.py
new file mode 100644
index 00000000000..f6ad583364a
--- /dev/null
+++ b/addons/event_share/__openerp__.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Events Share',
+    'version': '0.1',
+    'category': 'Tools',
+    'complexity': "easy",
+    'description': """ """,
+    'author': 'OpenERP SA',
+    'depends': ['event','share'],
+    'installable': True,
+    #'application': True,
+    'auto_install': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event_share/wizard/__init__.py b/addons/event_share/wizard/__init__.py
new file mode 100644
index 00000000000..d62c6170854
--- /dev/null
+++ b/addons/event_share/wizard/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard_share
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/event_share/wizard/wizard_share.py b/addons/event_share/wizard/wizard_share.py
new file mode 100644
index 00000000000..02b5ae26009
--- /dev/null
+++ b/addons/event_share/wizard/wizard_share.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+UID_ROOT = 1
+EVENT_ACCESS = ('perm_read', 'perm_write', 'perm_create')
+
+class share_wizard_event(osv.osv_memory):
+    """Inherited share wizard to automatically create appropriate
+       menus in the selected portal upon sharing with a portal group."""
+    _inherit = "share.wizard"
+    
+    def _add_access_rights_for_share_group(self, cr, uid, group_id, mode, fields_relations, context=None):
+        print "Calling _add_access_rights_for_share_group.....!!!"
+        """Adds access rights to group_id on object models referenced in ``fields_relations``,
+           intersecting with access rights of current user to avoid granting too much rights
+        """
+        res = super(share_wizard_event, self)._add_access_rights_for_share_group(cr, uid, group_id, mode, fields_relations, context=context)
+        access_model = self.pool.get('ir.model.access')
+        access_ids =  access_model.search(cr,uid,[('group_id','=',group_id)],context = context)
+        access_model.write(cr, uid, access_ids, {'perm_read': True, 'perm_write': True})
+        return res
+
+share_wizard_event()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From afe3ea9e46c6ba85b9e03d1452b7e7dcaf64fea0 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 26 Mar 2012 16:52:21 +0530
Subject: [PATCH 23/43] [IMP]

bzr revid: apa@tinyerp.com-20120326112221-jupd2mmjc504iu2x
---
 addons/event/event.py | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 6cd42843194..b9ca4d3276f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -223,20 +223,14 @@ class event_event(osv.osv):
                                                          'name':user.name,
                                                          'user_id':uid,
                                                          'subscribe':True})
-        else:
-            register_pool.write(cr, uid, curr_reg_id,{'subscribe':True})
         if isinstance(curr_reg_id, (int, long)):curr_reg_id = [curr_reg_id]
-        register_pool.confirm_registration(cr,uid,curr_reg_id,context)
-        return True
+        return register_pool.confirm_registration(cr,uid,curr_reg_id,context)
     
     def unsubscribe_to_event(self,cr,uid,ids,context=None):
         register_pool = self.pool.get('event.registration')
         curr_reg_id = register_pool.search(cr,uid,[('user_id','=',uid),('event_id','=',ids[0])])
-        if curr_reg_id:
-            if isinstance(curr_reg_id, (int, long)):curr_reg_id = [curr_reg_id]
-            register_pool.write(cr, uid, curr_reg_id,{'subscribe':False})
-            register_pool.button_reg_cancel(cr,uid,curr_reg_id,context)
-        return True
+        if isinstance(curr_reg_id, (int, long)):curr_reg_id = [curr_reg_id]
+        return register_pool.button_reg_cancel(cr,uid,curr_reg_id,context)
 
     def _check_closing_date(self, cr, uid, ids, context=None):
         for event in self.browse(cr, uid, ids, context=context):
@@ -304,7 +298,7 @@ class event_registration(osv.osv):
 
     def confirm_registration(self, cr, uid, ids, context=None):
         self.message_append(cr, uid, ids,_('State set to open'),body_text= _('Open'))
-        return self.write(cr, uid, ids, {'state': 'open'}, context=context)
+        return self.write(cr, uid, ids, {'state': 'open','subscribe':True}, context=context)
 
 
     def registration_open(self, cr, uid, ids, context=None):
@@ -331,7 +325,7 @@ class event_registration(osv.osv):
 
     def button_reg_cancel(self, cr, uid, ids, context=None, *args):
         self.message_append(cr, uid, ids,_('State set to Cancel'),body_text= _('Cancel'))
-        return self.write(cr, uid, ids, {'state': 'cancel'})
+        return self.write(cr, uid, ids, {'state': 'cancel','subscribe':False})
 
     def mail_user(self, cr, uid, ids, context=None):
         """

From ea7cedc96d857d6e842427d770f734e492de1e9d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 26 Mar 2012 17:01:32 +0530
Subject: [PATCH 24/43] [IMP]

bzr revid: apa@tinyerp.com-20120326113132-bnodi8lyzwohf5v3
---
 addons/event/event.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index b9ca4d3276f..a69e17aa269 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -215,14 +215,13 @@ class event_event(osv.osv):
     def subscribe_to_event(self,cr,uid,ids,context=None):
         register_pool = self.pool.get('event.registration')
         user_pool = self.pool.get('res.users')
-        curr_reg_id = register_pool.search(cr,uid,[('user_id','=',uid),('event_id','=',ids[0])])
         user = user_pool.browse(cr,uid,uid,context)
+        curr_reg_id = register_pool.search(cr,uid,[('user_id','=',user.id),('event_id','=',ids[0])])
         if not curr_reg_id:
-            curr_reg_id = register_pool.create(cr, uid, {'event_id':ids[0],
-                                                         'email':user.user_email,
-                                                         'name':user.name,
-                                                         'user_id':uid,
-                                                         'subscribe':True})
+            curr_reg_id = register_pool.create(cr, uid, {'event_id':ids[0],'email':user.user_email,
+                                                         'name':user.name,'user_id':user.id,
+                                                         'subscribe':True
+                                                         })
         if isinstance(curr_reg_id, (int, long)):curr_reg_id = [curr_reg_id]
         return register_pool.confirm_registration(cr,uid,curr_reg_id,context)
     

From b79985289aaa717c2c7b886ffdf0f70150e01adf Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 26 Mar 2012 17:08:47 +0530
Subject: [PATCH 25/43] [IMP]

bzr revid: apa@tinyerp.com-20120326113847-rcw09e4bp87sn6fh
---
 addons/event/event.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index a69e17aa269..8aca855cc0a 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -287,7 +287,6 @@ class event_registration(osv.osv):
     _defaults = {
         'nb_register': 1,
         'state': 'draft',
-        #'user_id': lambda self, cr, uid, ctx: uid,
     }
     _order = 'name, create_date desc'
 

From 928171ffe79bc8db58e138db1e3ffabeb2cc82da Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 26 Mar 2012 17:15:56 +0530
Subject: [PATCH 26/43] [IMP]give rights to registration

bzr revid: sgo@tinyerp.com-20120326114556-5hfi4wga6y7w455p
---
 addons/event_share/wizard/wizard_share.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/event_share/wizard/wizard_share.py b/addons/event_share/wizard/wizard_share.py
index 02b5ae26009..8179781f432 100644
--- a/addons/event_share/wizard/wizard_share.py
+++ b/addons/event_share/wizard/wizard_share.py
@@ -37,9 +37,11 @@ class share_wizard_event(osv.osv_memory):
         """
         res = super(share_wizard_event, self)._add_access_rights_for_share_group(cr, uid, group_id, mode, fields_relations, context=context)
         access_model = self.pool.get('ir.model.access')
+        
         access_ids =  access_model.search(cr,uid,[('group_id','=',group_id)],context = context)
-        access_model.write(cr, uid, access_ids, {'perm_read': True, 'perm_write': True})
-        return res
+        for record in access_model.browse(cr,uid,access_ids,context = context):
+            if record.model_id.model == 'event.registration':
+                access_model.write(cr, uid, record.id, {'perm_read': True, 'perm_write': True,'perm_create':True})
 
 share_wizard_event()
 

From 4f69e02d1c7c92e554af40c7e7d9f835399ebaba Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 26 Mar 2012 18:18:25 +0530
Subject: [PATCH 27/43] [IMP]add share access to registration and changes in
 security view

bzr revid: sgo@tinyerp.com-20120326124825-xewmd0qc82k9hk11
---
 addons/event/event_demo.xml              |  2 +-
 addons/event/event_view.xml              |  4 ++--
 addons/event/security/event_security.xml | 16 ++++++++++++----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 5b4654342c9..b76055cd0ff 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -45,7 +45,7 @@
         <field name="register_max">350</field>
     </record>
     <record id="event_2" model="event.event">
-        <field name="name">Conference on ERP Buisness</field>
+        <field name="name">Conference on ERP Business</field>
         <field eval="time.strftime('%Y-%m-05 14:00:00')" name="date_begin"/>
         <field eval="time.strftime('%Y-%m-05 16:30:00')" name="date_end"/>
         <field name="type" ref="event_type_2"/>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 4b4f2b1e44d..ff605297944 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -63,7 +63,7 @@
                     <page string="Event">
                         <separator string="Description" colspan="4"/>
                         <field name="note" colspan="4" nolabel="1"/>
-                        <field name="registration_ids" colspan="4" nolabel="1">
+                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                             <tree string="Registration" editable="top">
                                 <field name="name" />
                                 <field name="email" />
@@ -484,7 +484,7 @@
         <menuitem
             name="Registrations"
             id="menu_action_registration" parent="base.menu_event_main"
-            action="action_registration"/>
+            action="action_registration" groups="event.group_event_manager,event.group_event_user"/>
 
 
         <menuitem name="Reporting" id="base.menu_report_association" parent="event_main_menu" sequence="20"/>
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index e7a84337bac..c0eb37d7b84 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -2,12 +2,20 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="group_event_manager" model="res.groups">
-        <field name="name">Event Manager</field>
+    <record model="ir.module.category" id="module_category_event_management">
+            <field name="name">Event</field>
+            <field name="description">Helps you manage your Events.</field>
+            <field name="sequence">3</field>
+        </record>
+
+	<record id="group_event_user" model="res.groups">
+        <field name="name">User</field>
+        <field name="category_id" ref="module_category_event_management"/>
     </record>
 
-    <record id="group_event_user" model="res.groups">
-        <field name="name">Event User</field>
+    <record id="group_event_manager" model="res.groups">
+        <field name="name">Manager</field>
+        <field name="category_id" ref="module_category_event_management"/>
     </record>
 
     <record model="res.users" id="base.user_admin">

From cc88233248b6f4bd9e088d6ed832adb66c02e439 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 27 Mar 2012 12:05:18 +0200
Subject: [PATCH 28/43] [FIX] Reference to legacy Widget#widget_parent

bzr revid: fme@openerp.com-20120327100518-p64ada2s831exv52
---
 addons/web/static/src/js/chrome.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 0aaa0398e20..4a449d1152c 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -393,7 +393,7 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab
                     if (self.db_list) {
                         self.db_list.push(self.to_object(fields)['db_name']);
                         self.db_list.sort();
-                        self.widget_parent.set_db_list(self.db_list);
+                        self.getParent().set_db_list(self.db_list);
                     }
 
                     var form_obj = self.to_object(fields);

From 3666c8515e0c1d15bdaf1012947603b4bdf16e04 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 27 Mar 2012 16:40:58 +0530
Subject: [PATCH 29/43] [IMP]:improved help

bzr revid: apa@tinyerp.com-20120327111058-b2gvgfe75ahsd813
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index f4a30a45a47..89be60ea95b 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -267,7 +267,7 @@
                         <filter icon="terp-go-today" string="Upcoming"
                                 name="upcoming"
                                 domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                                help="Up coming events from today" />
+                                help="Upcoming events from today" />
                         <field name="name"/>
                         <field name="type" widget="selection"/>
                         <field name="user_id" widget="selection">

From f268241d7ab5ce00d8f498759e7b8f6fc0401066 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Tue, 27 Mar 2012 17:28:00 +0530
Subject: [PATCH 30/43] [IMP] mail: split out the send method and define a new
 method for post-processing of sent messages

bzr revid: psi@tinyerp.com-20120327115800-mjcwrzz31sjytld0
---
 addons/mail/mail_message.py                   | 27 +++++++++++--------
 addons/mail/wizard/mail_compose_message.py    |  2 --
 .../mail/wizard/mail_compose_message_view.xml |  1 -
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index f2565decb79..db67751b017 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -464,6 +464,20 @@ class mail_message(osv.osv):
         msg['sub_type'] = msg['subtype'] or 'plain'
         return msg
 
+    def _postprocess_sent_message(self, cr, uid, message, context=None):
+        """
+        if message is set to auto_delete=True then delete that sent messages as well as attachments
+
+        :param message: the message to parse
+        """
+        if message.auto_delete:
+            self.pool.get('ir.attachment').unlink(cr, uid,
+                                                  [x.id for x in message.attachment_ids \
+                                                        if x.res_model == self._name and \
+                                                           x.res_id == message.id],
+                                                  context=context)
+            message.unlink()
+        return True
 
     def send(self, cr, uid, ids, auto_commit=False, context=None):
         """Sends the selected emails immediately, ignoring their current
@@ -521,18 +535,9 @@ class mail_message(osv.osv):
                     message.write({'state':'sent', 'message_id': res})
                 else:
                     message.write({'state':'exception'})
-                model_pool = self.pool.get(message.model)
-                if hasattr(model_pool, '_hook_message_sent'):
-                    model_pool._hook_message_sent(cr, uid, message.res_id, context=context)
-                # if auto_delete=True then delete that sent messages as well as attachments
                 message.refresh()
-                if message.state == 'sent' and message.auto_delete:
-                    self.pool.get('ir.attachment').unlink(cr, uid,
-                                                          [x.id for x in message.attachment_ids \
-                                                                if x.res_model == self._name and \
-                                                                   x.res_id == message.id],
-                                                          context=context)
-                    message.unlink()
+                if message.state == 'sent':
+                    self._postprocess_sent_message(cr, uid, message, context=context)
             except Exception:
                 _logger.exception('failed sending mail.message %s', message.id)
                 message.write({'state':'exception'})
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 4f1163c0d69..f82132a2842 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -100,7 +100,6 @@ class mail_compose_message(osv.osv_memory):
         if not result.get('email_from'):
             current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
             result['email_from'] = current_user.user_email or False
-        result['subtype'] = 'html'
         return result
 
     _columns = {
@@ -161,7 +160,6 @@ class mail_compose_message(osv.osv_memory):
             result.update({
                     'subtype' : message_data.subtype or 'plain', # default to the text version due to quoting
                     'body_text' : body,
-                    'body_html' : message_data.body_html,
                     'subject' : subject,
                     'attachment_ids' : [],
                     'model' : message_data.model or False,
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 3a44b040139..d559d679c8b 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -23,7 +23,6 @@
                     <notebook colspan="4">
                         <page string="Body">
                             <field name="body_text" colspan="4" nolabel="1" height="300" width="300"/>
-                            <field name="body_html" invisible="1"/>
                         </page>
                         <page string="Attachments">
                             <field name="attachment_ids" colspan="4" nolabel="1"/>

From 94c7dff4eafb5b64ae6326d31e12fda03b209b74 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 27 Mar 2012 17:13:57 +0200
Subject: [PATCH 31/43] [FIX] usage issue of py.eval: in py.js 0.4, it returns
 a JS object not a PY object, so .toJSON should not be called on the result

bzr revid: xmo@openerp.com-20120327151357-4en4skjqb66b816c
---
 addons/web/static/src/js/view_form.js | 2 +-
 addons/web/static/src/js/view_page.js | 2 +-
 addons/web/static/src/js/views.js     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 8b1ec3098a6..b6788d979a5 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1605,7 +1605,7 @@ openerp.web.form.FieldFloat = openerp.web.form.FieldChar.extend({
     init: function (view, node) {
         this._super(view, node);
         if (node.attrs.digits) {
-            this.digits = py.eval(node.attrs.digits).toJSON();
+            this.digits = py.eval(node.attrs.digits);
         } else {
             this.digits = view.fields_view.fields[node.attrs.name].digits;
         }
diff --git a/addons/web/static/src/js/view_page.js b/addons/web/static/src/js/view_page.js
index 50cc95cdea6..1e7c570abdf 100644
--- a/addons/web/static/src/js/view_page.js
+++ b/addons/web/static/src/js/view_page.js
@@ -93,7 +93,7 @@ openerp.web.page = function (openerp) {
         init: function (view, node) {
             this._super(view, node);
             if (node.attrs.digits) {
-                this.digits = py.eval(node.attrs.digits).toJSON();
+                this.digits = py.eval(node.attrs.digits);
             } else {
                 this.digits = view.fields_view.fields[node.attrs.name].digits;
             }
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 5be0fad74f0..43ecc8444fc 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -763,7 +763,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
         _(log_records.reverse()).each(function (record) {
             var context = {};
             if (record.context) {
-                try { context = py.eval(record.context).toJSON(); }
+                try { context = py.eval(record.context); }
                 catch (e) { /* TODO: what do I do now? */ }
             }
             $(_.str.sprintf('<li><a href="#">%s</a></li>', record.name))

From c86b24b4c3a7206f3725ed83200270191dfc9dd6 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 27 Mar 2012 21:32:12 +0200
Subject: [PATCH 32/43] [FIX] Add 'More...' feature to main menu

bzr revid: fme@openerp.com-20120327193212-kflgwnvxp89lkqmb
---
 addons/web/static/src/css/base.css  | 615 +++++++++++++++-------------
 addons/web/static/src/css/base.sass |  14 +
 addons/web/static/src/js/chrome.js  |  29 ++
 addons/web/static/src/xml/base.xml  |   6 +
 4 files changed, 388 insertions(+), 276 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index dab8e6070af..8bf4208ba72 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -5,279 +5,342 @@
   color: #4c4c4c;
   font-size: 13px;
   background: white;
-  position: relative; }
-  .openerp2 a {
-    text-decoration: none; }
-  .openerp2 .oe_webclient {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0; }
-    .openerp2 .oe_webclient .oe_application {
-      position: absolute;
-      top: 32px;
-      bottom: 0;
-      left: 206px;
-      right: 0; }
-  .openerp2 .oe_content_full_screen .oe_application {
-    top: 0;
-    left: 0; }
-  .openerp2 .oe_content_full_screen .topbar, .openerp2 .oe_content_full_screen .leftbar {
-    display: none; }
-  .openerp2 .oe_topbar {
-    width: 100%;
-    height: 31px;
-    border-top: solid 1px #d3d3d3;
-    border-bottom: solid 1px black;
-    background-color: #646060;
-    background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
-    background-image: -webkit-linear-gradient(top, #646060, #262626);
-    background-image: -moz-linear-gradient(top, #646060, #262626);
-    background-image: -ms-linear-gradient(top, #646060, #262626);
-    background-image: -o-linear-gradient(top, #646060, #262626);
-    background-image: linear-gradient(to bottom, #646060, #262626); }
-    .openerp2 .oe_topbar .oe_systray {
-      float: right; }
-    .openerp2 .oe_topbar .oe_systray > div {
-      float: left;
-      padding: 0 4px 0 4px; }
-    .openerp2 .oe_topbar .oe_topbar_item li {
-      float: left; }
-      .openerp2 .oe_topbar .oe_topbar_item li a {
-        display: block;
-        padding: 5px 10px 7px;
-        line-height: 20px;
-        height: 20px;
-        color: #eeeeee;
-        vertical-align: top;
-        text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); }
-        .openerp2 .oe_topbar .oe_topbar_item li a:hover {
-          background: #303030;
-          color: white;
-          -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-          -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-          -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; }
-    .openerp2 .oe_topbar .oe_topbar_item .oe_active {
-      background: #303030;
-      font-weight: bold;
-      color: white;
-      -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-      -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-      -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; }
-    .openerp2 .oe_topbar .oe_topbar_avatar {
-      width: 24px;
-      height: 24px;
-      margin: -2px 2px 0 0;
-      -moz-border-radius: 4px;
-      -webkit-border-radius: 4px;
-      border-radius: 4px; }
-    .openerp2 .oe_topbar .oe_topbar_avatar {
-      vertical-align: top; }
-  .openerp2 .oe_leftbar {
-    width: 205px;
-    height: 100%;
-    background: #f0eeee;
-    border-right: 1px solid #afafb6;
-    overflow: auto;
-    text-shadow: 0 1px 1px white; }
-    .openerp2 .oe_leftbar .oe_footer {
-      position: absolute;
-      width: 205px;
-      text-align: center;
-      bottom: 8px; }
-  .openerp2 a.oe_logo {
-    display: block;
-    text-align: center;
-    height: 70px;
-    line-height: 70px; }
-    .openerp2 a.oe_logo img {
-      height: 40px;
-      width: 157px;
-      margin: 14px 0; }
-  .openerp2 .oe_footer {
-    position: absolute;
-    width: 205px;
-    text-align: center;
-    bottom: 8px; }
-    .openerp2 .oe_footer a {
-      font-weight: 800;
-      font-family: serif;
-      font-size: 16px;
-      color: black; }
-      .openerp2 .oe_footer a span {
-        color: #c81010;
-        font-style: italic; }
-  .openerp2 .oe_menu {
-    float: left;
-    padding: 0;
-    margin: 0; }
-    .openerp2 .oe_menu li {
-      list-style-type: none;
-      float: left; }
-    .openerp2 .oe_menu a {
-      display: block;
-      padding: 5px 10px 7px;
-      line-height: 20px;
-      height: 20px;
-      color: #eeeeee;
-      vertical-align: top;
-      text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); }
-      .openerp2 .oe_menu a:hover {
-        background: #303030;
-        color: white;
-        -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-        -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-        -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; }
-    .openerp2 .oe_menu .oe_active {
-      background: #303030;
-      font-weight: bold;
-      color: white;
-      -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-      -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-      -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; }
-  .openerp2 .oe_secondary_menu_section {
-    font-weight: bold;
-    margin-left: 8px;
-    color: #8a89ba; }
-  .openerp2 .oe_secondary_submenu {
-    padding: 2px 0 8px 0;
-    margin: 0;
-    width: 100%;
-    display: inline-block; }
-    .openerp2 .oe_secondary_submenu li {
-      position: relative;
-      padding: 1px 0 1px 16px;
-      list-style-type: none; }
-      .openerp2 .oe_secondary_submenu li a {
-        display: block;
-        color: #4c4c4c;
-        padding: 2px 4px 2px 0; }
-      .openerp2 .oe_secondary_submenu li .oe_menu_label {
-        position: absolute;
-        top: 1px;
-        right: 1px;
-        font-size: 10px;
-        background: #8a89ba;
-        color: white;
-        padding: 2px 4px;
-        margin: 1px 6px 0 0;
-        border: 1px solid lightGray;
-        text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-        -moz-border-radius: 4px;
-        -webkit-border-radius: 4px;
-        border-radius: 4px;
-        -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-        -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-        -box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); }
-    .openerp2 .oe_secondary_submenu .oe_active {
-      background: #8a89ba;
-      border-top: 1px solid lightGray;
-      border-bottom: 1px solid lightGray;
-      text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-      -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-      -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-      -box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); }
-      .openerp2 .oe_secondary_submenu .oe_active a {
-        color: white; }
-      .openerp2 .oe_secondary_submenu .oe_active .oe_menu_label {
-        background: #eeeeee;
-        color: #8a89ba;
-        text-shadow: 0 1px 1px white;
-        -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-        -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-        -box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); }
-    .openerp2 .oe_secondary_submenu .oe_menu_toggler:before {
-      width: 0;
-      height: 0;
-      display: inline-block;
-      content: "&darr";
-      text-indent: -99999px;
-      vertical-align: top;
-      margin-left: -8px;
-      margin-top: 4px;
-      margin-right: 4px;
-      border-top: 4px solid transparent;
-      border-bottom: 4px solid transparent;
-      border-left: 4px solid #4c4c4c;
-      filter: alpha(opacity=50);
-      opacity: 0.5; }
-    .openerp2 .oe_secondary_submenu .oe_menu_opened:before {
-      margin-top: 6px;
-      margin-left: -12px;
-      margin-right: 4px;
-      border-left: 4px solid transparent;
-      border-right: 4px solid transparent;
-      border-top: 4px solid #4c4c4c; }
-  .openerp2 .oe_user_menu {
-    float: right;
-    padding: 0;
-    margin: 0; }
-    .openerp2 .oe_user_menu li {
-      list-style-type: none;
-      float: left; }
-    .openerp2 .oe_user_menu .oe_dropdown {
-      position: relative; }
-    .openerp2 .oe_user_menu .oe_dropdown_toggle:after {
-      width: 0;
-      height: 0;
-      display: inline-block;
-      content: "&darr";
-      text-indent: -99999px;
-      vertical-align: top;
-      margin-top: 8px;
-      margin-left: 4px;
-      border-left: 4px solid transparent;
-      border-right: 4px solid transparent;
-      border-top: 4px solid white;
-      filter: alpha(opacity=50);
-      opacity: 0.5; }
-    .openerp2 .oe_user_menu .oe_dropdown_options {
-      float: left;
-      background: #333333;
-      background: rgba(37, 37, 37, 0.9);
-      display: none;
-      position: absolute;
-      top: 32px;
-      right: -1px;
-      border: 0;
-      z-index: 900;
-      margin-left: 0;
-      margin-right: 0;
-      padding: 6px 0;
-      zoom: 1;
-      border-color: #999999;
-      border-color: rgba(0, 0, 0, 0.2);
-      border-style: solid;
-      border-width: 0 1px 1px;
-      -moz-border-radius: 0 0 6px 6px;
-      -webkit-border-radius: 0 0 6px 6px;
-      border-radius: 0 0 6px 6px;
-      -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-      -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-      -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-      -webkit-background-clip: padding-box;
-      -moz-background-clip: padding-box;
-      background-clip: padding-box; }
-      .openerp2 .oe_user_menu .oe_dropdown_options li {
-        float: none;
-        display: block;
-        background-color: none; }
-        .openerp2 .oe_user_menu .oe_dropdown_options li a {
-          display: block;
-          padding: 4px 15px;
-          clear: both;
-          font-weight: normal;
-          line-height: 18px;
-          color: #eeeeee; }
-          .openerp2 .oe_user_menu .oe_dropdown_options li a:hover {
-            background-color: #292929;
-            background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919));
-            background-image: -webkit-linear-gradient(top, #292929, #191919);
-            background-image: -moz-linear-gradient(top, #292929, #191919);
-            background-image: -ms-linear-gradient(top, #292929, #191919);
-            background-image: -o-linear-gradient(top, #292929, #191919);
-            background-image: linear-gradient(to bottom, #292929, #191919);
-            -moz-box-shadow: none;
-            -webkit-box-shadow: none;
-            -box-shadow: none; }
+  position: relative;
+}
+.openerp2 a {
+  text-decoration: none;
+}
+.openerp2 .oe_webclient {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+.openerp2 .oe_webclient .oe_application {
+  position: absolute;
+  top: 32px;
+  bottom: 0;
+  left: 206px;
+  right: 0;
+}
+.openerp2 .oe_content_full_screen .oe_application {
+  top: 0;
+  left: 0;
+}
+.openerp2 .oe_content_full_screen .topbar, .openerp2 .oe_content_full_screen .leftbar {
+  display: none;
+}
+.openerp2 .oe_topbar {
+  width: 100%;
+  height: 31px;
+  border-top: solid 1px #d3d3d3;
+  border-bottom: solid 1px black;
+  background-color: #646060;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
+  background-image: -webkit-linear-gradient(top, #646060, #262626);
+  background-image: -moz-linear-gradient(top, #646060, #262626);
+  background-image: -ms-linear-gradient(top, #646060, #262626);
+  background-image: -o-linear-gradient(top, #646060, #262626);
+  background-image: linear-gradient(to bottom, #646060, #262626);
+}
+.openerp2 .oe_topbar .oe_systray {
+  float: right;
+}
+.openerp2 .oe_topbar .oe_systray > div {
+  float: left;
+  padding: 0 4px 0 4px;
+}
+.openerp2 .oe_topbar .oe_topbar_item li {
+  float: left;
+}
+.openerp2 .oe_topbar .oe_topbar_item li a {
+  display: block;
+  padding: 5px 10px 7px;
+  line-height: 20px;
+  height: 20px;
+  color: #eeeeee;
+  vertical-align: top;
+  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+}
+.openerp2 .oe_topbar .oe_topbar_item li a:hover {
+  background: #303030;
+  color: white;
+  -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
+  -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
+  -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
+}
+.openerp2 .oe_topbar .oe_topbar_item .oe_active {
+  background: #303030;
+  font-weight: bold;
+  color: white;
+  -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
+  -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
+  -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
+}
+.openerp2 .oe_topbar .oe_topbar_avatar {
+  width: 24px;
+  height: 24px;
+  margin: -2px 2px 0 0;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+}
+.openerp2 .oe_topbar .oe_topbar_avatar {
+  vertical-align: top;
+}
+.openerp2 .oe_leftbar {
+  width: 205px;
+  height: 100%;
+  background: #f0eeee;
+  border-right: 1px solid #afafb6;
+  overflow: auto;
+  text-shadow: 0 1px 1px white;
+}
+.openerp2 .oe_leftbar .oe_footer {
+  position: absolute;
+  width: 205px;
+  text-align: center;
+  bottom: 8px;
+}
+.openerp2 a.oe_logo {
+  display: block;
+  text-align: center;
+  height: 70px;
+  line-height: 70px;
+}
+.openerp2 a.oe_logo img {
+  height: 40px;
+  width: 157px;
+  margin: 14px 0;
+}
+.openerp2 .oe_footer {
+  position: absolute;
+  width: 205px;
+  text-align: center;
+  bottom: 8px;
+}
+.openerp2 .oe_footer a {
+  font-weight: 800;
+  font-family: serif;
+  font-size: 16px;
+  color: black;
+}
+.openerp2 .oe_footer a span {
+  color: #c81010;
+  font-style: italic;
+}
+.openerp2 .oe_menu {
+  float: left;
+  padding: 0;
+  margin: 0;
+}
+.openerp2 .oe_menu li {
+  list-style-type: none;
+  float: left;
+}
+.openerp2 .oe_menu a {
+  display: block;
+  padding: 5px 10px 7px;
+  line-height: 20px;
+  height: 20px;
+  color: #eeeeee;
+  vertical-align: top;
+  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+}
+.openerp2 .oe_menu a:hover {
+  background: #303030;
+  color: white;
+  -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
+  -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
+  -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
+}
+.openerp2 .oe_menu .oe_active {
+  background: #303030;
+  font-weight: bold;
+  color: white;
+  -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
+  -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
+  -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
+}
+.openerp2 .oe_menu_more_container {
+  position: relative;
+}
+.openerp2 .oe_menu_more_container .oe_menu_more {
+  position: absolute;
+  padding: 0;
+  background-color: #646060;
+  z-index: 1;
+  border: 1px solid black;
+  border-bottom-left-radius: 5px;
+  border-bottom-right-radius: 5px;
+}
+.openerp2 .oe_menu_more_container .oe_menu_more li {
+  float: none;
+}
+.openerp2 .oe_menu_more_container .oe_menu_more li a {
+  white-space: nowrap;
+}
+.openerp2 .oe_secondary_menu_section {
+  font-weight: bold;
+  margin-left: 8px;
+  color: #8a89ba;
+}
+.openerp2 .oe_secondary_submenu {
+  padding: 2px 0 8px 0;
+  margin: 0;
+  width: 100%;
+  display: inline-block;
+}
+.openerp2 .oe_secondary_submenu li {
+  position: relative;
+  padding: 1px 0 1px 16px;
+  list-style-type: none;
+}
+.openerp2 .oe_secondary_submenu li a {
+  display: block;
+  color: #4c4c4c;
+  padding: 2px 4px 2px 0;
+}
+.openerp2 .oe_secondary_submenu li .oe_menu_label {
+  position: absolute;
+  top: 1px;
+  right: 1px;
+  font-size: 10px;
+  background: #8a89ba;
+  color: white;
+  padding: 2px 4px;
+  margin: 1px 6px 0 0;
+  border: 1px solid lightGray;
+  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
+  -box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
+}
+.openerp2 .oe_secondary_submenu .oe_active {
+  background: #8a89ba;
+  border-top: 1px solid lightGray;
+  border-bottom: 1px solid lightGray;
+  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
+  -box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
+}
+.openerp2 .oe_secondary_submenu .oe_active a {
+  color: white;
+}
+.openerp2 .oe_secondary_submenu .oe_active .oe_menu_label {
+  background: #eeeeee;
+  color: #8a89ba;
+  text-shadow: 0 1px 1px white;
+  -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+  -box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+}
+.openerp2 .oe_secondary_submenu .oe_menu_toggler:before {
+  width: 0;
+  height: 0;
+  display: inline-block;
+  content: "&darr";
+  text-indent: -99999px;
+  vertical-align: top;
+  margin-left: -8px;
+  margin-top: 4px;
+  margin-right: 4px;
+  border-top: 4px solid transparent;
+  border-bottom: 4px solid transparent;
+  border-left: 4px solid #4c4c4c;
+  filter: alpha(opacity=50);
+  opacity: 0.5;
+}
+.openerp2 .oe_secondary_submenu .oe_menu_opened:before {
+  margin-top: 6px;
+  margin-left: -12px;
+  margin-right: 4px;
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+  border-top: 4px solid #4c4c4c;
+}
+.openerp2 .oe_user_menu {
+  float: right;
+  padding: 0;
+  margin: 0;
+}
+.openerp2 .oe_user_menu li {
+  list-style-type: none;
+  float: left;
+}
+.openerp2 .oe_user_menu .oe_dropdown {
+  position: relative;
+}
+.openerp2 .oe_user_menu .oe_dropdown_toggle:after {
+  width: 0;
+  height: 0;
+  display: inline-block;
+  content: "&darr";
+  text-indent: -99999px;
+  vertical-align: top;
+  margin-top: 8px;
+  margin-left: 4px;
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+  border-top: 4px solid white;
+  filter: alpha(opacity=50);
+  opacity: 0.5;
+}
+.openerp2 .oe_user_menu .oe_dropdown_options {
+  float: left;
+  background: #333333;
+  background: rgba(37, 37, 37, 0.9);
+  display: none;
+  position: absolute;
+  top: 32px;
+  right: -1px;
+  border: 0;
+  z-index: 900;
+  margin-left: 0;
+  margin-right: 0;
+  padding: 6px 0;
+  zoom: 1;
+  border-color: #999999;
+  border-color: rgba(0, 0, 0, 0.2);
+  border-style: solid;
+  border-width: 0 1px 1px;
+  -moz-border-radius: 0 0 6px 6px;
+  -webkit-border-radius: 0 0 6px 6px;
+  border-radius: 0 0 6px 6px;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+  -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding-box;
+  background-clip: padding-box;
+}
+.openerp2 .oe_user_menu .oe_dropdown_options li {
+  float: none;
+  display: block;
+  background-color: none;
+}
+.openerp2 .oe_user_menu .oe_dropdown_options li a {
+  display: block;
+  padding: 4px 15px;
+  clear: both;
+  font-weight: normal;
+  line-height: 18px;
+  color: #eeeeee;
+}
+.openerp2 .oe_user_menu .oe_dropdown_options li a:hover {
+  background-color: #292929;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919));
+  background-image: -webkit-linear-gradient(top, #292929, #191919);
+  background-image: -moz-linear-gradient(top, #292929, #191919);
+  background-image: -ms-linear-gradient(top, #292929, #191919);
+  background-image: -o-linear-gradient(top, #292929, #191919);
+  background-image: linear-gradient(to bottom, #292929, #191919);
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
+  -box-shadow: none;
+}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 56a735c98fd..89d4c785967 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -194,6 +194,20 @@ $colour4: #8a89ba
             font-weight: bold
             color: white
             @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
+    .oe_menu_more_container
+        position: relative
+        .oe_menu_more
+            position: absolute
+            padding: 0
+            background-color: #646060
+            z-index: 1
+            border: 1px solid black
+            border-bottom-left-radius: 5px
+            border-bottom-right-radius: 5px
+            li
+                float: none
+                a
+                    white-space: nowrap
     .oe_secondary_menu_section
         font-weight: bold
         margin-left: 8px
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 4a449d1152c..25d41c37257 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -635,11 +635,13 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
     init: function() {
         this._super.apply(this, arguments);
         this.has_been_loaded = $.Deferred();
+        this.maximum_visible_links = 'auto'; // # of menu to show. 0 = do not crop, 'auto' = algo
     },
     start: function() {
         this._super.apply(this, arguments);
         this.$secondary_menus = this.getParent().$element.find('.oe_secondary_menus_container');
         this.$secondary_menus.on('click', 'a[data-menu]', this.on_menu_click);
+        $('html').bind('click', this.do_hide_more);
     },
     do_reload: function() {
         var self = this;
@@ -650,14 +652,40 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
         });
     },
     on_loaded: function(data) {
+        var self = this;
         this.data = data;
         this.renderElement();
+        this.limit_entries();
         this.$element.on('click', 'a[data-menu]', this.on_menu_click);
+        this.$element.on('click', 'a.oe_menu_more_link', function() {
+            self.$element.find('.oe_menu_more').toggle();
+            return false;
+        });
         this.$secondary_menus.html(QWeb.render("Menu.secondary", { widget : this }));
         // Hide second level submenus
         this.$secondary_menus.find('.oe_menu_toggler').siblings('.oe_secondary_submenu').hide();
         this.has_been_loaded.resolve();
     },
+    limit_entries: function() {
+        var maximum_visible_links = this.maximum_visible_links;
+        if (maximum_visible_links === 'auto') {
+            maximum_visible_links = this.auto_limit_entries();
+        }
+        if (maximum_visible_links) {
+            var $more = $(QWeb.render('Menu.more')),
+                $index = this.$element.find('li').eq(maximum_visible_links - 1);
+            $index.after($more);
+            $more.find('.oe_menu_more').append($index.next().nextAll());
+        }
+    },
+    auto_limit_entries: function() {
+        // TODO: auto detect overflow and bind window on resize
+        var width = $(window).width();
+        return Math.floor(width / 125);
+    },
+    do_hide_more: function() {
+        this.$element.find('.oe_menu_more').hide();
+    },
     /**
      * Opens a given menu by id, as if a user had browsed to that menu by hand
      * except does not trigger any event on the way
@@ -702,6 +730,7 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
         }
     },
     on_menu_click: function(ev, id) {
+        this.do_hide_more();
         id = id || 0;
         var $clicked_menu, manual = false;
 
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c8a6762ab34..5b3a79391a7 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -332,6 +332,12 @@
         </li>
     </ul>
 </t>
+<t t-name="Menu.more">
+    <li class="oe_menu_more_container">
+        <a href="#" class="oe_menu_more_link">More...</a>
+        <ul class="oe_menu_more" style="display: none;"/>
+    </li>
+</t>
 <t t-name="Menu.secondary">
     <div t-foreach="widget.data.data.children" t-as="menu" style="display: none" class="oe_secondary_menu" t-att-data-menu-parent="menu.id">
         <t t-foreach="menu.children" t-as="menu">

From 603485baa1ef0d905659f2cae0919cb45d57e925 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 28 Mar 2012 12:04:02 +0200
Subject: [PATCH 33/43] [IMP] Improved menu

bzr revid: fme@openerp.com-20120328100402-23zbekaomclkdwkf
---
 addons/web/static/src/css/base.css  | 22 +++++++++----------
 addons/web/static/src/css/base.sass | 33 +++++++++++++++--------------
 addons/web/static/src/xml/base.xml  |  2 +-
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 8bf4208ba72..b0a2b7945b9 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -264,19 +264,10 @@
   border-right: 4px solid transparent;
   border-top: 4px solid #4c4c4c;
 }
-.openerp2 .oe_user_menu {
-  float: right;
-  padding: 0;
-  margin: 0;
-}
-.openerp2 .oe_user_menu li {
-  list-style-type: none;
-  float: left;
-}
-.openerp2 .oe_user_menu .oe_dropdown {
+.openerp2 .oe_dropdown {
   position: relative;
 }
-.openerp2 .oe_user_menu .oe_dropdown_toggle:after {
+.openerp2 .oe_dropdown_toggle:after {
   width: 0;
   height: 0;
   display: inline-block;
@@ -291,6 +282,15 @@
   filter: alpha(opacity=50);
   opacity: 0.5;
 }
+.openerp2 .oe_user_menu {
+  float: right;
+  padding: 0;
+  margin: 0;
+}
+.openerp2 .oe_user_menu li {
+  list-style-type: none;
+  float: left;
+}
 .openerp2 .oe_user_menu .oe_dropdown_options {
   float: left;
   background: #333333;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 89d4c785967..c31f501c499 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -275,6 +275,23 @@ $colour4: #8a89ba
     // }}}
 
     // UserMenu {{{
+    .oe_dropdown
+        position: relative
+
+    .oe_dropdown_toggle:after
+        width: 0
+        height: 0
+        display: inline-block
+        content: "&darr"
+        text-indent: -99999px
+        vertical-align: top
+        margin-top: 8px
+        margin-left: 4px
+        border-left: 4px solid transparent
+        border-right: 4px solid transparent
+        border-top: 4px solid white
+        @include opacity(0.5)
+
     .oe_user_menu
         float: right
         padding: 0
@@ -282,22 +299,6 @@ $colour4: #8a89ba
         li
             list-style-type: none
             float: left
-        .oe_dropdown
-            position: relative
-
-        .oe_dropdown_toggle:after
-            width: 0
-            height: 0
-            display: inline-block
-            content: "&darr"
-            text-indent: -99999px
-            vertical-align: top
-            margin-top: 8px
-            margin-left: 4px
-            border-left: 4px solid transparent
-            border-right: 4px solid transparent
-            border-top: 4px solid white
-            @include opacity(0.5)
 
         .oe_dropdown_options
             float: left
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 5b3a79391a7..894f7353c1a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -334,7 +334,7 @@
 </t>
 <t t-name="Menu.more">
     <li class="oe_menu_more_container">
-        <a href="#" class="oe_menu_more_link">More...</a>
+        <a href="#" class="oe_menu_more_link oe_dropdown_toggle">More</a>
         <ul class="oe_menu_more" style="display: none;"/>
     </li>
 </t>

From 1a58a96f8c50f58765f759bb2ba06aedf6580ff4 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 28 Mar 2012 13:17:23 +0200
Subject: [PATCH 34/43] [IMP] Show database name in UserMenu

bzr revid: fme@openerp.com-20120328111723-cmgn9wzspn5bulnp
---
 addons/web/static/src/js/chrome.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 25d41c37257..4041843e7ea 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -843,8 +843,9 @@ openerp.web.UserMenu =  openerp.web.Widget.extend(/** @lends openerp.web.UserMen
                 return;
             var func = new openerp.web.Model("res.users").get_func("read");
             return func(self.session.uid, ["name", "company_id"]).pipe(function(res) {
-                // TODO: Only show company if multicompany in use
-                self.$element.find('.oe_topbar_name').text(res.name + '/' + res.company_id[1]);
+                // TODO: Show company if multicompany is in use
+                var topbar_name = _.str.sprintf("%s (%s)", res.name, openerp.connection.db, res.company_id[1]);
+                self.$element.find('.oe_topbar_name').text(topbar_name);
                 return self.shortcut_load();
             });
         };

From 2d6775c4072f2415e159b9857e91a603d094ffd5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 28 Mar 2012 13:31:13 +0200
Subject: [PATCH 35/43] [FIX] Do not show More menu button if unnecessary

bzr revid: fme@openerp.com-20120328113113-w925pasg7jnmxtzw
---
 addons/web/static/src/js/chrome.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 4041843e7ea..ac70d99f79f 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -671,7 +671,7 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
         if (maximum_visible_links === 'auto') {
             maximum_visible_links = this.auto_limit_entries();
         }
-        if (maximum_visible_links) {
+        if (maximum_visible_links < this.data.data.children.length) {
             var $more = $(QWeb.render('Menu.more')),
                 $index = this.$element.find('li').eq(maximum_visible_links - 1);
             $index.after($more);

From e67101cb1e1da165638b15b29d2af9e3777c5338 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 29 Mar 2012 04:35:23 +0000
Subject: [PATCH 36/43] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120328044533-hh02d2641w32kwvd
bzr revid: launchpad_translations_on_behalf_of_openerp-20120329043523-692oa8mzk47dj070
---
 openerp/addons/base/i18n/ja.po | 729 +++++++++++++++++++++++++--------
 1 file changed, 558 insertions(+), 171 deletions(-)

diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index a9a91136c1c..87930f3ddb0 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-03-27 01:45+0000\n"
+"PO-Revision-Date: 2012-03-29 01:39+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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-03-27 04:51+0000\n"
-"X-Generator: Launchpad (build 15011)\n"
+"X-Launchpad-Export-Date: 2012-03-29 04:35+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -1282,7 +1282,7 @@ msgstr "テスト"
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
 msgid "Resource Ref."
-msgstr "リソース参照"
+msgstr "リソースの参照"
 
 #. module: base
 #: model:res.country,name:base.gs
@@ -8139,7 +8139,7 @@ msgstr "RML内部ヘッダー"
 #. module: base
 #: field:ir.actions.act_window,search_view_id:0
 msgid "Search View Ref."
-msgstr "リファレンスの検索ビュー"
+msgstr "検索ビューの参照"
 
 #. module: base
 #: field:ir.module.module,installed_version:0
@@ -9015,7 +9015,7 @@ msgstr "香港"
 #. module: base
 #: field:ir.default,ref_id:0
 msgid "ID Ref."
-msgstr "ID参照"
+msgstr "IDの参照"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_address_form
@@ -9871,19 +9871,19 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_repair
 msgid "Repairs Management"
-msgstr ""
+msgstr "修繕管理"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_asset
 msgid "Assets Management"
-msgstr ""
+msgstr "資産管理"
 
 #. module: base
 #: view:ir.model.access:0
 #: view:ir.rule:0
 #: field:ir.rule,global:0
 msgid "Global"
-msgstr ""
+msgstr "グローバル"
 
 #. module: base
 #: model:ir.module.module,description:base.module_stock_planning
@@ -10138,21 +10138,185 @@ msgid ""
 "product, warehouse and company because results\n"
 "   can be unpredictable. The same applies to Forecasts lines.\n"
 msgstr ""
+"\n"
+"MPS（Master Procurement Schedule）は、最小在庫ルールに基づき動作する通常のMRP（Material "
+"Requirements Planning）とは別に手作業の調達計画の作成ができます。\n"
+"============================================================================="
+"========================\n"
+"\n"
+"====================================\n"
+"\n"
+"簡単な用語集\n"
+"--------------\n"
+"・ 在庫期間 - 販売と在庫を予測し計画するための時間の境界（開始日と終了日の間）\n"
+"・ 販売予測 - 関連する在庫期間の間に販売する予定の製品の個数\n"
+"・ 在庫計画 - 関連する在庫期間のために購入または製造する予定の製品の個数\n"
+"\n"
+"s​​ale_forecastモジュール（\"販売予測\"と\"計画\"は総額）によって使用される用語との混同を避けるために、量の値を使用することを強調す"
+"る用語、\"在庫および販売予測\"と\"在庫計画\"を使用します。\n"
+"\n"
+"どこで開始されるか\n"
+"--------------\n"
+"このモジュールは以下の３つのステップでなされます：\n"
+"\n"
+"・ 在庫期間を作成　倉庫 > コンフィギュレーション > 在庫期間メニュー（必須のステップ）\n"
+"・ 予測数量を埋めた販売予測の作成　販売 > 販売予測メニュー\n"
+"　　（オプションのステップ。しかし将来計画に役立つ）\n"
+"・ 実際のMPS計画の作成、残高をチェック、必要な調達を行う。実際の調達は在庫期間の最後のステップ\n"
+"\n"
+"在庫期間のコンフィギュレーション\n"
+"--------------------------\n"
+"倉庫 > コンフィギュレーション > 在庫期間 に期間のために２つのメニューがあります：\n"
+"\n"
+"・ 在庫期間作成 - 日次、週次、月次の自動作成が可能\n"
+"・ 在庫期間 - どんな期間のタイプの作成も日付の変更も期間の状態の変更も可能\n"
+"\n"
+"期間を作るのは最初のステップです。\"在庫期間\"にあるNewボタンを使ってカスタム期間を作成できます。\n"
+"しかし、自動作成アシスタントである\"在庫期間作成\"を使うことを勧められます。\n"
+"\n"
+"備考：\n"
+"\n"
+"・ これらの期間（在庫期間）は金融や他のシステムの期間と完全に異なっています。\n"
+"・ "
+"複数会社を持つ場合、期間は会社ごとには割り当てられません。モジュールは複数の会社には同じ期間を使うもとのしています。もし、異なる会社には異なる期間を使うこ"
+"とを望む場合は、それらは重複を許すため望むように期間を定義して下さい。以下のテキストはそのような期間をどのように使うかを示します。\n"
+"・ "
+"自動的に作成される場合、開始時間は00:00:00、終了時間は23:59:00となります。日々の期間を作成する場合、開始日時は2010年1月31日00:0"
+"0:00、終了日時は2010年1月31日29:59:00となります。それは期間の自動作成の\n"
+"\n"
+"みで機能します。期間を手動で作成する場合は、販売や在庫において間違った値を持つことになるため、その時間には注意しなければなりません。\n"
+"・ 同じ製品に対して重複する期間を使う場合、倉庫と会社の結果は予測できません。\n"
+"・ 現在日付がどの期間にも属さない場合や期間の間に空きがある場合にはその結果は予測できません。\n"
+"\n"
+"販売予測コンフィギュレーション\n"
+"-----------------------------\n"
+"販売 > 販売予測 に販売予測のための幾つかのメニューがあります：\n"
+"\n"
+"・ 販売予測作成 - 自動的にあなたのニーズによる予測ラインを作成できます。\n"
+"・ 販売予測 - 販売予測の管理\n"
+"\n"
+"\"販売予測作成\"メニューは選択された分類の製品の選択された期間、選択された倉庫の予測を作成します。以前の予測をコピーすることも可能です。\n"
+"\n"
+"備考：\n"
+"\n"
+"・ "
+"すでに同じ製品、期間、倉庫の入力が同じユーザにより作られるか検証されている場合、このツールは重複ラインを作りません。もし、他の予測を作成したい場合や適切な"
+"ラインが存在する場合は、以下に示すように手作業で行う必要があります。\n"
+"・ 作成されたラインが他の誰かにより検証された場合、同じ期間、製品、倉庫の他のラインをこのツールを使って作る事ができます。\n"
+"・ "
+"\"前回の予測をコピー\"を選択した場合、作成されたラインの数量と他の設定は、あなたの（あなたが検証したもの、まだ検証されていないがあなたが作成したもの）"
+"以前作成した予測の最後の期間の予測が使われます。\n"
+"\n"
+"\"販売予測フォーム\"の上では主にあなたが\"製品数量\"の予測数量を入力しなければなりません。\n"
+"さらに計算はドラフト予測のために有効です。しかし、検証に設定することでどんな事故的な変更からもあなたのデータを救うことが可能です。\n"
+"検証ボタンのクリックは可能ですが、必須ではありません。\n"
+"\n"
+"数量の予測の代わりに\"製品数量\"項目による予測販売の総額を入力することもできます。\n"
+"システムは製品の販売価格に応じた総額から数量を計算します。\n"
+"\n"
+"フォームの全ての値はフォームで選択した計量単位で表現されます。\n"
+"デフォルトの分類または第二の分類から計量単位を選択することができます。\n"
+"計量単位を変更した場合は、予測製品数量は 新しい計量単位によって再計算されます。\n"
+"\n"
+"販売予測の解決のために製品の\"販売履歴\"を使うことができます。\n"
+"あなたはこのテーブルの先頭と左のパラメータを入力しなければなりません。そして、システムはそれらのパラメータにより販売数量を計算します。\n"
+"そして、所定の販売チームや期間のための結果を得ることができます。\n"
+"\n"
+"MPSまたは調達計画\n"
+"---------------------------\n"
+"MPS計画は、各適切な在庫期間と倉庫のための製品の調達を分析し、状態により駆動させる在庫計画ラインによって構成されます。\n"
+"このメニューは、倉庫 > スケジュール > マスタ調達スケジュール にあります：\n"
+"\n"
+"・ 在庫計画ライン作成 - 多数の計画ラインの自動作成を手助けするウィザード\n"
+"・ マスタ調達スケジュール - 計画ラインの管理\n"
+"\n"
+"同様に、販売予測は販売計画を定義することを提供する方法であり、MPSは調達（購入/製造）を立案することができます。\n"
+"\"在庫計画ライン作成\"ウィザードはMPSを素早く使いこなすことができます。それから\"マスタ調達スケジュール\"メニューからレビューを続行できます。"
+"\n"
+"\n"
+"\"在庫計画ライン作成\"ウィザードによって、所定の製品分類、所定の期間と倉庫のために全てのMPSラインを迅速に作成できます。\n"
+"ウィザードの\"全ての製品の予測\"オプションを有効にした場合、システムは選択された期間と倉庫（このケースには選択された分類は無視されます）の販売予測を持"
+"つ全ての製品のラインを作成します。\n"
+"\n"
+"メニューの\"マスタ調達スケジュール\"の下にある、\"計画出庫\"（Planned Out）と\"計画入庫\"（Planned "
+"In）の数量はいつでも変更できます。そして、もし所定の期間でもっと多くの製品を入手する必要があるかどうかを決めるために\"在庫シミュレーション\"の値の結"
+"果を注視して下さい。\n"
+"\"計画出庫\"は、最初にすでに計画された期間と倉庫のために全て出て行く在庫の動きの合計である\"倉庫予測\"を基にします。\n"
+"もちろん、あなた自身の数量を与えるためにその値を変更することができます。予測を持つ必要はありません\n"
+"\n"
+"。\n"
+"\"計画入庫\"の数量は期間の終わりにおける\"在庫シミュレーション\"に到達するために入手されるべき数量である項目の\"入って来る残り\"を計算するため"
+"に使われます。\n"
+"\"在庫シミュレーション\"数量とフォーム上に見える最小在庫ルールを比較することができます。\n"
+"そして、最小在庫ルールと異なった数量を計画することができます。計算はデフォルトで倉庫全体のために実行されます。もし、計算された倉庫の場所の在庫の値を見たい"
+"のなら\"在庫場所のみ\"をチェックして下さい。\n"
+"\n"
+"\"計画出庫\"、\"計画入庫\"、期間の終わりの\"在庫シミュレーション\"に納得した時には、\"入って来る残り\"数量の調達を作成するために\"入って"
+"来る残り調達\"をクリックできます。\n"
+"調達に対して在庫なのか倉庫の場所を入力するかを決めることができます。\n"
+"\n"
+"もしその製品の調達や購入は望まないが他の倉庫から計算した数量を転送するのなら、\"入って来る残り調達\"の代わりに\"他の倉庫から供給\"をクリックすると"
+"システムは適切な抽出リスト（在庫移動）を作成します。\n"
+"目的地の倉庫内の宛先（在庫または入力）は調達のケース同様に取得されます。\n"
+"\n"
+"\"確認入庫\"、\"確認出庫\"、\"確認入庫前\"、\"計画出庫前\"、\"在庫シミュレーション\"の数量の更新表示をするには\"計画を計算\"をクリ"
+"ックして下さい。\n"
+"\n"
+"フォームの上の全ての値はフォームで選択された計量単位で表現されます。\n"
+"計量単位はデフォルト分類または第二の分類から選択することができます。\n"
+"計量単位を変更する場合は編集可能な数量は新しい計量単位によって再計算されます。その他は\"計画を計算\"をクリックした後に更新されます。\n"
+"\n"
+"在庫シュミレーション数量の計算\n"
+"------------------------------------------\n"
+"在庫シミュレーション値は期間終了時の推定在庫数量です。\n"
+"この計算はいつも現在期間の始まりにおける実際の在庫から始まり、計算数量を加算、減算します。\n"
+"同じ期間（現在期間が計算されるものと同じである）にある時、在庫シミュレーションは以下のように計算されます：\n"
+"\n"
+"在庫シミュレーション ＝ 現在期間の開始時点の在庫 － 計画出庫 ＋ 計画入庫\n"
+"\n"
+"現在の次の期間を計算する場合：\n"
+"\n"
+"在庫シミュレーション ＝ 現在期間の開始時点の在庫 \n"
+"　 － 現在期間の計画出庫 ＋ 現在期間の確認入庫（既に入庫を含む）\n"
+"　 － 計算期間の計画出庫 ＋ 計算期間の計画入庫\n"
+"\n"
+"上で見たように計算期間は前のケースと同じ方式ですが、現在期間は少し違っています。\n"
+"最初にシステムは現在期間のために確認された移動のみを扱っていることに注意して下さい。これは、次の期間に行く前に、現在期間の計画と調達を終えていなければなら"
+"ないことを意味します。\n"
+"\n"
+"将来期間を計画する場合：\n"
+"\n"
+"在庫シミュレーション ＝ 現在期間の開始時点の在庫 \n"
+"　 － 計算済み以前の期間の計画出庫の合計 ＋  計算済み以前の期間の確認入庫（既に入庫を含む）の合計\n"
+"　 － 計算期間の計画出庫 ＋ 計算期間の計画入庫\n"
+"\n"
+"ここで、\"計算済み以前の期間\"は現在から始まる既に計算された１つ前の期間までの全てを示します。\n"
+"\n"
+"備考：\n"
+"\n"
+"・ 年代順にしたがって各期間の計画が継続して作成されなければなりません。そうでない場合の数値は現実を反映していないでしょう。\n"
+"・ "
+"将来の期間のために計画を実行し、本物の確認出庫がいくらか前の計画出庫よりも大きくなった場合は、計画を再度行って他の調達を作ることができます。それは同じ計画"
+"ラインの中で行わねばなりません。もし他の計画ラインで行った場合は、その提案は誤っている可能性があります。\n"
+"・ "
+"幾つかの製品に対して異なった期間を適用したい場合は、２種類の期間（例えば週次と月次）を定義して、異なった期間でそれを使って下さい。例として、いつも製品Aに"
+"は週次を使い、製品Bには月次を使う場合、全ての計算は正しく行われます。異なった倉庫や会社であれば、同じ商品に異なった期間を使うこともできます。しかし、同じ"
+"製品、倉庫、会社で期間が重複するのは結果が予想できないので許されません。同じことは予測ラインにも適用されます。\n"
 
 #. module: base
 #: model:res.country,name:base.mp
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "北マリアナ諸島"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_claim_from_delivery
 msgid "Claim on Deliveries"
-msgstr ""
+msgstr "配達におけるクレーム"
 
 #. module: base
 #: model:res.country,name:base.sb
 msgid "Solomon Islands"
-msgstr ""
+msgstr "ソロモン諸島"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:537
@@ -10163,12 +10327,12 @@ msgstr ""
 #: code:addons/orm.py:4408
 #, python-format
 msgid "AccessError"
-msgstr ""
+msgstr "アクセスエラー"
 
 #. module: base
 #: view:res.request:0
 msgid "Waiting"
-msgstr ""
+msgstr "待機中"
 
 #. module: base
 #: field:ir.exports,resource:0
@@ -10176,7 +10340,7 @@ msgstr ""
 #: view:ir.property:0
 #: field:ir.property,res_id:0
 msgid "Resource"
-msgstr ""
+msgstr "リソース"
 
 #. module: base
 #: view:res.lang:0
@@ -10198,27 +10362,36 @@ msgid ""
 "    * Generates Relationship Graph\n"
 "    "
 msgstr ""
+"\n"
+"このモジュールは再編テキスト形式（RST：Restructured Text format）で選択されたモジュールのテクニカルガイドを生成します。\n"
+"============================================================================="
+"====================\n"
+"\n"
+"　・ これはRSTの実装されたSphinx（http://sphinx.pocoo.org）を使用しています。\n"
+"　・ これはインデックスファイルとモジュールごとに一つのファイルを含むtarファイル（サフィックスが.tgz）を作成します。\n"
+"　・ 関係グラフを生成します。\n"
+"    "
 
 #. module: base
 #: field:res.log,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "作成日"
 
 #. module: base
 #: view:ir.translation:0
 #: model:ir.ui.menu,name:base.menu_translation
 msgid "Translations"
-msgstr ""
+msgstr "翻訳"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_gtd
 msgid "Todo Lists"
-msgstr ""
+msgstr "ToDoリスト"
 
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Report"
-msgstr ""
+msgstr "レポート"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:218
@@ -10228,11 +10401,14 @@ msgid ""
 "instead.If SSL is needed, an upgrade to Python 2.6 on the server-side should "
 "do the trick."
 msgstr ""
+"あなたのOpenERPサーバはSMTP-over-"
+"SSLをサポートしていません。代わりにSTARTTLSを使うことができます。SSLが必要な場合は、サーバ側でPython2.6にアップグレードするにはトリ"
+"ックが必要です。"
 
 #. module: base
 #: model:res.country,name:base.ua
 msgid "Ukraine"
-msgstr ""
+msgstr "ウクライナ"
 
 #. module: base
 #: field:ir.module.module,website:0
@@ -10244,37 +10420,37 @@ msgstr "ウェブサイト"
 #. module: base
 #: selection:ir.mail_server,smtp_encryption:0
 msgid "None"
-msgstr ""
+msgstr "なし"
 
 #. module: base
 #: view:ir.module.category:0
 msgid "Module Category"
-msgstr ""
+msgstr "モジュール分類"
 
 #. module: base
 #: view:partner.wizard.ean.check:0
 msgid "Ignore"
-msgstr ""
+msgstr "無視"
 
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "Reference Guide"
-msgstr ""
+msgstr "リファレンスガイド"
 
 #. module: base
 #: view:ir.values:0
 msgid "Default Value Scope"
-msgstr ""
+msgstr "デフォルト値の範囲"
 
 #. module: base
 #: view:ir.ui.view:0
 msgid "Architecture"
-msgstr ""
+msgstr "アーキテクチャ"
 
 #. module: base
 #: model:res.country,name:base.ml
 msgid "Mali"
-msgstr ""
+msgstr "マリ共和国"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_at
@@ -10284,6 +10460,8 @@ msgid ""
 "review and adapt it with your Accountant, before using it in a live "
 "Environment."
 msgstr ""
+"このモジュールはオーストリアの標準会計表を提供します。これはBMF.gv.atのテンプレートに基づいています。実際の環境で利用する前に、あなたの会計士とと"
+"もにレビューを行い適用させる必要があることを気に留めて下さい。"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -10293,12 +10471,12 @@ msgstr "フラマン語（ベルギー）/ Vlaams (BE)"
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
-msgstr ""
+msgstr "区間数"
 
 #. module: base
 #: model:res.country,name:base.tk
 msgid "Tokelau"
-msgstr ""
+msgstr "トケラウ"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_timesheet_sheet
@@ -10328,11 +10506,32 @@ msgid ""
 "* Maximal difference between timesheet and attendances\n"
 "    "
 msgstr ""
+"\n"
+"このモジュールはタイムシートと出勤のエンコードと検証を同じビューの中で簡易にできるように手助けします。\n"
+"============================================================================="
+"======================\n"
+"\n"
+"ビューの上部は出勤と追跡（Sign In / Sign Out）イベントのためにあります。\n"
+"ビューの下部はタイムシートのためにあります。\n"
+"\n"
+"その他のタブはあなたの時間やあなたのチームの時間を分析を手助けする統計的なビューが含まれています：\n"
+"・ 日別の勤務時間（出勤を含む）\n"
+"・ プロジェクト別の勤務時間\n"
+"\n"
+"このモジュールは完全なタイムシートの検証プロセスも実装されています：\n"
+"・ ドラフトシート\n"
+"・ 従業員による期間の終わりの確認\n"
+"・ プロジェクトマネジャによる検証\n"
+"\n"
+"検証は会社に対して構成されます：\n"
+"・ 期間のサイズ（日、週、月、年）\n"
+"・ タイムシートと出勤の間の最大の相違\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.bn
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "ブルネイ・ダルサラーム国"
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail_crm
@@ -10343,6 +10542,8 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    "
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -10351,28 +10552,28 @@ msgstr ""
 #: field:ir.ui.view,type:0
 #: field:wizard.ir.model.menu.create.line,view_type:0
 msgid "View Type"
-msgstr ""
+msgstr "ビュータイプ"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_2
 msgid "User Interface"
-msgstr ""
+msgstr "ユーザインタフェース"
 
 #. module: base
 #: field:res.partner,child_ids:0
 #: field:res.request,ref_partner_id:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "パートナの参照"
 
 #. module: base
 #: field:ir.attachment,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "作成日"
 
 #. module: base
 #: help:ir.actions.server,trigger_name:0
 msgid "The workflow signal to trigger"
-msgstr ""
+msgstr "トリガのためのワークフローのシグナル"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mrp
@@ -10417,33 +10618,69 @@ msgid ""
 "    * Graph of stock value variation\n"
 "    "
 msgstr ""
+"\n"
+"これはOpenERPの製造プロセスを管理するための基本モジュールです。\n"
+"=======================================================================\n"
+"\n"
+"特徴：\n"
+"---------\n"
+"　・ 在庫の作成 / 注文の作成（ラインによる）\n"
+"　・ 複数レベルのBoMs（Mill of Materials：部品表）、制限なし\n"
+"　・ 複数レベルの経路、制限なし\n"
+"　・ 経路とワークセンターが分析的な会計とともに統合されます。\n"
+"　・ 周期的に計算するスケジューラ / ジャストインタイムモジュール\n"
+"　・ 複数のPOS、複数の倉庫\n"
+"　・ 異なったリオーダリングポリシー\n"
+"　・ 製品別の原価法：標準価格、平均価格\n"
+"　・ トラブルやニーズの簡単な分析\n"
+"　・ 非常に柔軟です。\n"
+"　・ 子やファントムBoMsを含む完全な構造での部品表の参照ができます。\n"
+"\n"
+"完全な統合と在庫可能商品の計画化、サービスの消耗品をサポートします。\n"
+"サービスは完全にソフトウェアの残り部分と統合されています。\n"
+"例えば、製品の組み立てオーダーの上で自動購入するためにBoMの中にサブ契約サービスを設定できます。\n"
+"\n"
+"このモジュールで提供されるレポート：\n"
+"--------------------------------\n"
+"　・ 部品表構造と構成品\n"
+"　・ ワークセンターでの負荷予測\n"
+"　・ 製造オーダーの印刷\n"
+"　・ 在庫の予測\n"
+"\n"
+"このモジュールで提供されるダッシュボード：\n"
+"----------------------------------\n"
+"　・ 次の製造オーダーのリスト\n"
+"　・ 例外的な調達のリスト\n"
+"　・ ワークセンターの負荷グラフ\n"
+"　・ 在庫価値の変動グラフ\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_google_base_account
 msgid "The module adds google user in res user"
-msgstr ""
+msgstr "このモジュールはresユーザの中にGoogleユーザを加えます。"
 
 #. module: base
 #: selection:base.language.install,state:0
 #: selection:base.module.import,state:0
 #: selection:base.module.update,state:0
 msgid "done"
-msgstr ""
+msgstr "完了"
 
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "General Settings"
-msgstr ""
+msgstr "一般設定"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_uy
 msgid "Uruguay - Chart of Accounts"
-msgstr ""
+msgstr "ウルグアイー会計表"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration_shortcut
 msgid "Custom Shortcuts"
-msgstr ""
+msgstr "カスタムショートカット"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -10453,45 +10690,45 @@ msgstr "ベトナム語 / Tiếng Việt"
 #. module: base
 #: model:res.country,name:base.dz
 msgid "Algeria"
-msgstr ""
+msgstr "アルジェリア"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_plugin
 msgid "CRM Plugins"
-msgstr ""
+msgstr "CRMプラグイン"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_model
 #: model:ir.model,name:base.model_ir_model
 #: model:ir.ui.menu,name:base.ir_model_model_menu
 msgid "Models"
-msgstr ""
+msgstr "モデル"
 
 #. module: base
 #: code:addons/base/ir/ir_cron.py:292
 #, python-format
 msgid "Record cannot be modified right now"
-msgstr ""
+msgstr "現在はレコードを修正することができません。"
 
 #. module: base
 #: selection:ir.actions.todo,type:0
 msgid "Launch Manually"
-msgstr ""
+msgstr "手動起動"
 
 #. module: base
 #: model:res.country,name:base.be
 msgid "Belgium"
-msgstr ""
+msgstr "ベルギー"
 
 #. module: base
 #: view:res.company:0
 msgid "Preview Header"
-msgstr ""
+msgstr "ヘッダーのプレビュー"
 
 #. module: base
 #: field:res.company,paper_format:0
 msgid "Paper Format"
-msgstr ""
+msgstr "用紙フォーマット"
 
 #. module: base
 #: field:base.language.export,lang:0
@@ -10501,12 +10738,12 @@ msgstr ""
 #: field:res.partner,lang:0
 #: field:res.users,context_lang:0
 msgid "Language"
-msgstr ""
+msgstr "言語"
 
 #. module: base
 #: model:res.country,name:base.gm
 msgid "Gambia"
-msgstr ""
+msgstr "ガンビア"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_company_form
@@ -10516,7 +10753,7 @@ msgstr ""
 #: view:res.company:0
 #: field:res.users,company_ids:0
 msgid "Companies"
-msgstr ""
+msgstr "会社"
 
 #. module: base
 #: help:res.currency,symbol:0
@@ -10526,7 +10763,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%H - Hour (24-hour clock) [00,23]."
-msgstr ""
+msgstr "%H - 時（24時間表示）[00,23]."
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:451
@@ -10534,7 +10771,7 @@ msgstr ""
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
 "instead"
-msgstr ""
+msgstr "あなたのサーバはSSLをサポートしていないように見受けられます。代わりにSTARTTLSを試すことができます。"
 
 #. module: base
 #: model:ir.model,name:base.model_res_widget
@@ -10545,7 +10782,7 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:290
 #, python-format
 msgid "Model %s does not exist!"
-msgstr ""
+msgstr "モデル %s は存在しません。"
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin
@@ -10555,33 +10792,37 @@ msgid ""
 "=====================================================\n"
 "\n"
 msgstr ""
+"\n"
+"プラグインのための共通インタフェース\n"
+"=====================================================\n"
+"\n"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_jit
 msgid "Just In Time Scheduling"
-msgstr ""
+msgstr "ジャストインタイムスケジューリング"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_bank_statement_extensions
 msgid "Bank Statement extensions to support e-banking"
-msgstr ""
+msgstr "電子バンキングをサポートするための銀行取引明細書の拡張"
 
 #. module: base
 #: view:ir.actions.server:0
 #: field:ir.actions.server,code:0
 #: selection:ir.actions.server,state:0
 msgid "Python Code"
-msgstr ""
+msgstr "Pythonコード"
 
 #. module: base
 #: help:ir.actions.server,state:0
 msgid "Type of the Action that is to be executed"
-msgstr ""
+msgstr "実行されるアクションのタイプ"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base
 msgid "The kernel of OpenERP, needed for all installation."
-msgstr ""
+msgstr "全てのインストールに必要なOpenERPのカーネル"
 
 #. module: base
 #: model:ir.model,name:base.model_osv_memory_autovacuum
@@ -10591,7 +10832,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_us
 msgid "United States - Chart of accounts"
-msgstr ""
+msgstr "アメリカ合衆国－会計表"
 
 #. module: base
 #: view:base.language.install:0
@@ -10607,27 +10848,27 @@ msgstr ""
 #: view:res.config.installer:0
 #: view:res.widget.wizard:0
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: base
 #: selection:base.language.export,format:0
 msgid "PO File"
-msgstr ""
+msgstr "POファイル"
 
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
-msgstr ""
+msgstr "中立地帯"
 
 #. module: base
 #: view:ir.model:0
 msgid "Custom"
-msgstr ""
+msgstr "カスタム"
 
 #. module: base
 #: view:res.request:0
 msgid "Current"
-msgstr ""
+msgstr "現在"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_fundraising
@@ -10643,11 +10884,20 @@ msgid ""
 "fund status.\n"
 "    "
 msgstr ""
+"\n"
+"募金\n"
+"============\n"
+"\n"
+"あなたの組織やキャンペーンを援助したいと望む時には、あなたのお金を集めるための\n"
+"全ての活動を追跡することができます。メニューは基金の説明、電子メール、歴史、\n"
+"成功の確率といった検索リストを開きます。幾つかのアクションボタンはあなたの\n"
+"他の基金の状態を簡単に変更できます。\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_margin
 msgid "Margins in Sales Orders"
-msgstr ""
+msgstr "販売注文のマージン"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_9
@@ -10658,53 +10908,53 @@ msgstr "部品仕入先"
 #: model:ir.module.category,name:base.module_category_purchase_management
 #: model:ir.module.module,shortdesc:base.module_purchase
 msgid "Purchase Management"
-msgstr ""
+msgstr "購入管理"
 
 #. module: base
 #: field:ir.module.module,published_version:0
 msgid "Published Version"
-msgstr ""
+msgstr "出版バージョン"
 
 #. module: base
 #: model:res.country,name:base.is
 msgid "Iceland"
-msgstr ""
+msgstr "アイスランド"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_window
 #: model:ir.ui.menu,name:base.menu_ir_action_window
 msgid "Window Actions"
-msgstr ""
+msgstr "ウィンドウの操作"
 
 #. module: base
 #: view:res.lang:0
 msgid "%I - Hour (12-hour clock) [01,12]."
-msgstr ""
+msgstr "%I - 時（12時間表示）[01,12]."
 
 #. module: base
 #: selection:publisher_warranty.contract.wizard,state:0
 msgid "Finished"
-msgstr ""
+msgstr "完了"
 
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
-msgstr ""
+msgstr "ドイツ"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Week of the year: %(woy)s"
-msgstr ""
+msgstr "年の通算週： %(woy)s"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_14
 msgid "Bad customers"
-msgstr ""
+msgstr "悪質顧客"
 
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "Reports :"
-msgstr ""
+msgstr "レポート："
 
 #. module: base
 #: model:ir.module.module,description:base.module_multi_company
@@ -10716,11 +10966,17 @@ msgid ""
 "This module is the base module for other multi-company modules.\n"
 "    "
 msgstr ""
+"\n"
+"このモジュールは多角経営環境のためのモジュールです。\n"
+"=======================================================\n"
+"\n"
+"このモジュールは他の複数会社のモジュールのための基本モジュールです。\n"
+"    "
 
 #. module: base
 #: sql_constraint:res.currency:0
 msgid "The currency code must be unique per company!"
-msgstr ""
+msgstr "通貨コードは会社ごとに一意でなければなりません。"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_property
@@ -10763,6 +11019,34 @@ msgid ""
 "mail. \n"
 "    "
 msgstr ""
+"\n"
+"POP/IMAP サーバ上の受信メールを取得します。\n"
+"=============================================\n"
+"\n"
+"あなたのPOP/IMAPアカウントパラメータを入力して下さい。それらのアカウントの全ての\n"
+"受信メールは自動的にOpenERPシステムの中にダウンロードされます。暗号化SSL/TLS通信を含む\n"
+"全てのPOP3/IMAP互換サーバはサポートされています。\n"
+"\n"
+"以下のような多くの電子メール対応のOpenERPドキュメントのために、電子メールベースの\n"
+"ワークフローを簡単に作成するために利用することができます：\n"
+"\n"
+"・ CRMのリード / オポチュニティ\n"
+"・ CRMのクレーム\n"
+"・ プロジェクトの問題\n"
+"・ プロジェクトのタスク\n"
+"・ 人事の人材募集（申請）\n"
+"・ 他\n"
+"\n"
+"関連アプリケーションをインストールしただけで、受信メールアカウントにどんなドキュメント\n"
+"種類（リード、プロジェクトの問題など）も割り当てることができます。新しい電子メールは\n"
+"選択した種類の新しいドキュメントを自動的に生成します。それはメールボックスからOpenERP統合\n"
+"を行うための動作です。さらに良いことに、これらのドキュメントは直接電子メールと同期する\n"
+"小さな会話として機能します。あなたはOpenERPの中から返信することができ、そして、\n"
+"その答えが戻ってきたときに自動的に収集され、同じ会話ドキュメントに添付されます。\n"
+"\n"
+"さらに特定の要求にためにはそれぞれの受信メールをトリガーとするカスタム定義アクション\n"
+"（技術的にはサーバアクション）を割り当てることもできます。 \n"
+"    "
 
 #. module: base
 #: help:ir.actions.server,email:0
@@ -10771,6 +11055,8 @@ msgid ""
 "same values as for the condition field.\n"
 "Example: object.invoice_address_id.email, or 'me@example.com'"
 msgstr ""
+"電子メールを返信するためのアドレスの表現です。状態項目については同じ値に基づきます。\n"
+"例：object.invoice_address_id.email、または 'me@example.com'"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_hello
@@ -10779,11 +11065,14 @@ msgid ""
 "        OpenERP Web example module.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERPのWebモジュールの例\n"
+"        "
 
 #. module: base
 #: model:res.country,name:base.gy
 msgid "Guyana"
-msgstr ""
+msgstr "ガイアナ"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_expiry
@@ -10828,55 +11117,55 @@ msgstr ""
 msgid ""
 "View type: set to 'tree' for a hierarchical tree view, or 'form' for other "
 "views"
-msgstr ""
+msgstr "ビュータイプ：階層的なツリービューの場合は\"ツリー\"、他のビューの場合は\"フォーム\"とセットして下さい。"
 
 #. module: base
 #: code:addons/base/res/res_config.py:385
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
-msgstr ""
+msgstr "次のアドオンを設定するには\"続行\"をクリックして下さい。"
 
 #. module: base
 #: field:ir.actions.server,record_id:0
 msgid "Create Id"
-msgstr ""
+msgstr "作成ID"
 
 #. module: base
 #: model:res.country,name:base.hn
 msgid "Honduras"
-msgstr ""
+msgstr "ホンジュラス"
 
 #. module: base
 #: help:res.users,menu_tips:0
 msgid ""
 "Check out this box if you want to always display tips on each menu action"
-msgstr ""
+msgstr "常にそれぞれのメニューアクションのヒントを表示したい場合は、このボックスをチェックして下さい。"
 
 #. module: base
 #: model:res.country,name:base.eg
 msgid "Egypt"
-msgstr ""
+msgstr "エジプト"
 
 #. module: base
 #: field:ir.rule,perm_read:0
 msgid "Apply For Read"
-msgstr ""
+msgstr "購読申し込み"
 
 #. module: base
 #: help:ir.actions.server,model_id:0
 msgid ""
 "Select the object on which the action will work (read, write, create)."
-msgstr ""
+msgstr "アクションが動作する（読込、書込、作成）オブジェクトを選択して下さい。"
 
 #. module: base
 #: field:base.language.import,name:0
 msgid "Language Name"
-msgstr ""
+msgstr "言語名"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "Boolean"
-msgstr ""
+msgstr "ブール値"
 
 #. module: base
 #: help:ir.mail_server,smtp_encryption:0
@@ -10888,11 +11177,15 @@ msgid ""
 "- SSL/TLS: SMTP sessions are encrypted with SSL/TLS through a dedicated port "
 "(default: 465)"
 msgstr ""
+"接続の暗号化方式を選択して下さい：\n"
+"・ なし: SMTPセッションはクリアテキストで行われる。\n"
+"・ TLS（STARTTLS）：TLS暗号化はSMTPセッションの開始において要求されます（推奨）。\n"
+"・ SSL/TLS：SMTPセッションは専用のポート（デフォルト：465）によってSSL/TLSで暗号化されます。"
 
 #. module: base
 #: view:ir.model:0
 msgid "Fields Description"
-msgstr ""
+msgstr "項目の説明"
 
 #. module: base
 #: model:ir.module.module,description:base.module_report_designer
@@ -10906,21 +11199,28 @@ msgid ""
 "modules like base_report_designer and base_report_creator.\n"
 "    "
 msgstr ""
+"\n"
+"隠されたレポーティングのインストーラ\n"
+"==============================\n"
+"\n"
+"レポーティングの隠されたコンフィグレーションを有効にすることで、base_report_designer や base_report_creator "
+"のようなモジュールのインストールが可能です。\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_synchro
 msgid "Multi-DB Synchronization"
-msgstr ""
+msgstr "複数DBの同期"
 
 #. module: base
 #: selection:ir.module.module,complexity:0
 msgid "Expert"
-msgstr ""
+msgstr "専門家"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_holidays
 msgid "Leaves Management"
-msgstr ""
+msgstr "休暇管理"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -10935,14 +11235,14 @@ msgstr ""
 #: view:res.partner.address:0
 #: view:workflow.activity:0
 msgid "Group By..."
-msgstr ""
+msgstr "グループ化"
 
 #. module: base
 #: view:ir.model.fields:0
 #: field:ir.model.fields,readonly:0
 #: field:res.partner.bank.type.field,readonly:0
 msgid "Readonly"
-msgstr ""
+msgstr "リードオンリー"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_todo
@@ -10951,6 +11251,9 @@ msgid ""
 "Todo list for CRM leads and opportunities.\n"
 "    "
 msgstr ""
+"\n"
+"CRMのリードとオポチュニティのためのToDoリスト\n"
+"    "
 
 #. module: base
 #: field:ir.actions.act_window.view,view_id:0
@@ -10958,38 +11261,38 @@ msgstr ""
 #: selection:ir.translation,type:0
 #: field:wizard.ir.model.menu.create.line,view_id:0
 msgid "View"
-msgstr ""
+msgstr "ビュー"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_wiki_sale_faq
 msgid "Wiki: Sale FAQ"
-msgstr ""
+msgstr "Wiki：販売FAQ"
 
 #. module: base
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "To be installed"
-msgstr ""
+msgstr "インストールする"
 
 #. module: base
 #: help:ir.actions.act_window,display_menu_tip:0
 msgid ""
 "It gives the status if the tip has to be displayed or not when a user "
 "executes an action"
-msgstr ""
+msgstr "それは、ユーザがアクションを実行した時に、ヒントが表示されるべきかどうかのステータスを与えます。"
 
 #. module: base
 #: view:ir.model:0
 #: model:ir.module.module,shortdesc:base.module_base
 #: field:res.currency,base:0
 msgid "Base"
-msgstr ""
+msgstr "基本"
 
 #. module: base
 #: field:ir.model.data,model:0
 #: field:ir.values,model:0
 msgid "Model Name"
-msgstr ""
+msgstr "モデル名"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -11007,11 +11310,17 @@ msgid ""
 "outlook, Sunbird, ical, ...\n"
 "    "
 msgstr ""
+"\n"
+"他のアプリケーションとのカレンダーの同期ができます。\n"
+"=========================================================\n"
+"\n"
+"OpenERPのカレンダーは携帯電話、Outlook、Sunbird、iCalなどと同期することができます。\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.lr
 msgid "Liberia"
-msgstr ""
+msgstr "リベリア"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_in
@@ -11038,7 +11347,7 @@ msgstr ""
 #: field:res.partner,comment:0
 #: model:res.widget,title:base.note_widget
 msgid "Notes"
-msgstr ""
+msgstr "注釈"
 
 #. module: base
 #: field:ir.config_parameter,value:0
@@ -11052,7 +11361,7 @@ msgstr ""
 #: field:ir.server.object.lines,value:0
 #: field:ir.values,value:0
 msgid "Value"
-msgstr ""
+msgstr "値"
 
 #. module: base
 #: field:ir.sequence,code:0
@@ -11060,7 +11369,7 @@ msgstr ""
 #: selection:ir.translation,type:0
 #: field:res.partner.bank.type,code:0
 msgid "Code"
-msgstr ""
+msgstr "コード"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config_installer
@@ -11070,33 +11379,33 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.mc
 msgid "Monaco"
-msgstr ""
+msgstr "モナコ"
 
 #. module: base
 #: view:base.module.import:0
 msgid "Please be patient, this operation may take a few minutes..."
-msgstr ""
+msgstr "この操作は時間がかかります。どうぞしばらくお待ち下さい。"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Minutes"
-msgstr ""
+msgstr "分"
 
 #. module: base
 #: view:res.currency:0
 msgid "Display"
-msgstr ""
+msgstr "表示"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Help"
-msgstr ""
+msgstr "ヘルプ"
 
 #. module: base
 #: help:res.users,menu_id:0
 msgid ""
 "If specified, the action will replace the standard menu for this user."
-msgstr ""
+msgstr "もし指定した場合は、このアクションは標準メニューを置き換えます。"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_google_map
@@ -11106,12 +11415,12 @@ msgstr ""
 #. module: base
 #: model:ir.actions.report.xml,name:base.preview_report
 msgid "Preview Report"
-msgstr ""
+msgstr "レポートのプレビュー"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_purchase_analytic_plans
 msgid "Purchase Analytic Plans"
-msgstr ""
+msgstr "分析計画の購入"
 
 #. module: base
 #: model:ir.module.module,description:base.module_analytic_journal_billing_rate
@@ -11132,17 +11441,29 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"このモジュールは所定のアカウントで特定のジャーナルのデフォルト請求レートを定義することができます。\n"
+"============================================================================="
+"=================================\n"
+"\n"
+"これは主にユーザが自身のタイムシートをエンコードする時に使用されています：\n"
+"値は取り出され、そして項目は自動的に埋められます。しかし、これらの値の変更は可能です。\n"
+"\n"
+"現在のアカウントに何のデータも記録されていないことが明らかな場合は、このモジュールは古い構成と完全に互換性があるためアカウントデータによるデフォルト値がい"
+"つものように与えられます。\n"
+"\n"
+"    "
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_fundrising
 msgid "Fund Raising"
-msgstr ""
+msgstr "資金調達"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_type
 #: model:ir.ui.menu,name:base.menu_ir_sequence_type
 msgid "Sequence Codes"
-msgstr ""
+msgstr "順序コード"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -11155,21 +11476,22 @@ msgid ""
 "All pending configuration wizards have been executed. You may restart "
 "individual wizards via the list of configuration wizards."
 msgstr ""
+"全ての保留中のコンフィギュレーションウィザードは実行されました。あなたはコンフィグレーションウィザードのリストを介して、個別ウィザードの再起動ができます。"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Current Year with Century: %(year)s"
-msgstr ""
+msgstr "世紀を持つ現在の年：%(year)s"
 
 #. module: base
 #: field:ir.exports,export_fields:0
 msgid "Export ID"
-msgstr ""
+msgstr "エクスポートID"
 
 #. module: base
 #: model:res.country,name:base.fr
 msgid "France"
-msgstr ""
+msgstr "フランス"
 
 #. module: base
 #: model:ir.model,name:base.model_res_log
@@ -11180,12 +11502,12 @@ msgstr ""
 #: view:workflow.activity:0
 #: field:workflow.activity,flow_stop:0
 msgid "Flow Stop"
-msgstr ""
+msgstr "フローの停止"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Weeks"
-msgstr ""
+msgstr "週"
 
 #. module: base
 #: code:addons/base/res/res_company.py:157
@@ -11196,71 +11518,71 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.af
 msgid "Afghanistan, Islamic State of"
-msgstr ""
+msgstr "アフガニスタン・イスラム共和国"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_import.py:60
 #: code:addons/base/module/wizard/base_module_import.py:68
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "エラー"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_marketing_campaign_crm_demo
 msgid "Marketing Campaign - Demo"
-msgstr ""
+msgstr "マーケティングキャンペーン－デモ"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail_hr_recruitment
 msgid "eMail Gateway for Applicants"
-msgstr ""
+msgstr "応募者のためのEメールゲートウェイ"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_coda
 msgid "Belgium - Import bank CODA statements"
-msgstr ""
+msgstr "ベルギー－CODA銀行明細書のインポート"
 
 #. module: base
 #: field:ir.cron,interval_type:0
 msgid "Interval Unit"
-msgstr ""
+msgstr "間隔の単位"
 
 #. module: base
 #: field:publisher_warranty.contract,kind:0
 #: field:workflow.activity,kind:0
 msgid "Kind"
-msgstr ""
+msgstr "種類"
 
 #. module: base
 #: code:addons/orm.py:4368
 #, python-format
 msgid "This method does not exist anymore"
-msgstr ""
+msgstr "この方法はもはや存在していません。"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_import_google
 msgid "Google Import"
-msgstr ""
+msgstr "Googleインポート"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_12
 msgid "Segmentation"
-msgstr ""
+msgstr "分割"
 
 #. module: base
 #: field:res.lang,thousands_sep:0
 msgid "Thousands Separator"
-msgstr ""
+msgstr "千単位の桁区切り記号"
 
 #. module: base
 #: field:res.request,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "作成日"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Keywords"
-msgstr ""
+msgstr "キーワード"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_cn
@@ -11272,24 +11594,24 @@ msgstr "中国－会計"
 #: field:ir.model.access,perm_read:0
 #: view:ir.rule:0
 msgid "Read Access"
-msgstr ""
+msgstr "読み込みアクセス"
 
 #. module: base
 #: help:ir.actions.server,loop_action:0
 msgid ""
 "Select the action that will be executed. Loop action will not be avaliable "
 "inside loop."
-msgstr ""
+msgstr "実行するアクションを選択して下さい。ループアクションはループの内側では利用できません。"
 
 #. module: base
 #: help:ir.model.data,res_id:0
 msgid "ID of the target record in the database"
-msgstr ""
+msgstr "データベース内の目的レコードのID"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_analytic_analysis
 msgid "Contracts Management"
-msgstr ""
+msgstr "コンタクト管理"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -11304,27 +11626,27 @@ msgstr ""
 #. module: base
 #: view:ir.model:0
 msgid "In Memory"
-msgstr ""
+msgstr "メモリー内"
 
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Todo"
-msgstr ""
+msgstr "ToDo"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_visible_discount
 msgid "Prices Visible Discounts"
-msgstr ""
+msgstr "割引が明示された価格"
 
 #. module: base
 #: field:ir.attachment,datas:0
 msgid "File Content"
-msgstr ""
+msgstr "ファイルの内容"
 
 #. module: base
 #: model:res.country,name:base.pa
 msgid "Panama"
-msgstr ""
+msgstr "パナマ"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -11345,6 +11667,19 @@ msgid ""
 "account numbers\n"
 "    "
 msgstr ""
+"\n"
+"改良された電子バンキングをサポートするため、標準の account_bank_statement_line "
+"オブジェクトを拡張するためのモジュールです。\n"
+"\n"
+"追加項目\n"
+"・ 貨幣交換日付\n"
+"・ バッチ支払い\n"
+"・ 銀行取引明細書行の変更のトレーサビリティ\n"
+"・ 銀行取引明細書行のビュー\n"
+"・ 銀行取引明細書の残高レポート\n"
+"・ 銀行取引明細書のデジタルインポートにおける性能向上（'ebanking_import'コンテキストフラグを通して）\n"
+"・ res.partner.bankの拡張されたname_searchは銀行とIBAN口座番号の検索ができます。\n"
+"    "
 
 #. module: base
 #: code:addons/orm.py:1895
@@ -11383,31 +11718,63 @@ msgid ""
 "            "
 "fields_to_search.update(view_root.xpath(\"//field[@select=1]/@name"
 msgstr ""
+"%s のために、カレンダービューを作成するために不十分な項目です。date_stop あるいは date_delay が欠けています。 \" % "
+"(self._name)))\n"
+"\n"
+"        return view\n"
+"\n"
+"    def _get_default_search_view(self, cr, uid, context=None):\n"
+"        \"\n"
+"        :param cr: database cursor\n"
+"        :param int user: user id\n"
+"        :param dict context: connection context\n"
+"        :returns: an lxml document of the view\n"
+"        :rtype: etree._Element\n"
+"        \"\n"
+"        form_view = self.fields_view_get(cr, uid, False, 'form', "
+"context=context)\n"
+"        tree_view = self.fields_view_get(cr, uid, False, 'tree', "
+"context=context)\n"
+"\n"
+"        # TODO it seems _all_columns could be used instead of fields_get (no "
+"need for translated fields info)\n"
+"        fields = self.fields_get(cr, uid, context=context)\n"
+"        fields_to_search = set(\n"
+"            field for field, descriptor in fields.iteritems()\n"
+"            if descriptor.get('select'))\n"
+"\n"
+"        for view in (form_view, tree_view):\n"
+"            view_root = etree.fromstring(view['arch'])\n"
+"            # Only care about select=1 in xpath below, because select=2 is "
+"covered\n"
+"            # by the custom advanced search in clients\n"
+"            "
+"fields_to_search.update(view_root.xpath(\"//field[@select=1]/@name"
 
 #. module: base
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "選択された会社は、このユーザに許された会社ではありません。"
 
 #. module: base
 #: model:res.country,name:base.gi
 msgid "Gibraltar"
-msgstr ""
+msgstr "ジブラルタル"
 
 #. module: base
 #: field:ir.actions.report.xml,report_name:0
 msgid "Service Name"
-msgstr ""
+msgstr "サービス名"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_import_base
 msgid "Framework for complex import"
-msgstr ""
+msgstr "複雑なインポートのためのフレームワーク"
 
 #. module: base
 #: view:ir.actions.todo.category:0
 msgid "Wizard Category"
-msgstr ""
+msgstr "ウィザードの分類"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -11420,28 +11787,35 @@ msgid ""
 "journal. If set to true it allows user to cancel entries & invoices.\n"
 "    "
 msgstr ""
+"\n"
+"会計入力のキャンセルができます。\n"
+"=====================================\n"
+"\n"
+"このモジュールはアカウントジャーナルのフォームビューに\"入力のキャンセルを許可\"項目を追加します。Trueが設定されている場合は、ユーザは入力と請求書"
+"をキャンセルすることができます。\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_rule
 #: model:ir.ui.menu,name:base.menu_action_rule
 msgid "Record Rules"
-msgstr ""
+msgstr "レコードのルール"
 
 #. module: base
 #: field:res.users,name:0
 msgid "User Name"
-msgstr ""
+msgstr "ユーザ名"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Day of the year: %(doy)s"
-msgstr ""
+msgstr "年の通算日：%(doy)s"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_portal
 #: model:ir.module.module,shortdesc:base.module_portal
 msgid "Portal"
-msgstr ""
+msgstr "ポータル"
 
 #. module: base
 #: model:ir.module.module,description:base.module_claim_from_delivery
@@ -11452,20 +11826,25 @@ msgid ""
 "\n"
 "Adds a Claim link to the delivery order.\n"
 msgstr ""
+"\n"
+"配達注文からクレームを作成します。\n"
+"=====================================\n"
+"\n"
+"配達注文にクレームのリンクを加えます。\n"
 
 #. module: base
 #: view:ir.model:0
 #: view:ir.model.fields:0
 #: view:workflow.activity:0
 msgid "Properties"
-msgstr ""
+msgstr "プロパティ"
 
 #. module: base
 #: help:ir.sequence,padding:0
 msgid ""
 "OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
 "get the required padding size."
-msgstr ""
+msgstr "OpenERPは自動的に\"次の番号\"に要求されているサイズに応じて左側に0を加えます。"
 
 #. module: base
 #: constraint:res.partner.bank:0
@@ -11474,26 +11853,28 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"正当な支払いを行うために銀行タイプIBAN口座のための銀行にBIC/Swiftコードを定義して下さい。"
 
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
-msgstr ""
+msgstr "%A - 曜日のフルネーム"
 
 #. module: base
 #: help:ir.values,user_id:0
 msgid "If set, action binding only applies for this user."
-msgstr ""
+msgstr "設定すると、アクションバインディングはこのユーザのみに適用されます。"
 
 #. module: base
 #: model:res.country,name:base.gw
 msgid "Guinea Bissau"
-msgstr ""
+msgstr "ギニアビサウ"
 
 #. module: base
 #: field:ir.actions.act_window,search_view:0
 msgid "Search View"
-msgstr ""
+msgstr "検索ビュー"
 
 #. module: base
 #: view:base.language.import:0
@@ -11503,7 +11884,7 @@ msgstr ""
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
-msgstr ""
+msgstr "言語のコードは固有でなければなりません。"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_attachment
@@ -11511,7 +11892,7 @@ msgstr ""
 #: view:ir.attachment:0
 #: model:ir.ui.menu,name:base.menu_action_attachment
 msgid "Attachments"
-msgstr ""
+msgstr "添付"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_uy
@@ -11523,34 +11904,40 @@ msgid ""
 "Provide Templates for Chart of Accounts, Taxes for Uruguay\n"
 "\n"
 msgstr ""
+"\n"
+"一般的な会計表\n"
+"=========================\n"
+"\n"
+"ウルグアイのための会計表と税金のためのテンプレートを提供します。\n"
+"\n"
 
 #. module: base
 #: help:res.company,bank_ids:0
 msgid "Bank accounts related to this company"
-msgstr ""
+msgstr "この会社に関連した銀行口座"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_partner
 #: model:ir.ui.menu,name:base.menu_sale_config_sales
 #: model:ir.ui.menu,name:base.menu_sales
 msgid "Sales"
-msgstr ""
+msgstr "販売"
 
 #. module: base
 #: field:ir.actions.server,child_ids:0
 msgid "Other Actions"
-msgstr ""
+msgstr "その他のアクション"
 
 #. module: base
 #: selection:ir.actions.todo,state:0
 msgid "Done"
-msgstr ""
+msgstr "完了"
 
 #. module: base
 #: help:ir.cron,doall:0
 msgid ""
 "Specify if missed occurrences should be executed when the server restarts."
-msgstr ""
+msgstr "サーバを再起動する際に、失敗していた事象が実行されるべきかどうかを定義して下さい。"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_miss
@@ -11562,12 +11949,12 @@ msgstr ""
 #: field:ir.model.access,perm_write:0
 #: view:ir.rule:0
 msgid "Write Access"
-msgstr ""
+msgstr "書き込みアクセス"
 
 #. module: base
 #: view:res.lang:0
 msgid "%m - Month number [01,12]."
-msgstr ""
+msgstr "%m - 月[01,12]."
 
 #. module: base
 #: field:res.bank,city:0
@@ -11576,17 +11963,17 @@ msgstr ""
 #: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
-msgstr ""
+msgstr "市"
 
 #. module: base
 #: model:res.country,name:base.qa
 msgid "Qatar"
-msgstr ""
+msgstr "カタール"
 
 #. module: base
 #: model:res.country,name:base.it
 msgid "Italy"
-msgstr ""
+msgstr "イタリア"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -12900,7 +13287,7 @@ msgstr ""
 #. module: base
 #: field:ir.default,ref_table:0
 msgid "Table Ref."
-msgstr ""
+msgstr "テーブルの参照"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:443
@@ -13052,7 +13439,7 @@ msgstr ""
 #. module: base
 #: field:ir.ui.view_sc,user_id:0
 msgid "User Ref."
-msgstr ""
+msgstr "ユーザの参照"
 
 #. module: base
 #: code:addons/base/res/res_users.py:118
@@ -13361,7 +13748,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.act_window,view_id:0
 msgid "View Ref."
-msgstr ""
+msgstr "ビューの参照"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_sales_management

From 8c06f8ee1f9f11cf562f0595c4832263cf45cfe3 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 28 Mar 2012 14:12:24 +0200
Subject: [PATCH 37/43] [FIX] base: removed main menu reporting from extended
 view

bzr revid: qdp-launchpad@openerp.com-20120328121224-owstjwqkc6e3oe7a
---
 openerp/addons/base/base_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 050b1e5adf1..83460dee9af 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -27,7 +27,7 @@
             parent="base.menu_custom" name="Reporting" sequence="30"
              />
 
-        <menuitem id="base.menu_reporting" name="Reporting" sequence="45" groups="base.group_extended"/>
+        <menuitem id="base.menu_reporting" name="Reporting" sequence="45"/>
         <menuitem id="base.menu_reporting_dashboard" name="Dashboards" sequence="0" parent="base.menu_reporting" groups="base.group_extended"/>
         <menuitem id="menu_audit" name="Audit" parent="base.menu_reporting" sequence="50"/>
         <menuitem id="base.menu_reporting_config" name="Configuration" parent="base.menu_reporting" sequence="100"/>

From e5346f76cecbe9eed6c1b044ae19b0d4fd757f66 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 28 Mar 2012 16:38:53 +0200
Subject: [PATCH 38/43] [IMP] event: improvements related to kanban view  *
 removed foolish 'subscribe boolean field on event.registration  * if the
 register max field on the event is left to 0, it means the number of
 available ticket is unlimited  * few usabiltiy improvements and refactoring

bzr revid: qdp-launchpad@openerp.com-20120328143853-0m8uum4so8q4q3hv
---
 addons/event/event.py       | 58 ++++++++++------------
 addons/event/event_view.xml | 98 ++++++++++++++++++-------------------
 2 files changed, 75 insertions(+), 81 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 8aca855cc0a..bd16194bcef 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -149,26 +149,25 @@ class event_event(osv.osv):
                 elif field == 'register_prospect':
                     number = reg_draft
                 elif field == 'register_avail':
-                    number = event.register_max-reg_open
+                    #the number of ticket is unlimited if the event.register_max field is not set. 
+                    #In that cas we arbitrary set it to 9999, it is used in the kanban view to special case the display of the 'subscribe' button
+                    number = event.register_max - reg_open if event.register_max != 0 else 9999
                 res[event.id][field] = number
         return res
-    
+
     def _subscribe_fnc(self, cr, uid, ids, fields, args, context=None):
-        """Get Subscribe or Unsubscribe registration value.
-        @param ids: List of Event registration type's id
-        @param fields: List of function fields(subscribe).
-        @param context: A standard dictionary for contextual values
-        @return: Dictionary of function fields value.
+        """This functional fields compute if the current user (uid) is already subscribed or not to the event passed in parameter (ids)
         """
         register_pool = self.pool.get('event.registration')
         res = {}
         for event in self.browse(cr, uid, ids, context=context):
-            curr_reg_id = register_pool.search(cr,uid,[('user_id','=',uid),('event_id','=',event.id)])
-            if not curr_reg_id:res[event.id] = False
+            res[event.id] = False
+            curr_reg_id = register_pool.search(cr, uid, [('user_id', '=', uid), ('event_id', '=' ,event.id)])
             if curr_reg_id:
-                for reg in register_pool.browse(cr,uid,curr_reg_id,context=context):
-                    res[event.id] = False
-                    if reg.subscribe:res[event.id]= True
+                for reg in register_pool.browse(cr, uid, curr_reg_id, context=context):
+                    if reg.state in ('open','done'):
+                        res[event.id]= True
+                        continue
         return res 
 
     _columns = {
@@ -185,7 +184,7 @@ class event_event(osv.osv):
         'date_begin': fields.datetime('Start Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date_end': fields.datetime('End Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'state': fields.selection([
-            ('draft', 'Draft'),
+            ('draft', 'Unconfirmed'),
             ('confirm', 'Confirmed'),
             ('done', 'Done'),
             ('cancel', 'Cancelled')],
@@ -203,7 +202,7 @@ class event_event(osv.osv):
                     type='many2one', relation='res.country', string='Country', readonly=False, states={'done': [('readonly', True)]}),
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
-        'subscribe' : fields.function(_subscribe_fnc, type="boolean", string='Subscribe'),
+        'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
     }
 
     _defaults = {
@@ -211,25 +210,21 @@ class event_event(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'event.event', context=c),
         'user_id': lambda obj, cr, uid, context: uid,
     }
-    
-    def subscribe_to_event(self,cr,uid,ids,context=None):
+
+    def subscribe_to_event(self, cr, uid, ids, context=None):
         register_pool = self.pool.get('event.registration')
         user_pool = self.pool.get('res.users')
-        user = user_pool.browse(cr,uid,uid,context)
-        curr_reg_id = register_pool.search(cr,uid,[('user_id','=',user.id),('event_id','=',ids[0])])
-        if not curr_reg_id:
-            curr_reg_id = register_pool.create(cr, uid, {'event_id':ids[0],'email':user.user_email,
-                                                         'name':user.name,'user_id':user.id,
-                                                         'subscribe':True
-                                                         })
-        if isinstance(curr_reg_id, (int, long)):curr_reg_id = [curr_reg_id]
-        return register_pool.confirm_registration(cr,uid,curr_reg_id,context)
-    
+        user = user_pool.browse(cr, uid, uid, context=context)
+        curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , ids[0])])
+        if not curr_reg_ids:
+            curr_reg_ids = [register_pool.create(cr, uid, {'event_id': ids[0] ,'email': user.user_email,
+                                                         'name':user.name, 'user_id': user.id,})]
+        return register_pool.confirm_registration(cr, uid, curr_reg_ids, context=context)
+
     def unsubscribe_to_event(self,cr,uid,ids,context=None):
         register_pool = self.pool.get('event.registration')
-        curr_reg_id = register_pool.search(cr,uid,[('user_id','=',uid),('event_id','=',ids[0])])
-        if isinstance(curr_reg_id, (int, long)):curr_reg_id = [curr_reg_id]
-        return register_pool.button_reg_cancel(cr,uid,curr_reg_id,context)
+        curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', uid), ('event_id', '=', ids[0])])
+        return register_pool.button_reg_cancel(cr, uid, curr_reg_ids, context=context)
 
     def _check_closing_date(self, cr, uid, ids, context=None):
         for event in self.browse(cr, uid, ids, context=context):
@@ -281,7 +276,6 @@ class event_registration(osv.osv):
                                     ('cancel', 'Cancelled'),
                                     ('done', 'Attended')], 'State',
                                     size=16, readonly=True),
-        'subscribe': fields.boolean('Subscribe'),
     }
 
     _defaults = {
@@ -296,7 +290,7 @@ class event_registration(osv.osv):
 
     def confirm_registration(self, cr, uid, ids, context=None):
         self.message_append(cr, uid, ids,_('State set to open'),body_text= _('Open'))
-        return self.write(cr, uid, ids, {'state': 'open','subscribe':True}, context=context)
+        return self.write(cr, uid, ids, {'state': 'open'}, context=context)
 
 
     def registration_open(self, cr, uid, ids, context=None):
@@ -323,7 +317,7 @@ class event_registration(osv.osv):
 
     def button_reg_cancel(self, cr, uid, ids, context=None, *args):
         self.message_append(cr, uid, ids,_('State set to Cancel'),body_text= _('Cancel'))
-        return self.write(cr, uid, ids, {'state': 'cancel','subscribe':False})
+        return self.write(cr, uid, ids, {'state': 'cancel'})
 
     def mail_user(self, cr, uid, ids, context=None):
         """
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 89be60ea95b..0d72e16e7da 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -169,55 +169,55 @@
                     <field name="type"/>
                     <field name="user_id"/>
                     <field name="register_current"/>
-		    <field name="subscribe"/>
+                    <field name="is_subscribed"/>
                     <field name="country_id"/>
-		    <field name="date_begin"/>
-		    <field name="state"/>
-		    <field name="register_avail"/>
-		    <templates>
-			<t t-name="kanban-box">
-			    <div class="oe_module_vignette">
-				<a type="edit" class="oe_module_icon">
-				    <div class="oe_event_date "><t t-esc="record.date_begin.raw_value.getDate()"/></div>
-				    <div class="oe_event_month_year">
-					<t t-esc="record.date_begin.raw_value.toString('MMM')"/>
-					<t t-esc="record.date_begin.raw_value.getFullYear()"/>
-				    </div>
-				    <div class="oe_event_time"><t t-esc="record.date_begin.raw_value.toString('hh:mm tt')"/></div>
-				</a>
-				<div class="oe_module_desc">
-				    <h4><a type="edit"><field name="name"/></a></h4>
-				    <p>
-				    	<t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t>
-					<t t-if="record.user_id.raw_value">Organized by <field name="user_id"/><br/></t>
-					<t t-if="record.register_avail.raw_value lte 10 and record.register_avail.raw_value gt 0"><i>Only</i></t>
-					     <t t-if="record.register_avail.raw_value == 0"><i>No ticket available.</i></t>
-					    <t t-if="record.register_avail.raw_value != 0">
-						<i><b><field name="register_avail"/></b></i>
-						<i>
-						    <t t-if="record.register_avail.raw_value > 1">tickets </t>
-						    <t t-if="record.register_avail.raw_value == 1 || !record.register_avail.raw_value > 1">ticket </t>available.
-						</i>
-					    </t>
-					
-				    </p>
-				    <t t-if="record.register_avail.raw_value != 0">
-					<t t-if="!record.subscribe.raw_value">
-					    <button type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
-						<span >Subscribe</span>
-					    </button>
-					</t>
-				    </t>
-				    <t t-if="record.subscribe.raw_value">
-					<button type="object" name="unsubscribe_to_event" class="unsubscribe_button oe_event_button_unsubscribe">
-					    <span>Subscribed</span>
-					    <span class="unsubscribe">Unsubscribe</span>
-					</button>
-				    </t>
-				</div>
-			    </div>
-			</t>
-                  </templates>
+                    <field name="date_begin"/>
+                    <field name="state"/>
+                    <field name="register_avail"/>
+                    <templates>
+                    <t t-name="kanban-box">
+                      <div class="oe_module_vignette">
+                        <a type="edit" class="oe_module_icon">
+                           <div class="oe_event_date "><t t-esc="record.date_begin.raw_value.getDate()"/></div>
+                           <div class="oe_event_month_year">
+                             <t t-esc="record.date_begin.raw_value.toString('MMM')"/>
+                             <t t-esc="record.date_begin.raw_value.getFullYear()"/>
+                           </div>
+                           <div class="oe_event_time"><t t-esc="record.date_begin.raw_value.toString('hh:mm tt')"/></div>
+                        </a>
+                        <div class="oe_module_desc">
+                            <h4><a type="edit"><field name="name"/></a></h4>
+                            <p>
+                              <t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t>
+                              <t t-if="record.user_id.raw_value">Organized by <field name="user_id"/><br/></t>
+                              <t t-if="record.register_avail.raw_value lte 10 and record.register_avail.raw_value gt 0"><i>Only</i></t>
+                              <t t-if="record.register_avail.raw_value == 0"><i>No ticket available.</i></t>
+                              <t t-if="record.register_avail.raw_value != 0">
+                                <i><b><t t-if="record.register_avail.raw_value != 9999"><field name="register_avail"/></t></b></i>
+                                <i>
+                                    <t t-if="record.register_avail.raw_value > 1">tickets </t>
+                                    <t t-if="record.register_avail.raw_value == 1 || !record.register_avail.raw_value > 1">ticket </t>
+                                    available.
+                                </i>
+                              </t>
+                            </p>
+                            <t t-if="record.register_avail.raw_value != 0">
+                              <t t-if="!record.is_subscribed.raw_value">
+                                  <button type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
+                                  <span >Subscribe</span>
+                                  </button>
+                              </t>
+                            </t>
+                            <t t-if="record.is_subscribed.raw_value">
+                              <button type="object" name="unsubscribe_to_event" class="unsubscribe_button oe_event_button_unsubscribe">
+                                <span>Subscribed</span>
+                                <span class="unsubscribe">Unsubscribe</span>
+                              </button>
+                            </t>
+                        </div>
+                      </div>
+                    </t>
+                    </templates>
                 </kanban>
             </field>
         </record>
@@ -299,7 +299,7 @@
            <field name="res_model">event.event</field>
            <field name="view_type">form</field>
            <field name="view_mode">kanban,calendar,tree,form,graph</field>
-	   <field name="context">{"search_default_upcoming":1}</field>
+           <field name="context">{"search_default_upcoming":1}</field>
            <field name="search_view_id" ref="view_event_search"/>
            <field name="help">Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events.</field>
        </record>

From b7f2284d7f4056501efbde6b92954c1b16a59bf5 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 29 Mar 2012 04:35:42 +0000
Subject: [PATCH 39/43] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120328044619-mysiqxktsyz9yvhk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120329043542-rsvb6ox4tf09j7d5
---
 addons/account/i18n/zh_CN.po      |   4 +-
 addons/base_crypt/i18n/pl.po      |  45 ++
 addons/crm_caldav/i18n/pl.po      |  33 ++
 addons/hr_timesheet/i18n/es_EC.po | 657 ++++++++++++++++++++++++++++++
 4 files changed, 737 insertions(+), 2 deletions(-)
 create mode 100644 addons/base_crypt/i18n/pl.po
 create mode 100644 addons/crm_caldav/i18n/pl.po
 create mode 100644 addons/hr_timesheet/i18n/es_EC.po

diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index c5a78346b02..6b88c60792c 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-27 04:51+0000\n"
-"X-Generator: Launchpad (build 15011)\n"
+"X-Launchpad-Export-Date: 2012-03-28 04:45+0000\n"
+"X-Generator: Launchpad (build 15027)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/base_crypt/i18n/pl.po b/addons/base_crypt/i18n/pl.po
new file mode 100644
index 00000000000..4e4ff39a279
--- /dev/null
+++ b/addons/base_crypt/i18n/pl.po
@@ -0,0 +1,45 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+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-03-28 14:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish <pl@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-03-29 04:35+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Nie może być dwóch użytkowników o tym samym loginie !"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Wybrana firma jest niedozwolona dla tego użytkownika"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:140
+#, python-format
+msgid "Please specify the password !"
+msgstr "Proszę podać hasło!"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:140
+#, python-format
+msgid "Error"
+msgstr "Błąd"
diff --git a/addons/crm_caldav/i18n/pl.po b/addons/crm_caldav/i18n/pl.po
new file mode 100644
index 00000000000..748beb9313f
--- /dev/null
+++ b/addons/crm_caldav/i18n/pl.po
@@ -0,0 +1,33 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+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-03-28 14:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish <pl@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-03-29 04:35+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: crm_caldav
+#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
+msgid "Caldav Browse"
+msgstr ""
+
+#. module: crm_caldav
+#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
+msgid "Synchronize This Calendar"
+msgstr "Synchronizuj ten kalendarz"
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr "Zebranie"
diff --git a/addons/hr_timesheet/i18n/es_EC.po b/addons/hr_timesheet/i18n/es_EC.po
new file mode 100644
index 00000000000..b5d3252d359
--- /dev/null
+++ b/addons/hr_timesheet/i18n/es_EC.po
@@ -0,0 +1,657 @@
+# Spanish (Ecuador) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+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-03-27 14:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@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-03-28 04:46+0000\n"
+"X-Generator: Launchpad (build 15027)\n"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Wed"
+msgstr "Miércoles"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "(Keep empty for current_time)"
+msgstr "(Vacío para fecha actual)"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
+#, python-format
+msgid "No employee defined for your user !"
+msgstr "¡No se ha definido un empleado para su usuario!"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
+msgid ""
+"Employees can encode their time spent on the different projects. A project "
+"is an analytic account and the time spent on a project generate costs on the "
+"analytic account. This feature allows to record at the same time the "
+"attendance and the timesheet."
+msgstr ""
+"Los empleados pueden imputar el tiempo que han invertido en los diferentes "
+"proyectos. Un proyecto es una cuenta analítica y el tiempo  de empleado en "
+"un proyecto genera costes en esa cuenta analítica. Esta característica "
+"permite registrar al mismo tiempo la asistencia y la hoja de tiempos."
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: hr_timesheet
+#: field:hr.employee,journal_id:0
+msgid "Analytic Journal"
+msgstr "Diario analítico"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Stop Working"
+msgstr "Parar de trabajar"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_employee
+msgid "Employee Timesheet"
+msgstr "Horario del empleado"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Work done stats"
+msgstr "Estadísticas trabajo realizado"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_reporting_timesheet
+msgid "Timesheet"
+msgstr "Hoja de asistencia"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Mon"
+msgstr "Lunes"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in"
+msgstr "Acceder"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Fri"
+msgstr "Viernes"
+
+#. module: hr_timesheet
+#: field:hr.employee,uom_id:0
+msgid "UoM"
+msgstr "UoM"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid ""
+"Employees can encode their time spent on the different projects they are "
+"assigned on. A  project is an analytic account and the time spent on a "
+"project generates costs on the analytic account. This feature allows to "
+"record at the same time the attendance and the timesheet."
+msgstr ""
+"Los empleados pueden imputar el tiempo que han invertido en los diferentes "
+"proyectos. Un proyecto es una cuenta analítica y el tiempo  de empleado en "
+"un proyecto genera costes en esa cuenta analítica. Esta característica "
+"permite registrar al mismo tiempo la asistencia y la hoja de tiempos."
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,analytic_amount:0
+msgid "Minimum Analytic Amount"
+msgstr "Importe analítico mínimo"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Monthly Employee Timesheet"
+msgstr "Hoja de asistencia mensual del Empleado"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Work done in the last period"
+msgstr "Trabajo realizado en el último período"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,state:0
+#: field:hr.sign.out.project,state:0
+msgid "Current state"
+msgstr "Estado actual"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,name:0
+#: field:hr.sign.out.project,name:0
+msgid "Employees name"
+msgstr "Nombre de empleados"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,account_id:0
+msgid "Project / Analytic Account"
+msgstr "Proyecto / Cuenta Analítica"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
+msgid "Print Employees Timesheet"
+msgstr "Imprimir hoja de asistencia de los Empleados"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:175
+#: code:addons/hr_timesheet/hr_timesheet.py:177
+#, python-format
+msgid "Warning !"
+msgstr "Advertencia !"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
+#, python-format
+msgid "UserError"
+msgstr "Error de usuario"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
+#, python-format
+msgid "No cost unit defined for this employee !"
+msgstr "¡No se ha definido un coste unitario para este empleado!"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Tue"
+msgstr "Martes"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
+#, python-format
+msgid "Warning"
+msgstr "Advertencia"
+
+#. module: hr_timesheet
+#: field:hr.analytic.timesheet,partner_id:0
+msgid "Partner"
+msgstr "Cliente"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Sign In/Out By Project"
+msgstr "Acceder/salir del proyecto"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Sat"
+msgstr "Sábado"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Sun"
+msgstr "Domingo"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Analytic account"
+msgstr "Cuenta Analítica"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
+msgid "Timesheet Lines"
+msgstr "Líneas de la hoja de asistencia"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Monthly Employees Timesheet"
+msgstr "Hoja de asistencia mensual de empleados"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "July"
+msgstr "Julio"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,date:0
+#: field:hr.sign.out.project,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
+
+#. module: hr_timesheet
+#: view:hr.employee:0
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: hr_timesheet
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
+"No se puede modificar una entrada Confirmado / Hoja de asistencia ya hecha!."
+
+#. module: hr_timesheet
+#: help:hr.employee,product_id:0
+msgid "Specifies employee's designation as a product with type 'service'."
+msgstr ""
+"Especifica la designación del empleado como un producto de tipo 'servicio'."
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total cost"
+msgstr "Coste total"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "September"
+msgstr "Septiembre"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea hoja de servicios"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.users,employee_ids:0
+msgid "employees"
+msgstr "Empleados"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Stats by month"
+msgstr "Estadísticas por mes"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+#: field:hr.analytical.timesheet.employee,month:0
+#: field:hr.analytical.timesheet.users,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,info:0
+msgid "Work Description"
+msgstr "Descripción del trabajo"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Invoice Analysis"
+msgstr "Análisis de facturas"
+
+#. module: hr_timesheet
+#: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
+msgid "Employee timesheet"
+msgstr "Hoja de asistencia del empleado"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
+msgid "Sign in / Sign out by project"
+msgstr "Entrada/salida por proyecto"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
+msgid "Define your Analytic Structure"
+msgstr "Defina su estructura analítica"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in / Sign out"
+msgstr "Registrar entrada/salida"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:175
+#, python-format
+msgid ""
+"Analytic journal is not defined for employee %s \n"
+"Define an employee for the selected user and assign an analytic journal!"
+msgstr ""
+"El diario analítico no está definido para el empleado %s\n"
+"¡Defina un empleado para el usuario seleccionado y asígnele un diario "
+"analítico!"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "(Keep empty for current time)"
+msgstr "(Dejarlo vacío para hora actual)"
+
+#. module: hr_timesheet
+#: view:hr.employee:0
+msgid "Timesheets"
+msgstr "Hojas de trabajo"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.action_define_analytic_structure
+msgid ""
+"You should create an analytic account structure depending on your needs to "
+"analyse costs and revenues. In OpenERP, analytic accounts are also used to "
+"track customer contracts."
+msgstr ""
+"Debe crear una estructura de la cuenta analítica dependiendo de sus "
+"necesidades para analizar los costos e ingresos. En OpenERP, cuentas "
+"analíticas también se utilizan para seguimiento de contratos de clientes."
+
+#. module: hr_timesheet
+#: field:hr.analytic.timesheet,line_id:0
+msgid "Analytic Line"
+msgstr "Línea Analítica"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "June"
+msgstr "Junio"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Print My Timesheet"
+msgstr "Imprimir mi horario"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "November"
+msgstr "Noviembre"
+
+#. module: hr_timesheet
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "¡Error! No se puede crear una jerarquía recursiva de empleados."
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,date:0
+msgid "Closing Date"
+msgstr "Fecha de cierre"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "October"
+msgstr "Octubre"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "January"
+msgstr "Enero"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Key dates"
+msgstr "Fechas clave"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Thu"
+msgstr "Jueves"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Analysis stats"
+msgstr "Estadísticas de análisis"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
+msgid "Print Employee Timesheet & Print My Timesheet"
+msgstr "Imprime el 'Parte de Horas del Empleado' y 'Mi Parte de Horas'"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,emp_id:0
+#: field:hr.sign.out.project,emp_id:0
+msgid "Employee ID"
+msgstr "ID empleado"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
+msgid "My Timesheet"
+msgstr "My horario"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "December"
+msgstr "Diciembre"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_users
+#: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet
+#: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users
+msgid "Employees Timesheet"
+msgstr "Horario de empleados"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Information"
+msgstr "Información"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,employee_id:0
+#: model:ir.model,name:hr_timesheet.model_hr_employee
+msgid "Employee"
+msgstr "Empleado(a)"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+msgid ""
+"Through this menu you can register and follow your workings hours by project "
+"every day."
+msgstr ""
+"A través de este menú se puede registrar y seguir las horas diarias "
+"trabajadas por proyecto."
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,server_date:0
+#: field:hr.sign.out.project,server_date:0
+msgid "Current Date"
+msgstr "Fecha Actual"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "This wizard will print monthly timesheet"
+msgstr "Este asistente imprimirá el parte de horas mensual"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: field:hr.employee,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "May"
+msgstr "Mayo"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total time"
+msgstr "Tiempo total"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "(local time on the server side)"
+msgstr "(hora local en el servidor)"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
+msgid "Sign In By Project"
+msgstr "Registrarse en un proyecto"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "February"
+msgstr "Febrero"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
+msgid "Sign Out By Project"
+msgstr "Salir de un proyecto"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Employees"
+msgstr "Empleados"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "March"
+msgstr "Marzo"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:177
+#, python-format
+msgid ""
+"No analytic account defined on the project.\n"
+"Please set one or we can not automatically fill the timesheet."
+msgstr ""
+"No se ha definido una cuenta analítica para el proyecto.\n"
+"Por favor seleccione una o no se puede llenar automáticamente la hoja de "
+"asistencia."
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+#: view:hr.analytic.timesheet:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Start Working"
+msgstr "Empezar a trabajar"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Stats by user"
+msgstr "Estadísticas por usuario"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
+#, python-format
+msgid "No employee defined for this user"
+msgstr "No se ha definido un empleado para este usuario"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,year:0
+#: field:hr.analytical.timesheet.users,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Accounting"
+msgstr "Administración Financiera"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Change Work"
+msgstr "Cambiar trabajo"

From fb7b21d0024ca52d5ae5b1167b72d40cfcbedaa6 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 29 Mar 2012 04:46:39 +0000
Subject: [PATCH 40/43] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120329044639-uvugg6ws79fao36u
---
 addons/web/i18n/nl.po           | 114 ++++++++++++++++++++++++++++----
 addons/web_calendar/i18n/nb.po  |  41 ++++++++++++
 addons/web_dashboard/i18n/nb.po | 111 +++++++++++++++++++++++++++++++
 addons/web_graph/i18n/ro.po     |  23 +++++++
 4 files changed, 276 insertions(+), 13 deletions(-)
 create mode 100644 addons/web_calendar/i18n/nb.po
 create mode 100644 addons/web_dashboard/i18n/nb.po
 create mode 100644 addons/web_graph/i18n/ro.po

diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index 2c60216ae37..a303a2fb091 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-14 15:27+0100\n"
-"PO-Revision-Date: 2012-02-16 10:56+0000\n"
+"PO-Revision-Date: 2012-03-28 12:49+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-02-17 05:13+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-03-29 04:46+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:172
@@ -24,6 +24,8 @@ msgstr ""
 #: addons/web/static/src/js/view_form.js:419
 #: addons/web/static/src/js/view_form.js:1233
 #: addons/web/static/src/xml/base.xml:1695
+#: addons/web/static/src/js/view_form.js:424
+#: addons/web/static/src/js/view_form.js:1239
 msgid "Ok"
 msgstr "Ok"
 
@@ -92,6 +94,8 @@ msgstr "Voorkeuren"
 #: addons/web/static/src/xml/base.xml:1496
 #: addons/web/static/src/xml/base.xml:1506
 #: addons/web/static/src/xml/base.xml:1515
+#: addons/web/static/src/js/search.js:293
+#: addons/web/static/src/js/view_form.js:1234
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -103,7 +107,8 @@ msgstr "Wachtwoord wijzigen"
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:792
 #: addons/web/static/src/js/view_editor.js:73
-#: addons/web/static/src/js/views.js:962 addons/web/static/src/xml/base.xml:737
+#: addons/web/static/src/js/views.js:962
+#: addons/web/static/src/xml/base.xml:737
 #: addons/web/static/src/xml/base.xml:1500
 #: addons/web/static/src/xml/base.xml:1514
 msgid "Save"
@@ -118,11 +123,13 @@ msgstr "Wachtwoord wijzigen"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:1096
+#: addons/web/static/src/js/chrome.js:1100
 msgid "OpenERP - Unsupported/Community Version"
 msgstr "OpenERP - Unsupported/Community Version"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:1131
+#: addons/web/static/src/js/chrome.js:1135
 msgid "Client Error"
 msgstr "Cliënt fout"
 
@@ -139,6 +146,8 @@ msgstr "Gegevens exporteren"
 #: addons/web/static/src/js/view_form.js:692
 #: addons/web/static/src/js/view_form.js:3044
 #: addons/web/static/src/js/views.js:963
+#: addons/web/static/src/js/view_form.js:698
+#: addons/web/static/src/js/view_form.js:3067
 msgid "Close"
 msgstr "Sluiten"
 
@@ -180,11 +189,14 @@ msgstr "Externe ID"
 #. openerp-web
 #: addons/web/static/src/js/formats.js:300
 #: addons/web/static/src/js/view_page.js:245
+#: addons/web/static/src/js/formats.js:322
+#: addons/web/static/src/js/view_page.js:251
 msgid "Download"
 msgstr "Downloaden"
 
 #. openerp-web
 #: addons/web/static/src/js/formats.js:305
+#: addons/web/static/src/js/formats.js:327
 #, python-format
 msgid "Download \"%s\""
 msgstr "Download \"%s\""
@@ -202,59 +214,70 @@ msgstr "Filter regel"
 #. openerp-web
 #: addons/web/static/src/js/search.js:242
 #: addons/web/static/src/js/search.js:291
+#: addons/web/static/src/js/search.js:296
 msgid "OK"
 msgstr "OK"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:286
 #: addons/web/static/src/xml/base.xml:1292
+#: addons/web/static/src/js/search.js:291
 msgid "Add to Dashboard"
 msgstr "Aan dashboard toevoegen"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:415
+#: addons/web/static/src/js/search.js:420
 msgid "Invalid Search"
 msgstr "Ongeldige zoekopdracht"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:415
+#: addons/web/static/src/js/search.js:420
 msgid "triggered from search view"
 msgstr "geactiveerd door zoek weergave"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:503
+#: addons/web/static/src/js/search.js:508
 #, python-format
 msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
 msgstr "Onjuiste waarde bij veld %(fieldname)s: [%(value)s] is %(message)s"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:839
+#: addons/web/static/src/js/search.js:844
 msgid "not a valid integer"
 msgstr "geen geldig geheel getal"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:853
+#: addons/web/static/src/js/search.js:858
 msgid "not a valid number"
 msgstr "geen geldig getal"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:931
 #: addons/web/static/src/xml/base.xml:968
+#: addons/web/static/src/js/search.js:936
 msgid "Yes"
 msgstr "Ja"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:932
+#: addons/web/static/src/js/search.js:937
 msgid "No"
-msgstr "Nr."
+msgstr "Nee"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1290
+#: addons/web/static/src/js/search.js:1295
 msgid "contains"
 msgstr "bevat"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1291
+#: addons/web/static/src/js/search.js:1296
 msgid "doesn't contain"
 msgstr "bevat niet"
 
@@ -264,6 +287,11 @@ msgstr "bevat niet"
 #: addons/web/static/src/js/search.js:1325
 #: addons/web/static/src/js/search.js:1344
 #: addons/web/static/src/js/search.js:1365
+#: addons/web/static/src/js/search.js:1297
+#: addons/web/static/src/js/search.js:1311
+#: addons/web/static/src/js/search.js:1330
+#: addons/web/static/src/js/search.js:1349
+#: addons/web/static/src/js/search.js:1370
 msgid "is equal to"
 msgstr "is gelijk aan"
 
@@ -273,6 +301,11 @@ msgstr "is gelijk aan"
 #: addons/web/static/src/js/search.js:1326
 #: addons/web/static/src/js/search.js:1345
 #: addons/web/static/src/js/search.js:1366
+#: addons/web/static/src/js/search.js:1298
+#: addons/web/static/src/js/search.js:1312
+#: addons/web/static/src/js/search.js:1331
+#: addons/web/static/src/js/search.js:1350
+#: addons/web/static/src/js/search.js:1371
 msgid "is not equal to"
 msgstr "is niet gelijk aan"
 
@@ -282,6 +315,11 @@ msgstr "is niet gelijk aan"
 #: addons/web/static/src/js/search.js:1327
 #: addons/web/static/src/js/search.js:1346
 #: addons/web/static/src/js/search.js:1367
+#: addons/web/static/src/js/search.js:1299
+#: addons/web/static/src/js/search.js:1313
+#: addons/web/static/src/js/search.js:1332
+#: addons/web/static/src/js/search.js:1351
+#: addons/web/static/src/js/search.js:1372
 msgid "greater than"
 msgstr "is groter dan"
 
@@ -291,6 +329,11 @@ msgstr "is groter dan"
 #: addons/web/static/src/js/search.js:1328
 #: addons/web/static/src/js/search.js:1347
 #: addons/web/static/src/js/search.js:1368
+#: addons/web/static/src/js/search.js:1300
+#: addons/web/static/src/js/search.js:1314
+#: addons/web/static/src/js/search.js:1333
+#: addons/web/static/src/js/search.js:1352
+#: addons/web/static/src/js/search.js:1373
 msgid "less than"
 msgstr "kleiner dan"
 
@@ -300,6 +343,11 @@ msgstr "kleiner dan"
 #: addons/web/static/src/js/search.js:1329
 #: addons/web/static/src/js/search.js:1348
 #: addons/web/static/src/js/search.js:1369
+#: addons/web/static/src/js/search.js:1301
+#: addons/web/static/src/js/search.js:1315
+#: addons/web/static/src/js/search.js:1334
+#: addons/web/static/src/js/search.js:1353
+#: addons/web/static/src/js/search.js:1374
 msgid "greater or equal than"
 msgstr "is groter of gelijk aan"
 
@@ -309,27 +357,37 @@ msgstr "is groter of gelijk aan"
 #: addons/web/static/src/js/search.js:1330
 #: addons/web/static/src/js/search.js:1349
 #: addons/web/static/src/js/search.js:1370
+#: addons/web/static/src/js/search.js:1302
+#: addons/web/static/src/js/search.js:1316
+#: addons/web/static/src/js/search.js:1335
+#: addons/web/static/src/js/search.js:1354
+#: addons/web/static/src/js/search.js:1375
 msgid "less or equal than"
 msgstr "is kleiner of gelijk aan"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1360
 #: addons/web/static/src/js/search.js:1383
+#: addons/web/static/src/js/search.js:1365
+#: addons/web/static/src/js/search.js:1388
 msgid "is"
 msgstr "is"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1384
+#: addons/web/static/src/js/search.js:1389
 msgid "is not"
 msgstr "is niet"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1396
+#: addons/web/static/src/js/search.js:1401
 msgid "is true"
 msgstr "is waar"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1397
+#: addons/web/static/src/js/search.js:1402
 msgid "is false"
 msgstr "is onwaar"
 
@@ -424,51 +482,60 @@ msgstr "Aanpassen"
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:123
 #: addons/web/static/src/js/view_form.js:686
+#: addons/web/static/src/js/view_form.js:692
 msgid "Set Default"
 msgstr "Gebruik als standaard"
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:469
+#: addons/web/static/src/js/view_form.js:475
 msgid ""
 "Warning, the record has been modified, your changes will be discarded."
 msgstr "Letop: het record is gewijzigd; uw wijzigingen gaan verloren."
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:693
+#: addons/web/static/src/js/view_form.js:699
 msgid "Save default"
 msgstr "Opslaan als standaard"
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:754
+#: addons/web/static/src/js/view_form.js:760
 msgid "Attachments"
 msgstr "Bijlages"
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:792
+#: addons/web/static/src/js/view_form.js:798
 #, python-format
 msgid "Do you really want to delete the attachment %s?"
 msgstr "Weet u zeker dat u deze bijlage %s wilt verwijderen?"
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:822
+#: addons/web/static/src/js/view_form.js:828
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Onbekend operator% s in domein% s"
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:830
+#: addons/web/static/src/js/view_form.js:836
 #, python-format
 msgid "Unknown field %s in domain %s"
-msgstr "Onbekend vel %s in domein %s"
+msgstr "Onbekend veld %s in domein %s"
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:868
+#: addons/web/static/src/js/view_form.js:874
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Niet ondersteunde operator %s in domein %s"
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:1225
+#: addons/web/static/src/js/view_form.js:1231
 msgid "Confirm"
 msgstr "Bevestig"
 
@@ -476,34 +543,43 @@ msgstr "Bevestig"
 #: addons/web/static/src/js/view_form.js:1921
 #: addons/web/static/src/js/view_form.js:2578
 #: addons/web/static/src/js/view_form.js:2741
+#: addons/web/static/src/js/view_form.js:1933
+#: addons/web/static/src/js/view_form.js:2590
+#: addons/web/static/src/js/view_form.js:2760
 msgid "Open: "
 msgstr "Open: "
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:2049
+#: addons/web/static/src/js/view_form.js:2061
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Zoek verder...</em>"
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2074
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Maak \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:2068
+#: addons/web/static/src/js/view_form.js:2080
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Maak en wijzig...</em>"
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:2101
 #: addons/web/static/src/js/views.js:675
+#: addons/web/static/src/js/view_form.js:2113
 msgid "Search: "
 msgstr "Zoeken: "
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:2101
 #: addons/web/static/src/js/view_form.js:2550
+#: addons/web/static/src/js/view_form.js:2113
+#: addons/web/static/src/js/view_form.js:2562
 msgid "Create: "
 msgstr "Maken: "
 
@@ -512,11 +588,13 @@ msgstr "Maken: "
 #: addons/web/static/src/xml/base.xml:750
 #: addons/web/static/src/xml/base.xml:772
 #: addons/web/static/src/xml/base.xml:1646
+#: addons/web/static/src/js/view_form.js:2680
 msgid "Add"
 msgstr "Toevoegen"
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:2721
+#: addons/web/static/src/js/view_form.js:2740
 msgid "Add: "
 msgstr "Toevoegen: "
 
@@ -532,22 +610,26 @@ msgstr "Onbeperkt"
 
 #. openerp-web
 #: addons/web/static/src/js/view_list.js:305
+#: addons/web/static/src/js/view_list.js:309
 #, python-format
 msgid "[%(first_record)d to %(last_record)d] of %(records_count)d"
 msgstr "[%(first_record)d t/m %(last_record)d] van %(records_count)d"
 
 #. openerp-web
 #: addons/web/static/src/js/view_list.js:524
+#: addons/web/static/src/js/view_list.js:528
 msgid "Do you really want to remove these records?"
 msgstr "Wilt u deze records werkelijk verwijderen?"
 
 #. openerp-web
 #: addons/web/static/src/js/view_list.js:1230
+#: addons/web/static/src/js/view_list.js:1232
 msgid "Undefined"
 msgstr "Onbepaald"
 
 #. openerp-web
 #: addons/web/static/src/js/view_list.js:1327
+#: addons/web/static/src/js/view_list.js:1331
 #, python-format
 msgid "%(page)d/%(page_count)d"
 msgstr "%(page)d/%(page_count)d"
@@ -568,9 +650,10 @@ msgid "Tree"
 msgstr "Boomstructuur"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:565 addons/web/static/src/xml/base.xml:480
+#: addons/web/static/src/js/views.js:565
+#: addons/web/static/src/xml/base.xml:480
 msgid "Fields View Get"
-msgstr ""
+msgstr "Veldweergave 'Get'"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:573
@@ -585,7 +668,8 @@ msgid "Model %s fields"
 msgstr "Model %s velden"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:610 addons/web/static/src/xml/base.xml:482
+#: addons/web/static/src/js/views.js:610
+#: addons/web/static/src/xml/base.xml:482
 msgid "Manage Views"
 msgstr "Weergaven beheren"
 
@@ -652,12 +736,14 @@ msgid "Translations"
 msgstr "Vertalingen"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:44 addons/web/static/src/xml/base.xml:315
+#: addons/web/static/src/xml/base.xml:44
+#: addons/web/static/src/xml/base.xml:315
 msgid "Powered by"
 msgstr "Powered by"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:44 addons/web/static/src/xml/base.xml:315
+#: addons/web/static/src/xml/base.xml:44
+#: addons/web/static/src/xml/base.xml:315
 #: addons/web/static/src/xml/base.xml:1813
 msgid "OpenERP"
 msgstr "OpenERP"
@@ -673,12 +759,14 @@ msgid "CREATE DATABASE"
 msgstr "DATABASE MAKEN"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:68 addons/web/static/src/xml/base.xml:211
+#: addons/web/static/src/xml/base.xml:68
+#: addons/web/static/src/xml/base.xml:211
 msgid "Master password:"
 msgstr "Master wachtwoord:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:72 addons/web/static/src/xml/base.xml:191
+#: addons/web/static/src/xml/base.xml:72
+#: addons/web/static/src/xml/base.xml:191
 msgid "New database name:"
 msgstr "Naam nieuwe database:"
 
diff --git a/addons/web_calendar/i18n/nb.po b/addons/web_calendar/i18n/nb.po
new file mode 100644
index 00000000000..182519a66c4
--- /dev/null
+++ b/addons/web_calendar/i18n/nb.po
@@ -0,0 +1,41 @@
+# Norwegian Bokmal translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-03-28 13:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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-03-29 04:46+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:11
+msgid "Calendar"
+msgstr "Kalender"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:466
+#: addons/web_calendar/static/src/js/calendar.js:467
+msgid "Responsible"
+msgstr "Ansvarlig"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:504
+#: addons/web_calendar/static/src/js/calendar.js:505
+msgid "Navigator"
+msgstr "Navigator"
+
+#. openerp-web
+#: addons/web_calendar/static/src/xml/web_calendar.xml:5
+#: addons/web_calendar/static/src/xml/web_calendar.xml:6
+msgid "&nbsp;"
+msgstr "&nbsp;"
diff --git a/addons/web_dashboard/i18n/nb.po b/addons/web_dashboard/i18n/nb.po
new file mode 100644
index 00000000000..e47ff0aae68
--- /dev/null
+++ b/addons/web_dashboard/i18n/nb.po
@@ -0,0 +1,111 @@
+# Norwegian Bokmal translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-14 15:27+0100\n"
+"PO-Revision-Date: 2012-03-28 13:07+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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-03-29 04:46+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:63
+msgid "Edit Layout"
+msgstr "Rediger layout"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:109
+msgid "Are you sure you want to remove this item ?"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:316
+msgid "Uncategorized"
+msgstr "Ikke kategorisert"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:324
+#, python-format
+msgid "Execute task \"%s\""
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:325
+msgid "Mark this task as done"
+msgstr "Merk denne oppgaven som ferdig"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:4
+msgid "Reset Layout.."
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:6
+msgid "Reset"
+msgstr "Tilbakestill"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:8
+msgid "Change Layout.."
+msgstr "Endre layout.."
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:10
+msgid "Change Layout"
+msgstr "Endre layout"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:27
+msgid "&nbsp;"
+msgstr "&nbsp;"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:28
+msgid "Create"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:39
+msgid "Choose dashboard layout"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:62
+msgid "progress:"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:67
+msgid ""
+"Click on the functionalites listed below to launch them and configure your "
+"system"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:110
+msgid "Welcome to OpenERP"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:118
+msgid "Remember to bookmark"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:119
+msgid "This url"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:121
+msgid "Your login:"
+msgstr ""
diff --git a/addons/web_graph/i18n/ro.po b/addons/web_graph/i18n/ro.po
new file mode 100644
index 00000000000..c5debf64d00
--- /dev/null
+++ b/addons/web_graph/i18n/ro.po
@@ -0,0 +1,23 @@
+# Romanian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-03-28 19:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <ro@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-03-29 04:46+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. openerp-web
+#: addons/web_graph/static/src/js/graph.js:19
+msgid "Graph"
+msgstr "Grafic"

From 236ed739b997c565d452f9ca977e8c79ce643a99 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 29 Mar 2012 10:57:03 +0200
Subject: [PATCH 41/43] [FIX] event: fixed the access rights in order to have
 that being in the manager group implies being in the user group too

bzr revid: qdp-launchpad@openerp.com-20120329085703-419271p8s81cl6zo
---
 addons/event/security/event_security.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index c0eb37d7b84..fb29fffcca9 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -16,6 +16,7 @@
     <record id="group_event_manager" model="res.groups">
         <field name="name">Manager</field>
         <field name="category_id" ref="module_category_event_management"/>
+        <field name="implied_ids" eval="[(4, ref('group_event_user'))]"/>
     </record>
 
     <record model="res.users" id="base.user_admin">

From 9d429e4446f059a95079ba6619d2a015f2c2c775 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 29 Mar 2012 12:22:37 +0200
Subject: [PATCH 42/43] [REF] event, event_share: removed the event_share
 module and replaced by the use of uid=1 in the functions used by the kanban
 view to subscribe/unsubscribe

bzr revid: qdp-launchpad@openerp.com-20120329102237-4q7qjepjutlyet2f
---
 addons/event/event.py                     | 13 +++---
 addons/event_share/__init__.py            | 24 ------------
 addons/event_share/__openerp__.py         | 35 -----------------
 addons/event_share/wizard/__init__.py     | 24 ------------
 addons/event_share/wizard/wizard_share.py | 48 -----------------------
 5 files changed, 7 insertions(+), 137 deletions(-)
 delete mode 100644 addons/event_share/__init__.py
 delete mode 100644 addons/event_share/__openerp__.py
 delete mode 100644 addons/event_share/wizard/__init__.py
 delete mode 100644 addons/event_share/wizard/wizard_share.py

diff --git a/addons/event/event.py b/addons/event/event.py
index bd16194bcef..ce72dadb2cc 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -216,15 +216,16 @@ class event_event(osv.osv):
         user_pool = self.pool.get('res.users')
         user = user_pool.browse(cr, uid, uid, context=context)
         curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , ids[0])])
+        #the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe
         if not curr_reg_ids:
-            curr_reg_ids = [register_pool.create(cr, uid, {'event_id': ids[0] ,'email': user.user_email,
-                                                         'name':user.name, 'user_id': user.id,})]
-        return register_pool.confirm_registration(cr, uid, curr_reg_ids, context=context)
+            curr_reg_ids = [register_pool.create(cr, 1, {'event_id': ids[0] ,'email': user.user_email, 'name':user.name, 'user_id': user.id,})]
+        return register_pool.confirm_registration(cr, 1, curr_reg_ids, context=context)
 
-    def unsubscribe_to_event(self,cr,uid,ids,context=None):
+    def unsubscribe_to_event(self, cr, uid, ids, context=None):
         register_pool = self.pool.get('event.registration')
-        curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', uid), ('event_id', '=', ids[0])])
-        return register_pool.button_reg_cancel(cr, uid, curr_reg_ids, context=context)
+        #the unsubscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to unsubscribe
+        curr_reg_ids = register_pool.search(cr, 1, [('user_id', '=', uid), ('event_id', '=', ids[0])])
+        return register_pool.button_reg_cancel(cr, 1, curr_reg_ids, context=context)
 
     def _check_closing_date(self, cr, uid, ids, context=None):
         for event in self.browse(cr, uid, ids, context=context):
diff --git a/addons/event_share/__init__.py b/addons/event_share/__init__.py
deleted file mode 100644
index 8dbeda71145..00000000000
--- a/addons/event_share/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/event_share/__openerp__.py b/addons/event_share/__openerp__.py
deleted file mode 100644
index f6ad583364a..00000000000
--- a/addons/event_share/__openerp__.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-{
-    'name': 'Events Share',
-    'version': '0.1',
-    'category': 'Tools',
-    'complexity': "easy",
-    'description': """ """,
-    'author': 'OpenERP SA',
-    'depends': ['event','share'],
-    'installable': True,
-    #'application': True,
-    'auto_install': False,
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event_share/wizard/__init__.py b/addons/event_share/wizard/__init__.py
deleted file mode 100644
index d62c6170854..00000000000
--- a/addons/event_share/wizard/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard_share
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/event_share/wizard/wizard_share.py b/addons/event_share/wizard/wizard_share.py
deleted file mode 100644
index 5ed940ff05d..00000000000
--- a/addons/event_share/wizard/wizard_share.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-from tools.translate import _
-
-UID_ROOT = 1
-EVENT_ACCESS = ('perm_read', 'perm_write', 'perm_create')
-
-class share_wizard_event(osv.osv_memory):
-    """Inherited share wizard to automatically create appropriate
-       menus in the selected portal upon sharing with a portal group."""
-    _inherit = "share.wizard"
-    
-    def _add_access_rights_for_share_group(self, cr, uid, group_id, mode, fields_relations, context=None):
-        """Adds access rights to group_id on object models referenced in ``fields_relations``,
-           intersecting with access rights of current user to avoid granting too much rights
-        """
-        res = super(share_wizard_event, self)._add_access_rights_for_share_group(cr, uid, group_id, mode, fields_relations, context=context)
-        access_model = self.pool.get('ir.model.access')
-        
-        access_ids =  access_model.search(cr,uid,[('group_id','=',group_id)],context = context)
-        for record in access_model.browse(cr,uid,access_ids,context = context):
-            if record.model_id.model == 'event.registration':
-                access_model.write(cr, uid, record.id, {'perm_read': True, 'perm_write': True,'perm_create':True})
-
-share_wizard_event()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 0500d3167aa3fe2680f3e9dfc65c3abd762d98a5 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 29 Mar 2012 12:31:53 +0200
Subject: [PATCH 43/43] [FIX] base: restriced access on some menuitems
 ('Reporting\Audit' and 'Reporting\Configuration') to the group
 'base.group_system'

bzr revid: qdp-launchpad@openerp.com-20120329103153-1787msoq8bkufx5z
---
 openerp/addons/base/base_menu.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 83460dee9af..d8cde2700ba 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -29,8 +29,8 @@
 
         <menuitem id="base.menu_reporting" name="Reporting" sequence="45"/>
         <menuitem id="base.menu_reporting_dashboard" name="Dashboards" sequence="0" parent="base.menu_reporting" groups="base.group_extended"/>
-        <menuitem id="menu_audit" name="Audit" parent="base.menu_reporting" sequence="50"/>
-        <menuitem id="base.menu_reporting_config" name="Configuration" parent="base.menu_reporting" sequence="100"/>
+        <menuitem id="menu_audit" name="Audit" parent="base.menu_reporting" sequence="50" groups="base.group_system"/>
+        <menuitem id="base.menu_reporting_config" name="Configuration" parent="base.menu_reporting" sequence="100" groups="base.group_system"/>
 
     </data>
 </openerp>