From c850875ca386d81c69f02aa6614bb290b4264cf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 2 Oct 2012 12:04:20 +0200
Subject: [PATCH 01/26] [FIX] point_of_sale: Number.isNaN is not supported on
 older but supported browsers

bzr revid: fva@openerp.com-20121002100420-pcvbn7qqxyp62bzw
---
 addons/point_of_sale/static/src/js/widgets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 47a527a010d..72e7c5c1612 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -712,7 +712,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             });
             this.$('.button.set_weight').click(function(){
                 var kg = Number(self.$('input.weight').val());
-                if(!Number.isNaN(kg)){
+                if(!isNaN(kg)){
                     self.pos.proxy.debug_set_weight(kg);
                 }
             });

From 0fa7da31685d353e1d397f0f078629447ec9660e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 2 Oct 2012 12:13:53 +0200
Subject: [PATCH 02/26] [WIP FIX] point_of_sale: investigating a bug with
 codebar scanning in subcategories

bzr revid: fva@openerp.com-20121002101353-imjbqe1vxtdjbqu7
---
 addons/point_of_sale/static/src/js/devices.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js
index 142d35bd340..f998ed334df 100644
--- a/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -432,13 +432,13 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             // The barcode readers acts as a keyboard, we catch all keyup events and try to find a 
             // barcode sequence in the typed keys, then act accordingly.
             $('body').delegate('','keyup', function (e){
-
+                console.log('keyup:'+String.fromCharCode(e.keyCode)+' '+e.keyCode,e);
                 //We only care about numbers
-                if (!isNaN(Number(String.fromCharCode(e.keyCode)))) {
+                if (e.keyCode >= 48 && e.keyCode < 58){
 
                     // The barcode reader sends keystrokes with a specific interval.
                     // We look if the typed keys fit in the interval. 
-                    if (codeNumbers.length==0) {
+                    if (codeNumbers.length === 0) {
                         timeStamp = new Date().getTime();
                     } else {
                         if (lastTimeStamp + 30 < new Date().getTime()) {
@@ -449,7 +449,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
                     }
                     codeNumbers.push(e.keyCode - 48);
                     lastTimeStamp = new Date().getTime();
-                    if (codeNumbers.length == 13) {
+                    if (codeNumbers.length === 13) {
                         //We have found what seems to be a valid codebar
                         self.on_ean(codeNumbers.join(''));
                         codeNumbers = [];

From 6e27ee461b41688d375a43c3ec58c84149cede86 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Fri, 9 Nov 2012 17:43:58 +0530
Subject: [PATCH 03/26] [FIX]: Fix issue in warehouse module

bzr revid: aja@tinyerp.com-20121109121358-4ws1vlcrteq0ckv4
---
 addons/stock/stock_view.xml                 |  6 +++---
 addons/stock/wizard/stock_fill_inventory.py | 14 ++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9c2a672caf7..d548495d972 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -114,7 +114,7 @@
                 </header>
                 <sheet>
                     <div class="oe_right oe_button_box">
-                        <button name="%(action_view_stock_fill_inventory)d" string="Fill Inventory" type="action" />
+                        <button name="%(action_view_stock_fill_inventory)d" string="Fill Inventory" states="draft,cancel,confirm" type="action" />
                     </div>
                     <group>
                         <group>
@@ -1234,8 +1234,8 @@
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                         <group name="origin_grp" string="Origin">
-                            <field name="picking_id"/>
-                             <field name="type" on_change="onchange_move_type(type)"/>
+                            <field name="picking_id" domain="[('type','=',type)]"/>
+                             <field name="type" readonly="True" on_change="onchange_move_type(type)"/>
                             <field name="location_id" groups="stock.group_locations"/>
                             <field name="create_date" groups="base.group_no_one"/>
                         </group>
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 11907b674a1..1d3b8dd450d 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -60,9 +60,6 @@ class stock_fill_inventory(osv.osv_memory):
 
         if context.get('active_id', False):
             stock = self.pool.get('stock.inventory').browse(cr, uid, context.get('active_id', False))
-
-            if stock.state == 'done':
-                raise osv.except_osv(_('Warning!'), _('Stock Inventory is already Validated.'))
         return True
 
     def fill_inventory(self, cr, uid, ids, context=None):
@@ -126,22 +123,23 @@ class stock_fill_inventory(osv.osv_memory):
                 res[location] = datas
 
         if not flag:
-            raise osv.except_osv(_('Warning!'), _('No product in this location.'))
+            raise osv.except_osv(_('Warning!'), _('No product in this location. Please select a location in the product form.'))
 
         for stock_move in res.values():
             for stock_move_details in stock_move.values():
                 stock_move_details.update({'inventory_id': context['active_ids'][0]})
                 domain = []
-
-                if fill_inventory.set_stock_zero:
-                    stock_move_details.update({'product_qty': 0})
-
                 for field, value in stock_move_details.items():
+                    if field == 'product_qty' and fill_inventory.set_stock_zero:
+                         domain.append((field, 'in', [value,'0']))
+                         continue
                     domain.append((field, '=', value))
 
                 line_ids = inventory_line_obj.search(cr, uid, domain, context=context)
 
                 if not line_ids:
+                    if fill_inventory.set_stock_zero:
+                         stock_move_details.update({'product_qty': 0})
                     inventory_line_obj.create(cr, uid, stock_move_details, context=context)
 
         return {'type': 'ir.actions.act_window_close'}

From ba2f569d6debac69000c10ee8b6db5a9985abd39 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 9 Nov 2012 17:46:06 +0530
Subject: [PATCH 04/26] [IMP] add placeholder in procurement order.

bzr revid: tpa@tinyerp.com-20121109121606-vku2c5zzukv185b1
---
 addons/procurement/procurement_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 42179b17f92..cc922f70dc5 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -56,7 +56,7 @@
                     <h1>
                         <field name="name" class="oe_inline"/>
                         <label string="-" attrs="{'invisible':[('origin','=',False)]}"/>
-                        <field name="origin" class="oe_inline"/>
+                        <field name="origin" class="oe_inline" placeholder="e.g. SO005"/>
                     </h1>
                     <group>
                         <group>

From 269117635f746bed544275f32fbcef50e39c82ea Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 12 Nov 2012 11:44:01 +0530
Subject: [PATCH 05/26] [FIX] stock: meke type field to selection from related
 field.

bzr revid: tpa@tinyerp.com-20121112061401-jcqef7rxk0rw54g0
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 606cb9247d5..6a5b5745313 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1725,7 +1725,7 @@ class stock_move(osv.osv):
 
         # used for colors in tree views:
         'scrapped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scrapped', readonly=True),
-        'type': fields.related('picking_id', 'type', type='selection', selection=[('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], string='Shipping Type'),
+        'type': fields.selection( (('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')), 'Shipping Type', select=True),
     }
 
     def _check_location(self, cr, uid, ids, context=None):

From 8ed98ddec39fd774892420e40d15823f2baa4747 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 12 Nov 2012 12:32:24 +0530
Subject: [PATCH 06/26] [IMP] procurement: apply group on product_uom field.

bzr revid: tpa@tinyerp.com-20121112070224-md1utssp0qd99x69
---
 addons/procurement/procurement_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index cc922f70dc5..a0d51c87713 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -77,7 +77,7 @@
                                 <label for="product_qty"/>
                                 <div>
                                     <field name="product_qty" class="oe_inline"/>
-                                    <field name="product_uom" class="oe_inline"/>
+                                    <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
                                 </div>
                                 <label for="product_uos_qty" groups="product.group_uos"/>
                                 <div groups="product.group_uos">

From 58ec91eb79b873db6f38ff2c770c1b63f1cb887a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 14 Nov 2012 16:55:40 +0100
Subject: [PATCH 07/26] [FIX] point_of_sale: bad indentation

bzr revid: fva@openerp.com-20121114155540-dvkat6on42koims3
---
 addons/point_of_sale/static/src/js/widgets.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 5669bfe101b..bc5f29601a8 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -202,9 +202,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.currentOrderLines.bind('remove', this.renderElement, this);
         },
         update_numpad: function() {
-        	this.selected_line = this.pos.get('selectedOrder').getSelectedLine();
-        	if (this.numpadState)
-        		this.numpadState.reset();
+            this.selected_line = this.pos.get('selectedOrder').getSelectedLine();
+            if (this.numpadState)
+                this.numpadState.reset();
         },
         renderElement: function() {
             var self = this;

From 107e579ecdfb0ab8d20fb2e532a17967fc51350b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 14 Nov 2012 17:50:43 +0100
Subject: [PATCH 08/26] [IMP] point_of_sale: auto focus on paymentlines

bzr revid: fva@openerp.com-20121114165043-vbfj1r93ww3es9qt
---
 addons/point_of_sale/static/src/js/screens.js | 3 ++-
 addons/point_of_sale/static/src/js/widgets.js | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 0b8ab70a9c0..d8e53066c1e 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -899,7 +899,6 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                 });
 
             this.updatePaymentSummary();
-            this.$('.paymentline-amout input').last().focus();
         },
         close: function(){
             this._super();
@@ -946,6 +945,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                 self.deleteLine(r);
             });
             x.appendTo(this.$('#paymentlines'));
+            this.$('.paymentline-amount input:last').focus();
         },
         renderElement: function() {
             this._super();
@@ -975,6 +975,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             if(this.pos_widget.action_bar){
                 this.pos_widget.action_bar.set_button_disabled('validation', remaining > 0);
             }
+            this.$('.paymentline-amount input:last').focus();
         },
         set_numpad_state: function(numpadState) {
         	if (this.numpadState) {
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index bc5f29601a8..94d6a5dc57e 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -298,8 +298,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.payment_line.bind('change', this.changedAmount, this);
         },
         changeAmount: function(event) {
-            var newAmount;
-            newAmount = event.currentTarget.value;
+            var newAmount = event.currentTarget.value;
             if (newAmount && !isNaN(newAmount)) {
             	this.amount = parseFloat(newAmount);
                 this.payment_line.set_amount(this.amount);

From 8c820330a5e4985b622fcfaf10af45d1c6ef2379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 14 Nov 2012 18:00:06 +0100
Subject: [PATCH 09/26] [FIX] point_of_sale: removed the gif loader, replaced
 it by niv's js one

bzr revid: fva@openerp.com-20121114170006-gkx6ezikiw86po7u
---
 addons/point_of_sale/static/src/css/pos.css    |   5 -----
 addons/point_of_sale/static/src/img/loader.gif | Bin 3208 -> 0 bytes
 addons/point_of_sale/static/src/js/widgets.js  |   8 +++++---
 addons/point_of_sale/static/src/xml/pos.xml    |   1 -
 4 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 addons/point_of_sale/static/src/img/loader.gif

diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index 675b77345e7..9b286be250e 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -62,11 +62,6 @@
     z-index: 999;
     text-align: center;
 }
-.point-of-sale .loader img{
-    position:absolute;
-    top:50%;
-    left:50%;
-}
 
 /*  ********* Generic element styling  ********* */
 
diff --git a/addons/point_of_sale/static/src/img/loader.gif b/addons/point_of_sale/static/src/img/loader.gif
deleted file mode 100644
index 967288f55af9a3c9f27985da9559516e2d343aba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3208
zcmc(iX;2es0*0IPk)vBzyMq%5tO1D#<3Lc!aH<d>KtKWl5=E346};sT2m;{<36V2|
z%Yc$VVu+52cz})$f()nwh2!n4F5rv@-eWoIxKrzbJ5EvicdKUmXIEEuJ<s>PZ&mX{
zf;>DESpW-o0{|=*>%)f+LZMKlQY9oLWMpIv4-X$de%#N`kIUtXM4|@|9=w159{6<G
z{mYt{vN17jqlA@_oR-8&+>)5NZD*pyC3(lDoq*l15I~!J)b0biA~1R-&rcY*$b|!1
zOx{{J^@gdB0??ybgCWU@hKZp^Vu9SDDG0M{i6Z%FqK_{m8y2k`cjmaex?b9@-(@GQ
zzVIE#iZsjHp`XLEXmlZkINSXe%v<2MeD+QYsL*b)XSDm7_^TdHrWuOn^%q{8I4+@+
zGcx(UB8aw`4i#nui;HddAb!4T4mCEuF<$9SCBa~;q4A)%!K@87sq}}BG<Dk6b55O1
zV^;;Imh4Lr`2^>=<P-fRr)#O_)#7i6)z;#Hh``NWP<<X>wAQ7^_paaHBO)79iys0L
z@#4ND7td$Dshi*C9oSI%X5+Xme%l$ZxLLdj_%dKp!$%z!)7dAc*hQ@qLx)5`?)0Xh
z%Io?lq)!tqX7JC1%Fp&ZI}&DYl8jlunlBe^&tyI>*YshQ5Gx*|)0fv<;j)Pfmit*0
z=osY2_-%evVTYOs#%W6|+#*l>us0U5Vw0rM9y*jaZwp63E2nQO<!{dB<bowW`99R5
zHTpG*q^eAVj^75+vfA`*huRe_r)t+6;MARAe$78o#WWd(#nMK6AnDS1-NpK?(q25-
zy6zGstGxN@<)ppR8%b*Zy`u5hetmoX6X1FG)A%If(VF)1m%u=)QuTIz&F59ks}6j5
z+GEse(2n#wK507si%EPZw@Lg*ZhUviTKR$+UDUvFP4uEt&6cpD?7nM0EMm=w`)D}*
z{3wkxV&x>aqOrod=Cp>8ieGJ)4+WYA*3(Zw@GjgCLqqeSgiUldr68dL9{kakgrsBM
z1W76-<#3APm{eNHN)EU&!!`@r>O*d1Qx8V8w3Jj+tBlfCbGG`cBj&wr=GId!dUm(X
z{<HLRLG8(<ZoL|gvP7mZUin&dLQCxL^SGF)`bJ$!l^(pbyaX?~<#X>aFb?b=xN!f$
zW1#&!^O?u%M<Sp0(h2;Mf#UH-aVTCPv~)Om)?lZ;Fk|+o1c1{OOr^h#p`RGqY!w(Y
ztErZCqd7{EsEPKUb*FVEF?N2}QpZy@ts5zC9h43BN{}9}m>1~Av)CcKSWYjzlzZz2
z5Nfq>&fgaLCDu^P)=e=P2}>+O*us1FDKpd2$T^D_ld?JaNU~eBoDXl#u*u3{gG#nz
zRAUo?HS18AS}rg3)tNElp{B!Fi{a4X1E=`4>~77jGv_!)S_9D;8nsjIP7D@vLM|G&
zXKhtNeVIc9C0e;IXK+CUAitF`KAt6LDo;I$KWlulG<ltgU4G-mj`zNI@bSBsci&#J
zap;Ti-qt_T4^3zPc>K<$i6KX)K!ap$O(nrF_6eh?eiV(D-B<sVrl<?58^sybGuT|2
zJ->B<#9@uSLj5kZ<F7qINnceWU?R?pgoI`5cd>1Hi(UPLgz+0<W{l5R7Cn+iTIIS6
zA@k=)qy@l<>uge?EZc1Xj^XtU1lriNo2p9NP~T)gb@~P)DsI*<+TRfXR#%3D80KYL
zb<(=K8?BJ&lxz~xgCTkPCG1ouwC8M9dLdL8xR~CBwE&_RnbkfZ?QZSEhgIJOs2m=K
zCWk-w85NCst8O17Wc3oCYE}fPAT91^pWTk1&-S1B$MM6{6}*`mfT*^~0k98cvzlrv
z={jRz<Z5%}QT%)SWtc>*`o|Zdqej}>q=MS5k0W(^WktCASUP?lTOxWFLNBziJlsrz
zR?HBuLKS7Q^eTnBmiFR8O2IGGBkU|O^RuN1Y|>8Gls&fFJRQT-)dW&oNA{jutnjQm
zh-e$Dn~?^2i^l8;%GhN#Fp7fvl07>+ktW>4;!()mDA~T)-xkFDA*B0cKq^r|Cu0~w
z2Zs~lpiMarLh3CnJM8{4A#fQ(HQI<J0D5brC-B-E=qI%{_NfD->*3|u77~CIIx^1*
zm;Yr~?Cjnihfhm@O!x3~ng{u06j+wJsNU5pN}Pqx7Kg{YZ#W3Eoi!^8dY;Dzj#U0^
zN6B-GiCA<mfZDJwg&XpVn5Jv}>H5Xsy8Rwh|2l8#@gw$*6m#S1AMU1|Q;Th6f_Xeg
zfwF`EOUvMloMp-~4OpcX)PNPqQm(4m3(PDKKnMco`SDC9^1=Bzo_XY>2sup}ZwsUG
z&?%ESz@6cp38H8>0h>A^^Cb(gn*j9++96nl-^B3CD547YA0?10pfcpd6CAp$4EKGF
zldrTgQ;B!uUFSRk5-kd0T_}D1@-RO1`x26;^S}Hv`1w-CB(So=BS%`IF4N?ywCuPd
z0SN>>Z415hrhHCLE1L?NKzNEALi{Nmt=kwIFwh!A5OSDa9GQ<`*Z_JJp!Oq`N_ZHv
zx{Bg(|3C>k+zZ?z$o-uHaQHs{81L#={)jz$^!=0mOq*e3!Jt++x_@SzCAN?<_~d56
zURV21Q%ITa;MM=hf!vEiF7k7o>^{iLVK5=oXe>^TCy;gw>12|?q#Uuqh{6HA)({Bx
zt)1%&8%+cmMNP<L1_r_WSf^{K)lCGa-BlsiM#c$v(31yVdw@R;cqn*`RswJF=U)qq
za(#Lk^)x=<Y{TJHuKX)_Iqi>4q)wOcrxal_2r!COR+UKIX;pPtwWh41UUiTs_o9MR
zB2X0mC;~B?r$mrDQSxbK;G~B(Gr|QZ{nl&fl)1i;+0ca`2JjZJDs#Tmb;Rn{_aUB2
z^7SLY*z%n`_&S-Gh+ZbR|Lv38gyaY2OZv}i-(B$kQr80%G;=A8k;4I>ia?vr|M-6j
z0R{V3X8CalW^pKs=fLJpP121nqEMUIQ@4c`gTrVxFJ!CDcClcdVuPScjmtc!McIk!
z8jpq@+8RcEL$yIs5L@Y`bcGRQw^w*RlSXcD=cUVXfzw^&66?UE&aFq=$y|U6o&%;V
ztZVNm1VOIQ$2Ep>2NVSdsmDB*;o-e(+8F=JcTad@Ti*bCOw2p4m%6Nd&!xA$vQs$C
z{EQT<{L}z+I{be%AO`!-3R3$Rn$Vst?^Y~I6>uwP9a>DXFJzW%(9#LDqRk4s9eiw+
zj*oGvq|2WP;uuD}@L6+*+J&o^95XR<Nr<#M=}s@5oSsfjapkh&+>yc%?{&pCX(${q
zFOZrYq17rqW66lVrSX7gi)l&I0S2UNYwXb0dB@iBTxlRE>*g|;l(T*Hxz6Ws$39qP
z9lmpJ7k=g}EZZ?WAf6l73wq(XYd?>59@=jC6J#Y=HyUv@MF70+T(R5*n9yF8{0ig_
f?;bJ!IG4z`!2|SU|C{?ziu+^(yr=#HK3@L@=n}49

diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 94d6a5dc57e..4ab6ee4f5ee 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -791,7 +791,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         template: 'PosWidget',
         init: function() { 
             this._super(arguments[0],{});
-            
+
+            instance.web.blockUI(); 
+
             this.pos = new module.PosModel(this.session);
             this.pos_widget = this; //So that pos_widget's childs have pos_widget set automatically
 
@@ -841,11 +843,11 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                     self.screen_selector.show_popup('error', 'Sorry, we could not find any PoS Configuration for this session');
                 }
             
+                instance.web.unblockUI();
                 self.$('.loader').animate({opacity:0},1500,'swing',function(){self.$('.loader').hide();});
-                self.$('.loader img').hide();
 
             }).fail(function(){   // error when loading models data from the backend
-                self.$('.loader img').hide();
+                instance.web.unblockUI();
                 return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_session_opening']], ['res_id'])
                     .pipe( _.bind(function(res){
                         return instance.session.rpc('/web/action/load', {'action_id': res[0]['res_id']})
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 986921af1c5..cb4d90f1671 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -31,7 +31,6 @@
                 </div>
             </div>
             <div class="loader">
-                <img src="/point_of_sale/static/src/img/loader.gif" />
             </div>
         </div>
     </t>

From 1af48858a5d7870e096c95246730fe7fe298b98a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 19 Nov 2012 17:09:00 +0100
Subject: [PATCH 10/26] [IMP] prompt for cashier intervention when negative or
 zero price in self-checkout

bzr revid: fva@openerp.com-20121119160900-ks6a0bfuswlipyvu
---
 addons/point_of_sale/static/src/js/screens.js | 12 ++++++++++--
 addons/point_of_sale/static/src/js/widgets.js |  4 ++++
 addons/point_of_sale/static/src/xml/pos.xml   |  8 ++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index d8e53066c1e..61c6d1cc2b8 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -430,6 +430,10 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         template:'ErrorSessionPopupWidget',
     });
 
+    module.ErrorNegativePricePopupWidget = module.ErrorPopupWidget.extend({
+        template:'ErrorNegativePricePopupWidget',
+    });
+
     module.ScaleInviteScreenWidget = module.ScreenWidget.extend({
         template:'ScaleInviteScreenWidget',
 
@@ -684,8 +688,12 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                 console.log("CANCEL_END");
                 return (new $.Deferred()).resolve();
             }
-
-            this.queue.schedule(this.start);
+            
+            if(this.pos.get('selectedOrder').getDueLeft() <= 0){
+                this.pos_widget.screen_selector.show_popup('error-negative-price');
+            }else{
+                this.queue.schedule(this.start);
+            }
 
             this.add_action_button({
                     label: 'back',
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 4984ee5dda9..6038a74b35e 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -904,6 +904,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.choose_receipt_popup = new module.ChooseReceiptPopupWidget(this, {});
             this.choose_receipt_popup.appendTo($('.point-of-sale'));
 
+            this.error_negative_price_popup = new module.ErrorNegativePricePopupWidget(this, {});
+            this.error_negative_price_popup.appendTo($('.point-of-sale'));
+
             // --------  Misc ---------
 
             this.notification = new module.SynchNotificationWidget(this,{});
@@ -963,6 +966,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                     'error': this.error_popup,
                     'error-product': this.error_product_popup,
                     'error-session': this.error_session_popup,
+                    'error-negative-price': this.error_negative_price_popup,
                     'choose-receipt': this.choose_receipt_popup,
                 },
                 default_client_screen: 'welcome',
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index cb4d90f1671..6171869cbb4 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -351,6 +351,14 @@
         </div>
     </t>
 
+    <t t-name="ErrorNegativePricePopupWidget">
+        <div class="modal-dialog">
+            <div class="popup popup-help">
+                <p class="message">Your order has to be validated by a cashier.</p>
+            </div>
+        </div>
+    </t>
+
     <t t-name="ErrorPopupWidget">
         <div class="modal-dialog">
             <div class="popup popup-help">

From 977e86263dd2e95a2868b8c3bf5746253234d438 Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Tue, 20 Nov 2012 11:42:07 +0100
Subject: [PATCH 11/26] [FIX] Comment on general voucher view definition

lp bug: https://launchpad.net/bugs/1081056 fixed

bzr revid: stefan@therp.nl-20121120104207-l88t2dqnzwj5f2fy
---
 addons/account_voucher/account_voucher_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 2cb393f4008..4dd9431736b 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -34,7 +34,8 @@
             </field>
         </record>
 
-        <!-- where and when is this view used?? -->
+        <!-- This general view is used in 
+             Invoicing - Journal Entries - Journal Vouchers -->
         <record model="ir.ui.view" id="view_voucher_form">
             <field name="name">account.voucher.form</field>
             <field name="model">account.voucher</field>

From 87550820ac1fe1daf65ce4a01a28f643815b4dfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 21 Nov 2012 12:26:44 +0100
Subject: [PATCH 12/26] changed the clients to be partners instead of users,
 fixed receipt print css

bzr revid: fva@openerp.com-20121121112644-xqj6n0yvy0sahwev
---
 addons/point_of_sale/__init__.py              |  1 +
 addons/point_of_sale/__openerp__.py           |  1 +
 addons/point_of_sale/point_of_sale_data.xml   | 26 ++++++++++++++++++-
 addons/point_of_sale/static/src/css/pos.css   | 13 ++++++++++
 addons/point_of_sale/static/src/js/models.js  | 10 +++++++
 addons/point_of_sale/static/src/js/screens.js |  8 +++---
 addons/point_of_sale/static/src/js/widgets.js | 13 +++++-----
 addons/point_of_sale/static/src/xml/pos.xml   |  2 +-
 8 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
index bf0b86a0e9d..7a786ebb5f1 100644
--- a/addons/point_of_sale/__init__.py
+++ b/addons/point_of_sale/__init__.py
@@ -22,6 +22,7 @@
 import point_of_sale
 import account_bank_statement
 import res_users
+import res_partner
 import wizard
 import report
 
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index e9dd628243b..0823a573ab6 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -74,6 +74,7 @@ Main Features
         'account_statement_view.xml',
         'account_statement_report.xml',
         'res_users_view.xml',
+        'res_partner_view.xml',
     ],
     'demo': [
         'point_of_sale_demo.xml',
diff --git a/addons/point_of_sale/point_of_sale_data.xml b/addons/point_of_sale/point_of_sale_data.xml
index 01d8dd9ff60..2e9cf84ff39 100644
--- a/addons/point_of_sale/point_of_sale_data.xml
+++ b/addons/point_of_sale/point_of_sale_data.xml
@@ -1,6 +1,30 @@
 <?xml version="1.0" ?>
 <openerp>
-    <data noupdate="1">
+    <data noupdate="0">
+
+        <!-- Partners with EAN13s -->
+        <record id='base.res_partner_1'  model='res.partner'> <field name='ean13'>0420100000005</field> </record>
+        <record id='base.res_partner_2'  model='res.partner'> <field name='ean13'>0420200000004</field> </record>
+        <record id='base.res_partner_3'  model='res.partner'> <field name='ean13'>0420300000003</field> </record>
+        <record id='base.res_partner_4'  model='res.partner'> <field name='ean13'>0420400000002</field> </record>
+        <record id='base.res_partner_5'  model='res.partner'> <field name='ean13'>0420500000001</field> </record>
+        <record id='base.res_partner_6'  model='res.partner'> <field name='ean13'>0420600000000</field> </record>
+        <record id='base.res_partner_7'  model='res.partner'> <field name='ean13'>0420700000009</field> </record>
+        <record id='base.res_partner_8'  model='res.partner'> <field name='ean13'>0420800000008</field> </record>
+        <record id='base.res_partner_9'  model='res.partner'> <field name='ean13'>0420900000007</field> </record>
+        <record id='base.res_partner_10' model='res.partner'> <field name='ean13'>0421000000003</field> </record>
+        <record id='base.res_partner_11' model='res.partner'> <field name='ean13'>0421100000002</field> </record>
+        <record id='base.res_partner_12' model='res.partner'> <field name='ean13'>0421200000001</field> </record>
+        <record id='base.res_partner_13' model='res.partner'> <field name='ean13'>0421300000000</field> </record>
+        <record id='base.res_partner_14' model='res.partner'> <field name='ean13'>0421400000009</field> </record>
+        <record id='base.res_partner_15' model='res.partner'> <field name='ean13'>0421500000008</field> </record>
+        <record id='base.res_partner_16' model='res.partner'> <field name='ean13'>0421600000007</field> </record>
+        <record id='base.res_partner_17' model='res.partner'> <field name='ean13'>0421700000006</field> </record>
+        <record id='base.res_partner_18' model='res.partner'> <field name='ean13'>0421800000005</field> </record>
+        <record id='base.res_partner_19' model='res.partner'> <field name='ean13'>0421900000004</field> </record>
+        <record id='base.res_partner_20' model='res.partner'> <field name='ean13'>0422000000000</field> </record>
+        <record id='base.res_partner_21' model='res.partner'> <field name='ean13'>0422100000009</field> </record>
+
         <!-- After installation of the module, open the related menu -->
         <record id="action_client_pos_menu" model="ir.actions.client">
             <field name="name">Open POS Menu</field>
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index 9b286be250e..a8cb56dd7f8 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -800,12 +800,25 @@
     #receipt-screen {
         text-align: left;
     }
+    .pos-actionbar {
+        display: none !important;
+    }
     .pos-sale-ticket {
         margin: 0;
     }
     .debug-widget{
         display: none !important;
     }
+    .point-of-sale *{
+        text-shadow: none !important;
+        box-shadow: none !important;
+        background: transparent !important;
+    }
+    .point-of-sale .pos-sale-ticket{
+        margin-left: auto !important;
+        margin-right: auto !important;
+        border: solid 1px black !important;
+    }
 }
 
 /* d) The Scale screen */
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index f1462424f1e..9a96df7e221 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -36,6 +36,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 'company':          null,
                 'user':             null,   // the user that loaded the pos
                 'user_list':        null,   // list of all users
+                'partner_list':     null,   // list of all partners with an ean
                 'cashier':          null,   // the logged cashier, if different from user
 
                 'orders':           new module.OrderCollection(),
@@ -121,6 +122,11 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 }).then(function(users){
                     self.set('user_list',users);
 
+                    return self.fetch('res.partner', ['name','ean13'], [['ean13', '!=', false]]);
+                }).then(function(partners){
+                    self.set('partner_list',partners);
+                    console.log('Loaded partners:',partners);
+
                     return self.fetch('account.tax', ['amount', 'price_include', 'type']);
                 }).then(function(taxes){
                     self.set('taxes', taxes);
@@ -657,6 +663,10 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
         get_client: function(){
             return this.get('client');
         },
+        get_client_name: function(){
+            var client = this.get('client');
+            return client ? client.name : "";
+        },
         // the order also stores the screen status, as the PoS supports
         // different active screens per order. This method is used to
         // store the screen status.
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 61c6d1cc2b8..b783b170f9e 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -198,10 +198,10 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         // - if there's a user with a matching ean, put it as the active 'client' and return true
         // - else : return false. 
         barcode_client_action: function(ean){
-            var users = this.pos.get('user_list');
-            for(var i = 0, len = users.length; i < len; i++){
-                if(users[i].ean13 === ean.ean){
-                    this.pos.get('selectedOrder').set_client(users[i]);
+            var partners = this.pos.get('partner_list');
+            for(var i = 0, len = partners.length; i < len; i++){
+                if(partners[i].ean13 === ean.ean){
+                    this.pos.get('selectedOrder').set_client(partners[i]);
                     this.pos_widget.username.refresh();
                     this.pos.proxy.scan_item_success(ean);
                     return true;
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 6038a74b35e..c983b87168e 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -323,10 +323,11 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         template:'OrderButtonWidget',
         init: function(parent, options) {
             this._super(parent,options);
+            var self = this;
+
             this.order = options.order;
-            this.order.bind('destroy', _.bind( function() {
-                this.destroy();
-            }, this));
+            this.order.bind('destroy',function(){ self.destroy(); });
+            this.order.bind('change', function(){ self.renderElement(); });
             this.pos.bind('change:selectedOrder', _.bind( function(pos) {
                 var selectedOrder;
                 selectedOrder = pos.get('selectedOrder');
@@ -337,8 +338,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         },
         renderElement:function(){
             this._super();
-            this.$('button.select-order').click(_.bind(this.selectOrder, this));
-            this.$('button.close-order').click(_.bind(this.closeOrder, this));
+            this.$('button.select-order').off('click').click(_.bind(this.selectOrder, this));
+            this.$('button.close-order').off('click').click(_.bind(this.closeOrder, this));
         },
         selectOrder: function(event) {
             this.pos.set({
@@ -667,7 +668,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         template: "DebugWidget",
         eans:{
             admin_badge:  '0410100000006',
-            client_badge: '0420100000005',
+            client_badge: '0420200000004',
             invalid_ean:  '1232456',
             soda_33cl:    '5449000000996',
             oranges_kg:   '2100002031410',
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 6171869cbb4..e43c0d39bbb 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -536,7 +536,7 @@
 
     <t t-name="OrderButtonWidget">
         <li class="order-selector-button">
-            <button class="select-order"><t t-esc="widget.order.get('creationDate').toString('t')"/></button>
+            <button class="select-order"><t t-esc="(widget.order.get_client() ? widget.order.get_client_name()+' : ':'') + widget.order.get('creationDate').toString('t')"/></button>
         </li>
     </t>
 

From 72014c4109efe982e71d202d85eb814046ae9d46 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 21 Nov 2012 12:45:57 +0100
Subject: [PATCH 13/26] [ADD] base: added python test on the search() method

bzr revid: qdp-launchpad@openerp.com-20121121114557-5swzfuisp2apttd5
---
 openerp/addons/base/tests/test_search.py | 55 ++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 openerp/addons/base/tests/test_search.py

diff --git a/openerp/addons/base/tests/test_search.py b/openerp/addons/base/tests/test_search.py
new file mode 100644
index 00000000000..bc8a26b94fa
--- /dev/null
+++ b/openerp/addons/base/tests/test_search.py
@@ -0,0 +1,55 @@
+import unittest2
+
+import openerp.tests.common as common
+
+class test_expression(common.TransactionCase):
+
+    def test_search_order(self):
+
+        registry, cr, uid = self.registry, self.cr, self.uid
+
+        # Create 6 partners with a given name, and a given creation order to ensure the order of their ID. Some are set as unactive to verify they are by default excluded from the searchs and to provide a second order argument
+
+        partners = registry('res.partner')
+        c = partners.create(cr, uid, {'name': 'test_search_order_C'})
+        d = partners.create(cr, uid, {'name': 'test_search_order_D', 'active': False})
+        a = partners.create(cr, uid, {'name': 'test_search_order_A'})
+        b = partners.create(cr, uid, {'name': 'test_search_order_B'})
+        ab = partners.create(cr, uid, {'name': 'test_search_order_AB'})
+        e = partners.create(cr, uid, {'name': 'test_search_order_E', 'active': False})
+
+        # The tests.
+
+        # The basic searchs should exclude records that have active = False. The order of ids returned 
+        # should be given by the `order´ parameter of search()
+
+        name_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="name asc")
+        self.assertEqual([a, ab, b, c]), name_asc), "Search with 'NAME ASC' order failed.")
+        name_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="name desc")
+        self.assertEqual([c, b, ab, a]), name_desc), "Search with 'NAME DESC' order failed.")
+        id_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="id asc")
+        self.assertEqual([c, a, b, ab]), id_asc), "Search with 'ID ASC' order failed.")
+        id_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="id desc")
+        self.assertEqual([ab, b, a, c]), id_desc), "Search with 'ID DESC' order failed.")
+
+        # The inactive records shouldn't be ecxluded as soon as a condition on this field is present in the domain 
+        # criteria. The `order´ parameter of search() should support any valable coma-separated value
+
+        active_asc_id_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="active asc, id asc")
+        self.assertEqual([d, e, c, a, b, ab]), active_asc_id_asc), "Search with 'ACTIVE ASC, ID ASC' order failed.")
+        active_desc_id_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="active desc, id asc")
+        self.assertEqual([c, a, b, ab, d, e]), active_desc_id_asc), "Search with 'ACTIVE DESC, ID ASC' order failed.")
+        active_asc_id_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="active asc, id desc")
+        self.assertEqual([e, d, ab, b, a, c]), active_asc_id_desc), "Search with 'ACTIVE ASC, ID DESC' order failed.")
+        active_desc_id_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="active desc, id desc")
+        self.assertEqual([ab, b, a, c, e, d]), active_desc_id_desc), "Search with 'ACTIVE DESC, ID DESC' order failed.")
+        id_asc_active_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="id asc, active asc")
+        self.assertEqual(id_asc, id_asc_active_asc), "Search with 'ID ASC, ACTIVE ASC' order failed.")
+        id_asc_active_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="id asc, active desc")
+        self.assertEqual(id_asc, id_asc_active_desc), "Search with 'ID ASC, ACTIVE DESC' order failed.")
+        id_desc_active_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="id desc, active asc")
+        self.assertEqual(id_desc, id_desc_active_asc), "Search with 'ID DESC, ACTIVE ASC' order failed.")
+        id_desc_active_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="id desc, active desc")
+        self.assertEqual(id_desc, id_desc_active_desc), "Search with 'ID DESC, ACTIVE DESC' order failed.")
+
+

From a298819cd786599dfd40147b01ff7117e26e5d7f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 21 Nov 2012 13:10:05 +0100
Subject: [PATCH 14/26] [FIX] web_hello: inherited start() method should return
 the result of the super call

bzr revid: odo@openerp.com-20121121121005-f28bcm1k022ec1il
---
 addons/web_hello/static/openerp/base_hello.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_hello/static/openerp/base_hello.js b/addons/web_hello/static/openerp/base_hello.js
index 0a22079aa53..d36a6da6c13 100644
--- a/addons/web_hello/static/openerp/base_hello.js
+++ b/addons/web_hello/static/openerp/base_hello.js
@@ -16,7 +16,7 @@ instance.web.SearchView = instance.web.SearchView.extend({
 instance.web.Login = instance.web.Login.extend({
     start: function() {
         console.log('Hello there');
-        this._super.apply(this,arguments);
+        return this._super.apply(this,arguments);
     }
 });
 

From d0b4d040e1874a2ba5230dbe5bc4c6c1911c3ba5 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 21 Nov 2012 13:21:06 +0100
Subject: [PATCH 15/26] [FIX] base: fixed syntax errors and test import of
 test_search python test

bzr revid: qdp-launchpad@openerp.com-20121121122106-4mrnlw4z01np21dq
---
 openerp/addons/base/tests/__init__.py    |  3 ++-
 openerp/addons/base/tests/test_search.py | 28 ++++++++++++------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/openerp/addons/base/tests/__init__.py b/openerp/addons/base/tests/__init__.py
index 409f9928c6f..e8ad035131b 100644
--- a/openerp/addons/base/tests/__init__.py
+++ b/openerp/addons/base/tests/__init__.py
@@ -1,7 +1,8 @@
-import test_base, test_expression, test_ir_values
+import test_base, test_expression, test_search, test_ir_values
 
 checks = [
     test_base,
     test_expression,
+    test_search,
     test_ir_values,
 ]
diff --git a/openerp/addons/base/tests/test_search.py b/openerp/addons/base/tests/test_search.py
index bc8a26b94fa..9ee883dfca2 100644
--- a/openerp/addons/base/tests/test_search.py
+++ b/openerp/addons/base/tests/test_search.py
@@ -21,35 +21,35 @@ class test_expression(common.TransactionCase):
         # The tests.
 
         # The basic searchs should exclude records that have active = False. The order of ids returned 
-        # should be given by the `order´ parameter of search()
+        # should be given by the 'order' parameter of search()
 
         name_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="name asc")
-        self.assertEqual([a, ab, b, c]), name_asc), "Search with 'NAME ASC' order failed.")
+        self.assertEqual([a, ab, b, c], name_asc, "Search with 'NAME ASC' order failed.")
         name_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="name desc")
-        self.assertEqual([c, b, ab, a]), name_desc), "Search with 'NAME DESC' order failed.")
+        self.assertEqual([c, b, ab, a], name_desc, "Search with 'NAME DESC' order failed.")
         id_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="id asc")
-        self.assertEqual([c, a, b, ab]), id_asc), "Search with 'ID ASC' order failed.")
+        self.assertEqual([c, a, b, ab], id_asc, "Search with 'ID ASC' order failed.")
         id_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="id desc")
-        self.assertEqual([ab, b, a, c]), id_desc), "Search with 'ID DESC' order failed.")
+        self.assertEqual([ab, b, a, c], id_desc, "Search with 'ID DESC' order failed.")
 
         # The inactive records shouldn't be ecxluded as soon as a condition on this field is present in the domain 
-        # criteria. The `order´ parameter of search() should support any valable coma-separated value
+        # criteria. The 'order' parameter of search() should support any valable coma-separated value
 
         active_asc_id_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="active asc, id asc")
-        self.assertEqual([d, e, c, a, b, ab]), active_asc_id_asc), "Search with 'ACTIVE ASC, ID ASC' order failed.")
+        self.assertEqual([d, e, c, a, b, ab], active_asc_id_asc, "Search with 'ACTIVE ASC, ID ASC' order failed.")
         active_desc_id_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="active desc, id asc")
-        self.assertEqual([c, a, b, ab, d, e]), active_desc_id_asc), "Search with 'ACTIVE DESC, ID ASC' order failed.")
+        self.assertEqual([c, a, b, ab, d, e], active_desc_id_asc, "Search with 'ACTIVE DESC, ID ASC' order failed.")
         active_asc_id_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="active asc, id desc")
-        self.assertEqual([e, d, ab, b, a, c]), active_asc_id_desc), "Search with 'ACTIVE ASC, ID DESC' order failed.")
+        self.assertEqual([e, d, ab, b, a, c], active_asc_id_desc, "Search with 'ACTIVE ASC, ID DESC' order failed.")
         active_desc_id_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="active desc, id desc")
-        self.assertEqual([ab, b, a, c, e, d]), active_desc_id_desc), "Search with 'ACTIVE DESC, ID DESC' order failed.")
+        self.assertEqual([ab, b, a, c, e, d], active_desc_id_desc, "Search with 'ACTIVE DESC, ID DESC' order failed.")
         id_asc_active_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="id asc, active asc")
-        self.assertEqual(id_asc, id_asc_active_asc), "Search with 'ID ASC, ACTIVE ASC' order failed.")
+        self.assertEqual(id_asc, id_asc_active_asc, "Search with 'ID ASC, ACTIVE ASC' order failed.")
         id_asc_active_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="id asc, active desc")
-        self.assertEqual(id_asc, id_asc_active_desc), "Search with 'ID ASC, ACTIVE DESC' order failed.")
+        self.assertEqual(id_asc, id_asc_active_desc, "Search with 'ID ASC, ACTIVE DESC' order failed.")
         id_desc_active_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="id desc, active asc")
-        self.assertEqual(id_desc, id_desc_active_asc), "Search with 'ID DESC, ACTIVE ASC' order failed.")
+        self.assertEqual(id_desc, id_desc_active_asc, "Search with 'ID DESC, ACTIVE ASC' order failed.")
         id_desc_active_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="id desc, active desc")
-        self.assertEqual(id_desc, id_desc_active_desc), "Search with 'ID DESC, ACTIVE DESC' order failed.")
+        self.assertEqual(id_desc, id_desc_active_desc, "Search with 'ID DESC, ACTIVE DESC' order failed.")
 
 

From b4742249b4355880b9189f57c0de3f157b629a35 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 21 Nov 2012 13:53:47 +0100
Subject: [PATCH 16/26] [FIX] base: test_search, invalid use of search
 criterion 'active in (True, False)' replaced by 'active is True OR active is
 False'

bzr revid: qdp-launchpad@openerp.com-20121121125347-hsihsibwz0igp03r
---
 openerp/addons/base/tests/test_search.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/openerp/addons/base/tests/test_search.py b/openerp/addons/base/tests/test_search.py
index 9ee883dfca2..04fd4afe63e 100644
--- a/openerp/addons/base/tests/test_search.py
+++ b/openerp/addons/base/tests/test_search.py
@@ -35,21 +35,21 @@ class test_expression(common.TransactionCase):
         # The inactive records shouldn't be ecxluded as soon as a condition on this field is present in the domain 
         # criteria. The 'order' parameter of search() should support any valable coma-separated value
 
-        active_asc_id_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="active asc, id asc")
+        active_asc_id_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), '|', ('active', '=', True), ('active', '=', False)], order="active asc, id asc")
         self.assertEqual([d, e, c, a, b, ab], active_asc_id_asc, "Search with 'ACTIVE ASC, ID ASC' order failed.")
-        active_desc_id_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="active desc, id asc")
+        active_desc_id_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), '|', ('active', '=', True), ('active', '=', False)], order="active desc, id asc")
         self.assertEqual([c, a, b, ab, d, e], active_desc_id_asc, "Search with 'ACTIVE DESC, ID ASC' order failed.")
-        active_asc_id_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="active asc, id desc")
+        active_asc_id_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), '|', ('active', '=', True), ('active', '=', False)], order="active asc, id desc")
         self.assertEqual([e, d, ab, b, a, c], active_asc_id_desc, "Search with 'ACTIVE ASC, ID DESC' order failed.")
-        active_desc_id_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="active desc, id desc")
+        active_desc_id_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), '|', ('active', '=', True), ('active', '=', False)], order="active desc, id desc")
         self.assertEqual([ab, b, a, c, e, d], active_desc_id_desc, "Search with 'ACTIVE DESC, ID DESC' order failed.")
-        id_asc_active_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="id asc, active asc")
-        self.assertEqual(id_asc, id_asc_active_asc, "Search with 'ID ASC, ACTIVE ASC' order failed.")
-        id_asc_active_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="id asc, active desc")
-        self.assertEqual(id_asc, id_asc_active_desc, "Search with 'ID ASC, ACTIVE DESC' order failed.")
-        id_desc_active_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="id desc, active asc")
-        self.assertEqual(id_desc, id_desc_active_asc, "Search with 'ID DESC, ACTIVE ASC' order failed.")
-        id_desc_active_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="id desc, active desc")
-        self.assertEqual(id_desc, id_desc_active_desc, "Search with 'ID DESC, ACTIVE DESC' order failed.")
+        id_asc_active_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), '|', ('active', '=', True), ('active', '=', False)], order="id asc, active asc")
+        self.assertEqual([c, d, a, b, ab, e], id_asc_active_asc, "Search with 'ID ASC, ACTIVE ASC' order failed.")
+        id_asc_active_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), '|', ('active', '=', True), ('active', '=', False)], order="id asc, active desc")
+        self.assertEqual([c, d, a, b, ab, e], id_asc_active_desc, "Search with 'ID ASC, ACTIVE DESC' order failed.")
+        id_desc_active_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), '|', ('active', '=', True), ('active', '=', False)], order="id desc, active asc")
+        self.assertEqual([e, ab, b, a, d, c], id_desc_active_asc, "Search with 'ID DESC, ACTIVE ASC' order failed.")
+        id_desc_active_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), '|', ('active', '=', True), ('active', '=', False)], order="id desc, active desc")
+        self.assertEqual([e, ab, b, a, d, c], id_desc_active_desc, "Search with 'ID DESC, ACTIVE DESC' order failed.")
 
 

From 18b7592b8d73d1b4d01d3affec824279c042da4e Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 21 Nov 2012 14:07:36 +0100
Subject: [PATCH 17/26] [FIX] osv/orm: fixed the use of 'order' argument given
 to a search function in order to allow to order by 'ID DESC' and by '<another
 valid order> + ID ASC/DESC'

bzr revid: qdp-launchpad@openerp.com-20121121130736-guj7np9nk65zx3o1
---
 openerp/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index c1f04dbbfa8..6a1f917caa1 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -4722,7 +4722,7 @@ class BaseModel(object):
                 order_direction = order_split[1].strip() if len(order_split) == 2 else ''
                 inner_clause = None
                 if order_field == 'id':
-                    order_by_clause = '"%s"."%s"' % (self._table, order_field)
+                    order_by_elements.append('"%s"."id" %s' % (self._table, order_direction))
                 elif order_field in self._columns:
                     order_column = self._columns[order_field]
                     if order_column._classic_read:

From 4b007e15218a1abe9eef249bf8fb6d0b9570cf7a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 21 Nov 2012 14:56:57 +0100
Subject: [PATCH 18/26] [FIX] Searchview proposition facet does not format
 date[time]s client side

bzr revid: fme@openerp.com-20121121135657-nh3t6usqkvl9vh03
---
 addons/web/static/src/js/search.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 0f25b2484c3..67d5911ee3f 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1893,6 +1893,9 @@ instance.web.search.ExtendedSearchProposition.DateTime = instance.web.search.Ext
     get_value: function() {
         return this.datewidget.get_value();
     },
+    toString: function () {
+        return instance.web.format_value(this.get_value(), { type:"datetime" });
+    },
     start: function() {
         var ready = this._super();
         this.datewidget = new (this.widget())(this);
@@ -1901,7 +1904,10 @@ instance.web.search.ExtendedSearchProposition.DateTime = instance.web.search.Ext
     }
 });
 instance.web.search.ExtendedSearchProposition.Date = instance.web.search.ExtendedSearchProposition.DateTime.extend({
-    widget: function () { return instance.web.DateWidget; }
+    widget: function () { return instance.web.DateWidget; },
+    toString: function () {
+        return instance.web.format_value(this.get_value(), { type:"date" });
+    }
 });
 instance.web.search.ExtendedSearchProposition.Integer = instance.web.search.ExtendedSearchProposition.Field.extend({
     template: 'SearchView.extended_search.proposition.integer',

From dc3d462b9f4d836deab6be00d432778cba25e91d Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 21 Nov 2012 15:31:59 +0100
Subject: [PATCH 19/26] [IMP] test_search: comment typos.

bzr revid: vmt@openerp.com-20121121143159-mppc6s7rezpwc3hx
---
 openerp/addons/base/tests/test_search.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/tests/test_search.py b/openerp/addons/base/tests/test_search.py
index 04fd4afe63e..dc554408667 100644
--- a/openerp/addons/base/tests/test_search.py
+++ b/openerp/addons/base/tests/test_search.py
@@ -8,7 +8,10 @@ class test_expression(common.TransactionCase):
 
         registry, cr, uid = self.registry, self.cr, self.uid
 
-        # Create 6 partners with a given name, and a given creation order to ensure the order of their ID. Some are set as unactive to verify they are by default excluded from the searchs and to provide a second order argument
+	# Create 6 partners with a given name, and a given creation order to
+	# ensure the order of their ID. Some are set as unactive to verify they
+	# are by default excluded from the searches and to provide a second
+	# `order` argument.
 
         partners = registry('res.partner')
         c = partners.create(cr, uid, {'name': 'test_search_order_C'})
@@ -20,8 +23,9 @@ class test_expression(common.TransactionCase):
 
         # The tests.
 
-        # The basic searchs should exclude records that have active = False. The order of ids returned 
-        # should be given by the 'order' parameter of search()
+	# The basic searches should exclude records that have active = False.
+	# The order of the returned ids should be given by the `order`
+	# parameter of search().
 
         name_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="name asc")
         self.assertEqual([a, ab, b, c], name_asc, "Search with 'NAME ASC' order failed.")
@@ -32,8 +36,9 @@ class test_expression(common.TransactionCase):
         id_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="id desc")
         self.assertEqual([ab, b, a, c], id_desc, "Search with 'ID DESC' order failed.")
 
-        # The inactive records shouldn't be ecxluded as soon as a condition on this field is present in the domain 
-        # criteria. The 'order' parameter of search() should support any valable coma-separated value
+	# The inactive records shouldn't be excluded as soon as a condition on
+	# that field is present in the domain. The `order` parameter of
+	# search() should support any legal coma-separated values.
 
         active_asc_id_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), '|', ('active', '=', True), ('active', '=', False)], order="active asc, id asc")
         self.assertEqual([d, e, c, a, b, ab], active_asc_id_asc, "Search with 'ACTIVE ASC, ID ASC' order failed.")

From 9f9a2996f69b8f2342f30789996c7353dcf77934 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 21 Nov 2012 15:43:20 +0100
Subject: [PATCH 20/26] [FIX] __debug__ key wrongly set in QWeb default_dict

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

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 7ddefa301f2..8b12f39c5e4 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -543,12 +543,12 @@ instance.web._lt = function (s) {
     return {toString: function () { return instance.web._t(s); }}
 };
 instance.web.qweb = new QWeb2.Engine();
-instance.web.qweb.default_dict['__debug__'] = instance.session.debug; // Which one ?
 instance.web.qweb.debug = instance.session.debug;
 instance.web.qweb.default_dict = {
     '_' : _,
     '_t' : instance.web._t,
     'JSON': JSON,
+    '__debug__': instance.session.debug,
 };
 instance.web.qweb.preprocess_node = function() {
     // Note that 'this' is the Qweb Node

From b04140e54c698aaca4be7b427cc7160fd59a4bda Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 21 Nov 2012 16:24:43 +0100
Subject: [PATCH 21/26] [IMP] Improved styling of searchview datepicker icon

bzr revid: fme@openerp.com-20121121152443-xj45wq1lttrs8rrh
---
 addons/web/static/src/css/base.css  | 1 +
 addons/web/static/src/css/base.sass | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ab7b74f85fe..f361a3c879d 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1842,6 +1842,7 @@
   padding: 0;
 }
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced li {
+  cursor: pointer;
   position: relative;
   list-style: none;
   margin: 0;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c5fcb8008a5..b2f71befbaa 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1471,6 +1471,7 @@ $sheet-padding: 16px
                     list-style: none
                     padding: 0
                 li
+                    cursor: pointer
                     position: relative
                     list-style: none
                     margin: 0

From 56ee9f011bb4fb4faa3fa5e17ceab258ac27d483 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 21 Nov 2012 16:50:01 +0100
Subject: [PATCH 22/26] [FIX] qweb: <t t-log> action was generating invalid
 code

bzr revid: chs@openerp.com-20121121155001-7gwb3w3mxqevxibm
---
 addons/web/static/lib/qweb/qweb2.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/lib/qweb/qweb2.js b/addons/web/static/lib/qweb/qweb2.js
index 71a9628eff2..5c076112eb0 100644
--- a/addons/web/static/lib/qweb/qweb2.js
+++ b/addons/web/static/lib/qweb/qweb2.js
@@ -698,7 +698,7 @@ QWeb2.Element = (function() {
             this.top("debugger;");
         },
         compile_action_log : function(value) {
-            this.top("console.log(" + this.format_expression(value) + "});");
+            this.top("console.log(" + this.format_expression(value) + ");");
         }
     });
     return Element;

From a5e242456ec87e2aa1605b82d7c336e96eb44bbc Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 21 Nov 2012 17:04:52 +0100
Subject: [PATCH 23/26] [IMP] mini_calendar loses it's date when refreshed

bzr revid: fme@openerp.com-20121121160452-nojlacwpafgmemc7
---
 addons/web_calendar/static/src/js/calendar.js | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index 30b14c32749..5fd9b6677a0 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -245,11 +245,6 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
     refresh_scheduler: function() {
         scheduler.setCurrentView(scheduler._date);
     },
-    refresh_minical: function() {
-        if (this.sidebar) {
-            scheduler.updateCalendar(this.sidebar.mini_calendar);
-        }
-    },
     reload_event: function(id) {
         this.dataset.read_ids([id], _.keys(this.fields)).done(this.proxy('events_loaded'));
     },
@@ -306,7 +301,6 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
         }
         scheduler.parse(res_events, 'json');
         this.refresh_scheduler();
-        this.refresh_minical();
         if (!no_filter_reload && this.sidebar) {
             this.sidebar.filter.events_loaded(sidebar_items);
         }
@@ -402,9 +396,7 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
         var index = this.dataset.get_id_index(event_id);
         if (index !== null) {
             event_id = this.dataset.ids[index];
-            this.dataset.write(event_id, data, {}).done(function() {
-                self.refresh_minical();
-            });
+            this.dataset.write(event_id, data, {});
         }
     },
     quick_create: function(event_id, event_obj) {
@@ -414,7 +406,6 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
             var id = r;
             self.dataset.ids.push(id);
             scheduler.changeEventId(event_id, id);
-            self.refresh_minical();
             self.reload_event(id);
         }).fail(function(r, event) {
             event.preventDefault();
@@ -487,9 +478,7 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
         var self = this;
         var index = this.dataset.get_id_index(event_id);
         if (index !== null) {
-            this.dataset.unlink(event_id).done(function() {
-                self.refresh_minical();
-            });
+            this.dataset.unlink(event_id);
         }
     },
 });
@@ -506,6 +495,7 @@ instance.web_calendar.Sidebar = instance.web.Widget.extend({
                 scheduler.setCurrentView(date, 'day');
             }
         });
+        scheduler.linkCalendar(this.mini_calendar);
         this.filter = new instance.web_calendar.SidebarFilter(this, this.getParent());
         this.filter.appendTo(this.$el.find('.oe_calendar_filter'));
     }

From b5ce5ee91b32479d2f938e4eb041ad4ea528ce3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 21 Nov 2012 17:58:23 +0100
Subject: [PATCH 24/26] [IMP] point_of_sale: forgot views and decls for
 partner's ean13. Demo data where at the wrong place also

bzr revid: fva@openerp.com-20121121165823-awkqy7wp0mq4zkhm
---
 addons/point_of_sale/point_of_sale_data.xml | 24 +-------------
 addons/point_of_sale/point_of_sale_demo.xml | 31 +++++++++++++-----
 addons/point_of_sale/res_partner.py         | 35 +++++++++++++++++++++
 addons/point_of_sale/res_partner_view.xml   | 22 +++++++++++++
 addons/point_of_sale/static/src/css/pos.css |  5 +--
 5 files changed, 84 insertions(+), 33 deletions(-)
 create mode 100644 addons/point_of_sale/res_partner.py
 create mode 100644 addons/point_of_sale/res_partner_view.xml

diff --git a/addons/point_of_sale/point_of_sale_data.xml b/addons/point_of_sale/point_of_sale_data.xml
index 2e9cf84ff39..2164ddc1cb1 100644
--- a/addons/point_of_sale/point_of_sale_data.xml
+++ b/addons/point_of_sale/point_of_sale_data.xml
@@ -1,29 +1,7 @@
 <?xml version="1.0" ?>
 <openerp>
-    <data noupdate="0">
+    <data noupdate="1">
 
-        <!-- Partners with EAN13s -->
-        <record id='base.res_partner_1'  model='res.partner'> <field name='ean13'>0420100000005</field> </record>
-        <record id='base.res_partner_2'  model='res.partner'> <field name='ean13'>0420200000004</field> </record>
-        <record id='base.res_partner_3'  model='res.partner'> <field name='ean13'>0420300000003</field> </record>
-        <record id='base.res_partner_4'  model='res.partner'> <field name='ean13'>0420400000002</field> </record>
-        <record id='base.res_partner_5'  model='res.partner'> <field name='ean13'>0420500000001</field> </record>
-        <record id='base.res_partner_6'  model='res.partner'> <field name='ean13'>0420600000000</field> </record>
-        <record id='base.res_partner_7'  model='res.partner'> <field name='ean13'>0420700000009</field> </record>
-        <record id='base.res_partner_8'  model='res.partner'> <field name='ean13'>0420800000008</field> </record>
-        <record id='base.res_partner_9'  model='res.partner'> <field name='ean13'>0420900000007</field> </record>
-        <record id='base.res_partner_10' model='res.partner'> <field name='ean13'>0421000000003</field> </record>
-        <record id='base.res_partner_11' model='res.partner'> <field name='ean13'>0421100000002</field> </record>
-        <record id='base.res_partner_12' model='res.partner'> <field name='ean13'>0421200000001</field> </record>
-        <record id='base.res_partner_13' model='res.partner'> <field name='ean13'>0421300000000</field> </record>
-        <record id='base.res_partner_14' model='res.partner'> <field name='ean13'>0421400000009</field> </record>
-        <record id='base.res_partner_15' model='res.partner'> <field name='ean13'>0421500000008</field> </record>
-        <record id='base.res_partner_16' model='res.partner'> <field name='ean13'>0421600000007</field> </record>
-        <record id='base.res_partner_17' model='res.partner'> <field name='ean13'>0421700000006</field> </record>
-        <record id='base.res_partner_18' model='res.partner'> <field name='ean13'>0421800000005</field> </record>
-        <record id='base.res_partner_19' model='res.partner'> <field name='ean13'>0421900000004</field> </record>
-        <record id='base.res_partner_20' model='res.partner'> <field name='ean13'>0422000000000</field> </record>
-        <record id='base.res_partner_21' model='res.partner'> <field name='ean13'>0422100000009</field> </record>
 
         <!-- After installation of the module, open the related menu -->
         <record id="action_client_pos_menu" model="ir.actions.client">
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index faa3927a9c4..d49805656f3 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -1,13 +1,32 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+        <!-- Partners with EAN13s -->
+        <record id='base.res_partner_1'  model='res.partner'> <field name='ean13'>0420100000005</field> </record>
+        <record id='base.res_partner_2'  model='res.partner'> <field name='ean13'>0420200000004</field> </record>
+        <record id='base.res_partner_3'  model='res.partner'> <field name='ean13'>0420300000003</field> </record>
+        <record id='base.res_partner_4'  model='res.partner'> <field name='ean13'>0420400000002</field> </record>
+        <record id='base.res_partner_5'  model='res.partner'> <field name='ean13'>0420500000001</field> </record>
+        <record id='base.res_partner_6'  model='res.partner'> <field name='ean13'>0420600000000</field> </record>
+        <record id='base.res_partner_7'  model='res.partner'> <field name='ean13'>0420700000009</field> </record>
+        <record id='base.res_partner_8'  model='res.partner'> <field name='ean13'>0420800000008</field> </record>
+        <record id='base.res_partner_9'  model='res.partner'> <field name='ean13'>0420900000007</field> </record>
+        <record id='base.res_partner_10' model='res.partner'> <field name='ean13'>0421000000003</field> </record>
+        <record id='base.res_partner_11' model='res.partner'> <field name='ean13'>0421100000002</field> </record>
+        <record id='base.res_partner_12' model='res.partner'> <field name='ean13'>0421200000001</field> </record>
+        <record id='base.res_partner_13' model='res.partner'> <field name='ean13'>0421300000000</field> </record>
+        <record id='base.res_partner_14' model='res.partner'> <field name='ean13'>0421400000009</field> </record>
+        <record id='base.res_partner_15' model='res.partner'> <field name='ean13'>0421500000008</field> </record>
+        <record id='base.res_partner_16' model='res.partner'> <field name='ean13'>0421600000007</field> </record>
+        <record id='base.res_partner_17' model='res.partner'> <field name='ean13'>0421700000006</field> </record>
+        <record id='base.res_partner_18' model='res.partner'> <field name='ean13'>0421800000005</field> </record>
+        <record id='base.res_partner_19' model='res.partner'> <field name='ean13'>0421900000004</field> </record>
+        <record id='base.res_partner_20' model='res.partner'> <field name='ean13'>0422000000000</field> </record>
+        <record id='base.res_partner_21' model='res.partner'> <field name='ean13'>0422100000009</field> </record>
+
         <record id="base.user_root" model="res.users">
             <field name="ean13">0410100000006</field>
         </record>
-        <record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4,ref('group_pos_user'))]"/>
-            <field name="ean13">0420100000005</field>
-        </record>
         <record id="account.cash_journal" model="account.journal">
             <field eval="True" name="journal_user"/>
         </record>
@@ -15,10 +34,6 @@
             <field name="ean13">0410100000006</field>
             <field name="groups_id" eval="[(4,ref('group_pos_manager'))]"/>
         </record>
-        <record id="base.user_demo" model="res.users">
-            <field name="ean13">0420100000005</field>
-            <field name="groups_id" eval="[(4,ref('group_pos_manager'))]"/>
-        </record>
 
         <record model="pos.config" id="pos_config_main">
             <field name="journal_ids" eval="[(6, 0, [ref('account.cash_journal'), ref('account.bank_journal')])]" />
diff --git a/addons/point_of_sale/res_partner.py b/addons/point_of_sale/res_partner.py
new file mode 100644
index 00000000000..61462b8e0de
--- /dev/null
+++ b/addons/point_of_sale/res_partner.py
@@ -0,0 +1,35 @@
+
+#!/usr/bin/env python
+from osv import osv, fields
+import math
+import openerp.addons.product.product
+
+
+class res_users(osv.osv):
+    _inherit = 'res.partner'
+    _columns = {
+        'ean13' : fields.char('EAN13', size=13, help="BarCode"),
+    }
+
+    def _check_ean(self, cr, uid, ids, context=None):
+        return all(
+            openerp.addons.product.product.check_ean(user.ean13) == True
+            for user in self.browse(cr, uid, ids, context=context)
+        )
+
+    def edit_ean(self, cr, uid, ids, context):
+        return {
+            'name': "Edit Ean",
+            'type': 'ir.actions.act_window',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'pos.ean_wizard',
+            'target' : 'new',
+            'view_id': False,
+            'context':context,
+        }
+
+    _constraints = [
+        (_check_ean, "Error: Invalid ean code", ['ean13'],),
+    ]
+
diff --git a/addons/point_of_sale/res_partner_view.xml b/addons/point_of_sale/res_partner_view.xml
new file mode 100644
index 00000000000..4bd433adf28
--- /dev/null
+++ b/addons/point_of_sale/res_partner_view.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        
+        <record id="view_partner_property_form" model="ir.ui.view">
+            <field name="name">res.partner.product.property.form.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Point of Sale"> 
+                        <group>
+                            <field name="ean13" />
+                            <button name="edit_ean" type="object" string="Edit" />
+                        </group>
+                    </page>
+                </notebook>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index a8cb56dd7f8..1b98c25f1c6 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -7,7 +7,7 @@
     padding: 0;
     margin: 0;
     background-color: #f0eeee;
-    font-family: "Lucida Grande", Helvetica, Verdana, Arial;
+    font-family: "Lato","Lucida Grande", Helvetica, Verdana, Arial;
     color: #555555;
     font-size: 12px;
     position: absolute;
@@ -15,6 +15,7 @@
     top: 0;
     width: 100%;
     height: 100%;
+    text-shadow: none;
     -webkit-user-select: none;
        -moz-user-select: none;
             user-select: none;
@@ -955,7 +956,7 @@
 }
 
 .point-of-sale .order{
-    background: #F00;
+    background: white;
     background: -webkit-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
     background:    -moz-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
     background:     -ms-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));

From c41790025507228dc42fbb4bdbbca3991bcd09b0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Thu, 22 Nov 2012 00:05:13 +0100
Subject: [PATCH 25/26] [FIX] css hr employee

bzr revid: fp@openerp.com-20121121230513-5qtw1ci29sz07a5x
---
 addons/hr/static/src/css/hr.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/static/src/css/hr.css b/addons/hr/static/src/css/hr.css
index f395f9939e5..78dfc946436 100644
--- a/addons/hr/static/src/css/hr.css
+++ b/addons/hr/static/src/css/hr.css
@@ -22,7 +22,7 @@
   -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
   -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-  box-shadow: 0 1px 4px 3px rgba(0, 0, 0, 0.4);
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
 }
 
 .oe_employee_picture {

From c0df907c29d37cef45b9955190c5ac8bcb5f9c2f Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 22 Nov 2012 05:15:21 +0000
Subject: [PATCH 26/26] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121122050804-x25fbyb04bfqak10
bzr revid: launchpad_translations_on_behalf_of_openerp-20121122051521-cxaalmqp2gst0xww
---
 addons/account/i18n/es.po      |  23 +-
 addons/crm_helpdesk/i18n/nb.po | 742 ++++++++++++++++++++++++++++
 addons/hr_holidays/i18n/nb.po  | 864 +++++++++++++++++++++++++++++++++
 addons/web/i18n/fr.po          |  36 +-
 4 files changed, 1635 insertions(+), 30 deletions(-)
 create mode 100644 addons/crm_helpdesk/i18n/nb.po
 create mode 100644 addons/hr_holidays/i18n/nb.po

diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 2553706cf6d..37a130e7d7b 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-20 16:18+0000\n"
-"Last-Translator: mikel <mikel.martin@gmail.com>\n"
+"PO-Revision-Date: 2012-11-21 18:46+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-30 05:04+0000\n"
-"X-Generator: Launchpad (build 16206)\n"
+"X-Launchpad-Export-Date: 2012-11-22 05:07+0000\n"
+"X-Generator: Launchpad (build 16293)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -2166,9 +2166,7 @@ msgstr "Pro-forma"
 msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
-msgstr ""
-"No se ha definido una cuenta debe por defecto \n"
-"en el diario \"%s\""
+msgstr "No se ha definido una cuenta deudora por defecto en el diario \"%s\""
 
 #. module: account
 #: help:account.account.template,type:0
@@ -2375,8 +2373,7 @@ msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
 msgstr ""
-"No se ha definido una cuenta haber por defecto \n"
-"en el diario \"%s\""
+"No se ha definido una cuenta acreedora por defecto en el diario \"%s\""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_review_financial_journals_installer
@@ -3252,7 +3249,7 @@ msgstr "Plantillas para el plan contable"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Establezca las opciones de contabilidad"
 
 #. module: account
 #: view:report.account.sales:0
@@ -4010,7 +4007,7 @@ msgid ""
 msgstr ""
 "Lo más recomendable es usar un diario dedicado a contener los asientos de "
 "apertura de todos los ejercicios. Tenga en cuenta que lo debería definir con "
-"cuentas de debe/haber por defecto, de tipo 'situación' y con una "
+"cuentas acreedora/deudora por defecto, de tipo 'situación' y con una "
 "contrapartida centralizada."
 
 #. module: account
@@ -6387,7 +6384,7 @@ msgstr "Otra información"
 #. module: account
 #: field:account.journal,default_credit_account_id:0
 msgid "Default Credit Account"
-msgstr "Cuenta haber por defecto"
+msgstr "Cuenta acreedora por defecto"
 
 #. module: account
 #: help:account.analytic.line,currency_id:0
@@ -7696,7 +7693,7 @@ msgstr "Información opcional"
 #: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
-msgstr "El diario debe tener una cuenta haber y debe por defecto."
+msgstr "El diario debe tener una cuenta acreedora y deudora por defecto."
 
 #. module: account
 #: report:account.general.journal:0
diff --git a/addons/crm_helpdesk/i18n/nb.po b/addons/crm_helpdesk/i18n/nb.po
new file mode 100644
index 00000000000..1f6be71a4a6
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/nb.po
@@ -0,0 +1,742 @@
+# Norwegian Bokmal 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-11-21 11:04+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-11-22 05:08+0000\n"
+"X-Generator: Launchpad (build 16293)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr "Forsinkelse til lukking"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr "# av Saker."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr "I dag."
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr "Mars."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current year"
+msgstr "Kundestøtte forespørsler skjedde i inneværende år."
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr "Firma."
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr "Høyest."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr "Dag."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr "Legg til internt notat."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Date of helpdesk requests"
+msgstr "Dato for kundestøtte forespørsler."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr "Notater"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr "Meldinger."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My company"
+msgstr "Min bedrift."
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr "Kansellert."
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
+msgid "Helpdesk Analysis"
+msgstr "Kundestøtte Analyse."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr "Lukkingsdato."
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr "Referanse."
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr "Neste handling."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr "Kundestøtte Støtter."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr "Ekstra informasjon."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,partner_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,partner_id:0
+msgid "Partner"
+msgstr "Partner."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr "Seksjon."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in last month"
+msgstr "Kundestøtte forespørsler skjedde i forrige måned."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr "Send ny e-post."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk requests during last 7 days"
+msgstr "Kundestøtte forespørsler under de siste 7 dager."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+msgid "New"
+msgstr "Ny."
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr "Kundestøtte rapport etter salg tjenester."
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr "E-post."
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,channel_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,channel_id:0
+msgid "Channel"
+msgstr "Kanal."
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr "Laveste."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr "# E-poster."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "My Sales Team(s)"
+msgstr "Mine salgs lag."
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr "Opprettelses dato."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr "Sett tilbake til utkast."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr "Venter."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr "Frist."
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr "juli"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr "Kundestøtte kategorier."
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr "Kategorier."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "New Helpdesk Request"
+msgstr "Ny kundestøtte forespørsel."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr "Historisk informasjon."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr "Datoer."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month of helpdesk requests"
+msgstr "Måned for kundestøtte forespørsler."
+
+#. module: crm_helpdesk
+#: code:addons/crm_helpdesk/crm_helpdesk.py:101
+#, python-format
+msgid "No Subject"
+msgstr "Ingen emne."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr "#Kundestøtte."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "All pending Helpdesk Request"
+msgstr "Alle venter på Kundestøtte forespørsel."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Year of helpdesk requests"
+msgstr "År for kundestøtte forespørsel."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr "Referanser"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr "September."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr "Kommunikasjon."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr "Dato oppdatert."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current month"
+msgstr "Kundestøtte forespørsler skjedde i nåeværende måned."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr "Salgs man."
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr "Referanse 2"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr "Kategori"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Responsible User"
+msgstr "Ansvarlig bruker."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "Budsjett kostnader."
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,channel_id:0
+msgid "Communication channel."
+msgstr "Kommunikasjons kanal."
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+"Disse e-postadressene vil bli lagt til kopi-feltet for alle inngående og "
+"utgående e-poster før de sendes. Skill flere e-postadresser med komma."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr "Søk kundestøtte."
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr "Kladd"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr "Lav"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "Lukket."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr "Svar."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr "7 dager"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication & History"
+msgstr "Kommunikasjon & Historikk."
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr "August"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr "Global CC"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr "Juni."
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Planlagt omsetning."
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr "Bruker."
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr "Aktiv."
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr "November."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr "Utvidet Filtere ..."
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr "Kundestøtte forespørsel."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr "Søk"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr "Disse personene vil motta e-post."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr "Historie."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,priority:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,priority:0
+msgid "Priority"
+msgstr "Prioritet."
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Partner kontakt."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr "Div."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,state:0
+msgid "State"
+msgstr "Stat."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr "Generelt."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr "Send påminnelse."
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                                 Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr "Ferdig"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr "Desember"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr "Lukke"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr "Åpne"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+msgid "In Progress"
+msgstr "I arbeid."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr "Kategorisering"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
+msgid "Helpdesk"
+msgstr "Kundestøtte."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr "Ansvarlig."
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Passert frist."
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr "Beskrivelse."
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr "Mai."
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr "Sannsynlighet (%)"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr "# E-poster"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"Have a general overview of all support requests by sorting them with "
+"specific criteria such as the processing time, number of requests answered, "
+"emails sent and costs."
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr "Februar"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month-1"
+msgstr "Måned-1"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr "Kundestøtte og støtte."
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr "April"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr "Min(e) sak(er)"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support requests."
+msgstr ""
+"Opprette og administrere kundestøtte kategorier til å administrere og "
+"klassifisere support."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Todays's Helpdesk Requests"
+msgstr "Dagens kundestøtte forespørsler."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Request Date"
+msgstr "Forespørsels dato."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Open Helpdesk Request"
+msgstr "Åpen kundestøtte forespørsel."
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr "Høy."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr "Salgsteam"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr "Siste handling."
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"Helpdesk and Support allow you to track your interventions. Select a "
+"customer, add notes and categorize interventions with partners if necessary. "
+"You can also assign a priority level. Use the OpenERP Issues system to "
+"manage your support activities. Issues can be connected to the email "
+"gateway: new emails may create issues, each of them automatically gets the "
+"history of the conversation with the customer."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr "År."
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr "Varighet."
diff --git a/addons/hr_holidays/i18n/nb.po b/addons/hr_holidays/i18n/nb.po
new file mode 100644
index 00000000000..30e9e2294fa
--- /dev/null
+++ b/addons/hr_holidays/i18n/nb.po
@@ -0,0 +1,864 @@
+# Norwegian Bokmal 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 01:37+0100\n"
+"PO-Revision-Date: 2012-11-21 11:45+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-11-22 05:07+0000\n"
+"X-Generator: Launchpad (build 16293)\n"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Blue"
+msgstr "Blå"
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_type:0
+msgid "Allocation Type"
+msgstr "Tildeling type."
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "Waiting Second Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,remaining_leaves:0
+msgid "Maximum Leaves Allowed - Leaves Already Taken"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Leaves Management"
+msgstr "Etterlater ledelse."
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Allocation Mode"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
+msgid "Department"
+msgstr "Avdeling"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
+msgid "Requests Approve"
+msgstr "Godta forespørsler ."
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "Refused"
+msgstr "Avvist"
+
+#. module: hr_holidays
+#: help:hr.holidays,category_id:0
+msgid "Category of Employee"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid " Month-1"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Brown"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Remaining Days"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,employee_id:0
+msgid ""
+"Leave Manager can let this field empty if this leave request/allocation is "
+"for every employee"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Cyan"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Green"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.employee,current_leave_id:0
+msgid "Current Leave Type"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leave requests can be recorded by employees and validated by their managers. "
+"Once a leave request is validated, it appears automatically in the agenda of "
+"the employee. You can define several allowance types (paid holidays, "
+"sickness, etc.) and manage allowances per type."
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
+msgid "Summary Of Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,state:0
+msgid "Approved"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.employee,last_login:0
+msgid "Latest Connection"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Refuse"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:344
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s: too few remaining days (%s)."
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,state:0
+msgid ""
+"The state is set to 'Draft', when a holiday request is created.            \n"
+"The state is 'Waiting Approval', when holiday request is confirmed by user.  "
+"          \n"
+"The state is 'Refused', when holiday request is refused by manager.          "
+"  \n"
+"The state is 'Approved', when holiday request is approved by manager."
+msgstr ""
+
+#. module: hr_holidays
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_reporting_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
+msgid "Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays
+msgid "Leave"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
+msgid "Leave Requests to Approve"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
+msgid "Leaves by Department"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,type:0
+msgid ""
+"Choose 'Leave Request' if someone wants to take an off-day. \n"
+"Choose 'Allocation Request' if you want to increase the number of leaves "
+"available for someone"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.employee,remaining_leaves:0
+msgid ""
+"Total number of legal leaves allocated to this employee, change this value "
+"to create allocation/leave requests."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:377
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,color_name:0
+msgid "Color in Report"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
+msgid "HR Holidays Summary Report By Employee"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id:0
+msgid "This area is automatically filled by the user who validate the leave"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_status_id:0
+#: field:hr.holidays.remaining.leaves.user,leave_type:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
+#: field:hr.holidays.summary.dept,holiday_type:0
+#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
+#: model:ir.model,name:hr_holidays.model_hr_holidays_status
+#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
+msgid "Leave Type"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:199
+#: code:addons/hr_holidays/hr_holidays.py:344
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Magenta"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least 1 Department. And try again"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
+msgid "Confirmed"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,date_from:0
+#: field:hr.holidays.summary.employee,date_from:0
+msgid "From"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Confirm"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:384
+#, python-format
+msgid "Leave Request for %s"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,remaining_leaves:0
+msgid "Remaining Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
+msgid "Total holidays by type"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
+#: field:hr.holidays.remaining.leaves.user,name:0
+#: model:ir.model,name:hr_holidays.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "New"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Red"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.remaining.leaves.user:0
+msgid "Leaves by Type"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Wheat"
+msgstr ""
+
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:382
+#, python-format
+msgid "Allocation for %s"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
+#: field:hr.holidays,number_of_days_temp:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:377
+#, python-format
+msgid ""
+"The feature behind the field 'Remaining Legal Leaves' can only be used when "
+"there is only one leave type with the option 'Allow to Override Limit' "
+"unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot "
+"decide on which leave type the update has to be done. \n"
+"You may prefer to use the classic menus 'Leave Requests' and 'Allocation "
+"Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
+"the employees if the configuration does not allow to use this field."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "You have to select an employee or a category"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,double_validation:0
+msgid ""
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "Waiting Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,emp:0
+msgid "Employee(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,categ_id:0
+msgid ""
+"If you set a meeting type, OpenERP will create a meeting in the calendar "
+"once a leave is validated."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,linked_request_ids:0
+msgid "Linked Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Lavender"
+msgstr ""
+
+#. module: hr_holidays
+#: xsl:holidays.summary:0
+#: view:hr.holidays:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
+msgid "Leave Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,limit:0
+msgid "Allow to Override Limit"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.employee:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
+msgid "Employee's Holidays"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,max_leaves:0
+msgid ""
+"This value is given by the sum of all holidays requests with a positive "
+"value."
+msgstr ""
+
+#. module: hr_holidays
+#: view:board.board:0
+msgid "All Employee Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Coral"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
+msgid "Holidays by Department"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Black"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.hr_holidays_leaves_assign_legal
+msgid "Allocate Leaves for Employees"
+msgstr ""
+
+#. module: hr_holidays
+#: field:resource.calendar.leaves,holiday_id:0
+msgid "Holiday"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
+msgid "Meeting"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Ivory"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Both Validated and Confirmed"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,leaves_taken:0
+msgid "Leaves Already Taken"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,user_id:0
+#: field:hr.holidays.remaining.leaves.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The start date must be before the end date !"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_holidays
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
+msgid "Remaining Legal Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id:0
+msgid "First Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
+msgid "Unpaid"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_company_allocation
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Holidays during last month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.employee:0
+msgid "Assign Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Blue"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "My Department Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.employee,current_leave_state:0
+msgid "Current Leave Status"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,type:0
+msgid "Request Type"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the leave "
+"type without removing it."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Misc"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "General"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
+msgid "Compensatory Days"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
+msgid "Reasons"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
+msgid "Leaves Analysis"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,color_name:0
+msgid ""
+"This color will be used in the leaves summary located in Reporting\\Leaves "
+"by Departement"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
+msgid "Validated"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
+msgid "Allocation Request"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
+msgid "Leave Detail"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,double_validation:0
+#: field:hr.holidays.status,double_validation:0
+msgid "Apply Double Validation"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
+msgid "Print"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Details"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
+msgid "My Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
+msgid "Leave Request"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
+msgid "Legal Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The number of days must be greater than 0 !"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,holiday_type:0
+msgid ""
+"By Employee: Allocation/Request for individual Employee, By Employee "
+"Category: Allocation/Request for group of employees in category"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:199
+#, python-format
+msgid "You cannot delete a leave which is not in draft state !"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Search Leave"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,holiday_type:0
+msgid "Select Holiday Type"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
+msgid "Remaining leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,depts:0
+msgid "Department(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id2:0
+msgid "Second Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
+msgid "Sick Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,limit:0
+msgid ""
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,leaves_taken:0
+msgid ""
+"This value is given by the sum of all holidays requests with a negative "
+"value."
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Violet"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.hr_holidays_leaves_assign_legal
+msgid ""
+"You can assign remaining Legal Leaves for each employee, OpenERP will "
+"automatically create and validate allocation requests."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id2:0
+msgid ""
+"This area is automaticly filled by the user who validate the leave with "
+"second level (If Leave type need second validation)"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Mode"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
+msgid "HR Holidays Summary Report By Department"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Approve"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
+msgid "Allocation Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Yellow"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Pink"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Confirm"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Approve"
+msgstr ""
diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po
index fdc3c87a399..13b15a63c62 100644
--- a/addons/web/i18n/fr.po
+++ b/addons/web/i18n/fr.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-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-15 10:35+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-21 16:26+0000\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-Team: French <fr@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-11-15 05:08+0000\n"
-"X-Generator: Launchpad (build 16265)\n"
+"X-Launchpad-Export-Date: 2012-11-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16293)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
@@ -129,29 +129,29 @@ msgstr "OpenERP - Version communautaire/non supportée"
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:619
 msgid "less than a minute ago"
-msgstr ""
+msgstr "il y a moins d'une minute"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:620
 msgid "about a minute ago"
-msgstr ""
+msgstr "il y a une minute"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:621
 #, python-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "il y a %d minutes"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:622
 msgid "about an hour ago"
-msgstr ""
+msgstr "il y a une heure"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:623
 #, python-format
 msgid "%d hours ago"
-msgstr ""
+msgstr "il y a %d heures"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:624
@@ -162,23 +162,23 @@ msgstr ""
 #: addons/web/static/src/js/coresetup.js:625
 #, python-format
 msgid "%d days ago"
-msgstr ""
+msgstr "il y a %d jours"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:626
 msgid "about a month ago"
-msgstr ""
+msgstr "il y a un mois"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:627
 #, python-format
 msgid "%d months ago"
-msgstr ""
+msgstr "il y a %d mois"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:628
 msgid "about a year ago"
-msgstr ""
+msgstr "il y a un an"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:629
@@ -243,17 +243,19 @@ msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
+"Les champs de destination ne devraient être sélectionnés qu'une seule fois, "
+"plusieurs champs ont été sélectionnés plusieurs fois:"
 
 #. openerp-web
 #: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
-msgstr ""
+msgstr "*Les champs requis ne sont pas sélectionnés :"
 
 #. openerp-web
 #: addons/web/static/src/js/formats.js:139
 #, python-format
 msgid "(%d records)"
-msgstr ""
+msgstr "(%d enregistrements)"
 
 #. openerp-web
 #: addons/web/static/src/js/formats.js:325
@@ -1120,7 +1122,7 @@ msgstr ""
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:523
 msgid "/web/binary/upload_attachment"
-msgstr ""
+msgstr "/web/binary/upload_attachment"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:527
@@ -1136,7 +1138,7 @@ msgstr ""
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:687
 msgid "Discard"
-msgstr ""
+msgstr "Annuler"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:806