diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f0311f8fce5..08ca21d6553 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -296,7 +296,7 @@
                     <field name="planned_revenue" sum="Expected Revenues"/>
                     <field name="user_email"/>
                     <field name="user_id"/>
-                    <field name="partner_address_email"/>
+                    <field name="partner_address_email"/><
                     <field name="message_summary"/>
                     <field name="message_unread"/>
                     <templates>
diff --git a/addons/lunch_new/lunch.py b/addons/lunch_new/lunch.py
index 398260ae554..76c0ec7d6ea 100644
--- a/addons/lunch_new/lunch.py
+++ b/addons/lunch_new/lunch.py
@@ -21,218 +21,231 @@
 import addons
 import tools
 import pytz
+import time
 from osv import osv, fields
+from datetime import datetime, timedelta
 
 class lunch_order(osv.Model):
-	""" lunch order """
-	_name = 'lunch.order'
-	_description = 'Lunch Order'
+    """ lunch order """
+    _name = 'lunch.order'
+    _description = 'Lunch Order'
 
-	def _price_get(self,cr,uid,ids,name,arg,context=None):
-		orders = self.browse(cr,uid,ids,context=context)
-		result={}
-		for order in orders:
-			value = 0.0
-			for product in order.products:
-				if product.state != 'cancelled':
-					value+=product.product.price
-					result[order.id]=value
-		return result
+    def _price_get(self,cr,uid,ids,name,arg,context=None):
+        orders = self.browse(cr,uid,ids,context=context)
+        result={}
+        for order in orders:
+            value = 0.0
+            for product in order.products:
+                if product.state != 'cancelled':
+                    value+=product.product.price
+                    result[order.id]=value
+        return result
 
-	def _alerts_get(self,cr,uid,ids,name,arg,context=None):
-		orders = self.browse(cr,uid,ids,context=context)
-		alert_ref = self.pool.get('lunch.alert')
-		alert_ids = alert_ref.search(cr,uid,[],context=context)
-		result={}
-		alert_msg= self._default_alerts_get(cr,uid,arg,context)
-		for order in orders:
-			if order.state=='new':
-				result[order.id]=alert_msg
-		return result
+    def _alerts_get(self,cr,uid,ids,name,arg,context=None):
+        orders = self.browse(cr,uid,ids,context=context)
+        alert_ref = self.pool.get('lunch.alert')
+        alert_ids = alert_ref.search(cr,uid,[],context=context)
+        result={}
+        alert_msg= self._default_alerts_get(cr,uid,arg,context)
+        for order in orders:
+            if order.state=='new':
+                result[order.id]=alert_msg
+        return result
 
-	def _default_alerts_get(self,cr,uid,arg,context=None):
-		alert_ref = self.pool.get('lunch.alert')
-		alert_ids = alert_ref.search(cr,uid,[],context=context)
-		alert_msg=""
-		for alert in alert_ref.browse(cr,uid,alert_ids,context=context):
-			if alert :
-				#there are alerts
-				if alert.active==True:
-					#the alert is active
-					if alert.day=='specific':
-						#the alert is only activated a specific day
-						if alert.specific==fields.datetime.now().split(' ')[0]:
-							print alert.specific
-					elif alert.day=='week':
-						#the alert is activated during some days of the week
-						continue
-					elif alert.day=='days':
-						#the alert is activated everyday
-						if alert.active_from==alert.active_to:
-							#the alert is executing all the day
-							alert_msg+=" * "
-							alert_msg+=alert.message
-							alert_msg+='\n'
-						elif alert.active_from<alert.active_to:
-							#the alert is executing from ... to ...
-							now = fields.datetime.now().split(' ')[1]
-							user = self.pool.get('res.users').browse(cr, uid, uid)
-            				tz = pytz.timezone(user.tz) if user.tz else pytz.utc
-            				hour_to = int(alert.active_to)
-            				min_to = int((alert.active_to-hour_to)*60)
-            				to_alert = ""+str(hour_to)+":"+str(min_to)
-            				hour_from = int(alert.active_from)
-            				min_from = int((alert.active_from-hour_from)*60)
-            				from_alert = ""+str(hour_from)+":"+str(min_from)
-            				if now>=from_alert and now<=to_alert:
-								alert_msg+=" * "
-								alert_msg+=alert.message
-								alert_msg+='\n'
-		return alert_msg
+    def _default_alerts_get(self,cr,uid,arg,context=None):
+        alert_ref = self.pool.get('lunch.alert')
+        alert_ids = alert_ref.search(cr,uid,[],context=context)
+        alert_msg=""
+        for alert in alert_ref.browse(cr,uid,alert_ids,context=context):
+            if alert :
+                #there are alerts
+                if alert.active==True:
+                    #the alert is active
+                    if alert.day=='specific':
+                        #the alert is only activated a specific day
+                        if alert.specific==fields.datetime.now().split(' ')[0]:
+                            print alert.specific
+                    elif alert.day=='week':
+                        #the alert is activated during some days of the week
+                        continue
+                    elif alert.day=='days':
+                        #the alert is activated everyday
+                        if alert.active_from==alert.active_to:
+                            #the alert is executing all the day
+                            alert_msg+=" * "
+                            alert_msg+=alert.message
+                            alert_msg+='\n'
+                        elif alert.active_from<alert.active_to:
+                            #the alert is executing from ... to ...
+                            now = datetime.utcnow()#.split(' ')[1] 
+                            user = self.pool.get('res.users').browse(cr, uid, uid)
+                            tz = pytz.timezone(user.tz) if user.tz else pytz.utc
+                            tzoffset=tz.utcoffset(now)
+                            mynow = now+tzoffset
+                            hour_to = int(alert.active_to)
+                            min_to = int((alert.active_to-hour_to)*60)
+                            to_alert = datetime.strptime(str(hour_to)+":"+str(min_to),"%H:%M")
+                            hour_from = int(alert.active_from)
+                            min_from = int((alert.active_from-hour_from)*60)
+                            from_alert = datetime.strptime(str(hour_from)+":"+str(min_from),"%H:%M")
+                            if mynow.time()>=from_alert.time() and mynow.time()<=to_alert.time():
+                                alert_msg+=" * "
+                                alert_msg+=alert.message
+                                alert_msg+='\n'
+        return alert_msg
 
-	def onchange_price(self,cr,uid,ids,products,context=None):
-		res = {'value':{'total':0.0}}
-		if products:
-			tot = 0.0
-			for prod in products:
-				#price = self.pool.get('lunch.product').read(cr, uid, prod, ['price'])['price']
-				#tot += price
-				res = {'value':{'total':2.0}}
-		#	prods = self.pool.get('lunch.order.line').read(cr,uid,products,['price'])['price']
-		#	res = {'value':{'total': self._price_get(cr,uid,ids,products,context),}}
-		return res
+    def onchange_price(self,cr,uid,ids,products,context=None):
+        res = {'value':{'total':0.0}}
+        if products:
+            tot = 0.0
+            for prod in products:
+                #price = self.pool.get('lunch.product').read(cr, uid, prod, ['price'])['price']
+                #tot += price
+                res = {'value':{'total':2.0}}
+        #    prods = self.pool.get('lunch.order.line').read(cr,uid,products,['price'])['price']
+        #    res = {'value':{'total': self._price_get(cr,uid,ids,products,context),}}
+        return res
 
-	_columns = {
-		'user_id' : fields.many2one('res.users','User Name',required=True,readonly=True, states={'new':[('readonly', False)]}),
-		'date': fields.date('Date', required=True,readonly=True, states={'new':[('readonly', False)]}),
-		'products' : fields.one2many('lunch.order.line','order_id','Products',ondelete="cascade",readonly=True,states={'new':[('readonly', False)]}),
-		'total' : fields.function(_price_get, string="Total",store=True),
-		'state': fields.selection([('new', 'New'),('confirmed','Confirmed'), ('cancelled','Cancelled'), ('partially','Parcially Confirmed')], \
-        	'Status', readonly=True, select=True),
-		'alerts': fields.function(_alerts_get, string="Alerts", type='text'),
-	}
+    def _default_product_get(self,cr,uid,arg,context=None):
+        cr.execute('''SELECT lp.name, lp.description, lp.price, lp.supplier, lp.active, lp.category_id FROM lunch_product AS lp''')
+        res = cr.dictfetchall()
+        return res
+            
 
-	_defaults = {
+    _columns = {
+        'user_id' : fields.many2one('res.users','User Name',required=True,readonly=True, states={'new':[('readonly', False)]}),
+        'date': fields.date('Date', required=True,readonly=True, states={'new':[('readonly', False)]}),
+        'products' : fields.one2many('lunch.order.line','order_id','Products',ondelete="cascade",readonly=True,states={'new':[('readonly', False)]}),
+        'total' : fields.function(_price_get, string="Total",store=True),
+        'state': fields.selection([('new', 'New'),('confirmed','Confirmed'), ('cancelled','Cancelled'), ('partially','Parcially Confirmed')], \
+            'Status', readonly=True, select=True),
+        'alerts': fields.function(_alerts_get, string="Alerts", type='text'),
+        'preferences': fields.one2many("lunch.product",'order_id',readonly=True),
+    }
+
+    _defaults = {
         'user_id': lambda self, cr, uid, context: uid,
         'date': fields.date.context_today,
         'state': lambda self, cr, uid, context: 'new',
         'alerts': _default_alerts_get,
+        'preferences': _default_product_get,
     }
 
 class lunch_order_line(osv.Model): #define each product that will be in one ORDER.
-	""" lunch order line """
-	_name = 'lunch.order.line'
-	_description = 'lunch order line'
+    """ lunch order line """
+    _name = 'lunch.order.line'
+    _description = 'lunch order line'
 
-	def _price_get(self,cr,uid,ids,name,arg,context=None):
-		orderLines = self.browse(cr,uid,ids,context=context)
-		result={}
-		for orderLine in orderLines:
-			result[orderLine.id]=orderLine.product.price
-		return result
+    def _price_get(self,cr,uid,ids,name,arg,context=None):
+        orderLines = self.browse(cr,uid,ids,context=context)
+        result={}
+        for orderLine in orderLines:
+            result[orderLine.id]=orderLine.product.price
+        return result
 
-	def onchange_price(self,cr,uid,ids,product,context=None):
-		if product:
-			price = self.pool.get('lunch.product').read(cr, uid, product, ['price'])['price']
-        	return {'value': {'price': price}}
-		return {'value': {'price': 0.0}} 
+    def onchange_price(self,cr,uid,ids,product,context=None):
+        if product:
+            price = self.pool.get('lunch.product').read(cr, uid, product, ['price'])['price']
+            return {'value': {'price': price}}
+        return {'value': {'price': 0.0}} 
 
 
-	def confirm(self,cr,uid,ids,context=None):
-		#confirm one or more order.line, update order status and create new cashmove
-		cashmove_ref = self.pool.get('lunch.cashmove')
-		orders_ref = self.pool.get('lunch.order')
+    def confirm(self,cr,uid,ids,context=None):
+        #confirm one or more order.line, update order status and create new cashmove
+        cashmove_ref = self.pool.get('lunch.cashmove')
+        orders_ref = self.pool.get('lunch.order')
 
-		for order in self.browse(cr,uid,ids,context=context):
-			if order.state!='confirmed':
-				new_id = cashmove_ref.create(cr,uid,{'user_id': order.user_id.id, 'amount':0 - order.price,'description':order.product.name, 'order_id':order.id, 'state':'order', 'date':order.date})
-				self.write(cr,uid,[order.id],{'cashmove':[('0',new_id)], 'state':'confirmed'},context)
-		for order in self.browse(cr,uid,ids,context=context):
-			isconfirmed = True
-			for product in order.order_id.products:
-				if product.state == 'new':
-					isconfirmed = False
-				if product.state == 'cancelled':
-					isconfirmed = False
-					orders_ref.write(cr,uid,[order.order_id.id],{'state':'partially'},context)
-			if isconfirmed == True:
-				orders_ref.write(cr,uid,[order.order_id.id],{'state':'confirmed'},context)
-		return {}
+        for order in self.browse(cr,uid,ids,context=context):
+            if order.state!='confirmed':
+                new_id = cashmove_ref.create(cr,uid,{'user_id': order.user_id.id, 'amount':0 - order.price,'description':order.product.name, 'order_id':order.id, 'state':'order', 'date':order.date})
+                self.write(cr,uid,[order.id],{'cashmove':[('0',new_id)], 'state':'confirmed'},context)
+        for order in self.browse(cr,uid,ids,context=context):
+            isconfirmed = True
+            for product in order.order_id.products:
+                if product.state == 'new':
+                    isconfirmed = False
+                if product.state == 'cancelled':
+                    isconfirmed = False
+                    orders_ref.write(cr,uid,[order.order_id.id],{'state':'partially'},context)
+            if isconfirmed == True:
+                orders_ref.write(cr,uid,[order.order_id.id],{'state':'confirmed'},context)
+        return {}
 
-	def cancel(self,cr,uid,ids,context=None):
-		#confirm one or more order.line, update order status and create new cashmove
-		cashmove_ref = self.pool.get('lunch.cashmove')
-		orders_ref = self.pool.get('lunch.order')
+    def cancel(self,cr,uid,ids,context=None):
+        #confirm one or more order.line, update order status and create new cashmove
+        cashmove_ref = self.pool.get('lunch.cashmove')
+        orders_ref = self.pool.get('lunch.order')
 
-		for order in self.browse(cr,uid,ids,context=context):
-			self.write(cr,uid,[order.id],{'state':'cancelled'},context)
-			for cash in order.cashmove:
-				cashmove_ref.unlink(cr,uid,cash.id,context)
-		for order in self.browse(cr,uid,ids,context=context):
-			hasconfirmed = False
-			hasnew = False
-			for product in order.order_id.products:
-				if product.state=='confirmed':
-					hasconfirmed= True
-				if product.state=='new':
-					hasnew= True
-			if hasnew == False:
-				if hasconfirmed == False:
-					orders_ref.write(cr,uid,[order.order_id.id],{'state':'cancelled'},context)
-					return {}
-			orders_ref.write(cr,uid,[order.order_id.id],{'state':'partially'},context)
-		return {}
+        for order in self.browse(cr,uid,ids,context=context):
+            self.write(cr,uid,[order.id],{'state':'cancelled'},context)
+            for cash in order.cashmove:
+                cashmove_ref.unlink(cr,uid,cash.id,context)
+        for order in self.browse(cr,uid,ids,context=context):
+            hasconfirmed = False
+            hasnew = False
+            for product in order.order_id.products:
+                if product.state=='confirmed':
+                    hasconfirmed= True
+                if product.state=='new':
+                    hasnew= True
+            if hasnew == False:
+                if hasconfirmed == False:
+                    orders_ref.write(cr,uid,[order.order_id.id],{'state':'cancelled'},context)
+                    return {}
+            orders_ref.write(cr,uid,[order.order_id.id],{'state':'partially'},context)
+        return {}
 
-	_columns = {
-		'date' : fields.related('order_id','date',type='date', string="Date", readonly=True,store=True),
-		'supplier' : fields.related('product','supplier',type='many2one',relation='res.partner',string="Supplier",readonly=True,store=True),
-		'user_id' : fields.related('order_id', 'user_id', type='many2one', relation='res.users', string='User', readonly=True),
-		'product' : fields.many2one('lunch.product','Product',required=True), #one offer can have more than one product and one product can be in more than one offer.
-		'note' : fields.text('Note',size=256,required=False),
-		'order_id' : fields.many2one('lunch.order','Order',required=True,ondelete='cascade'),
-		'price' : fields.function(_price_get, string="Price",store=True),
-		'state': fields.selection([('new', 'New'),('confirmed','Confirmed'), ('cancelled','Cancelled')], \
-        	'Status', readonly=True, select=True),
-		'cashmove': fields.one2many('lunch.cashmove','order_id','Cash Move',ondelete='cascade'),
-	}
-	_defaults = {
-		'state': lambda self, cr, uid, context: 'new',
+    _columns = {
+        'date' : fields.related('order_id','date',type='date', string="Date", readonly=True,store=True),
+        'supplier' : fields.related('product','supplier',type='many2one',relation='res.partner',string="Supplier",readonly=True,store=True),
+        'user_id' : fields.related('order_id', 'user_id', type='many2one', relation='res.users', string='User', readonly=True),
+        'product' : fields.many2one('lunch.product','Product',required=True), #one offer can have more than one product and one product can be in more than one offer.
+        'note' : fields.text('Note',size=256,required=False),
+        'order_id' : fields.many2one('lunch.order','Order',required=True,ondelete='cascade'),
+        'price' : fields.function(_price_get, string="Price",store=True),
+        'state': fields.selection([('new', 'New'),('confirmed','Confirmed'), ('cancelled','Cancelled')], \
+            'Status', readonly=True, select=True),
+        'cashmove': fields.one2many('lunch.cashmove','order_id','Cash Move',ondelete='cascade'),
+    }
+    _defaults = {
+        'state': lambda self, cr, uid, context: 'new',
     }
 
 class lunch_product(osv.Model):
-	""" lunch product """
-	_name = 'lunch.product'
-	_description = 'lunch product'
-	_columns = {
-		'name' : fields.char('Product',required=True, size=64),
-		'category_id': fields.many2one('lunch.product.category', 'Category'),
-		'description': fields.text('Description', size=256, required=False),
+    """ lunch product """
+    _name = 'lunch.product'
+    _description = 'lunch product'
+    _columns = {
+        'name' : fields.char('Product',required=True, size=64),
+        'category_id': fields.many2one('lunch.product.category', 'Category'),
+        'description': fields.text('Description', size=256, required=False),
         'price': fields.float('Price', digits=(16,2)),
         'active': fields.boolean('Active'), #If this product isn't offered anymore, the active boolean is set to false. This will allow to keep trace of previous orders and cashmoves.
         'supplier' : fields.many2one('res.partner','Supplier',required=True, domain=[('supplier_lunch','=',True)]), 
-	}
+        'order_id' : fields.many2one('lunch.order','Order'),
+    }
 
 class lunch_product_category(osv.Model):
-	""" lunch product category """
-	_name = 'lunch.product.category'
-	_description = 'lunch product category'
-	_columns = {
-		'name' : fields.char('Category', required=True, size=64), #such as PIZZA, SANDWICH, PASTA, CHINESE, BURGER, ...
-	}
+    """ lunch product category """
+    _name = 'lunch.product.category'
+    _description = 'lunch product category'
+    _columns = {
+        'name' : fields.char('Category', required=True, size=64), #such as PIZZA, SANDWICH, PASTA, CHINESE, BURGER, ...
+    }
 
 class lunch_cashmove(osv.Model):
-	""" lunch cashmove => order or payment """
-	_name = 'lunch.cashmove'
-	_description = 'lunch description'
-	_columns = {
-		'user_id' : fields.many2one('res.users','User Name',required=True),
-		'date' : fields.date('Date', required=True),
-		'amount' : fields.float('Amount', required=True), #depending on the kind of cashmove, the amount will be positive or negative
-		'description' : fields.text('Description',size=256), #the description can be an order or a payment
-		'order_id' : fields.many2one('lunch.order.line','Order',required=False,ondelete='cascade'),
-		'state' : fields.selection([('order','Order'),('payment','Payment')],'Is an order or a Payment'),
-	}
-	_defaults = {
+    """ lunch cashmove => order or payment """
+    _name = 'lunch.cashmove'
+    _description = 'lunch description'
+    _columns = {
+        'user_id' : fields.many2one('res.users','User Name',required=True),
+        'date' : fields.date('Date', required=True),
+        'amount' : fields.float('Amount', required=True), #depending on the kind of cashmove, the amount will be positive or negative
+        'description' : fields.text('Description',size=256), #the description can be an order or a payment
+        'order_id' : fields.many2one('lunch.order.line','Order',required=False,ondelete='cascade'),
+        'state' : fields.selection([('order','Order'),('payment','Payment')],'Is an order or a Payment'),
+    }
+    _defaults = {
         'user_id': lambda self, cr, uid, context: uid,
         'date': fields.date.context_today,
         'state': lambda self, cr, uid, context: 'payment',
@@ -240,25 +253,25 @@ class lunch_cashmove(osv.Model):
 
 
 class lunch_alert(osv.Model):
-	""" lunch alert """
-	_name = 'lunch.alert'
-	_description = 'lunch alert'
-	_columns = {
-		'message' : fields.text('Message',size=256, required=True),
-		'active' : fields.boolean('Active'),
-		'day' : fields.selection([('specific','Specific day'), ('week','Every Week'), ('days','Every Day')], 'Recurrency'),
-		'specific' : fields.date('Day'),
-		'monday' : fields.boolean('Monday'),
-		'tuesday' : fields.boolean('Tuesday'),
-		'wednesday' : fields.boolean('Wednesday'),
-		'thursday' : fields.boolean('Thursday'),
-		'friday' : fields.boolean('Friday'),
-		'saturday' : fields.boolean('Saturday'),
-		'sunday' :  fields.boolean('Sunday'),
-		'active_from': fields.float('Between',required=True),
-		'active_to': fields.float('And',required=True),
-		#'active_from' : fields.selection([('0','00h00'),('1','00h30'),('2','01h00'),('3','01h30'),('4','02h00'),('5','02h30'),('6','03h00'),('7','03h30'),('8','04h00'),('9','04h30'),('10','05h00'),('11','05h30'),('12','06h00'),('13','06h30'),('14','07h00'),('15','07h30'),('16','08h00'),('17','08h30'),('18','09h00'),('19','09h30'),('20','10h00'),('21','10h30'),('22','11h00'),('23','11h30'),('24','12h00'),('25','12h30'),('26','13h00'),('27','13h30'),('28','14h00'),('29','14h30'),('30','15h00'),('31','15h30'),('32','16h00'),('33','16h30'),('34','17h00'),('35','17h30'),('36','18h00'),('37','18h30'),('38','19h00'),('39','19h30'),('40','20h00'),('41','20h30'),('42','21h00'),('43','21h30'),('44','22h00'),('45','22h30'),('46','23h00'),('47','23h30')],'Between',required=True), #defines from when (hours) the alert will be displayed
-		#'active_to' : fields.selection([('0','00h00'),('1','00h30'),('2','01h00'),('3','01h30'),('4','02h00'),('5','02h30'),('6','03h00'),('7','03h30'),('8','04h00'),('9','04h30'),('10','05h00'),('11','05h30'),('12','06h00'),('13','06h30'),('14','07h00'),('15','07h30'),('16','08h00'),('17','08h30'),('18','09h00'),('19','09h30'),('20','10h00'),('21','10h30'),('22','11h00'),('23','11h30'),('24','12h00'),('25','12h30'),('26','13h00'),('27','13h30'),('28','14h00'),('29','14h30'),('30','15h00'),('31','15h30'),('32','16h00'),('33','16h30'),('34','17h00'),('35','17h30'),('36','18h00'),('37','18h30'),('38','19h00'),('39','19h30'),('40','20h00'),('41','20h30'),('42','21h00'),('43','21h30'),('44','22h00'),('45','22h30'),('46','23h00'),('47','23h30')],'and',required=True), # to when (hours) the alert will be disabled
-	}
+    """ lunch alert """
+    _name = 'lunch.alert'
+    _description = 'lunch alert'
+    _columns = {
+        'message' : fields.text('Message',size=256, required=True),
+        'active' : fields.boolean('Active'),
+        'day' : fields.selection([('specific','Specific day'), ('week','Every Week'), ('days','Every Day')], 'Recurrency'),
+        'specific' : fields.date('Day'),
+        'monday' : fields.boolean('Monday'),
+        'tuesday' : fields.boolean('Tuesday'),
+        'wednesday' : fields.boolean('Wednesday'),
+        'thursday' : fields.boolean('Thursday'),
+        'friday' : fields.boolean('Friday'),
+        'saturday' : fields.boolean('Saturday'),
+        'sunday' :  fields.boolean('Sunday'),
+        'active_from': fields.float('Between',required=True),
+        'active_to': fields.float('And',required=True),
+        #'active_from' : fields.selection([('0','00h00'),('1','00h30'),('2','01h00'),('3','01h30'),('4','02h00'),('5','02h30'),('6','03h00'),('7','03h30'),('8','04h00'),('9','04h30'),('10','05h00'),('11','05h30'),('12','06h00'),('13','06h30'),('14','07h00'),('15','07h30'),('16','08h00'),('17','08h30'),('18','09h00'),('19','09h30'),('20','10h00'),('21','10h30'),('22','11h00'),('23','11h30'),('24','12h00'),('25','12h30'),('26','13h00'),('27','13h30'),('28','14h00'),('29','14h30'),('30','15h00'),('31','15h30'),('32','16h00'),('33','16h30'),('34','17h00'),('35','17h30'),('36','18h00'),('37','18h30'),('38','19h00'),('39','19h30'),('40','20h00'),('41','20h30'),('42','21h00'),('43','21h30'),('44','22h00'),('45','22h30'),('46','23h00'),('47','23h30')],'Between',required=True), #defines from when (hours) the alert will be displayed
+        #'active_to' : fields.selection([('0','00h00'),('1','00h30'),('2','01h00'),('3','01h30'),('4','02h00'),('5','02h30'),('6','03h00'),('7','03h30'),('8','04h00'),('9','04h30'),('10','05h00'),('11','05h30'),('12','06h00'),('13','06h30'),('14','07h00'),('15','07h30'),('16','08h00'),('17','08h30'),('18','09h00'),('19','09h30'),('20','10h00'),('21','10h30'),('22','11h00'),('23','11h30'),('24','12h00'),('25','12h30'),('26','13h00'),('27','13h30'),('28','14h00'),('29','14h30'),('30','15h00'),('31','15h30'),('32','16h00'),('33','16h30'),('34','17h00'),('35','17h30'),('36','18h00'),('37','18h30'),('38','19h00'),('39','19h30'),('40','20h00'),('41','20h30'),('42','21h00'),('43','21h30'),('44','22h00'),('45','22h30'),('46','23h00'),('47','23h30')],'and',required=True), # to when (hours) the alert will be disabled
+    }
 
 
diff --git a/addons/lunch_new/lunch_view.xml b/addons/lunch_new/lunch_view.xml
index 1177bf88cf5..5ef29b55378 100644
--- a/addons/lunch_new/lunch_view.xml
+++ b/addons/lunch_new/lunch_view.xml
@@ -47,6 +47,7 @@
             <field name='arch' type='xml'>
                 <search string="lunch employee payment">
                     <filter name='is_payment' string="Payment" domain="[('state','=','payment')]"/>
+                    <filter name='is_mine' string="My Account" domain="[('user_id','=',uid)]"/>
                 </search>
             </field>
         </record>
@@ -62,11 +63,25 @@
             </field>
         </record>
 
+        <!--View search for order-->
+        <record id="view_search_my_order" model="ir.ui.view">
+            <field name='name'>lunch orders</field>
+            <field name='model'>lunch.order</field>
+            <field name='type'>search</field>
+            <field name='arch' type='xml'>
+                <search string="lunch orders">
+                    <filter name='is_mine' string="My Orders" domain="[('user_id','=',uid)]"/>
+                </search>
+            </field>
+        </record>
+
     	<!--Action for Your Orders-->
 		<record model="ir.actions.act_window" id="action_lunch_order_form">
             <field name="name">Your Orders</field>
             <field name="res_model">lunch.order</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_search_my_order"/>
+            <field name="context">{"search_default_is_mine":1}</field>
             <field name="help" type="html">
             <p class="oe_view_nocontent_create">
                 Click to create a lunch order. 
@@ -83,6 +98,8 @@
             <field name="name">Your Account</field>
             <field name="res_model">lunch.cashmove</field>
             <field name="view_mode">tree</field>
+            <field name="search_view_id" ref="view_lunch_employee_payment_filter"/>
+            <field name="context">{"search_default_is_mine":1}</field>
             <field name="help" type="html">
               <p>
                 Here you can see your cash moves. There are your orders and refund.
@@ -163,7 +180,7 @@
         <record model="ir.actions.act_window" id="action_lunch_products">
             <field name="name">Products</field>
             <field name="res_model">lunch.product</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,kanban</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                 Click to create a product for lunch. 
@@ -237,6 +254,7 @@
                     <field name="products"/>
                     <field name="state" invisible='1'/>
                     <field name="total" sum="Total"/>
+                    <field name="preferences" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -244,9 +262,9 @@
         <record model="ir.ui.view" id="orders_form_view">
 			<field name="name">Orders Form</field>
 			<field name="model">lunch.order</field>
-			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Orders Form" version="7.0">
+                    <sheet>
                 <field name="state" invisible='1'/>
                 <group col="2">
                     <field name="user_id"/>
@@ -260,8 +278,36 @@
                     </group>
                     <group colspan="2" col="2">
                     </group>
-					<separator string="Products" colspan="4"/>					
-
+					<separator string="Products" colspan="4"/>	
+                    <field name="preferences" colspan="4" nolabel="1">
+                        <kanban default_group_by="category_id">
+                            <templates>
+                                <t t-name="kanban-box">
+                                    <div class="oe_kanban_color_0 oe_kanban_card oe_kanban_global_click oe_kanban_draghandle">
+                                    <div class="oe_kanban_vignette oe_semantic_html_override"> 
+                                        <div class="oe_kanban_details">
+                                            <h3 class="oe_partner_heading">
+                                                <a type="open">
+                                                    <u><field name="name"/><br/></u>
+                                                </a>
+                                            </h3> 
+                                            <h4>
+                                                <a type="open">
+                                                    Price:
+                                                    <field name="price"/>
+                                                    €
+                                                    <br/>
+                                                </a>
+                                            </h4> 
+                                            Supplier: <field name="supplier"/><br/>
+                                            <font size="2" color="gray"><field name="description"/></font>
+                                        </div>
+                                    </div>
+                                    </div>
+                                </t>
+                            </templates>
+                        </kanban>
+                    </field>
 					<separator string="Your Order" colspan="4"/>
 					<field name="products" colspan="4" nolabel="1" on_change="onchange_price(products)">
 						<tree string="List" editable="bottom">
@@ -270,8 +316,9 @@
                             <field name="state"/>
 							<field name="price"/>
 						</tree>
-					</field>
+					</field> 
 					<field name="total"/>
+                    </sheet>
 				</form>
 			</field>
 		</record>
@@ -299,20 +346,54 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Products Form">
-                    <group colspan="2" col="2">
-                        <field name='name'/>
-                        <field name='category_id'/>
-                        <field name='supplier'/>
-                        <field name='price'/>
-                        <field name='active'/>
-                    </group>
-                    <group colspan="2" col="2">
-                    </group>
-                    <field name='description'/>
+                        <group colspan="2" col="2">
+                            <field name='name'/>
+                            <field name='category_id'/>
+                            <field name='supplier'/>
+                            <field name='price'/>
+                            <field name='active'/>
+                        </group>
+                        <group colspan="2" col="2">
+                        </group>
+                        <field name='description'/>
                 </form>
             </field>
         </record>
 
+        <record model="ir.ui.view" id="products_kanban_view">
+            <field name="name">Products Kanban</field>
+            <field name="model">lunch.product</field>
+            <field name="arch" type="xml">
+                <kanban default_group_by="category_id">
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div class="oe_kanban_color_0 oe_kanban_card oe_kanban_global_click oe_kanban_draghandle">
+                            <div class="oe_kanban_vignette oe_semantic_html_override"> 
+                                <div class="oe_kanban_details">
+                                    <h3 class="oe_partner_heading">
+                                        <a type="open">
+                                            <u><field name="name"/><br/></u>
+                                        </a>
+                                    </h3> 
+                                    <h4>
+                                        <a type="open">
+                                            Price:
+                                            <field name="price"/>
+                                            €
+                                            <br/>
+                                        </a>
+                                    </h4> 
+                                    Supplier: <field name="supplier"/><br/>
+                                    <font size="2" color="gray"><field name="description"/></font>
+                                </div>
+                            </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
         <!--view for cashmove-->
         <record model="ir.ui.view" id="casmove_tree_view">
             <field name="name">cashmove tree</field>
@@ -354,6 +435,9 @@
             <field name="arch" type="xml">
                 <tree string="alert tree">
                     <field name="message"/>
+                    <field name="day"/>
+                    <field name='active_from' widget='float_time'/>
+                    <field name='active_to' widget='float_time'/>
                     <field name="active"/>
                 </tree>
             </field>