From 819f2a33feaaac3924479513e3b5db3b87359191 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Fri, 19 Feb 2010 16:21:45 +0530
Subject: [PATCH 01/11] [IMP]: stock: Improvement for wizards of consume and
 scrap moves + converted simple wizards to osv_memory wizards

bzr revid: rpa@openerp.co.in-20100219105145-f9pvx6g8ua9fjq0r
---
 addons/stock/__init__.py                 |   2 +
 addons/stock/__terp__.py                 |   1 +
 addons/stock/stock.py                    | 117 +++++++++++++++++++
 addons/stock/stock_osv_wizards.xml       | 102 +++++++++++++++++
 addons/stock/stock_wizard.py             | 107 ++++++++++++++++++
 addons/stock/stock_wizard.xml            |  10 +-
 addons/stock/wizard/__init__.py          |   2 +-
 addons/stock/wizard/wizard_track_line.py | 138 -----------------------
 8 files changed, 332 insertions(+), 147 deletions(-)
 create mode 100644 addons/stock/stock_osv_wizards.xml
 create mode 100644 addons/stock/stock_wizard.py
 delete mode 100644 addons/stock/wizard/wizard_track_line.py

diff --git a/addons/stock/__init__.py b/addons/stock/__init__.py
index 216fa82d01a..d728efbf2fe 100644
--- a/addons/stock/__init__.py
+++ b/addons/stock/__init__.py
@@ -27,6 +27,8 @@ import report
 import wizard
 import report_stock
 
+import stock_wizard
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index 7ddf97553de..f492b6b0ed9 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -45,6 +45,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "stock_data.xml",
         "stock_incoterms.xml",
         "stock_wizard.xml",
+        "stock_osv_wizards.xml", 
         "stock_view.xml",
         "stock_report.xml",
         "stock_sequence.xml",
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b7e43705fd1..66a65602e50 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1493,6 +1493,123 @@ class stock_move(osv.osv):
         return super(stock_move, self).unlink(
             cr, uid, ids, context=context)
 
+    def _track_lines(self, cr, uid, ids, data, context=None):
+        move_obj = self.pool.get('stock.move').browse(cr, uid, ids)
+        prodlot_obj = self.pool.get('stock.production.lot')
+        ir_sequence_obj = self.pool.get('ir.sequence')
+    
+        sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
+        if not sequence:
+            raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
+        if data['tracking_prefix']:
+            sequence=data['tracking_prefix']+'/'+(sequence or '')
+    
+        move = self.browse(cr, uid, [ids])[0]
+
+        quantity=data['quantity']
+        if quantity <= 0 or move.product_qty == 0:
+            return {}
+        uos_qty=quantity/move.product_qty*move.product_uos_qty
+    
+        quantity_rest = move.product_qty%quantity
+        uos_qty_rest = quantity_rest/move.product_qty*move.product_uos_qty
+    
+        update_val = {
+            'product_qty': quantity,
+            'product_uos_qty': uos_qty,
+        }
+        new_move = []
+        for idx in range(int(move.product_qty//quantity)):
+            if idx:
+                current_move = self.copy(cr, uid, move.id, {'state': move.state})
+                new_move.append(current_move)
+            else:
+                current_move = move.id
+            new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id})
+            update_val['prodlot_id'] = new_prodlot
+            self.write(cr, uid, [current_move], update_val)
+        
+        if quantity_rest > 0:
+            idx = int(move.product_qty//quantity)
+            update_val['product_qty']=quantity_rest
+            update_val['product_uos_qty']=uos_qty_rest
+            if idx:
+                current_move = self.copy(cr, uid, move.id, {'state': move.state})
+                new_move.append(current_move)
+            else:
+                current_move = move.id
+            new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id})
+            update_val['prodlot_id'] = new_prodlot
+            self.write(cr, uid, [current_move], update_val)
+        return new_move
+
+    def split_moves(self, cr, uid, ids, datas, context=None):
+        new_move = None
+        if not context:
+            context = {}
+        qty = datas['product_qty']
+        if qty <= 0:
+            raise wizard.except_wizard(_('Warning!'), _('Please provide Proper Quantity !'))
+        
+        move = self.browse(cr, uid, ids, context=context)
+        move_qty = move.product_qty
+        
+        if qty > move_qty:
+            qty = move_qty
+        rest = 0
+    
+        if qty <= move_qty:
+            rest= move_qty - qty
+            vals = {
+                'product_qty' : qty, 
+                'product_uos_qty': qty, 
+                'location_id': datas['location_id'],
+                }
+            track = move.product_id.track_production
+            self.write(cr, uid, move.id, vals)
+            if track:
+                data = {'tracking_prefix': '', 'quantity': 1}
+                newmoves = self._track_lines(cr, uid, ids, data, context=None)
+            self.action_done(cr, uid, [move.id])
+        
+        if rest:
+            defaults = {'product_qty': rest, 
+                                'product_uos_qty': rest, 
+                                'state': move.state}
+            new_move = self.copy(cr, uid, move.id, default=defaults)
+        return new_move
+
+    def scrap_moves(self, cr, uid, ids, datas, context=None):
+        new_move = None
+        qty = datas['product_qty']
+        if qty <= 0:
+            raise wizard.except_wizard(_('Warning!'), _('Please provide Proper Quantity !'))
+        
+        move = self.browse(cr, uid, ids, context=context)
+        location = move.location_dest_id.id
+        move_qty = move.product_qty
+
+        if qty > move_qty:
+            qty = move_qty
+        rest = 0
+    
+        if qty <= move_qty: 
+            rest= move_qty - qty
+            vals = {
+                        'product_qty': qty, 
+                        'state': move.state, 
+                        'location_dest_id': datas['location_id']
+                        }
+            self.write(cr, uid, ids, vals)
+    
+        if rest:
+            defaults = {'product_qty': rest, 
+                        'product_uos_qty': rest, 
+                        'location_dest_id': location, 
+                        'state': move.state}
+            new_move = self.copy(cr, uid, move.id, default=defaults)
+        return new_move
+
 stock_move()
 
 
diff --git a/addons/stock/stock_osv_wizards.xml b/addons/stock/stock_osv_wizards.xml
new file mode 100644
index 00000000000..ad5b74a6cce
--- /dev/null
+++ b/addons/stock/stock_osv_wizards.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+	    <record id="view_stock_move_track_wizard" model="ir.ui.view">
+	            <field name="name">Tracking a move</field>
+	            <field name="model">stock.move.track</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Tracking a move">
+	                	<field name="tracking_prefix" colspan="4"/>
+	                	<field name="quantity" colspan="4"/>
+	                	<newline/>
+	                	<separator string="" colspan="4" />
+	                	<button icon='gtk-cancel' special="cancel"
+	                		string="Cancel" />
+	                	<button name="track_lines" string="Ok"
+	                		type="object" icon="gtk-ok" />
+	                </form>
+	            </field>
+	        </record>
+	
+	        <record id="track_line" model="ir.actions.act_window">
+	            <field name="name">Tracking a move</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="res_model">stock.move.track</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="target">new</field>
+	        </record>
+	        
+        
+        <!--  Consume, scrap move -->
+        
+		<record id="view_stock_move_consume_wizard" model="ir.ui.view">
+            <field name="name">Consume Move</field>
+            <field name="model">stock.move.consume</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Consume Move">
+                	<separator string="Consume Products" colspan="4"/>
+				    <field name="product_id" colspan="4" readonly="1"/>
+				    <field name="location_id" colspan="4"/>
+				    <field name="product_qty" colspan="2"/>
+				    <field name="product_uom" nolabel="1" readonly="1"/>
+                	<newline/>
+                	<separator string="" colspan="4" />
+                	<label string="" colspan="2" />
+                	<group col="2" colspan="1">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="move_consume" string="Ok"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="move_consume" model="ir.actions.act_window">
+            <field name="name">Consume Move</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.move.consume</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        
+       <record id="view_stock_move_scrap_wizard" model="ir.ui.view">
+            <field name="name">Scrap Move</field>
+            <field name="model">stock.move.scrap</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Scrap Move">
+                	<separator string="Scrap Products" colspan="4"/>
+				    <field name="product_id" colspan="4" readonly="1"/>
+				    <field name="location_id" colspan="4"/>
+				    <field name="product_qty" colspan="2"/>
+				    <field name="product_uom" nolabel="1" readonly="1"/>
+                	<newline/>
+                	<separator string="" colspan="4" />
+                	<label string="" colspan="2" />
+                	<group col="2" colspan="1">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="move_scrap" string="Ok"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="move_scrap" model="ir.actions.act_window">
+            <field name="name">Scrap Move</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.move.scrap</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        
+	</data>
+</openerp>	
\ No newline at end of file
diff --git a/addons/stock/stock_wizard.py b/addons/stock/stock_wizard.py
new file mode 100644
index 00000000000..be0d98ca7c7
--- /dev/null
+++ b/addons/stock/stock_wizard.py
@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import re
+import time
+import tools
+
+class stock_move_track(osv.osv_memory):
+    _name = "stock.move.track"
+    _description = "Track moves"
+    
+    _columns = {
+        'tracking_prefix': fields.char('Tracking prefix', size=64), 
+        'quantity': fields.float("Quantity per lot")
+              }
+
+    _defaults = {
+        'quantity': lambda *x: 1
+                 }
+    
+    def track_lines(self, cr, uid, ids, context={}):
+        datas = self.read(cr, uid, ids)[0]
+        move_obj = self.pool.get('stock.move')
+        move_obj._track_lines(cr, uid, context['active_id'], datas, context=context)
+        return {}
+
+stock_move_track()
+
+class stock_move_consume(osv.osv_memory):
+    _name = "stock.move.consume"
+    _description = "Consume Products"
+    
+    _columns = {
+        'product_id': fields.many2one('product.product', 'Product', required=True, select=True), 
+        'product_qty': fields.float('Quantity', required=True), 
+        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True), 
+        'location_id': fields.many2one('stock.location', 'Source Location', required=True)
+              }
+
+    def _get_product_id(self, cr, uid, context):
+        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
+        return move.product_id.id
+    
+    def _get_product_qty(self, cr, uid, context):
+        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
+        return move.product_qty
+    
+    def _get_product_uom(self, cr, uid, context):
+        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
+        return move.product_uom.id
+    
+    def _get_location_id(self, cr, uid, context):
+        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
+        return move.location_id.id
+    
+    _defaults = {
+                 'product_id': _get_product_id, 
+                 'product_qty': _get_product_qty, 
+                 'product_uom': _get_product_uom, 
+                 'location_id': _get_location_id
+                 }
+
+    def move_consume(self, cr, uid, ids, context={}):
+        datas = self.read(cr, uid, ids)[0]
+        move_obj = self.pool.get('stock.move')
+        move_obj.split_moves(cr, uid, context['active_id'], datas, context=context)
+        return {}
+
+stock_move_consume()
+
+
+class stock_move_scrap(osv.osv_memory):
+    _name = "stock.move.scrap"
+    _description = "Scrap Products"
+    _inherit = "stock.move.consume"
+    
+    _defaults = {
+                 'location_id': lambda *x: False
+                 }
+
+    def move_scrap(self, cr, uid, ids, context={}):
+        datas = self.read(cr, uid, ids)[0]
+        move_obj = self.pool.get('stock.move')
+        move_obj.scrap_moves(cr, uid, context['active_id'], datas, context=context)
+        return {}
+
+stock_move_scrap()
\ No newline at end of file
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index b5b0d7ce303..5db1269d42c 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -28,13 +28,6 @@
             name="stock.partial_move"
             string="Partial Move"/>
 
-    <wizard
-        id="track_line"
-        model="stock.move"
-        multi="True"
-        name="stock.move.track"
-        string="Track line"/>
-        
     <wizard
         id="split_inventory_lots"
         model="stock.inventory.line"
@@ -85,5 +78,6 @@
         model="stock.location"
         name="stock.location.products"
         string="Products by Location"/>
-    </data>
+            
+   </data>        
 </openerp>
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index e918e030721..6a15449a151 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -26,7 +26,6 @@ import wizard_picking_make
 import wizard_replacement
 import wizard_return
 import wizard_split_lot_line
-import wizard_track_line
 import wizard_ups
 import wizard_invoice_onshipping
 import wizard_location_product
@@ -34,5 +33,6 @@ import wizard_inventory
 import wizard_split_inventory_lots
 import inventory_merge_zero
 import inventory_merge
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/wizard/wizard_track_line.py b/addons/stock/wizard/wizard_track_line.py
deleted file mode 100644
index 64a869758ce..00000000000
--- a/addons/stock/wizard/wizard_track_line.py
+++ /dev/null
@@ -1,138 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-import time
-from osv import osv
-from tools.translate import _
-
-track_form = '''<?xml version="1.0"?>
-<form string="Tracking a move">
- <field name="tracking_prefix"/>
- <newline/>
- <field name="quantity"/>
-</form>
-'''
-fields = {
-        'tracking_prefix': {
-            'string': 'Tracking prefix',
-            'type': 'char',
-            'size': 64,
-        },
-        'quantity': {
-            'string': 'Quantity per lot',
-            'type': 'float',
-            'default': 1,
-        }
-}
-
-def _check_picking(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    move_obj = pool.get('stock.move').browse(cr, uid, data['id'])
-    if not move_obj.picking_id:
-        raise wizard.except_wizard(_('Caution!'), _('Before splitting the production lots,make sure this move has a Picking attached !\nYou must save the move before performing this operation.'))
-    return data['form']    
-
-def _track_lines(self, cr, uid, data, context):
-    move_id = data['id']
-
-    pool = pooler.get_pool(cr.dbname)
-    prodlot_obj = pool.get('stock.production.lot')
-    move_obj = pool.get('stock.move')
-#    production_obj = pool.get('mrp.production')
-    ir_sequence_obj = pool.get('ir.sequence')
-
-    sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
-    if not sequence:
-        raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
-    if data['form']['tracking_prefix']:
-        sequence=data['form']['tracking_prefix']+'/'+(sequence or '')
-
-    move = move_obj.browse(cr, uid, [move_id])[0]
-    quantity=data['form']['quantity']
-    if quantity <= 0 or move.product_qty == 0:
-        return {}
-    uos_qty=quantity/move.product_qty*move.product_uos_qty
-
-    quantity_rest = move.product_qty%quantity
-    uos_qty_rest = quantity_rest/move.product_qty*move.product_uos_qty
-
-    update_val = {
-        'product_qty': quantity,
-        'product_uos_qty': uos_qty,
-    }
-    new_move = []
-#    production_ids = []
-    for idx in range(int(move.product_qty//quantity)):
-        if idx:
-#            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
-            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state})
-            new_move.append(current_move)
-        else:
-            current_move = move.id
-        new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id})
-        update_val['prodlot_id'] = new_prodlot
-        move_obj.write(cr, uid, [current_move], update_val)
-#        production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
-    
-    if quantity_rest > 0:
-        idx = int(move.product_qty//quantity)
-        update_val['product_qty']=quantity_rest
-        update_val['product_uos_qty']=uos_qty_rest
-        if idx:
-#            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
-            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state})
-            new_move.append(current_move)
-        else:
-            current_move = move.id
-        new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id})
-        update_val['prodlot_id'] = new_prodlot
-        move_obj.write(cr, uid, [current_move], update_val)
-
-#    products = production_obj.read(cr, uid, production_ids, ['move_lines'])
-#    for p in products:
-#        for new in new_move:
-#            if new not in p['move_lines']:
-#                p['move_lines'].append(new)
-#        production_obj.write(cr, uid, [p['id']], {'move_lines': [(6, 0, p['move_lines'])]})
-
-    return {}
-
-class wizard_track_move(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_check_picking],
-            'result': {'type': 'form', 'arch': track_form, 'fields': fields, 'state': [('end', 'Cancel', 'gtk-cancel'), ('track', 'Ok', 'gtk-ok')]},
-            },
-        'track': {
-            'actions': [_track_lines],
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-
-wizard_track_move('stock.move.track')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 0abe3714370e5aedd8179c7dada92eb52013ce18 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Fri, 19 Feb 2010 16:25:43 +0530
Subject: [PATCH 02/11] [IMP]: mrp: Manufacturing Order Usability Improvement:
 View improvement, Separated move_lines into 2, one for product to consume and
 the other for consumed products + wizard related changes

bzr revid: rpa@openerp.co.in-20100219105543-rc1jxi0lrimfk21i
---
 addons/mrp/__terp__.py                     |   1 +
 addons/mrp/mrp.py                          |  93 +++++++++++--
 addons/mrp/mrp_view.xml                    | 150 +++++++++++++++++----
 addons/mrp/mrp_wizard.xml                  |   7 -
 addons/mrp/wizard/__init__.py              |   2 +-
 addons/mrp/wizard/wizard_split_in_lots.py  |  56 ++++++++
 addons/mrp/wizard/wizard_split_in_lots.xml |  41 ++++++
 addons/mrp/wizard/wizard_track_line.py     | 138 -------------------
 8 files changed, 306 insertions(+), 182 deletions(-)
 create mode 100644 addons/mrp/wizard/wizard_split_in_lots.py
 create mode 100644 addons/mrp/wizard/wizard_split_in_lots.xml
 delete mode 100644 addons/mrp/wizard/wizard_track_line.py

diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index 3bf2410cff9..a8647098506 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -60,6 +60,7 @@
         'security/ir.model.access.csv',
         'mrp_workflow.xml',
         'mrp_data.xml',
+        'wizard/wizard_split_in_lots.xml', 
         'mrp_view.xml',
         'mrp_wizard.xml',
         'mrp_report.xml',
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 86938ac6f08..e509c33740b 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -19,14 +19,13 @@
 #
 ##############################################################################
 
+from mx import DateTime
 from osv import fields
 from osv import osv
+from tools.translate import _
 import ir
-
 import netsvc
 import time
-from mx import DateTime
-from tools.translate import _
 
 #----------------------------------------------------------
 # Work Centers
@@ -334,6 +333,45 @@ def rounding(f, r):
         return f
     return round(f / r) * r
 
+class many2many_domain(fields.many2many):
+    def set(self, cr, obj, id, name, values, user=None, context=None):
+        if not values:
+            return
+        return super(many2many_domain, self).set(cr, obj, id, name, values, user=user,
+                context=context)
+
+    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
+        if not context:
+            context = {}
+        res = {}
+        move_obj = obj.pool.get('stock.move')
+        for prod in obj.browse(cr, user, ids, context=context):
+            cr.execute("SELECT move_id from mrp_production_move_ids where\
+                production_id=%s" % (prod.id))
+            m_ids = map(lambda x: x[0], cr.fetchall())
+            final = move_obj.search(cr, user, self._domain + [('id', 'in', tuple(m_ids))])
+            res[prod.id] = final
+        return res
+
+class one2many_domain(fields.one2many):
+    def set(self, cr, obj, id, field, values, user=None, context=None):
+        if not values:
+            return
+        return super(one2many_domain, self).set(cr, obj, id, field, values, 
+                                            user=user, context=context)
+
+    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
+        if not context:
+            context = {}
+        res = {}
+        move_obj = obj.pool.get('stock.move')
+        for prod in obj.browse(cr, user, ids, context=context):
+            cr.execute("SELECT id from stock_move where production_id=%s" % (prod.id))
+            m_ids = map(lambda x: x[0], cr.fetchall())
+            final = move_obj.search(cr, user, self._domain + [('id', 'in', tuple(m_ids))])
+            res[prod.id] = final
+        return res
+
 class mrp_production(osv.osv):
     _name = 'mrp.production'
     _description = 'Production'
@@ -420,9 +458,10 @@ class mrp_production(osv.osv):
         'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True,
             help="This is the internal picking list that brings the finished product to the production plan"),
         'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True),
-        'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products Consummed'),
-
-        'move_created_ids': fields.one2many('stock.move', 'production_id', 'Moves Created'),
+        'move_lines': many2many_domain('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consumme', domain=[('state','not in', ('done', 'cancel'))]),
+        'move_lines2': many2many_domain('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consummed Products', domain=[('state','in', ('done', 'cancel'))]),
+        'move_created_ids': one2many_domain('stock.move', 'production_id', 'Moves Created', domain=[('state','not in', ('done', 'cancel'))]),
+        'move_created_ids2': one2many_domain('stock.move', 'production_id', 'Moves Created', domain=[('state','in', ('done', 'cancel'))]),
         'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation'),
         'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
@@ -541,6 +580,10 @@ class mrp_production(osv.osv):
                 self.pool.get('stock.move').write(cr, uid, [production.move_prod_id.id],
                         {'location_id':production.location_dest_id.id})
         return True
+    
+    def action_start(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state':'in_production'})
+        return True
 
     #TODO Review materials in function in_prod and prod_end.
     def action_production_end(self, cr, uid, ids):
@@ -562,7 +605,7 @@ class mrp_production(osv.osv):
             self.pool.get('stock.move').check_assign(cr, uid, new_moves)
             self.pool.get('stock.move').action_done(cr, uid, new_moves)
             self._costs_generate(cr, uid, production)
-#        self.pool.get('stock.move').action_done(cr, uid, move_ids)
+        self.pool.get('stock.move').action_done(cr, uid, move_ids)
         self.write(cr,  uid, ids, {'state': 'done'})
         return True
 
@@ -606,7 +649,7 @@ class mrp_production(osv.osv):
             if not production.date_start:
                 self.write(cr, uid, [production.id],
                         {'date_start': time.strftime('%Y-%m-%d %H:%M:%S')})
-        self.pool.get('stock.move').action_done(cr, uid, move_ids)
+#        self.pool.get('stock.move').action_done(cr, uid, move_ids)
         self.write(cr, uid, ids, {'state': 'in_production'})
         return True
 
@@ -1299,6 +1342,40 @@ class StockMove(osv.osv):
                     wf_service = netsvc.LocalService("workflow")
                     wf_service.trg_validate(uid, 'mrp.procurement', m, 'button_wait_done', cr)
         return True
+    
+    def _track_lines(self, cr, uid, ids, data, context=None):
+        production_ids = []
+        new_move = super(StockMove, self)._track_lines(cr, uid, ids, data, context=context)
+        if new_move:
+            production_obj = self.pool.get('mrp.production')
+            move_obj = self.pool.get('stock.move')
+            move = move_obj.browse(cr, uid, ids)
+            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+            for new in new_move:
+                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new)]})
+                move_obj.action_done(cr, uid, [new])
+        return new_move
+    
+    def split_moves(self, cr, uid, ids, datas, context=None):
+        new_move = super(StockMove, self).split_moves(cr, uid, ids, datas, context=context)
+        if new_move:
+            production_obj = self.pool.get('mrp.production')
+            move_obj = self.pool.get('stock.move')
+            move = move_obj.browse(cr, uid, ids)
+            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+            production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
+        return {}
+    
+    def scrap_moves(self, cr, uid, ids, datas, context=None):
+        new_move = super(StockMove, self).scrap_moves(cr, uid, ids, datas, context=context)
+        if new_move:
+            production_obj = self.pool.get('mrp.production')
+            move_obj = self.pool.get('stock.move')
+            move = move_obj.browse(cr, uid, ids)
+            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+            production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
+        return {}
+
 StockMove()
 
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index f85c5ace21b..843680c1f73 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -438,6 +438,7 @@
                 </graph>
             </field>
         </record>
+
         <wizard
             string="Change Product Qty."
             model="mrp.production"
@@ -445,54 +446,102 @@
             id="mrp.wizard_change_production_qty"
             keyword="client_action_multi"
             multi="True"/>
-
+	
         <record id="mrp_production_form_view" model="ir.ui.view">
             <field name="name">mrp.production.form</field>
             <field name="model">mrp.production</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Manufacturing Orders">
-                    <group colspan="4" col="7">
-                        <field name="name" select="1"/>
+                    <group colspan="4" col="6">
+                        <field name="name" select="1" string="Reference"/>
                         <field name="date_planned" select="1"/>
                         <field name="origin" select="1"/>
-                        <newline/>
-                        <field name="product_id" on_change="product_id_change(product_id)" select="1"/>
+                        <field name="product_id" on_change="product_id_change(product_id)" select="1"/>                        
                         <field name="product_qty"/>
-                        <field name="product_uom"/>
-                        <button type="action" name="%(mrp.wizard_change_production_qty)d" string="Change Qty" states="ready,confirmed,in_production" icon="gtk-ok"/>
-                        <field name="product_uos_qty" groups="product.group_uos"/>
-                        <field name="product_uos" groups="product.group_uos"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <group colspan="2" col="3">
+                            <field name="product_uom"/>
+                            <!-- TODO Fix change qty accroding to move_lines and move_lines2 -->
+<!--                            <button type="action" name="%(mrp.wizard_change_production_qty)d" string="Change Qty" states="ready,confirmed,in_production" icon="gtk-ok"/>-->
+                        </group>
+                        <label string="" colspan="2"/>                          
+                        <field name="product_uos_qty" groups="product.group_uos"/>                        
+                        <group colspan="2" col="3" groups="product.group_uos">
+                            <field name="product_uos"/>
+                            <label string=""/> 
+                        </group>                        
                     </group>
 
                     <notebook colspan="4">
                         <page string="Consumed Products">
-                            <field name="location_src_id" select="2" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
-                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                             <field name="bom_id" select="2" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
                             <field name="routing_id" groups="base.group_extended" select="1"/>
-                            <newline/>
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list">
-                                <tree string="Moves">
-                                    <field name="product_id" select="1"/>
-                                    <field name="product_qty" select="1"/>
-                                    <field name="product_uom" select="1" string="UOM"/>
-                                    <field name="prodlot_id" select="1"/>
-                                    <field name="product_packaging" domain="[('product_id','=',product_id)]"/>
-                                    <field name="picking_id"/>
-                                    <field name="location_id" select="1"/>
-                                    <field name="location_dest_id" select="1"/>
-                                    <field name="date" select="1"/>
-                                    <field name="date_planned" select="1" string="Date"/>
+                            <field name="location_src_id" select="2" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
+                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
+                            <separator string="" colspan="4"/>
 
-                                </tree>
+                            <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
+                            	mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
+                            	<tree string="Products to Consume">
+                            		<field name="product_id" />
+                            		<field name="product_qty" />
+                            		<field name="product_uom" />
+                            		<field name="state" invisible="1" />
+                            		<button
+                            			name="%(stock.move_consume)d"
+                            			string=">" type="action"
+                            			icon="gtk-go-forward" context="{'consume': True}"
+                            			states="draft,waiting,confirmed,assigned"/>
+                            		<button name="%(stock.move_scrap)d"
+                            			string="D" type="action"
+                            			icon="gtk-justify-fill" context="{'scrap': True}"
+                            			states="draft,waiting,confirmed,assigned" />
+                            	</tree>
+                            	<form string="Products to Consume">
+                            		<field name="product_id" />
+                            		<field name="product_qty" />
+                            		<field name="product_uom" />
+                            	</form>
                             </field>
+
+                            <field colspan="2" name="move_lines2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
+                           			widget="one2many_list" mode="tree,form" height="275">
+                           		<tree string="Consumed Products" editable="bottom">
+                           			<field name="product_id" readonly="1"/>
+                           			<field name="product_qty" readonly="1"/>
+                           			<field name="product_uom" readonly="1" />
+                           			<field name="state" invisible="1" />
+                           			<field name="location_id" readonly="1"/>
+                           			<field name="prodlot_id" />                           			
+<!--                           			<button-->
+<!--                           				name="%(stock.track_line)d"-->
+<!--                           				string="Split in production lots"-->
+<!--                           				type="action" icon="gtk-justify-fill"-->
+<!--                           				states="done,cancel" />-->
+                           			<button
+                           				name="%(mrp.split_in_lots)d"
+                           				string="Split in production lots"
+                           				type="action" icon="gtk-justify-fill"
+                           				states="done,cancel" />
+                           			<button
+                           				name="%(stock.move_scrap)d"
+                           				string="D" type="action"
+                           				icon="gtk-convert"
+                           				states="done,cancel" />
+                           		</tree>
+                           		<form string="Consumed Products">
+                           			<field name="product_id" />
+                           			<field name="product_qty" />
+                           			<field name="product_uom" />
+                           		</form>
+                           	</field>						
+
                             <group col="9" colspan="4">
                                 <field name="state" select="2"/>
                                 <button name="action_compute" states="draft" string="Compute Data" type="object" icon="gtk-execute"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
-                                <button name="button_produce" states="ready" string="Start Production" icon="gtk-media-play"/>
+<!--                                <button name="action_start" states="ready" string="Mark as Start" icon="gtk-media-play" type="object"/>-->
+                                <button name="button_produce" states="ready" string="Produce" icon="gtk-execute"/>
                                 <button name="button_produce_done" states="in_production" string="Production done" icon="gtk-ok"/>
                                 <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
                                 <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-cancel"/>
@@ -503,7 +552,51 @@
                             <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
                         </page>
                         <page string="Finished Products">
-                            <field colspan="4" name="move_created_ids" nolabel="1"/>
+                            <field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list"
+                            	mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
+                            	<tree string="Products to Consume">
+                            		<field name="product_id" />
+                            		<field name="product_qty" />
+                            		<field name="product_uom" />
+                            		<field name="state" invisible="1" />
+                            		<button
+                            			name="%(stock.move_consume)d"
+                            			string=">" type="action"
+                            			icon="gtk-go-forward"
+                            			states="draft,waiting,confirmed,assigned"/>
+                            		<button name="%(stock.move_scrap)d"
+                            			string="D" type="action"
+                            			icon="gtk-justify-fill" context="{'scrap': True}"
+                            			states="draft,waiting,confirmed,assigned" />
+                            	</tree>
+                            	<form string="Products to Consume">
+                            		<field name="product_id" />
+                            		<field name="product_qty" />
+                            		<field name="product_uom" />
+                            	</form>
+                            </field>
+
+                            <field colspan="2" name="move_created_ids2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
+                           			widget="one2many_list" mode="tree,form" height="275">
+                           		<tree string="Consumed Products" editable="bottom">
+                           			<field name="product_id" readonly="1"/>
+                           			<field name="product_qty" readonly="1"/>
+                           			<field name="product_uom" readonly="1" />
+                           			<field name="state" invisible="1" />
+                           			<field name="location_id" readonly="1"/>
+                           			<field name="prodlot_id" />                           			
+                           			<button name="%(stock.track_line)d" 
+                                            string="Split in production lots" type="action" icon="gtk-justify-fill" states="done,cancel"/>
+                           			<button name="%(stock.move_scrap)d"
+                           				string="D" type="action" icon="gtk-go-forward" 
+                           				states="done,cancel" />
+                           		</tree>
+                           		<form string="Consumed Products">
+                           			<field name="product_id" />
+                           			<field name="product_qty" />
+                           			<field name="product_uom" />
+                           		</form>
+                           	</field>
                         </page>
                         <page string="Work Orders">
                             <field colspan="4" name="workcenter_lines" nolabel="1">
@@ -525,6 +618,7 @@
 
                         </page>
                         <page string="Extra Information">
+                            <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                             <field name="priority" groups="base.group_extended"/>
                             <newline/>
                             <field name="date_start" select="2"/>
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index 0bb41f1355c..cc9e4aa7114 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -31,12 +31,5 @@
             keyword="client_action_multi"
             id="product_procurement_wizard"/>
 
-        <wizard
-            id="stock.track_line"
-            model="stock.move"
-            multi="True"
-            name="mrp.stock.move.track"
-            string="Track line"/>
-
     </data>
 </openerp>
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index d619539a802..274a245d4d0 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -27,7 +27,7 @@ import wizard_workcenter_load
 import wizard_track_prod
 import wizard_change_production_qty
 import make_procurement
-import wizard_track_line
+import wizard_split_in_lots
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp/wizard/wizard_split_in_lots.py b/addons/mrp/wizard/wizard_split_in_lots.py
new file mode 100644
index 00000000000..be48cd15dff
--- /dev/null
+++ b/addons/mrp/wizard/wizard_split_in_lots.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import re
+import time
+import tools
+
+class spilt_in_lot(osv.osv_memory):
+    _name = "spilt.in.lot"
+    _description = "Split in lots"
+    
+    _columns = {
+        'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
+        'line_ids': fields.one2many('track.lines', 'lot_id', 'Lots Number')
+              }
+    
+    def _get_product_id(self, cr, uid, context):
+        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
+        return move.product_id.id
+    
+    _defaults = {
+                 'product_id': _get_product_id, 
+                 }
+
+spilt_in_lot()
+
+class track_lines(osv.osv_memory):
+    _name = "track.lines"
+    _description = "Track lines"
+    
+    _columns = {
+        'name': fields.char('Tracking serial', size=64), 
+        'lot_id': fields.many2one('spilt.in.lot', 'Lot')
+              }
+
+track_lines()
diff --git a/addons/mrp/wizard/wizard_split_in_lots.xml b/addons/mrp/wizard/wizard_split_in_lots.xml
new file mode 100644
index 00000000000..5862a765839
--- /dev/null
+++ b/addons/mrp/wizard/wizard_split_in_lots.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+	    <record id="view_split_in_lots" model="ir.ui.view">
+	            <field name="name">Split in lots</field>
+	            <field name="model">spilt.in.lot</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Split in lots">
+	                	<field name="product_id" colspan="4"/>
+	                	<newline/>
+	                	<field name="line_ids" colspan="4" nolabel="1">
+	                		<tree string="Lots Number" editable="top">
+	                			<field name="name" string="Lots"/>
+	                		</tree>
+	                		<form string="Lots Number">
+	                			<field name="name" string="Lots"/>
+	                		</form>
+	                	</field>
+	                	<separator string="" colspan="4" />
+	                	<label string="" colspan="2" />
+	                	<button icon='gtk-cancel' special="cancel"
+	                		string="Cancel" />
+	                	<button name="track_lines" string="Ok"
+	                		type="object" icon="gtk-ok" />
+	                </form>
+	            </field>
+	        </record>
+	
+	        <record id="split_in_lots" model="ir.actions.act_window">
+	            <field name="name">Split in lots</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="res_model">spilt.in.lot</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="target">new</field>
+	        </record>
+	        
+	</data>
+</openerp>	
\ No newline at end of file
diff --git a/addons/mrp/wizard/wizard_track_line.py b/addons/mrp/wizard/wizard_track_line.py
deleted file mode 100644
index b13de11735b..00000000000
--- a/addons/mrp/wizard/wizard_track_line.py
+++ /dev/null
@@ -1,138 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-import time
-from osv import osv
-from tools.translate import _
-
-track_form = '''<?xml version="1.0"?>
-<form string="Tracking a move">
- <field name="tracking_prefix"/>
- <newline/>
- <field name="quantity"/>
-</form>
-'''
-fields = {
-        'tracking_prefix': {
-            'string': 'Tracking prefix',
-            'type': 'char',
-            'size': 64,
-        },
-        'quantity': {
-            'string': 'Quantity per lot',
-            'type': 'float',
-            'default': 1,
-        }
-}
-
-def _check_picking(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    move_obj = pool.get('stock.move').browse(cr, uid, data['id'])
-    if not move_obj.picking_id:
-        raise wizard.except_wizard(_('Caution!'), _('Before splitting the production lots,make sure this move has a Picking attached !\nYou must save the move before performing this operation.'))
-    return data['form']
-
-def _track_lines(self, cr, uid, data, context):
-    move_id = data['id']
-
-    pool = pooler.get_pool(cr.dbname)
-    prodlot_obj = pool.get('stock.production.lot')
-    move_obj = pool.get('stock.move')
-    production_obj = pool.get('mrp.production')
-    ir_sequence_obj = pool.get('ir.sequence')
-
-    sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
-    if not sequence:
-        raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
-    if data['form']['tracking_prefix']:
-        sequence=data['form']['tracking_prefix']+'/'+(sequence or '')
-
-    move = move_obj.browse(cr, uid, [move_id])[0]
-    quantity=data['form']['quantity']
-    if quantity <= 0 or move.product_qty == 0:
-        return {}
-    uos_qty=quantity/move.product_qty*move.product_uos_qty
-
-    quantity_rest = move.product_qty%quantity
-    uos_qty_rest = quantity_rest/move.product_qty*move.product_uos_qty
-
-    update_val = {
-        'product_qty': quantity,
-        'product_uos_qty': uos_qty,
-    }
-    new_move = []
-    production_ids = []
-    for idx in range(int(move.product_qty//quantity)):
-        if idx:
-            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
-            new_move.append(current_move)
-        else:
-            current_move = move.id
-        new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id})
-        update_val['prodlot_id'] = new_prodlot
-        move_obj.write(cr, uid, [current_move], update_val)
-        production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
-    
-    if quantity_rest > 0:
-        idx = int(move.product_qty//quantity)
-        update_val['product_qty']=quantity_rest
-        update_val['product_uos_qty']=uos_qty_rest
-        if idx:
-            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
-            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state})
-            new_move.append(current_move)
-        else:
-            current_move = move.id
-        new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id})
-        update_val['prodlot_id'] = new_prodlot
-        move_obj.write(cr, uid, [current_move], update_val)
-
-    products = production_obj.read(cr, uid, production_ids, ['move_lines'])
-    for p in products:
-        for new in new_move:
-            if new not in p['move_lines']:
-                p['move_lines'].append(new)
-        production_obj.write(cr, uid, [p['id']], {'move_lines': [(6, 0, p['move_lines'])]})
-
-    return {}
-
-class wizard_track_move(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_check_picking],
-            'result': {'type': 'form', 'arch': track_form, 'fields': fields, 'state': [('end', 'Cancel', 'gtk-cancel'), ('track', 'Ok', 'gtk-ok')]},
-            },
-        'track': {
-            'actions': [_track_lines],
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-
-wizard_track_move('mrp.stock.move.track')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 80181ea3892016290d96020027cdbcdbfa1206fd Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Fri, 19 Feb 2010 19:14:55 +0530
Subject: [PATCH 03/11] [IMP]: stock, mrp: Changed logic of track lots,
 Improvement in functions of split and consume

bzr revid: rpa@openerp.co.in-20100219134455-47etho3p4i67dszw
---
 addons/mrp/__terp__.py                     |  1 -
 addons/mrp/mrp.py                          | 10 +--
 addons/mrp/mrp_view.xml                    |  7 +-
 addons/mrp/wizard/__init__.py              |  1 -
 addons/mrp/wizard/wizard_split_in_lots.py  | 56 --------------
 addons/mrp/wizard/wizard_split_in_lots.xml | 41 -----------
 addons/stock/stock.py                      | 85 +++++++++-------------
 addons/stock/stock_osv_wizards.xml         | 41 ++++++++++-
 addons/stock/stock_wizard.py               | 53 +++++++++++++-
 9 files changed, 129 insertions(+), 166 deletions(-)
 delete mode 100644 addons/mrp/wizard/wizard_split_in_lots.py
 delete mode 100644 addons/mrp/wizard/wizard_split_in_lots.xml

diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index a8647098506..3bf2410cff9 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -60,7 +60,6 @@
         'security/ir.model.access.csv',
         'mrp_workflow.xml',
         'mrp_data.xml',
-        'wizard/wizard_split_in_lots.xml', 
         'mrp_view.xml',
         'mrp_wizard.xml',
         'mrp_report.xml',
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index e509c33740b..5e789c569da 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1354,10 +1354,10 @@ class StockMove(osv.osv):
             for new in new_move:
                 production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new)]})
                 move_obj.action_done(cr, uid, [new])
-        return new_move
+        return {}
     
-    def split_moves(self, cr, uid, ids, datas, context=None):
-        new_move = super(StockMove, self).split_moves(cr, uid, ids, datas, context=context)
+    def consume_moves(self, cr, uid, ids, product_qty, location_id, context=None):
+        new_move = super(StockMove, self).consume_moves(cr, uid, ids, product_qty, location_id, context=context)
         if new_move:
             production_obj = self.pool.get('mrp.production')
             move_obj = self.pool.get('stock.move')
@@ -1366,8 +1366,8 @@ class StockMove(osv.osv):
             production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
         return {}
     
-    def scrap_moves(self, cr, uid, ids, datas, context=None):
-        new_move = super(StockMove, self).scrap_moves(cr, uid, ids, datas, context=context)
+    def scrap_moves(self, cr, uid, ids, product_qty, location_id, context=None):
+        new_move = super(StockMove, self).scrap_moves(cr, uid, ids, product_qty, location_id, context=context)
         if new_move:
             production_obj = self.pool.get('mrp.production')
             move_obj = self.pool.get('stock.move')
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 843680c1f73..2ee0c1cd9fb 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -513,13 +513,8 @@
                            			<field name="state" invisible="1" />
                            			<field name="location_id" readonly="1"/>
                            			<field name="prodlot_id" />                           			
-<!--                           			<button-->
-<!--                           				name="%(stock.track_line)d"-->
-<!--                           				string="Split in production lots"-->
-<!--                           				type="action" icon="gtk-justify-fill"-->
-<!--                           				states="done,cancel" />-->
                            			<button
-                           				name="%(mrp.split_in_lots)d"
+                           				name="%(stock.track_line)d"
                            				string="Split in production lots"
                            				type="action" icon="gtk-justify-fill"
                            				states="done,cancel" />
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 274a245d4d0..240f25daa9d 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -27,7 +27,6 @@ import wizard_workcenter_load
 import wizard_track_prod
 import wizard_change_production_qty
 import make_procurement
-import wizard_split_in_lots
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp/wizard/wizard_split_in_lots.py b/addons/mrp/wizard/wizard_split_in_lots.py
deleted file mode 100644
index be48cd15dff..00000000000
--- a/addons/mrp/wizard/wizard_split_in_lots.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-from tools.translate import _
-import re
-import time
-import tools
-
-class spilt_in_lot(osv.osv_memory):
-    _name = "spilt.in.lot"
-    _description = "Split in lots"
-    
-    _columns = {
-        'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
-        'line_ids': fields.one2many('track.lines', 'lot_id', 'Lots Number')
-              }
-    
-    def _get_product_id(self, cr, uid, context):
-        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
-        return move.product_id.id
-    
-    _defaults = {
-                 'product_id': _get_product_id, 
-                 }
-
-spilt_in_lot()
-
-class track_lines(osv.osv_memory):
-    _name = "track.lines"
-    _description = "Track lines"
-    
-    _columns = {
-        'name': fields.char('Tracking serial', size=64), 
-        'lot_id': fields.many2one('spilt.in.lot', 'Lot')
-              }
-
-track_lines()
diff --git a/addons/mrp/wizard/wizard_split_in_lots.xml b/addons/mrp/wizard/wizard_split_in_lots.xml
deleted file mode 100644
index 5862a765839..00000000000
--- a/addons/mrp/wizard/wizard_split_in_lots.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-	    <record id="view_split_in_lots" model="ir.ui.view">
-	            <field name="name">Split in lots</field>
-	            <field name="model">spilt.in.lot</field>
-	            <field name="type">form</field>
-	            <field name="arch" type="xml">
-	                <form string="Split in lots">
-	                	<field name="product_id" colspan="4"/>
-	                	<newline/>
-	                	<field name="line_ids" colspan="4" nolabel="1">
-	                		<tree string="Lots Number" editable="top">
-	                			<field name="name" string="Lots"/>
-	                		</tree>
-	                		<form string="Lots Number">
-	                			<field name="name" string="Lots"/>
-	                		</form>
-	                	</field>
-	                	<separator string="" colspan="4" />
-	                	<label string="" colspan="2" />
-	                	<button icon='gtk-cancel' special="cancel"
-	                		string="Cancel" />
-	                	<button name="track_lines" string="Ok"
-	                		type="object" icon="gtk-ok" />
-	                </form>
-	            </field>
-	        </record>
-	
-	        <record id="split_in_lots" model="ir.actions.act_window">
-	            <field name="name">Split in lots</field>
-	            <field name="type">ir.actions.act_window</field>
-	            <field name="res_model">spilt.in.lot</field>
-	            <field name="view_type">form</field>
-	            <field name="view_mode">form</field>
-	            <field name="target">new</field>
-	        </record>
-	        
-	</data>
-</openerp>	
\ No newline at end of file
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 66a65602e50..4c74e34b726 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1493,61 +1493,46 @@ class stock_move(osv.osv):
         return super(stock_move, self).unlink(
             cr, uid, ids, context=context)
 
-    def _track_lines(self, cr, uid, ids, data, context=None):
-        move_obj = self.pool.get('stock.move').browse(cr, uid, ids)
+    def _track_lines(self, cr, uid, ids, lines, context=None):
         prodlot_obj = self.pool.get('stock.production.lot')
-        ir_sequence_obj = self.pool.get('ir.sequence')
-    
-        sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
-        if not sequence:
-            raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
-        if data['tracking_prefix']:
-            sequence=data['tracking_prefix']+'/'+(sequence or '')
-    
         move = self.browse(cr, uid, [ids])[0]
-
-        quantity=data['quantity']
-        if quantity <= 0 or move.product_qty == 0:
-            return {}
-        uos_qty=quantity/move.product_qty*move.product_uos_qty
-    
-        quantity_rest = move.product_qty%quantity
-        uos_qty_rest = quantity_rest/move.product_qty*move.product_uos_qty
-    
-        update_val = {
-            'product_qty': quantity,
-            'product_uos_qty': uos_qty,
-        }
+        move_qty = move.product_qty
+        quantity_rest = move.product_qty
         new_move = []
-        for idx in range(int(move.product_qty//quantity)):
-            if idx:
-                current_move = self.copy(cr, uid, move.id, {'state': move.state})
-                new_move.append(current_move)
-            else:
-                current_move = move.id
-            new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id})
-            update_val['prodlot_id'] = new_prodlot
-            self.write(cr, uid, [current_move], update_val)
-        
+        for line in lines:
+            quantity = line['quantity']
+            sequence = line['tracking_num']
+            if quantity <= 0 or move_qty == 0:
+                continue
+            quantity_rest -= quantity
+            uos_qty = quantity / move_qty * move.product_uos_qty
+            uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
+            default_val = {
+                'product_qty': quantity,
+                'product_uos_qty': uos_qty,
+                'state': move.state
+            }
+            current_move = self.copy(cr, uid, move.id, default_val)
+            new_move.append(current_move)
+            new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence,
+                                                 'ref': '%d'%int(move_qty//quantity)}, 
+                                                 {'product_id': move.product_id.id})
+            self.write(cr, uid, [current_move], {'prodlot_id': new_prodlot})
+            
         if quantity_rest > 0:
-            idx = int(move.product_qty//quantity)
-            update_val['product_qty']=quantity_rest
-            update_val['product_uos_qty']=uos_qty_rest
-            if idx:
-                current_move = self.copy(cr, uid, move.id, {'state': move.state})
-                new_move.append(current_move)
-            else:
-                current_move = move.id
-            new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id})
-            update_val['prodlot_id'] = new_prodlot
-            self.write(cr, uid, [current_move], update_val)
+            new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence + '/', 'ref': '%d' % int(move_qty//quantity)}, {'product_id': move.product_id.id})
+            update_val= {'prodlot_id': new_prodlot, 
+                                    'product_qty': quantity_rest, 
+                                    'product_uos_qty': uos_qty_rest
+                                    }
+            self.write(cr, uid, [move.id], update_val)
         return new_move
 
-    def split_moves(self, cr, uid, ids, datas, context=None):
+    def consume_moves(self, cr, uid, ids, product_qty, location_id, context=None):
         new_move = None
         if not context:
             context = {}
-        qty = datas['product_qty']
+        qty = product_qty
         if qty <= 0:
             raise wizard.except_wizard(_('Warning!'), _('Please provide Proper Quantity !'))
         
@@ -1563,7 +1548,7 @@ class stock_move(osv.osv):
             vals = {
                 'product_qty' : qty, 
                 'product_uos_qty': qty, 
-                'location_id': datas['location_id'],
+                'location_id': location_id
                 }
             track = move.product_id.track_production
             self.write(cr, uid, move.id, vals)
@@ -1579,9 +1564,9 @@ class stock_move(osv.osv):
             new_move = self.copy(cr, uid, move.id, default=defaults)
         return new_move
 
-    def scrap_moves(self, cr, uid, ids, datas, context=None):
+    def scrap_moves(self, cr, uid, ids, product_qty, location_id, context=None):
         new_move = None
-        qty = datas['product_qty']
+        qty = product_qty
         if qty <= 0:
             raise wizard.except_wizard(_('Warning!'), _('Please provide Proper Quantity !'))
         
@@ -1598,7 +1583,7 @@ class stock_move(osv.osv):
             vals = {
                         'product_qty': qty, 
                         'state': move.state, 
-                        'location_dest_id': datas['location_id']
+                        'location_dest_id': location_id
                         }
             self.write(cr, uid, ids, vals)
     
diff --git a/addons/stock/stock_osv_wizards.xml b/addons/stock/stock_osv_wizards.xml
index ad5b74a6cce..6b5694f76df 100644
--- a/addons/stock/stock_osv_wizards.xml
+++ b/addons/stock/stock_osv_wizards.xml
@@ -20,7 +20,7 @@
 	            </field>
 	        </record>
 	
-	        <record id="track_line" model="ir.actions.act_window">
+	        <record id="track_line_old" model="ir.actions.act_window">
 	            <field name="name">Tracking a move</field>
 	            <field name="type">ir.actions.act_window</field>
 	            <field name="res_model">stock.move.track</field>
@@ -49,7 +49,7 @@
                 	<group col="2" colspan="1">
                 		<button icon='gtk-cancel' special="cancel"
                 			string="Cancel" />
-                		<button name="move_consume" string="Ok"
+                		<button name="do_move_consume" string="Ok"
                 			colspan="1" type="object" icon="gtk-ok" />
                 	</group>
                 </form>
@@ -98,5 +98,42 @@
             <field name="target">new</field>
         </record>
         
+        <record id="view_split_in_lots" model="ir.ui.view">
+	            <field name="name">Split in lots</field>
+	            <field name="model">spilt.in.lot</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Split in lots">
+	                	<field name="product_id" colspan="4"/>
+	                	<newline/>
+	                	<field name="line_ids" colspan="4" nolabel="1">
+	                		<tree string="Lots Number" editable="top">
+	                			<field name="name" string="Lots"/>
+	                			<field name="quantity" />
+	                		</tree>
+	                		<form string="Lots Number">
+	                			<field name="name" string="Lots"/>
+	                			<field name="quantity" />
+	                		</form>
+	                	</field>
+	                	<separator string="" colspan="4" />
+	                	<label string="" colspan="2" />
+	                	<button icon='gtk-cancel' special="cancel"
+	                		string="Cancel" />
+	                	<button name="split_lot" string="Ok"
+	                		type="object" icon="gtk-ok" />
+	                </form>
+	            </field>
+	        </record>
+	
+	        <record id="track_line" model="ir.actions.act_window">
+	            <field name="name">Split in lots</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="res_model">spilt.in.lot</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="target">new</field>
+	        </record>
+
 	</data>
 </openerp>	
\ No newline at end of file
diff --git a/addons/stock/stock_wizard.py b/addons/stock/stock_wizard.py
index be0d98ca7c7..278b9b22fd8 100644
--- a/addons/stock/stock_wizard.py
+++ b/addons/stock/stock_wizard.py
@@ -80,10 +80,12 @@ class stock_move_consume(osv.osv_memory):
                  'location_id': _get_location_id
                  }
 
-    def move_consume(self, cr, uid, ids, context={}):
+    def do_move_consume(self, cr, uid, ids, context={}):
         datas = self.read(cr, uid, ids)[0]
         move_obj = self.pool.get('stock.move')
-        move_obj.split_moves(cr, uid, context['active_id'], datas, context=context)
+        move_obj.consume_moves(cr, uid, context['active_id'], 
+                         datas['product_qty'], datas['location_id'], 
+                         context=context)
         return {}
 
 stock_move_consume()
@@ -101,7 +103,50 @@ class stock_move_scrap(osv.osv_memory):
     def move_scrap(self, cr, uid, ids, context={}):
         datas = self.read(cr, uid, ids)[0]
         move_obj = self.pool.get('stock.move')
-        move_obj.scrap_moves(cr, uid, context['active_id'], datas, context=context)
+        move_obj.scrap_moves(cr, uid, context['active_id'], 
+                         datas['product_qty'], datas['location_id'], 
+                         context=context)
         return {}
 
-stock_move_scrap()
\ No newline at end of file
+stock_move_scrap()
+
+
+class spilt_in_lot(osv.osv_memory):
+    _name = "spilt.in.lot"
+    _description = "Split in lots"
+    
+    _columns = {
+        'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
+        'line_ids': fields.one2many('track.lines', 'lot_id', 'Lots Number')
+              }
+    
+    def _get_product_id(self, cr, uid, context):
+        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
+        return move.product_id.id
+    
+    _defaults = {
+                 'product_id': _get_product_id, 
+                 }
+    
+    def split_lot(self, cr, uid, ids, context=None):
+        datas = self.read(cr, uid, ids)[0]
+        lines = []
+        for line in self.pool.get('track.lines').browse(cr, uid, datas.get('line_ids', [])):
+            lines.append({'tracking_num': line.name, 'quantity': line.quantity})
+        move_obj = self.pool.get('stock.move')
+        move_obj._track_lines(cr, uid, context['active_id'], lines, context=context)
+        return {}
+
+spilt_in_lot()
+
+class track_lines(osv.osv_memory):
+    _name = "track.lines"
+    _description = "Track lines"
+    
+    _columns = {
+        'name': fields.char('Tracking serial', size=64), 
+        'quantity': fields.integer('Quantity'), 
+        'lot_id': fields.many2one('spilt.in.lot', 'Lot')
+              }
+
+track_lines()

From 45d1d5eee4eee4ed5846bc47a03ba63bd8093068 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Mon, 22 Feb 2010 04:41:47 +0000
Subject: [PATCH 04/11] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100221045620-c8jywt3797917isg
bzr revid: codehost@crowberry-20100222044147-am1vm2vcw1ek12qc
---
 addons/account/i18n/pl.po                  | 117 ++--
 addons/account/i18n/pt_BR.po               |  10 +-
 addons/account_analytic_default/i18n/pl.po |  14 +-
 addons/account_chart/i18n/nb.po            |  23 +
 addons/account_chart/i18n/sv.po            |   8 +-
 addons/crm/i18n/sv.po                      | 640 ++++++++++++++-------
 addons/hr_expense/i18n/el.po               |   8 +-
 addons/project/i18n/sv.po                  | 172 +++---
 addons/sale/i18n/pl.po                     |  21 +-
 addons/sale_journal/i18n/bg.po             | 118 ++--
 addons/stock/i18n/pl.po                    |  18 +-
 addons/subscription/i18n/pl.po             |  16 +-
 12 files changed, 702 insertions(+), 463 deletions(-)
 create mode 100644 addons/account_chart/i18n/nb.po

diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index 69e4ad11b75..c51ecc45b32 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-18 15:39+0000\n"
+"PO-Revision-Date: 2010-02-20 16:07+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus) <Unknown>\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: 2010-02-20 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-02-21 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -45,7 +45,7 @@ msgstr "Podaj wiadomość dla raportu o przeterminowanych należnościach."
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement from draft"
-msgstr "Zatwierdź projekt zestawienia"
+msgstr "Zatwierdź projekt wyciągu"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
@@ -60,7 +60,7 @@ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "Waluta zastosowana do wprowadzenia zestawienia"
+msgstr "Waluta zastosowana do wprowadzenia wyciągu"
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
@@ -334,7 +334,7 @@ msgstr "Odnośnik"
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Subscription Compute"
-msgstr ""
+msgstr "Oblicz subskrypcję"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -344,7 +344,7 @@ msgstr "Nr konta"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Debit"
-msgstr ""
+msgstr "Przyrost Winien"
 
 #. module: account
 #: rml:account.invoice:0
@@ -466,7 +466,7 @@ msgstr "Specjalne Obliczenie"
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement with/without reconciliation from draft statement"
-msgstr "Potwierdź projekt zestawienia z lub bez uzgodnienia"
+msgstr "Potwierdź projekt wyciągu z lub bez uzgodnienia"
 
 #. module: account
 #: wizard_view:account.move.bank.reconcile,init:0
@@ -910,7 +910,7 @@ msgstr "Dziennik odpisów"
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr "Waluta kwoty"
+msgstr "Kwota w walucie"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
@@ -981,7 +981,7 @@ msgstr "Domyślne konto Winien"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Entries by Statements"
-msgstr "Zapisy wg zestawień"
+msgstr "Zapisy wg wyciągów"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
@@ -1471,7 +1471,7 @@ msgstr "Wyświetl konta "
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile_line
 msgid "Statement reconcile line"
-msgstr "Pozycja uzgodnienia zestawienia"
+msgstr "Pozycja uzgodnienia wyciągu"
 
 #. module: account
 #: view:account.tax:0
@@ -1631,7 +1631,7 @@ msgstr "Konta należności i zobowiązań"
 #: view:account.subscription:0
 #: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
-msgstr ""
+msgstr "Pozycje subskrypcji"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1750,13 +1750,13 @@ msgstr "Włącz do kwoty bazowej"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Credit"
-msgstr ""
+msgstr "Przyrost Ma"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
 #: model:ir.actions.wizard,name:account.wizard_unreconcile
 msgid "Unreconcile Entries"
-msgstr ""
+msgstr "Skasuj uzgodnienie zapisów"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -1772,7 +1772,7 @@ msgstr "Rejestr kosztów dla okresu"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree2
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree2
 msgid "New Statement"
-msgstr "Nowe zestawienie"
+msgstr "Nowy wyciąg"
 
 #. module: account
 #: wizard_field:account.analytic.account.chart,init,from_date:0
@@ -1936,7 +1936,7 @@ msgstr "Projekty faktur dla klienta"
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr ""
+msgstr "Pozycja konta subskrypcji"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -2154,7 +2154,7 @@ msgstr "Uzgodnienie płatności"
 #: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
 msgid "Statements reconciliation"
-msgstr "Uzgodnienie zestawienia"
+msgstr "Uzgodnienie wyciagów"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -2187,7 +2187,7 @@ msgstr "Schemat podatków"
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Value Amount"
-msgstr ""
+msgstr "Kwota"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
@@ -2270,7 +2270,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_generate_subscription
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Create subscription entries"
-msgstr ""
+msgstr "Utwórz zapisy subskrypcji"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,journal_id:0
@@ -2321,7 +2321,7 @@ msgstr ""
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
 msgid "The account basis of the tax declaration."
-msgstr ""
+msgstr "Konto podstawy do deklaracji podatkowej"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2352,7 +2352,7 @@ msgstr "Typ odnośnika"
 #: wizard_button:account.move.line.unreconcile,init,unrec:0
 #: wizard_button:account.reconcile.unreconcile,init,unrec:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "Skasuj uzgodnienie"
 
 #. module: account
 #: field:account.tax,type:0
@@ -2363,7 +2363,7 @@ msgstr "Typ podatku"
 #. module: account
 #: model:process.transition,name:account.process_transition_statemententries0
 msgid "Statement Entries"
-msgstr "Zapisy zestawienia"
+msgstr "Zapisy wyciągu"
 
 #. module: account
 #: field:account.analytic.line,user_id:0
@@ -2627,7 +2627,7 @@ msgstr "Konto zobowiązań"
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Import Invoices in Statement"
-msgstr "Importuj faktury do zestawienia"
+msgstr "Importuj faktury do wyciągu"
 
 #. module: account
 #: view:account.invoice:0
@@ -2673,7 +2673,7 @@ msgstr "Kapitał własny"
 #. module: account
 #: field:wizard.company.setup,overdue_msg:0
 msgid "Overdue Payment Message"
-msgstr ""
+msgstr "Komunikat przeterminowanej płatności"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
@@ -2703,7 +2703,7 @@ msgstr "Zamykanie roku"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_generic_report
 msgid "Generic Reports"
-msgstr ""
+msgstr "Ogólne raporty"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,power:0
@@ -2808,12 +2808,12 @@ msgstr "Nazwa"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 msgid "Reconciliation transactions"
-msgstr ""
+msgstr "Transakcje uzgodnień"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,direction_selection:0
 msgid "Analysis Direction"
-msgstr ""
+msgstr "Kierunek analizy"
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,init,go:0
@@ -2928,7 +2928,7 @@ msgstr "Konto Podatkowe"
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
 msgid "From statement, create entries"
-msgstr "Z zestawienia, utwórz zapisy"
+msgstr "Z wyciągu, utwórz zapisy"
 
 #. module: account
 #: field:account.analytic.account,complete_name:0
@@ -2981,7 +2981,7 @@ msgstr "Mapowanie podatków"
 #: wizard_view:account.move.line.unreconcile,init:0
 #: wizard_view:account.reconcile.unreconcile,init:0
 msgid "Unreconciliation transactions"
-msgstr ""
+msgstr "Transakcje kasowania uzgodnień"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
@@ -3029,7 +3029,7 @@ msgstr "Dziennik analityczny -"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Debit"
-msgstr ""
+msgstr "Winien - analityka"
 
 #. module: account
 #: field:account.account,currency_mode:0
@@ -3268,7 +3268,7 @@ msgstr "Kurs średni"
 #: model:process.node,note:account.process_node_bankstatement0
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Statement encoding produces payment entries"
-msgstr ""
+msgstr "Wprowadzenie wyciągu generuje zapisy płatności"
 
 #. module: account
 #: field:account.account,code:0
@@ -3342,7 +3342,7 @@ msgstr "30 dni od końca miesiąca"
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
 msgid "Root Tax Code"
-msgstr ""
+msgstr "Główny kod podatkowy"
 
 #. module: account
 #: constraint:account.invoice:0
@@ -3543,7 +3543,7 @@ msgstr "Zapłać i uzgodnij"
 #: rml:account.central.journal:0
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr ""
+msgstr "Dziennik główny"
 
 #. module: account
 #: rml:account.third_party_ledger:0
@@ -3709,7 +3709,7 @@ msgstr "Wprowadzanie zapisów"
 #: wizard_view:account.invoice.refund,init:0
 #: model:ir.actions.wizard,name:account.wizard_invoice_refund
 msgid "Credit Note"
-msgstr ""
+msgstr "Nota kredytowa"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_fiscalyear
@@ -3754,7 +3754,7 @@ msgstr "Miesiąc"
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
 msgid "Account Subscription"
-msgstr ""
+msgstr "Konto subskrypcji"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
@@ -3766,7 +3766,7 @@ msgstr "Data zapłaty"
 #. module: account
 #: view:account.subscription:0
 msgid "Entry Subscription"
-msgstr ""
+msgstr "Zapis subskrypcji"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
@@ -3815,7 +3815,7 @@ msgstr "Data faktury"
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Unreconciled"
-msgstr ""
+msgstr "Skasowano uzgodnienie"
 
 #. module: account
 #: field:account.account,note:0
@@ -3880,7 +3880,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
 #: view:wizard.company.setup:0
 msgid "Overdue Payment Report Message"
-msgstr ""
+msgstr "Komunikat raportu przeterminowanych płatności"
 
 #. module: account
 #: selection:account.tax,tax_group:0
@@ -3966,6 +3966,9 @@ msgid ""
 "needs to create analytic entries, Open ERP will look for a matching journal "
 "of the same type."
 msgstr ""
+"Podaje typ dziennika analitycznego. Kiedy dokument (np. faktura) ma utworzyć "
+"zapisy analityczne, to OpenERP będzie szukał odpowiedniego dziennika tego "
+"samego typu."
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -3975,7 +3978,7 @@ msgstr "Grupy"
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Code/Date"
-msgstr ""
+msgstr "Kod/Data"
 
 #. module: account
 #: field:account.account,active:0
@@ -4084,7 +4087,7 @@ msgstr "Zmiana stanu konta"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "Pozycje zestawienia"
+msgstr "Pozycje wyciągu"
 
 #. module: account
 #: field:account.move.line,amount_taxed:0
@@ -4160,7 +4163,7 @@ msgstr "Ogólne"
 #. module: account
 #: rml:account.general.journal:0
 msgid "Credit Trans."
-msgstr ""
+msgstr "Trans. Ma"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
@@ -4228,7 +4231,7 @@ msgstr "Szukaj zapisów"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to reinvoice purchases, timesheets, ..."
-msgstr ""
+msgstr "Koszt analityczny do refakturowania zakupów, kart pracy, ..."
 
 #. module: account
 #: field:account.account,tax_ids:0
@@ -4276,7 +4279,7 @@ msgstr ""
 #. module: account
 #: field:account.account,parent_left:0
 msgid "Parent Left"
-msgstr ""
+msgstr "Lewy nadrzędny"
 
 #. module: account
 #: help:account.journal,sequence_id:0
@@ -4397,7 +4400,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
 #: model:ir.ui.menu,name:account.menu_action_subscription_form_running
 msgid "Running Subscriptions"
-msgstr ""
+msgstr "Działające subskrypcje"
 
 #. module: account
 #: selection:account.move,type:0
@@ -4413,7 +4416,7 @@ msgstr "Zaksięgowano"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr ""
+msgstr "Nota kredytowa"
 
 #. module: account
 #: field:account.config.wizard,date2:0
@@ -4587,7 +4590,7 @@ msgstr "Ważna zapisy"
 #: model:ir.actions.wizard,name:account.wizard_line_account_use_model
 #: model:ir.ui.menu,name:account.menu_account_use_model
 msgid "Create Entries From Models"
-msgstr "Utwórz zapisu z modeli"
+msgstr "Utwórz zapisy z modeli"
 
 #. module: account
 #: field:account.account.template,reconcile:0
@@ -4642,7 +4645,7 @@ msgstr ""
 #: field:account.bank.statement.line,statement_id:0
 #: field:account.move.line,statement_id:0
 msgid "Statement"
-msgstr "Zestawienie"
+msgstr "Wyciąg"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
@@ -4719,7 +4722,7 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr "Projekt zestawienia"
+msgstr "Projekt wyciągu"
 
 #. module: account
 #: field:account.analytic.journal,name:0
@@ -4729,7 +4732,7 @@ msgstr "Nazwa dziennika"
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid "Import invoice from statement"
-msgstr "Importuj fakturę z zestawienia"
+msgstr "Importuj fakturę z wyciągu"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -4825,7 +4828,7 @@ msgstr "Anulowano"
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr "Projekty zestawień"
+msgstr "Projekty wyciągów"
 
 #. module: account
 #: wizard_field:populate_statement_from_inv,init,date:0
@@ -4852,7 +4855,7 @@ msgstr "Konta należności"
 #. module: account
 #: wizard_button:account.move.line.unreconcile.select,init,open:0
 msgid "Open for unreconciliation"
-msgstr ""
+msgstr "Otwórz do kasowania uzgodnień"
 
 #. module: account
 #: field:account.bank.statement.reconcile,statement_line:0
@@ -5098,7 +5101,7 @@ msgstr "Dziennik kont"
 #. module: account
 #: view:account.subscription.line:0
 msgid "Subscription lines"
-msgstr ""
+msgstr "pozycje subskrypcji"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
@@ -5204,7 +5207,7 @@ msgstr "Szablon kodu konta podatkowego"
 #. module: account
 #: view:account.subscription:0
 msgid "Subscription Periods"
-msgstr ""
+msgstr "Okresy subskrypcji"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
@@ -5265,7 +5268,7 @@ msgstr "Podatek zamienny"
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "Encode manually statement comes into the draft statement"
-msgstr "Ręcznie wprowadzone zestawienie jest projektem"
+msgstr "Ręcznie wprowadzony wyciąg jest projektem wyciągu"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_43
@@ -5292,7 +5295,7 @@ msgstr "Płatności"
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Accounting entries at statement's confirmation"
-msgstr "Zapisy księgowe przy potwierdzeniu zestawienia"
+msgstr "Zapisy księgowe przy potwierdzeniu wyciągu"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
@@ -5474,7 +5477,7 @@ msgstr "Zastosowanie podatku"
 #: model:ir.actions.act_window,name:account.action_subscription_form
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Subscription Entries"
-msgstr ""
+msgstr "Zapisy subskrypcji"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree6
@@ -5995,12 +5998,12 @@ msgstr "Obszary podatkowe"
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement Process"
-msgstr ""
+msgstr "Proces wyciągu"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile
 msgid "Statement reconcile"
-msgstr ""
+msgstr "Uzgodnienia wyciągu"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,sure:0
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index f37e09831bb..0b03cdeb1cc 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-14 10:44+0000\n"
-"Last-Translator: Carlos Paiva <Unknown>\n"
+"PO-Revision-Date: 2010-02-21 23:52+0000\n"
+"Last-Translator: Holverat Bortolossi <holverat@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: 2010-01-15 04:34+0000\n"
+"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -313,7 +313,7 @@ msgstr "Pagamentos atrasados"
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 #: wizard_view:account.vat.declaration,init:0
 msgid "Select period"
-msgstr "Periodo selecionado"
+msgstr "Selecione o período"
 
 #. module: account
 #: field:account.invoice,origin:0
@@ -1011,7 +1011,7 @@ msgstr "Período"
 #. module: account
 #: rml:account.partner.balance:0
 msgid "Grand total"
-msgstr "Grande total"
+msgstr "Total geral"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
diff --git a/addons/account_analytic_default/i18n/pl.po b/addons/account_analytic_default/i18n/pl.po
index f87507a75db..c1fa0fe36bc 100644
--- a/addons/account_analytic_default/i18n/pl.po
+++ b/addons/account_analytic_default/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:38+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-20 15:28+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus) <Unknown>\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: 2009-12-16 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-02-21 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,12 +21,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form
 #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form
 msgid "Analytic Defaults"
-msgstr ""
+msgstr "Domyślne ustawienia analityczne"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
 msgid "Account Analytic Default"
-msgstr ""
+msgstr "Domyślne ustawienia konta analitycznego"
 
 #. module: account_analytic_default
 #: constraint:ir.ui.view:0
@@ -84,7 +84,7 @@ msgstr "Użytkownik"
 #. module: account_analytic_default
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
@@ -111,4 +111,4 @@ msgstr "Warunki"
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
 msgid "Analytic Rules"
-msgstr ""
+msgstr "Reguły analityczne"
diff --git a/addons/account_chart/i18n/nb.po b/addons/account_chart/i18n/nb.po
new file mode 100644
index 00000000000..9b7d1b3f53b
--- /dev/null
+++ b/addons/account_chart/i18n/nb.po
@@ -0,0 +1,23 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-02-21 07:35+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: 2010-02-22 04:41+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_chart
+#: model:ir.module.module,description:account_chart.module_meta_information
+msgid "Remove minimal account chart"
+msgstr "Fjern minimal konto diagram"
diff --git a/addons/account_chart/i18n/sv.po b/addons/account_chart/i18n/sv.po
index fb88848c6b7..5ea542a2016 100644
--- a/addons/account_chart/i18n/sv.po
+++ b/addons/account_chart/i18n/sv.po
@@ -7,16 +7,16 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-18 15:24+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-21 07:34+0000\n"
+"Last-Translator: Kristian <kimocoder> Bremvaag <Unknown>\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: 2009-12-16 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
 msgid "Remove minimal account chart"
-msgstr ""
+msgstr "Ta bort minimal konto diagram"
diff --git a/addons/crm/i18n/sv.po b/addons/crm/i18n/sv.po
index eff7b49a2da..efe54b2f77f 100644
--- a/addons/crm/i18n/sv.po
+++ b/addons/crm/i18n/sv.po
@@ -1,31 +1,31 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* crm
+#	* crm
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-01-05 05:59:11+0000\n"
-"PO-Revision-Date: 2010-01-05 09:03+0000\n"
-"Last-Translator: Jay  (Open ERP) <jvo@tinyerp.com>\n"
+"POT-Creation-Date: 2010-01-05 05:59+0000\n"
+"PO-Revision-Date: 2010-02-21 19:17+0000\n"
+"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\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: 2009-12-16 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
 #: field:crm.email.add.cc,name:0
 msgid "Send to"
-msgstr ""
+msgstr "Skicka till"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
 msgid ""
-"This property defines the list of date/time exceptions for arecurring "
-"calendar component."
+"This property defines the list                 of date/time exceptions for "
+"arecurring calendar component."
 msgstr ""
 
 #. module: crm
@@ -37,7 +37,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Title"
-msgstr ""
+msgstr "Titel"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
@@ -47,17 +47,20 @@ msgstr ""
 #. module: crm
 #: wizard_field:crm.lead.partner_create,init,close:0
 msgid "Close Lead"
-msgstr ""
+msgstr "Välj lead"
 
 #. module: crm
-#: view:crm.job:0 view:crm.lead:0 view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "    7 Days    "
 msgstr ""
 
 #. module: crm
 #: help:crm.menu.config_wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr ""
+msgstr "Administrera en supportavdelning"
 
 #. module: crm
 #: view:crm.job:0
@@ -72,7 +75,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case:0
 msgid "Planned costs"
-msgstr ""
+msgstr "Planerade kostnader"
 
 #. module: crm
 #: wizard_field:crm.job.partner_create,init,close:0
@@ -85,13 +88,14 @@ msgid "Stage Name"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.case.history:0
+#: view:crm.case:0
+#: view:crm.case.history:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act
 #: model:ir.actions.act_window,name:crm.crm_case_section_open_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_51
 msgid "Cases"
-msgstr ""
+msgstr "Ärenden"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -103,7 +107,7 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_hr
 msgid "Human Resources"
-msgstr ""
+msgstr "Personalärenden"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
@@ -120,7 +124,7 @@ msgstr ""
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Amount"
-msgstr ""
+msgstr "Belopp"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -131,15 +135,16 @@ msgstr ""
 #: model:crm.case.stage,name:crm.stage_claim2
 #: model:crm.case.stage,name:crm.stage_meet1
 msgid "Fixed"
-msgstr ""
+msgstr "Fast"
 
 #. module: crm
-#: code:addons/crm/crm.py:0 code:addons/crm/wizard/crm_job_wizard.py:0
+#: code:addons/crm/crm.py:0
+#: code:addons/crm/wizard/crm_job_wizard.py:0
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varning !"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
@@ -150,7 +155,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Campaign"
-msgstr ""
+msgstr "Kampanj"
 
 #. module: crm
 #: view:crm.opportunity:0
@@ -189,15 +194,18 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,partner_id:0
+#: view:crm.case:0
+#: field:crm.case,partner_id:0
 #: model:crm.case.categ,name:crm.categ_lead4
 #: model:crm.case.categ,name:crm.categ_oppor4
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,partner_id:0
-#: field:crm.case.rule,trg_partner_id:0 selection:crm.email.add.cc,name:0
+#: field:crm.case.rule,trg_partner_id:0
+#: selection:crm.email.add.cc,name:0
 #: field:crm.email.add.cc,partner_id:0
 #: wizard_field:crm.lead.opportunity_set,create_partner,partner_id:0
 #: wizard_field:crm.lead.opportunity_set,opportunity,partner_id:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 #: wizard_field:crm.phonecall.opportunity_set,create_partner,partner_id:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,partner_id:0
 #: model:process.node,name:crm.process_node_partner0
@@ -205,17 +213,19 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: crm
-#: field:crm.case.categ,section_id:0 field:crm.case.category2,section_id:0
-#: view:crm.case.section:0 field:crm.case.section,name:0
+#: field:crm.case.categ,section_id:0
+#: field:crm.case.category2,section_id:0
+#: view:crm.case.section:0
+#: field:crm.case.section,name:0
 #: field:crm.case.stage,section_id:0
 #: model:ir.model,name:crm.model_crm_case_section
 msgid "Case Section"
-msgstr ""
+msgstr "Ärende sektion"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Proposed Salary"
-msgstr ""
+msgstr "Förslagen lön"
 
 #. module: crm
 #: help:crm.case.section,sequence:0
@@ -228,7 +238,7 @@ msgstr ""
 #: model:crm.case.categ,name:crm.categ_meet3
 #, python-format
 msgid "Phone Call"
-msgstr ""
+msgstr "Telefonsamtal"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_stage
@@ -243,7 +253,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
 msgid "None"
-msgstr ""
+msgstr "Inga"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -251,10 +261,14 @@ msgid "Special Keywords to Be Used in The Body"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Skicka ett nytt epost meddelande"
 
 #. module: crm
 #: view:crm.case.history:0
@@ -264,13 +278,13 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr ""
+msgstr "Villkor"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sections"
-msgstr ""
+msgstr "Sektioner"
 
 #. module: crm
 #: help:crm.menu.config_wizard,opportunity:0
@@ -295,12 +309,12 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job3
 msgid "Second Interview"
-msgstr ""
+msgstr "Andra intervju"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe
 msgid "Subscribe to a Remote calendar"
-msgstr ""
+msgstr "Prenumerera på en extern kalender"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ-act
@@ -312,13 +326,17 @@ msgstr "Kategorier"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Dates"
-msgstr ""
+msgstr "Datum"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -331,14 +349,15 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: view:crm.fundraising:0 view:crm.opportunity:0
+#: view:crm.fundraising:0
+#: view:crm.opportunity:0
 msgid "Description Information"
-msgstr ""
+msgstr "Beskrivning"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Contact Name"
-msgstr ""
+msgstr "Kontaktnamn"
 
 #. module: crm
 #: selection:crm.lead.opportunity_set,create_partner,action:0
@@ -352,15 +371,19 @@ msgid "Delay type"
 msgstr ""
 
 #. module: crm
-#: view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Next Interview"
-msgstr ""
+msgstr "Nästa intervju"
 
 #. module: crm
 #: field:crm.case.rule,regex_history:0
@@ -370,12 +393,12 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_email_add_cc
 msgid "Email Add CC"
-msgstr ""
+msgstr "Epost lägg till CC"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Tillfälle möte"
 
 #. module: crm
 #: help:crm.case,canal_id:0
@@ -394,7 +417,7 @@ msgstr ""
 #: field:crm.menu.config_wizard,opportunity:0
 #: model:ir.actions.report.xml,name:crm.crm_business_opportunities_report
 msgid "Business Opportunities"
-msgstr ""
+msgstr "Affärstillfällen"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim1
@@ -411,7 +434,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case,history_line:0
 msgid "Communication"
-msgstr ""
+msgstr "Kommunikation"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -421,26 +444,27 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
 msgid "Dead"
-msgstr ""
+msgstr "Död"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm Meeting"
-msgstr "Konfiguration"
+msgstr "Godkänn möte"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead1
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Existing Customer"
-msgstr ""
+msgstr "Befintlig kund"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet2
 msgid "Home"
-msgstr ""
+msgstr "Hem"
 
 #. module: crm
-#: field:crm.case,categ_id:0 field:crm.case.rule,trg_categ_id:0
+#: field:crm.case,categ_id:0
+#: field:crm.case.rule,trg_categ_id:0
 #: wizard_field:crm.job.reschedule_phone_call,init,category_id:0
 #: view:crm.opportunity:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,category_id:0
@@ -455,7 +479,7 @@ msgstr "Kategori"
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_stage_tree
 #: view:report.crm.case.section.categ.stage:0
 msgid "Cases by Section, Category and Stage"
-msgstr ""
+msgstr "Ärdenden per sektion, kategori och nivå"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_watchers:0
@@ -467,7 +491,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Privacy"
-msgstr ""
+msgstr "Sekretess"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -475,8 +499,12 @@ msgid "%(partner)s = Partner name"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Action Information"
 msgstr ""
 
@@ -500,17 +528,19 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions"
-msgstr ""
+msgstr "Villkor"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
 msgid "Open Cases"
-msgstr ""
+msgstr "Öppna ärenden"
 
 #. module: crm
-#: field:crm.case.log,name:0 view:crm.claim:0 view:crm.job:0
+#: field:crm.case.log,name:0
+#: view:crm.claim:0
+#: view:crm.job:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: crm
 #: wizard_view:crm.case.opportunity.partner_opportunity,init:0
@@ -520,7 +550,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity1
 msgid "Create Opportunity"
-msgstr ""
+msgstr "Skapa affärstillfälle"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -528,7 +558,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "August"
-msgstr ""
+msgstr "Augusti"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -536,18 +566,21 @@ msgid "Meetings Tree"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.fundraising:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.fundraising:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 #, python-format
 msgid "Escalate"
-msgstr ""
+msgstr "Eskalera"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
 msgid "All Meetings"
-msgstr ""
+msgstr "Alla möten"
 
 #. module: crm
 #: model:ir.module.module,shortdesc:crm.module_meta_information
@@ -558,7 +591,7 @@ msgstr ""
 #: view:crm.email.add.cc:0
 #: model:ir.actions.act_window,name:crm.action_view_crm_email_add_cc_wizard
 msgid "Add CC"
-msgstr ""
+msgstr "Lagg till CC"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -566,12 +599,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
 msgid "Default (0=None)"
-msgstr ""
+msgstr "Standardvärde (0=inget)"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job7
@@ -586,7 +619,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,allow_unlink:0
 msgid "Allow Delete"
-msgstr ""
+msgstr "Tillåt makulering"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -594,7 +627,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor3
@@ -609,7 +642,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor2
 msgid "New Business"
-msgstr ""
+msgstr "Ny affär"
 
 #. module: crm
 #: help:crm.case,email_from:0
@@ -622,7 +655,10 @@ msgid "Allows to show calendar"
 msgstr ""
 
 #. module: crm
-#: view:crm.job:0 view:crm.lead:0 view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "   Today   "
 msgstr ""
 
@@ -630,12 +666,12 @@ msgstr ""
 #: wizard_view:crm.job.reschedule_phone_call,init:0
 #: wizard_view:crm.opportunity.reschedule_phone_call,init:0
 msgid "Phone Call Description"
-msgstr ""
+msgstr "Telefonsamtal, beskrivning"
 
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr ""
+msgstr "Ärendekategori"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
@@ -661,7 +697,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Tilldelad till"
 
 #. module: crm
 #: view:res.partner.events:0
@@ -679,9 +715,12 @@ msgid "Jobs - Hiring Process"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Related Cases"
-msgstr ""
+msgstr "Relaterade ärenden"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -689,11 +728,15 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Communication history"
 msgstr ""
 
@@ -736,15 +779,16 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
 msgid "All Leads"
-msgstr ""
+msgstr "Alla möjligheter"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "Möjlighetersida"
 
 #. module: crm
-#: view:crm.segmentation:0 model:ir.model,name:crm.model_crm_segmentation
+#: view:crm.segmentation:0
+#: model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
 msgstr ""
 
@@ -761,17 +805,18 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor1
 msgid "Existing Business"
-msgstr ""
+msgstr "Befintlig affär"
 
 #. module: crm
-#: field:crm.case,probability:0 field:crm.case.categ,probability:0
+#: field:crm.case,probability:0
+#: field:crm.case.categ,probability:0
 msgid "Probability (%)"
-msgstr ""
+msgstr "Sannolikhet (%)"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
 msgid "Leads Cases"
-msgstr ""
+msgstr "Möjlighetsärenden"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -781,26 +826,32 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: view:crm.case.rule:0 model:ir.model,name:crm.model_crm_case_rule
+#: view:crm.case.rule:0
+#: model:ir.model,name:crm.model_crm_case_rule
 msgid "Case Rule"
-msgstr ""
+msgstr "Möjlighetsregel"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
 #: code:addons/crm/wizard/crm_opportunity_wizard.py:0
-#: code:addons/crm/wizard/crm_phonecall_wizard.py:0 view:crm.opportunity:0
+#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
+#: view:crm.opportunity:0
 #: view:crm.phonecall:0
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "Tillfälle"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Emails"
-msgstr ""
+msgstr "E-post"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead7
@@ -826,7 +877,7 @@ msgstr ""
 #: wizard_button:crm.lead.opportunity_set,create_partner,create:0
 #: wizard_button:crm.phonecall.opportunity_set,create_partner,create:0
 msgid "Continue"
-msgstr ""
+msgstr "Fortsätt"
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
@@ -847,7 +898,7 @@ msgstr ""
 #: wizard_field:crm.new.send.mail,init,text:0
 #: wizard_field:crm.send.mail,init,text:0
 msgid "Message"
-msgstr ""
+msgstr "Meddelande"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -911,11 +962,12 @@ msgid "Gives the sequence order when displaying a list of case stages."
 msgstr ""
 
 #. module: crm
-#: model:crm.case.section,name:crm.section_support3 view:crm.opportunity:0
+#: model:crm.case.section,name:crm.section_support3
+#: view:crm.opportunity:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr ""
+msgstr "Tillfällen"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -944,7 +996,8 @@ msgid "Direction"
 msgstr ""
 
 #. module: crm
-#: help:crm.case,email_cc:0 help:crm.case.rule,act_email_cc:0
+#: help:crm.case,email_cc:0
+#: help:crm.case.rule,act_email_cc:0
 msgid ""
 "These people will receive a copy of the future communication between partner "
 "and users by email"
@@ -1017,7 +1070,8 @@ msgid "Mobile"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,name:0 field:crm.segmentation.line,name:0
+#: field:crm.case.rule,name:0
+#: field:crm.segmentation.line,name:0
 msgid "Rule Name"
 msgstr ""
 
@@ -1062,8 +1116,10 @@ msgid "Export ICS"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_claim.py:0 code:addons/crm/crm_helpdesk.py:0
-#: code:addons/crm/crm_meeting.py:0 code:addons/crm/crm_opportunity.py:0
+#: code:addons/crm/crm_claim.py:0
+#: code:addons/crm/crm_helpdesk.py:0
+#: code:addons/crm/crm_meeting.py:0
+#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "You can not assign Closed Case."
@@ -1076,9 +1132,11 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:0 code:addons/crm/wizard/crm_job_wizard.py:0
+#: code:addons/crm/crm_meeting.py:0
+#: code:addons/crm/wizard/crm_job_wizard.py:0
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
-#: model:crm.case.section,name:crm.section_support1 view:crm.meeting:0
+#: model:crm.case.section,name:crm.section_support1
+#: view:crm.meeting:0
 #, python-format
 msgid "Meetings"
 msgstr ""
@@ -1094,8 +1152,10 @@ msgid "Next Action"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,date_deadline:0
-#: selection:crm.case.rule,trg_date_type:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: field:crm.case,date_deadline:0
+#: selection:crm.case.rule,trg_date_type:0
+#: view:crm.opportunity:0
 msgid "Deadline"
 msgstr ""
 
@@ -1127,8 +1187,10 @@ msgid "Category of case"
 msgstr ""
 
 #. module: crm
-#: field:crm.email.add.cc,subject:0 view:crm.meeting:0
-#: wizard_field:crm.new.send.mail,init,subject:0 view:crm.phonecall:0
+#: field:crm.email.add.cc,subject:0
+#: view:crm.meeting:0
+#: wizard_field:crm.new.send.mail,init,subject:0
+#: view:crm.phonecall:0
 #: wizard_field:crm.send.mail,init,subject:0
 msgid "Subject"
 msgstr ""
@@ -1193,13 +1255,15 @@ msgid "Print"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,som:0 field:crm.case.log,som:0
+#: field:crm.case,som:0
+#: field:crm.case.log,som:0
 #: selection:crm.segmentation.line,expr_name:0
 msgid "State of Mind"
 msgstr ""
 
 #. module: crm
-#: view:crm.claim:0 view:crm.meeting:0
+#: view:crm.claim:0
+#: view:crm.meeting:0
 #: field:report.crm.case.section.categ.categ2,category2_id:0
 #: field:report.crm.case.section.categ2,category2_id:0
 msgid "Type"
@@ -1234,7 +1298,8 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: crm
-#: view:crm.meeting:0 view:crm.phonecall:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
 #: model:process.node,name:crm.process_node_meeting0
 msgid "Meeting"
 msgstr ""
@@ -1245,8 +1310,13 @@ msgid "%(partner_email)s = Partner email"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "Reset to Draft"
 msgstr "Återställ till utdrag"
 
@@ -1270,7 +1340,8 @@ msgid "Open cases"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,stage_id:0 view:crm.case.stage:0
+#: field:crm.case,stage_id:0
+#: view:crm.case.stage:0
 #: field:report.crm.case.section.categ.categ2,stage_id:0
 #: field:report.crm.case.section.categ.stage,stage_id:0
 #: field:report.crm.case.section.categ2,stage_id:0
@@ -1321,7 +1392,9 @@ msgid "Meeting Date"
 msgstr ""
 
 #. module: crm
-#: view:crm.job:0 view:crm.lead:0 view:crm.phonecall:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.phonecall:0
 msgid "Convert to Partner"
 msgstr ""
 
@@ -1383,7 +1456,8 @@ msgid "done"
 msgstr ""
 
 #. module: crm
-#: view:crm.meeting:0 view:crm.phonecall:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
 msgid "Reminder"
 msgstr ""
 
@@ -1446,8 +1520,10 @@ msgid "Awaiting Response"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,date:0 field:crm.case.log,date:0
-#: selection:crm.case.rule,trg_date_type:0 view:crm.claim:0
+#: field:crm.case,date:0
+#: field:crm.case.log,date:0
+#: selection:crm.case.rule,trg_date_type:0
+#: view:crm.claim:0
 #: view:crm.phonecall:0
 msgid "Date"
 msgstr "Datum"
@@ -1474,8 +1550,12 @@ msgid "Converted"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Reply to Last Email"
 msgstr ""
 
@@ -1490,8 +1570,12 @@ msgid "Gives Location of Meeting"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "History"
 msgstr ""
 
@@ -1511,7 +1595,8 @@ msgid "Regular Expression on Case Name"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,state:0 field:report.crm.case.section.categ.categ2,state:0
+#: field:crm.case,state:0
+#: field:report.crm.case.section.categ.categ2,state:0
 #: field:report.crm.case.section.categ.stage,state:0
 #: field:report.crm.case.section.categ2,state:0
 #: field:report.crm.case.section.stage,state:0
@@ -1524,27 +1609,36 @@ msgid "Send Reminder"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
+#: view:crm.case:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "References"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #: wizard_button:crm.case.opportunity.partner_opportunity,init,end:0
-#: view:crm.claim:0 view:crm.claim.assign_wizard:0 view:crm.fundraising:0
+#: view:crm.claim:0
+#: view:crm.claim.assign_wizard:0
+#: view:crm.fundraising:0
 #: view:crm.helpdesk.assign_wizard:0
 #: wizard_button:crm.job.meeting_set,init,end:0
 #: wizard_button:crm.job.partner_create,init,end:0
-#: wizard_button:crm.job.reschedule_phone_call,init,end:0 view:crm.lead:0
+#: wizard_button:crm.job.reschedule_phone_call,init,end:0
+#: view:crm.lead:0
 #: wizard_button:crm.lead.opportunity_set,create_partner,end:0
 #: wizard_button:crm.lead.opportunity_set,opportunity,end:0
 #: wizard_button:crm.lead.partner_create,init,end:0
 #: view:crm.meeting.generic_wizard:0
-#: wizard_button:crm.new.send.mail,init,end:0 view:crm.opportunity:0
+#: wizard_button:crm.new.send.mail,init,end:0
+#: view:crm.opportunity:0
 #: view:crm.opportunity.assign_wizard:0
 #: wizard_button:crm.opportunity.reschedule_phone_call,init,end:0
-#: view:crm.phonecall:0 view:crm.phonecall.assign_wizard:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall.assign_wizard:0
 #: wizard_button:crm.phonecall.meeting_set,init,end:0
 #: wizard_button:crm.phonecall.opportunity_set,create_partner,end:0
 #: wizard_button:crm.phonecall.opportunity_set,opportunity,end:0
@@ -1591,7 +1685,8 @@ msgid "Claim Cost"
 msgstr ""
 
 #. module: crm
-#: view:crm.job:0 view:crm.opportunity:0
+#: view:crm.job:0
+#: view:crm.opportunity:0
 msgid "Schedule a Phone Call"
 msgstr ""
 
@@ -1646,8 +1741,12 @@ msgid "Sale Amount"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Add a CC"
 msgstr ""
 
@@ -1657,7 +1756,9 @@ msgid "="
 msgstr ""
 
 #. module: crm
-#: view:crm.fundraising:0 view:crm.job:0 field:crm.menu.config_wizard,name:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: field:crm.menu.config_wizard,name:0
 #: field:crm.segmentation,name:0
 msgid "Name"
 msgstr "Namn"
@@ -1678,7 +1779,8 @@ msgid "Mail to watchers (CC)"
 msgstr ""
 
 #. module: crm
-#: view:crm.fundraising:0 view:crm.meeting:0
+#: view:crm.fundraising:0
+#: view:crm.meeting:0
 msgid "Next Meeting"
 msgstr ""
 
@@ -1706,14 +1808,19 @@ msgid "Bug Tracking"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.case.rule:0 view:crm.claim:0
-#: view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
+#: view:crm.case:0
+#: view:crm.case.rule:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Actions"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "High"
@@ -1811,7 +1918,8 @@ msgid "Email Fail!"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_phone1 view:crm.phonecall:0
+#: model:crm.case.categ,name:crm.categ_phone1
+#: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Inbound"
@@ -1837,7 +1945,8 @@ msgstr ""
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
 #: view:report.crm.case.section.categ.stage:0
-#: view:report.crm.case.section.categ2:0 view:report.crm.case.section.stage:0
+#: view:report.crm.case.section.categ2:0
+#: view:report.crm.case.section.stage:0
 msgid "This Year"
 msgstr ""
 
@@ -1847,7 +1956,8 @@ msgid "Remind Partner"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Highest"
@@ -1928,7 +2038,8 @@ msgid "Convert To Opportunity"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_phone2 view:crm.phonecall:0
+#: model:crm.case.stage,name:crm.stage_phone2
+#: view:crm.phonecall:0
 msgid "Held"
 msgstr ""
 
@@ -1971,7 +2082,9 @@ msgid "Send"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,priority:0 view:crm.fundraising:0 view:crm.lead:0
+#: field:crm.case,priority:0
+#: view:crm.fundraising:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Priority"
 msgstr "Prioritet"
@@ -2000,7 +2113,9 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: view:crm.claim:0 view:crm.job:0 view:crm.lead:0
+#: view:crm.claim:0
+#: view:crm.job:0
+#: view:crm.lead:0
 msgid "Stage: "
 msgstr ""
 
@@ -2015,9 +2130,12 @@ msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 code:addons/crm/crm_claim.py:0
-#: code:addons/crm/crm_helpdesk.py:0 code:addons/crm/crm_meeting.py:0
-#: code:addons/crm/crm_opportunity.py:0 code:addons/crm/crm_phonecall.py:0
+#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm_claim.py:0
+#: code:addons/crm/crm_helpdesk.py:0
+#: code:addons/crm/crm_meeting.py:0
+#: code:addons/crm/crm_opportunity.py:0
+#: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -2130,7 +2248,8 @@ msgid "%(case_date)s = Creation date"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_phone3 view:crm.phonecall:0
+#: model:crm.case.stage,name:crm.stage_phone3
+#: view:crm.phonecall:0
 msgid "Not Held"
 msgstr ""
 
@@ -2173,7 +2292,8 @@ msgid "Month"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.section,name:crm.section_support2 view:crm.lead:0
+#: model:crm.case.section,name:crm.section_support2
+#: view:crm.lead:0
 #: field:crm.menu.config_wizard,lead:0
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
@@ -2217,7 +2337,8 @@ msgstr ""
 
 #. module: crm
 #: help:crm.menu.config_wizard,fund:0
-msgid "This may help associations in their fund raising process and tracking."
+msgid ""
+"This may help associations in their fund raising process and tracking."
 msgstr ""
 
 #. module: crm
@@ -2249,14 +2370,16 @@ msgid "Delay Close"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Low"
 msgstr "Låg"
 
 #. module: crm
-#: field:crm.case,date_closed:0 selection:crm.case,state:0
+#: field:crm.case,date_closed:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
@@ -2284,7 +2407,10 @@ msgid "Internal Meeting"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,child_ids:0 view:crm.claim:0 view:crm.lead:0
+#: view:crm.case:0
+#: field:crm.case,child_ids:0
+#: view:crm.claim:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Events"
 msgstr ""
@@ -2337,7 +2463,8 @@ msgstr ""
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:0
 #: model:crm.case.section,name:crm.section_support_phone
-#: field:crm.menu.config_wizard,phonecall:0 view:crm.phonecall:0
+#: field:crm.menu.config_wizard,phonecall:0
+#: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #, python-format
@@ -2372,7 +2499,8 @@ msgid "Cheque"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,active:0 field:crm.case.rule,active:0
+#: field:crm.case,active:0
+#: field:crm.case.rule,active:0
 #: field:crm.case.section,active:0
 msgid "Active"
 msgstr "Aktiv"
@@ -2410,8 +2538,10 @@ msgid "Months"
 msgstr ""
 
 #. module: crm
-#: view:crm.claim.assign_wizard:0 view:crm.helpdesk.assign_wizard:0
-#: view:crm.opportunity.assign_wizard:0 view:crm.phonecall.assign_wizard:0
+#: view:crm.claim.assign_wizard:0
+#: view:crm.helpdesk.assign_wizard:0
+#: view:crm.opportunity.assign_wizard:0
+#: view:crm.phonecall.assign_wizard:0
 #: model:ir.actions.act_window,name:crm.action_crm_claim_assign_wizard
 #: model:ir.actions.act_window,name:crm.action_crm_helpdesk_assign_wizard
 #: model:ir.actions.act_window,name:crm.action_crm_opportunity_assign_wizard
@@ -2443,8 +2573,10 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_claim.py:0
-#: model:crm.case.section,name:crm.section_support_claims view:crm.claim:0
-#: field:crm.menu.config_wizard,claims:0 view:crm.phonecall:0
+#: model:crm.case.section,name:crm.section_support_claims
+#: view:crm.claim:0
+#: field:crm.menu.config_wizard,claims:0
+#: view:crm.phonecall:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_claims
 #, python-format
 msgid "Claims"
@@ -2482,7 +2614,8 @@ msgid "Sales"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: view:crm.phonecall:0
 msgid "General"
 msgstr ""
 
@@ -2503,8 +2636,12 @@ msgid "Other"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.lead:0
-#: selection:crm.new.send.mail,init,state:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.lead:0
+#: selection:crm.new.send.mail,init,state:0
+#: view:crm.opportunity:0
 msgid "Done"
 msgstr ""
 
@@ -2519,12 +2656,18 @@ msgid "All Opportunities"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0 selection:crm.case,state:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.claim:0
-#: view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 #: selection:report.crm.case.section.categ.categ2,state:0
 #: selection:report.crm.case.section.categ.stage,state:0
 #: selection:report.crm.case.section.categ2,state:0
@@ -2562,11 +2705,17 @@ msgid "Helpdesk"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,user_id:0 field:crm.case.rule,trg_user_id:0 view:crm.claim:0
-#: field:crm.claim.assign_wizard,user_id:0 view:crm.fundraising:0
-#: field:crm.helpdesk.assign_wizard,user_id:0 view:crm.job:0
-#: view:crm.meeting:0 field:crm.meeting.generic_wizard,user_id:0
-#: view:crm.opportunity:0 field:crm.opportunity.assign_wizard,user_id:0
+#: field:crm.case,user_id:0
+#: field:crm.case.rule,trg_user_id:0
+#: view:crm.claim:0
+#: field:crm.claim.assign_wizard,user_id:0
+#: view:crm.fundraising:0
+#: field:crm.helpdesk.assign_wizard,user_id:0
+#: view:crm.job:0
+#: view:crm.meeting:0
+#: field:crm.meeting.generic_wizard,user_id:0
+#: view:crm.opportunity:0
+#: field:crm.opportunity.assign_wizard,user_id:0
 #: field:crm.phonecall.assign_wizard,user_id:0
 msgid "Responsible"
 msgstr ""
@@ -2645,7 +2794,8 @@ msgstr ""
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
 #: view:report.crm.case.section.categ.stage:0
-#: view:report.crm.case.section.categ2:0 view:report.crm.case.section.stage:0
+#: view:report.crm.case.section.categ2:0
+#: view:report.crm.case.section.stage:0
 msgid "This Month"
 msgstr ""
 
@@ -2662,12 +2812,12 @@ msgstr ""
 #. module: crm
 #: help:crm.case,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"
+"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 ""
 
@@ -2831,7 +2981,8 @@ msgid "Provide path for Remote Calendar"
 msgstr ""
 
 #. module: crm
-#: view:crm.segmentation:0 field:crm.segmentation.line,segmentation_id:0
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
 msgid "Segmentation"
 msgstr ""
 
@@ -2891,7 +3042,8 @@ msgstr ""
 #. module: crm
 #: wizard_button:caldav.crm.export,init,end:0
 #: wizard_button:caldav.crm.import,display,end:0
-#: wizard_button:caldav.crm.subscribe,display,end:0 view:crm.email.add.cc:0
+#: wizard_button:caldav.crm.subscribe,display,end:0
+#: view:crm.email.add.cc:0
 msgid "Ok"
 msgstr ""
 
@@ -2913,7 +3065,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 code:addons/crm/wizard/wizard_cal_subscribe.py:0
+#: code:addons/crm/crm.py:0
+#: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2930,7 +3083,8 @@ msgid "All Jobs Requests"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,state:0 selection:crm.case.rule,act_state:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
 #: selection:report.crm.case.section.categ.categ2,state:0
@@ -2998,7 +3152,8 @@ msgid "%(case_subject)s = Case subject"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,section_id:0 field:crm.case.log,section_id:0
+#: field:crm.case,section_id:0
+#: field:crm.case.log,section_id:0
 #: field:crm.case.rule,trg_section_id:0
 #: field:crm.claim.assign_wizard,section_id:0
 #: field:crm.helpdesk.assign_wizard,section_id:0
@@ -3042,13 +3197,15 @@ msgstr "Beskrivning"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead3
-#: field:crm.case.history,email:0 field:crm.email.add.cc,email:0
+#: field:crm.case.history,email:0
+#: field:crm.email.add.cc,email:0
 #: view:crm.job:0
 msgid "Email"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,canal_id:0 field:crm.case.log,canal_id:0
+#: field:crm.case,canal_id:0
+#: field:crm.case.log,canal_id:0
 msgid "Channel"
 msgstr "Kanal"
 
@@ -3093,12 +3250,18 @@ msgid "Reporting"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0 selection:crm.case,state:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.claim:0
-#: view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
-#: selection:crm.new.send.mail,init,state:0 view:crm.opportunity:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: selection:crm.new.send.mail,init,state:0
+#: view:crm.opportunity:0
 #: selection:report.crm.case.section.categ.categ2,state:0
 #: selection:report.crm.case.section.categ.stage,state:0
 #: selection:report.crm.case.section.categ2,state:0
@@ -3154,7 +3317,8 @@ msgid "Lead Subject"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0 view:crm.phonecall:0
+#: view:crm.lead:0
+#: view:crm.phonecall:0
 msgid "Convert to Opportunity"
 msgstr ""
 
@@ -3242,7 +3406,8 @@ msgid "All Funds"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.section,calendar:0 view:crm.meeting:0
+#: field:crm.case.section,calendar:0
+#: view:crm.meeting:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_category_act_meetings
 msgid "Calendar"
 msgstr ""
@@ -3268,7 +3433,8 @@ msgid "Sales Purchase"
 msgstr ""
 
 #. module: crm
-#: view:crm.job:0 model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
+#: view:crm.job:0
+#: model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_meeting_set
 msgid "Schedule Meeting"
 msgstr ""
@@ -3279,7 +3445,8 @@ msgid "Arts And Culture"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_phone2 view:crm.phonecall:0
+#: model:crm.case.categ,name:crm.categ_phone2
+#: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Outbound"
@@ -3309,10 +3476,12 @@ msgid "Success Probability"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 selection:crm.case,state:0
+#: code:addons/crm/crm.py:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.meeting:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.meeting:0
 #: selection:report.crm.case.section.categ.categ2,state:0
 #: selection:report.crm.case.section.categ.stage,state:0
 #: selection:report.crm.case.section.categ2,state:0
@@ -3337,7 +3506,8 @@ msgid "Set section to"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Normal"
@@ -3371,7 +3541,8 @@ msgid "Change RRule"
 msgstr ""
 
 #. module: crm
-#: selection:crm.email.add.cc,name:0 field:crm.email.add.cc,user_id:0
+#: selection:crm.email.add.cc,name:0
+#: field:crm.email.add.cc,user_id:0
 #: field:report.crm.case.section.categ.categ2,user_id:0
 #: field:report.crm.case.section.categ.stage,user_id:0
 #: field:report.crm.case.section.categ2,user_id:0
@@ -3451,10 +3622,15 @@ msgid "Healthcare"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.claim.assign_wizard:0
-#: view:crm.helpdesk.assign_wizard:0 view:crm.meeting:0
-#: view:crm.meeting.generic_wizard:0 view:crm.opportunity:0
-#: view:crm.opportunity.assign_wizard:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.claim.assign_wizard:0
+#: view:crm.helpdesk.assign_wizard:0
+#: view:crm.meeting:0
+#: view:crm.meeting.generic_wizard:0
+#: view:crm.opportunity:0
+#: view:crm.opportunity.assign_wizard:0
+#: view:crm.phonecall:0
 #: view:crm.phonecall.assign_wizard:0
 msgid "Assign"
 msgstr ""
@@ -3480,7 +3656,9 @@ msgid "Stage of case"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.fundraising:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.fundraising:0
+#: view:crm.opportunity:0
 msgid "Estimates"
 msgstr ""
 
@@ -3490,7 +3668,8 @@ msgid "Responsible User"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #, python-format
 msgid "Close"
 msgstr ""
@@ -3548,9 +3727,14 @@ msgid "% = The '%' Character"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,name:0 field:crm.case.history,description:0
-#: field:crm.case.history,note:0 view:crm.job:0 view:crm.meeting:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: field:crm.case,name:0
+#: field:crm.case.history,description:0
+#: field:crm.case.history,note:0
+#: view:crm.job:0
+#: view:crm.meeting:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 #: field:crm.segmentation,description:0
 msgid "Description"
 msgstr "Beskrivning"
@@ -3575,9 +3759,14 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 wizard_field:crm.new.send.mail,init,cc:0
-#: view:crm.opportunity:0 wizard_field:crm.send.mail,init,cc:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: wizard_field:crm.new.send.mail,init,cc:0
+#: view:crm.opportunity:0
+#: wizard_field:crm.send.mail,init,cc:0
 msgid "CC"
 msgstr ""
 
@@ -3592,10 +3781,14 @@ msgid "_Import"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 field:crm.case.log,case_id:0
-#: field:crm.claim,inherit_case_id:0 field:crm.fundraising,inherit_case_id:0
-#: field:crm.helpdesk,inherit_case_id:0 field:crm.job,inherit_case_id:0
-#: field:crm.lead,inherit_case_id:0 field:crm.meeting,inherit_case_id:0
+#: code:addons/crm/crm.py:0
+#: field:crm.case.log,case_id:0
+#: field:crm.claim,inherit_case_id:0
+#: field:crm.fundraising,inherit_case_id:0
+#: field:crm.helpdesk,inherit_case_id:0
+#: field:crm.job,inherit_case_id:0
+#: field:crm.lead,inherit_case_id:0
+#: field:crm.meeting,inherit_case_id:0
 #: field:crm.opportunity,inherit_case_id:0
 #: field:crm.phonecall,inherit_case_id:0
 #: model:ir.model,name:crm.model_crm_case
@@ -3605,7 +3798,8 @@ msgid "Case"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Lowest"
@@ -3639,7 +3833,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: wizard_view:crm.new.send.mail,init:0 wizard_view:crm.send.mail,init:0
+#: wizard_view:crm.new.send.mail,init:0
+#: wizard_view:crm.send.mail,init:0
 msgid "Mass Mailing"
 msgstr ""
 
@@ -3715,7 +3910,8 @@ msgid "Export ICS File"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,sequence:0 field:crm.case.section,sequence:0
+#: field:crm.case.rule,sequence:0
+#: field:crm.case.section,sequence:0
 #: field:crm.case.stage,sequence:0
 msgid "Sequence"
 msgstr ""
diff --git a/addons/hr_expense/i18n/el.po b/addons/hr_expense/i18n/el.po
index b27e59bf8e9..7088826572d 100644
--- a/addons/hr_expense/i18n/el.po
+++ b/addons/hr_expense/i18n/el.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-15 01:57+0000\n"
-"Last-Translator: thunk <thunk77@gmail.com>\n"
+"PO-Revision-Date: 2010-02-21 16:01+0000\n"
+"Last-Translator: Μάριος Ζηντίλης <m.zindilis@dmajor.org>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-17 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -312,7 +312,7 @@ msgstr "Χρήστης"
 #: field:hr.expense.expense,date:0
 #: field:hr.expense.line,date_value:0
 msgid "Date"
-msgstr "Ηεμρ/νία"
+msgstr "Ημερ/νία"
 
 #. module: hr_expense
 #: rml:hr.expense:0
diff --git a/addons/project/i18n/sv.po b/addons/project/i18n/sv.po
index a67fff415cf..6897406c25b 100644
--- a/addons/project/i18n/sv.po
+++ b/addons/project/i18n/sv.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-10 08:37+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-21 19:41+0000\n"
+"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\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: 2009-12-16 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned tasks"
-msgstr ""
+msgstr "Tilldelade aktiviteter"
 
 #. module: project
 #: model:process.process,name:project.process_process_tasksprocess0
 msgid "Tasks Process"
-msgstr ""
+msgstr "Aktivitetsprocess"
 
 #. module: project
 #: help:project.task.delegate,init,name:0
@@ -34,22 +34,22 @@ msgstr ""
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Change Remaining Hours"
-msgstr ""
+msgstr "Ändra återstående timmar"
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_close_task
 msgid "Close Task"
-msgstr ""
+msgstr "Avsluta aktivitet"
 
 #. module: project
 #: view:project.task:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Projektaktiviteter"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
 msgid "Open Done Task"
-msgstr ""
+msgstr "Öppna avslutade aktiviteter"
 
 #. module: project
 #: constraint:ir.actions.act_window:0
@@ -64,7 +64,7 @@ msgstr ""
 #. module: project
 #: field:project.project,progress_rate:0
 msgid "Progress"
-msgstr ""
+msgstr "Upparbetning"
 
 #. module: project
 #: help:config.compute.remaining,remaining_hours:0
@@ -115,7 +115,7 @@ msgstr ""
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Update"
-msgstr ""
+msgstr "Uppdatera"
 
 #. module: project
 #: help:project.task.delegate,init,user_id:0
@@ -125,7 +125,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_attachment_task
 msgid "All Attachments"
-msgstr ""
+msgstr "Alla bilagor"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -141,7 +141,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.open_task_type_form
 #: model:ir.ui.menu,name:project.menu_task_types
 msgid "Task Types"
-msgstr ""
+msgstr "Aktivtetstyoer"
 
 #. module: project
 #: view:project.project:0
@@ -151,7 +151,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
 msgid "Project's tasks"
-msgstr ""
+msgstr "Projektets aktiviteter"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -161,7 +161,7 @@ msgstr ""
 #. module: project
 #: wizard_button:project.task.delegate,init,valid:0
 msgid "Validate"
-msgstr ""
+msgstr "Validera"
 
 #. module: project
 #: model:ir.module.module,description:project.module_meta_information
@@ -175,17 +175,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_prog
 msgid "My Tasks in Progress"
-msgstr ""
+msgstr "Mina pågående aktiviteter"
 
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr ""
+msgstr "Definiera som mall"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr ""
+msgstr "Preliminär aktivitet"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
@@ -211,7 +211,7 @@ msgstr "Anteckningar"
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Days"
-msgstr ""
+msgstr "Dagar"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_analysis
@@ -229,7 +229,7 @@ msgstr "Projekt"
 #. module: project
 #: view:project.task:0
 msgid "Start Task"
-msgstr ""
+msgstr "Starta aktivitet"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_draft
@@ -247,7 +247,7 @@ msgstr ""
 #: selection:project.project,state:0
 #: selection:project.task,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbruten"
 
 #. module: project
 #: view:project.project:0
@@ -258,12 +258,12 @@ msgstr ""
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
-msgstr ""
+msgstr "Avslutade aktiviteter"
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr ""
+msgstr "Aktiviteten är avslutad"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -295,7 +295,7 @@ msgstr ""
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr ""
+msgstr "Utfört av"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -307,24 +307,24 @@ msgstr "Alla uppgifter"
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr ""
+msgstr "Planering"
 
 #. module: project
 #: view:project.task:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Tilläggsinformation"
 
 #. module: project
 #: field:project.project,partner_id:0
 #: field:project.task,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: project
 #: field:project.task,planned_hours:0
 #: wizard_field:project.task.delegate,init,planned_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Planerade timmar"
 
 #. module: project
 #: view:project.project:0
@@ -350,13 +350,13 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "My projects"
-msgstr ""
+msgstr "Mina projekt"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 msgid "All projects"
-msgstr ""
+msgstr "Alla projekt"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -376,17 +376,17 @@ msgstr ""
 #. module: project
 #: wizard_field:project.task.delegate,init,new_task_description:0
 msgid "New Task Description"
-msgstr ""
+msgstr "Ny aktivitetsbeskrivning"
 
 #. module: project
 #: help:project.project,notes:0
 msgid "Internal description of the project."
-msgstr ""
+msgstr "Intern beskrivning av projektet"
 
 #. module: project
 #: field:project.project,parent_id:0
 msgid "Parent Project"
-msgstr ""
+msgstr "Överliggande projekt"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -402,19 +402,19 @@ msgstr "Typ"
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Weeks"
-msgstr ""
+msgstr "Veckor"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog
 msgid "My Current Tasks"
-msgstr ""
+msgstr "Mina pågående aktiviteter"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project
 #: model:ir.ui.menu,name:project.menu_open_view_project
 msgid "New Project"
-msgstr ""
+msgstr "Nytt projekt"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -426,17 +426,17 @@ msgstr ""
 #: field:config.compute.remaining,remaining_hours:0
 #: field:project.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Återstående timmar"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
 msgid "Project task type"
-msgstr ""
+msgstr "Projekt aktivitetstyp"
 
 #. module: project
 #: field:project.project,planned_hours:0
 msgid "Planned Time"
-msgstr ""
+msgstr "Planerade timmar"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -448,7 +448,7 @@ msgstr ""
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Hours"
-msgstr ""
+msgstr "Timmar"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_pending
@@ -461,7 +461,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task6_prog
 #: model:ir.ui.menu,name:project.menu_action_view_task6_prog
 msgid "Tasks in Progress"
-msgstr ""
+msgstr "Pågående aktiviteter"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task7
@@ -478,7 +478,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.open_view_my_project
 #: model:ir.ui.menu,name:project.menu_open_view_my_project
 msgid "My Projects"
-msgstr ""
+msgstr "Mina projekt"
 
 #. module: project
 #: help:project.task.delegate,init,planned_hours:0
@@ -488,7 +488,7 @@ msgstr ""
 #. module: project
 #: selection:project.project,state:0
 msgid "Template"
-msgstr ""
+msgstr "Mall"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions
@@ -500,23 +500,23 @@ msgstr "Konfiguration"
 #: field:project.project,date_start:0
 #: field:project.task,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Startdatum"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_all_project
 #: view:project.project:0
 msgid "Projects"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project
 #: view:project.task:0
 msgid "Dates"
-msgstr ""
+msgstr "Datum"
 
 #. module: project
 #: field:project.task,history:0
 msgid "Task Details"
-msgstr ""
+msgstr "Aktivitetsdetaljer"
 
 #. module: project
 #: model:process.node,name:project.process_node_triggerinvoice0
@@ -559,13 +559,13 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_main
 #: view:res.company:0
 msgid "Project Management"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project
 #: field:project.project,effective_hours:0
 #: field:project.task.work,hours:0
 msgid "Time Spent"
-msgstr ""
+msgstr "Nedlagd tid"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_tasks
@@ -576,13 +576,13 @@ msgstr "Uppgifter"
 #. module: project
 #: view:project.task.type:0
 msgid "Task type"
-msgstr ""
+msgstr "Aktivitetstyp"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_new
 #: model:ir.ui.menu,name:project.menu_action_view_task_new
 msgid "New Task"
-msgstr ""
+msgstr "Ny aktivitet"
 
 #. module: project
 #: help:project.project,timesheet_id:0
@@ -608,7 +608,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task4
 #: model:ir.ui.menu,name:project.menu_action_view_task4
 msgid "My Tasks"
-msgstr ""
+msgstr "Mina aktiviteter"
 
 #. module: project
 #: view:project.project:0
@@ -618,7 +618,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Planned"
-msgstr ""
+msgstr "Planerad"
 
 #. module: project
 #: help:project.project,total_hours:0
@@ -633,17 +633,17 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Information"
-msgstr ""
+msgstr "Information"
 
 #. module: project
 #: view:project.task:0
 msgid "Review"
-msgstr ""
+msgstr "Granska"
 
 #. module: project
 #: view:project.project:0
 msgid "Administration"
-msgstr ""
+msgstr "Administration"
 
 #. module: project
 #: wizard_field:project.task.close,mail_ask,email:0
@@ -660,7 +660,7 @@ msgstr ""
 #: view:project.task:0
 #: selection:project.task,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Preliminär"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -670,7 +670,7 @@ msgstr "Låg"
 #. module: project
 #: field:project.project,manager:0
 msgid "Project Manager"
-msgstr ""
+msgstr "Projektledare"
 
 #. module: project
 #: view:project.project:0
@@ -679,12 +679,12 @@ msgstr ""
 #: selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Väntande"
 
 #. module: project
 #: field:project.task,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: project
 #: help:project.task.delegate,init,state:0
@@ -702,17 +702,17 @@ msgstr ""
 #: field:project.project,complete_name:0
 #: field:project.project,name:0
 msgid "Project Name"
-msgstr ""
+msgstr "Projektnamn"
 
 #. module: project
 #: wizard_button:project.task.close,mail_ask,mail_send:0
 msgid "Send Message"
-msgstr ""
+msgstr "Skicka meddelande"
 
 #. module: project
 #: field:project.project,total_hours:0
 msgid "Total Time"
-msgstr ""
+msgstr "Total tid"
 
 #. module: project
 #: field:project.task,active:0
@@ -722,12 +722,12 @@ msgstr "Aktiv"
 #. module: project
 #: model:project.task.type,name:project.project_tt_bug
 msgid "Bug"
-msgstr ""
+msgstr "Fel"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_quote
 msgid "Quotation"
-msgstr ""
+msgstr "Offert"
 
 #. module: project
 #: view:project.task:0
@@ -744,17 +744,17 @@ msgstr ""
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
-msgstr ""
+msgstr "Öppna aktivitet"
 
 #. module: project
 #: field:project.project,timesheet_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Arbetstid"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Months"
-msgstr ""
+msgstr "Månader"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -764,7 +764,7 @@ msgstr ""
 #. module: project
 #: field:project.task.work,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: project
 #: help:res.company,project_time_mode:0
@@ -852,7 +852,7 @@ msgstr ""
 #. module: project
 #: field:project.project,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: project
 #: field:project.task,name:0
@@ -879,7 +879,7 @@ msgstr ""
 #: selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
-msgstr ""
+msgstr "Klar"
 
 #. module: project
 #: view:config.compute.remaining:0
@@ -890,17 +890,17 @@ msgstr ""
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_new
 msgid "Create a Task"
-msgstr ""
+msgstr "Skapa en aktivitet"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 msgid "Open"
-msgstr ""
+msgstr "Öppna"
 
 #. module: project
 #: view:project.project:0
@@ -910,7 +910,7 @@ msgstr ""
 #. module: project
 #: selection:project.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Pågår"
 
 #. module: project
 #: constraint:ir.model:0
@@ -942,7 +942,7 @@ msgstr "Mycket låg"
 #. module: project
 #: wizard_view:project.task.close,mail_ask:0
 msgid "Send mail to customer"
-msgstr ""
+msgstr "Skicka epost till kunden"
 
 #. module: project
 #: field:project.project,warn_manager:0
@@ -979,13 +979,13 @@ msgstr ""
 #. module: project
 #: model:process.transition,name:project.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Aktivtetsfaktura"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project_open
 #: model:ir.ui.menu,name:project.menu_open_view_my_project_open
 msgid "Projects Structure"
-msgstr ""
+msgstr "Projektstruktur"
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
@@ -995,7 +995,7 @@ msgstr ""
 #. module: project
 #: field:project.task,work_ids:0
 msgid "Work done"
-msgstr ""
+msgstr "Avslutat arbete"
 
 #. module: project
 #: selection:project.project,state:0
@@ -1029,7 +1029,7 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_feature
 msgid "New Feature"
-msgstr ""
+msgstr "Ny funktion"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -1039,17 +1039,17 @@ msgstr ""
 #. module: project
 #: wizard_field:project.task.delegate,init,prefix:0
 msgid "Your Task Title"
-msgstr ""
+msgstr "Din aktivitets titel"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
-msgstr ""
+msgstr "Projektaktivitet"
 
 #. module: project
 #: field:project.task,effective_hours:0
 msgid "Hours Spent"
-msgstr ""
+msgstr "Nedlagda timmar"
 
 #. module: project
 #: field:project.task,total_hours:0
@@ -1066,7 +1066,7 @@ msgstr ""
 #: field:project.project,priority:0
 #: field:project.task,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvens"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1103,7 +1103,7 @@ msgstr "Slutdatum"
 #. module: project
 #: wizard_field:project.task.delegate,init,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Tilldela till"
 
 #. module: project
 #: field:project.task.work,name:0
@@ -1135,4 +1135,4 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.open_view_project_open
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
-msgstr ""
+msgstr "Pågående projekt"
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index a59969fc98c..2e66078874e 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 10:31+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-20 15:42+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus) <Unknown>\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: 2009-12-16 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-02-21 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -860,6 +860,16 @@ msgid ""
 "  - The 'Invoice from the packing' choice is used to create an invoice "
 "during the packing process."
 msgstr ""
+"Zasady wysyłki są stosowane do synchronizowania operacji fakturowych i "
+"wysyłkowych.\n"
+"  - 'Płać przed wysyłką' najpierw wygeneruje fakturę a potem, po otrzymaniu "
+"wpłaty, wygeneruje zamówienie wysyłki.\n"
+"  - 'Wysyłka i faktura ręczna' utworzy zamówienie wysyłki od razu i poczeka, "
+"aż użytkownik naciśnie przycisk 'Faktura', aby wygenerować projekt faktury.\n"
+"  - 'Faktura wg zamówienia po postawie' utworzy projekt faktury po wysyłce "
+"na podstawie zamówienia.\n"
+"  - 'Faktura wg wysyłki' jest stosowana do tworzenia faktury w trakcie "
+"procesu wysyłki."
 
 #. module: sale
 #: rml:sale.order:0
@@ -947,6 +957,11 @@ msgid ""
 "'Waiting Schedule' state is set when the invoice is confirmed but waiting "
 "for the scheduler to run on the date 'Date Ordered'."
 msgstr ""
+"Podaje stan oferty lub zamówienia sprzedaży. Stan wyjątku jest ustawiany "
+"automatycznie gdy wystąpi operacja anulowania w trakcie zatwierdzania "
+"faktury (Wyjątek faktury) lub w procesie listy przesunięć (Wyjątek wysyłki). "
+"Stan 'Oczekiwanie na planistę' jest ustawiany, gdy faktura jest zatwierdzona "
+"ale oczekuje na planistę, aby uruchomił akcję dla daty zamówienia."
 
 #. module: sale
 #: view:sale.order:0
diff --git a/addons/sale_journal/i18n/bg.po b/addons/sale_journal/i18n/bg.po
index b294f579fc3..b5e9f185209 100644
--- a/addons/sale_journal/i18n/bg.po
+++ b/addons/sale_journal/i18n/bg.po
@@ -7,130 +7,130 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:34+0000\n"
+"PO-Revision-Date: 2010-02-21 20:40+0000\n"
 "Last-Translator: lem0na <nickyk@gmx.net>\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: 2009-12-16 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_journal_sale_stats
 msgid "Monthly sales"
-msgstr ""
+msgstr "Месечни продажби"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_assigned
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_assigned
 msgid "Assigned packing"
-msgstr ""
+msgstr "Назначени пакетирания"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "assigned"
-msgstr ""
+msgstr "назначен"
 
 #. module: sale_journal
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаване на действие"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Waiting Schedule"
-msgstr ""
+msgstr "Очакващ график"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "to be invoiced"
-msgstr ""
+msgstr "за фактуриране"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_sale_journal
 #: view:sale_journal.sale.journal:0
 #: field:stock.picking,sale_journal_id:0
 msgid "Sale Journal"
-msgstr ""
+msgstr "Дневник продажби"
 
 #. module: sale_journal
 #: field:sale_journal.sale.journal,sale_stats_ids:0
 msgid "Sale Stats"
-msgstr ""
+msgstr "Състояние на продажба"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "waiting"
-msgstr ""
+msgstr "чакащ"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Пращане в проект"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date:0
 #: field:sale_journal.sale.journal,date:0
 msgid "Journal date"
-msgstr ""
+msgstr "Дата от дневник"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice_method
 #: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_all
 #: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_menu
 msgid "Packing by Invoice Method"
-msgstr ""
+msgstr "Пакетиране според метода на фактуриране"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking
 msgid "Packing Journals"
-msgstr ""
+msgstr "Дневници на пакетиране"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Notes"
-msgstr ""
+msgstr "Бележки"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_my
 msgid "My open journals"
-msgstr ""
+msgstr "Моите отворени дневници"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,count:0
 #: field:sale_journal.picking.stats,count:0
 #: field:sale_journal.sale.stats,count:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# от редове"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_all
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_all_open
 msgid "All Open Journals"
-msgstr ""
+msgstr "Всички отворени дневници"
 
 #. module: sale_journal
 #: model:ir.module.module,shortdesc:sale_journal.module_meta_information
 msgid "Managing sales and deliveries by journal"
-msgstr ""
+msgstr "Управление на продажби и доставки по дневник"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "done"
-msgstr ""
+msgstr "готов"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,price_average:0
 #: field:sale_journal.picking.stats,price_average:0
 #: field:sale_journal.sale.stats,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Средна цена"
 
 #. module: sale_journal
 #: constraint:ir.ui.view:0
@@ -140,14 +140,14 @@ msgstr "Невалиден XML за преглед на архитектурат
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Grouped"
-msgstr ""
+msgstr "Групиран"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,state:0
 #: field:sale_journal.picking.stats,state:0
 #: field:sale_journal.sale.journal,state:0
 msgid "State"
-msgstr ""
+msgstr "Състояние"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_all
@@ -160,12 +160,12 @@ msgstr "Всички месеци"
 #: field:sale_journal.picking.stats,price_total:0
 #: field:sale_journal.sale.stats,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Обща цена"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal
 msgid "Packing journals"
-msgstr ""
+msgstr "Дневник на опаковане"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales
@@ -175,42 +175,42 @@ msgstr "Справки"
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree_my
 msgid "My open packing journals"
-msgstr ""
+msgstr "Моите отворени дневници на опаковане"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_sale_stats
 msgid "Sales Orders by Journal"
-msgstr ""
+msgstr "Поръчки за продажби по дневник"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_all
 msgid "Open journals"
-msgstr ""
+msgstr "Отваряне на дневници"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 msgid "Packing"
-msgstr ""
+msgstr "Опаковане"
 
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
 msgid "The type of journal used for sales and packing."
-msgstr ""
+msgstr "Вида дневник използван при продажби и пакетиране"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "None"
-msgstr ""
+msgstr "Няма"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_sale_sale_stats_open_menu_month
 msgid "Sales by journal (this month)"
-msgstr ""
+msgstr "Продажби по дневник (този месец)"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Manual in progress"
-msgstr ""
+msgstr "Ръчно в изпълнение"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree
@@ -218,141 +218,141 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_all
 #: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_month
 msgid "Packing by journal"
-msgstr ""
+msgstr "Пакетиране по дневник"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 msgid "Cancel Packing"
-msgstr ""
+msgstr "Прекратяване на пакетиране"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_confirmed
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_confirmed
 msgid "Confirmed packing"
-msgstr ""
+msgstr "Потвърдени опакования"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "In progress"
-msgstr ""
+msgstr "В развитие"
 
 #. module: sale_journal
 #: view:sale_journal.picking.stats:0
 msgid "Packing by journals"
-msgstr ""
+msgstr "Опаковане по дневник"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,name:0
 #: field:sale_journal.picking.stats,name:0
 #: field:sale_journal.sale.stats,name:0
 msgid "Month"
-msgstr ""
+msgstr "Месец"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,invoice_state:0
 msgid "Invoice state"
-msgstr ""
+msgstr "Състояние на фактура"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_all
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_month
 #: view:sale_journal.invoice.type.stats:0
 msgid "Packing by invoice method"
-msgstr ""
+msgstr "Опаковане според метод на фактуриране"
 
 #. module: sale_journal
 #: field:sale_journal.sale.stats,state:0
 msgid "Order State"
-msgstr ""
+msgstr "Състояние на поръчка"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Грешка при доставка"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
 #: field:sale_journal.picking.journal,note:0
 #: field:sale_journal.sale.journal,note:0
 msgid "Note"
-msgstr ""
+msgstr "Бележка"
 
 #. module: sale_journal
 #: selection:sale_journal.picking.journal,state:0
 #: selection:sale_journal.sale.journal,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Проект"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "cancel"
-msgstr ""
+msgstr "отказан"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Грешла при фактура"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date_validation:0
 #: field:sale_journal.sale.journal,date_validation:0
 msgid "Validation date"
-msgstr ""
+msgstr "Дата на проверка"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "draft"
-msgstr ""
+msgstr "проект"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активен"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_draft
 msgid "Draft sales"
-msgstr ""
+msgstr "Продажби в проект"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Запитване"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal
 msgid "Sales Journals"
-msgstr ""
+msgstr "Дневници за продажби"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_tree
 msgid "sale_journal.invoice.type.tree"
-msgstr ""
+msgstr "sale_journal.invoice.type.tree"
 
 #. module: sale_journal
 #: view:sale_journal.sale.journal:0
 msgid "Confirm Sales"
-msgstr ""
+msgstr "Потвърждаване на продажби"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date_created:0
 #: field:sale_journal.picking.journal,state:0
 #: field:sale_journal.sale.journal,date_created:0
 msgid "Creation date"
-msgstr ""
+msgstr "Дата на създаване"
 
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
 msgid "Invoicing Method"
-msgstr ""
+msgstr "Метод на фактуриране"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,code:0
 #: field:sale_journal.sale.journal,code:0
 msgid "Code"
-msgstr ""
+msgstr "Код"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 80b95935026..c0fd04b38bd 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-18 15:41+0000\n"
+"PO-Revision-Date: 2010-02-20 15:47+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus) <Unknown>\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: 2010-02-20 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-02-21 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -44,13 +44,13 @@ msgstr ""
 #. module: stock
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
 #: model:ir.ui.menu,name:stock.menu_stock_root
 msgid "Inventory Management"
-msgstr ""
+msgstr "Inwentaryzacja"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -571,7 +571,7 @@ msgstr ""
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "Lewy nadrzędny"
 
 #. module: stock
 #: field:report.stock.lines.date,create_date:0
@@ -1375,7 +1375,7 @@ msgstr "Stan faktury"
 #. module: stock
 #: rml:lot.location:0
 msgid "Units"
-msgstr ""
+msgstr "Jednostki"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1630,7 +1630,7 @@ msgstr "Incoterms"
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Total:"
-msgstr ""
+msgstr "Suma:"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1685,7 +1685,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_workshop
 msgid "Workshop"
-msgstr ""
+msgstr "Sklep"
 
 #. module: stock
 #: selection:stock.inventory,state:0
@@ -2271,6 +2271,8 @@ msgid ""
 "Scheduled date for the movement of the products or real date if the move is "
 "done."
 msgstr ""
+"Planowana data przesunięcia produktów lub rzeczywista data, jeśli "
+"przesunięcie już nastąpiło."
 
 #. module: stock
 #: view:stock.picking:0
diff --git a/addons/subscription/i18n/pl.po b/addons/subscription/i18n/pl.po
index 6b15c22ddcd..83912434c70 100644
--- a/addons/subscription/i18n/pl.po
+++ b/addons/subscription/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-15 15:42+0000\n"
+"PO-Revision-Date: 2010-02-20 15:53+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus) <Unknown>\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: 2009-12-16 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-02-21 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
@@ -78,7 +78,7 @@ msgstr "Stan"
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document_fields
 msgid "Subscription document fields"
-msgstr ""
+msgstr "Pola dokumentu subskrypcji"
 
 #. module: subscription
 #: field:subscription.subscription,interval_number:0
@@ -99,7 +99,7 @@ msgstr "Ustaw na projekt"
 #: model:ir.module.module,description:subscription.module_meta_information
 msgid ""
 "Module allows to create new documents and add subscription on that document."
-msgstr ""
+msgstr "Moduł pozwala tworzyć dokumenty i dodawać subskrypcję do nich."
 
 #. module: subscription
 #: selection:subscription.subscription,state:0
@@ -175,7 +175,7 @@ msgstr "Dni"
 #. module: subscription
 #: model:ir.module.module,shortdesc:subscription.module_meta_information
 msgid "Subscription and recurring operations"
-msgstr ""
+msgstr "Subskrypcje i operacje powtarzalne"
 
 #. module: subscription
 #: field:subscription.subscription,active:0
@@ -185,7 +185,7 @@ msgstr "Aktywny"
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
 msgid "Subscription document"
-msgstr ""
+msgstr "Dokument subskrypcji"
 
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
@@ -212,7 +212,7 @@ msgstr "Dane subskrypcji"
 #: view:subscription.document:0
 #: field:subscription.document.fields,document_id:0
 msgid "Subscription Document"
-msgstr ""
+msgstr "Dokument subskrypcji"
 
 #. module: subscription
 #: selection:subscription.document.fields,value:0
@@ -245,7 +245,7 @@ msgstr "Typy dokumentów"
 #. module: subscription
 #: view:subscription.document.fields:0
 msgid "Subscription Document Fields"
-msgstr ""
+msgstr "Pola dokumentu subskrypcji"
 
 #. module: subscription
 #: selection:subscription.subscription,state:0

From 4aa73d8e5edd5a94ddf811daa214708c33caff17 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 22 Feb 2010 12:50:35 +0530
Subject: [PATCH 05/11] [IMP] crm: do not create meeting on click on scheduling
 meeting button on opportunity, phonecall form

bzr revid: hmo@tinyerp.com-20100222072035-szqppgw2kfxzdh98
---
 addons/crm/wizard/crm_opportunity_wizard.py | 16 +---------------
 addons/crm/wizard/crm_phonecall_wizard.py   | 16 +---------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/addons/crm/wizard/crm_opportunity_wizard.py b/addons/crm/wizard/crm_opportunity_wizard.py
index 2745da166e9..ec50a41c948 100644
--- a/addons/crm/wizard/crm_opportunity_wizard.py
+++ b/addons/crm/wizard/crm_opportunity_wizard.py
@@ -135,21 +135,7 @@ class opportunity2meeting(wizard.interface):
 
     def _makeMeeting(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
-        opportunity_case_obj = pool.get('crm.opportunity')
-        meeting_case_obj = pool.get('crm.meeting')        
-        for opportunity in opportunity_case_obj.browse(cr, uid, data['ids']):
-            new_meeting_id = meeting_case_obj.create(cr, uid, {
-                'name': opportunity.name,
-                'date': time.strftime('%Y-%m-%d'),
-                'section_id' : opportunity.section_id and opportunity.section_id.id or False,
-                'date_deadline': opportunity.date_deadline,
-                'description':opportunity.description,
-                'opportunity_id':opportunity.id
-                })
-            new_meeting = meeting_case_obj.browse(cr, uid, new_meeting_id)
-            vals = {}
-            opportunity_case_obj.write(cr, uid, [opportunity.id], vals)            
-            meeting_case_obj.case_open(cr, uid, [new_meeting_id])        
+        opportunity_case_obj = pool.get('crm.opportunity')                
         data_obj = pool.get('ir.model.data')
         result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
         id = data_obj.read(cr, uid, result, ['res_id'])
diff --git a/addons/crm/wizard/crm_phonecall_wizard.py b/addons/crm/wizard/crm_phonecall_wizard.py
index 4aafecccfc5..b2d717a553a 100644
--- a/addons/crm/wizard/crm_phonecall_wizard.py
+++ b/addons/crm/wizard/crm_phonecall_wizard.py
@@ -202,21 +202,7 @@ class phonecall2meeting(wizard.interface):
 
     def _makeMeeting(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
-        phonecall_case_obj = pool.get('crm.phonecall')
-        meeting_case_obj = pool.get('crm.meeting')        
-        for phonecall in phonecall_case_obj.browse(cr, uid, data['ids']):
-            new_meeting_id = meeting_case_obj.create(cr, uid, {
-                'name': phonecall.name,
-                'section_id' : phonecall.section_id and phonecall.section_id.id or False,
-                'duration': phonecall.duration,
-                'description':phonecall.description,
-                'phonecall_id':phonecall.id
-                })
-            new_meeting = meeting_case_obj.browse(cr, uid, new_meeting_id)
-            vals = {}
-            phonecall_case_obj.write(cr, uid, [phonecall.id], vals)
-            phonecall_case_obj.case_cancel(cr, uid, [phonecall.id])
-            meeting_case_obj.case_open(cr, uid, [new_meeting_id])             
+        phonecall_case_obj = pool.get('crm.phonecall')                   
         data_obj = pool.get('ir.model.data')
         result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
         id = data_obj.read(cr, uid, result, ['res_id'])

From a4caddbda41718b58bb9d3eb59b5a603d10d6b7e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 22 Feb 2010 12:53:42 +0530
Subject: [PATCH 06/11] [IMP]: stock: Improvement in track lines wizard

bzr revid: rpa@openerp.co.in-20100222072342-9pvsxmn5l5kz8c14
---
 addons/stock/stock.py        | 47 ++++++++++++++++++++++++------------
 addons/stock/stock_wizard.py |  3 ---
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 4c74e34b726..e71a165e1f7 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -20,11 +20,12 @@
 ##############################################################################
 
 from mx import DateTime
-import time
-import netsvc
 from osv import fields, osv
 from tools import config
 from tools.translate import _
+import math
+import netsvc
+import time
 import tools
 
 
@@ -1495,32 +1496,48 @@ class stock_move(osv.osv):
 
     def _track_lines(self, cr, uid, ids, lines, context=None):
         prodlot_obj = self.pool.get('stock.production.lot')
+        ir_sequence_obj = self.pool.get('ir.sequence')
+        sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
+        if not sequence:
+            raise osv.except_osv(_('Error!'), _('No production sequence defined'))
+
         move = self.browse(cr, uid, [ids])[0]
         move_qty = move.product_qty
         quantity_rest = move.product_qty
+        uos_qty_rest = move.product_uos_qty
         new_move = []
+        cnt = 0
+
         for line in lines:
             quantity = line['quantity']
-            sequence = line['tracking_num']
+            sequence = (line['tracking_num'] and line['tracking_num'] + '/' \
+                            + sequence) or sequence
+
             if quantity <= 0 or move_qty == 0:
                 continue
             quantity_rest -= quantity
             uos_qty = quantity / move_qty * move.product_uos_qty
             uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
+            if quantity_rest <= 0:
+                quantity_rest = quantity
+                break
             default_val = {
-                'product_qty': quantity,
-                'product_uos_qty': uos_qty,
+                'product_qty': quantity, 
+                'product_uos_qty': uos_qty, 
                 'state': move.state
             }
             current_move = self.copy(cr, uid, move.id, default_val)
             new_move.append(current_move)
-            new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence,
-                                                 'ref': '%d'%int(move_qty//quantity)}, 
-                                                 {'product_id': move.product_id.id})
+            new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 
+                                         'ref': '%d' % (cnt)}, 
+                                         {'product_id': move.product_id.id})
             self.write(cr, uid, [current_move], {'prodlot_id': new_prodlot})
-            
+            cnt += 1
+
         if quantity_rest > 0:
-            new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence + '/', 'ref': '%d' % int(move_qty//quantity)}, {'product_id': move.product_id.id})
+            new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 
+                                            'ref': '%d' % (cnt)}, 
+                                            {'product_id': move.product_id.id})
             update_val= {'prodlot_id': new_prodlot, 
                                     'product_qty': quantity_rest, 
                                     'product_uos_qty': uos_qty_rest
@@ -1534,7 +1551,7 @@ class stock_move(osv.osv):
             context = {}
         qty = product_qty
         if qty <= 0:
-            raise wizard.except_wizard(_('Warning!'), _('Please provide Proper Quantity !'))
+            raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
         
         move = self.browse(cr, uid, ids, context=context)
         move_qty = move.product_qty
@@ -1553,10 +1570,10 @@ class stock_move(osv.osv):
             track = move.product_id.track_production
             self.write(cr, uid, move.id, vals)
             if track:
-                data = {'tracking_prefix': '', 'quantity': 1}
-                newmoves = self._track_lines(cr, uid, ids, data, context=None)
+                data = [{'tracking_num': '', 'quantity': 1}]
+                newmoves = self._track_lines(cr, uid, ids, data*int(math.floor(qty)), context=None)
             self.action_done(cr, uid, [move.id])
-        
+
         if rest:
             defaults = {'product_qty': rest, 
                                 'product_uos_qty': rest, 
@@ -1568,7 +1585,7 @@ class stock_move(osv.osv):
         new_move = None
         qty = product_qty
         if qty <= 0:
-            raise wizard.except_wizard(_('Warning!'), _('Please provide Proper Quantity !'))
+            raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
         
         move = self.browse(cr, uid, ids, context=context)
         location = move.location_dest_id.id
diff --git a/addons/stock/stock_wizard.py b/addons/stock/stock_wizard.py
index 278b9b22fd8..204a62daf0e 100644
--- a/addons/stock/stock_wizard.py
+++ b/addons/stock/stock_wizard.py
@@ -21,9 +21,6 @@
 
 from osv import fields, osv
 from tools.translate import _
-import re
-import time
-import tools
 
 class stock_move_track(osv.osv_memory):
     _name = "stock.move.track"

From e70f2f72f1dc1314959c493bf27aa6649e77cdc4 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 22 Feb 2010 14:01:22 +0530
Subject: [PATCH 07/11] [FIX] crm: wrong view is define in Incomming Phonecall
 menu action

bzr revid: hmo@tinyerp.com-20100222083122-fj9x60m70lwo0q07
---
 addons/crm/crm_phonecall_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 07dfb5b89e7..b67fb2b97ee 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -56,7 +56,7 @@
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming0">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_phone_incomming_tree_view"/>
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_incoming0">

From 222ab7cd116bfbee0f4f7b0bb80bd8239a89e863 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Mon, 22 Feb 2010 16:07:24 +0100
Subject: [PATCH 08/11] [FIX] account: context argument was missing from method
 signature

bzr revid: olt@tinyerp.com-20100222150724-o1dltc9hxc5hc3ek
---
 addons/account/account_move_line.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 9470c6fc01e..8355cf6be3c 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -283,7 +283,10 @@ class account_move_line(osv.osv):
                 result.append((line.id, line.name))
         return result
 
-    def _balance_search(self, cursor, user, obj, name, args):
+    def _balance_search(self, cursor, user, obj, name, args, domain=None, context=None):
+        if context is None:
+            context = {}
+
         if not len(args):
             return []
         where = ' and '.join(map(lambda x: '(abs(sum(debit-credit))'+x[1]+str(x[2])+')',args))

From be9153b6d598bceab2428503444d917561eda8b2 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Tue, 23 Feb 2010 05:05:29 +0000
Subject: [PATCH 09/11] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100223050529-dkgt7sl4cd7jpmv7
---
 addons/account/i18n/ar.po         |   6 +-
 addons/account/i18n/pt_BR.po      |  17 +-
 addons/account_balance/i18n/bs.po |  75 +++----
 addons/mrp_operations/i18n/ko.po  |  10 +-
 addons/process/i18n/pt_BR.po      |  26 +--
 addons/project/i18n/pt_BR.po      | 317 +++++++++++++++++-------------
 addons/project/i18n/sv.po         |   8 +-
 addons/purchase/i18n/bg.po        |  56 +++---
 addons/scrum/i18n/pt_BR.po        | 317 ++++++++++++++++--------------
 addons/stock/i18n/es.po           |  11 +-
 addons/wiki/i18n/ko.po            |   8 +-
 11 files changed, 464 insertions(+), 387 deletions(-)

diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index 2dcf62a1dbb..d67b9c0e8c8 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-20 12:49+0000\n"
-"Last-Translator: Hend Awad <Unknown>\n"
+"PO-Revision-Date: 2010-02-22 08:34+0000\n"
+"Last-Translator: some one <Unknown>\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: 2009-12-21 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 0b03cdeb1cc..ecb7e15efc4 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-21 23:52+0000\n"
-"Last-Translator: Holverat Bortolossi <holverat@gmail.com>\n"
+"PO-Revision-Date: 2010-02-22 21:38+0000\n"
+"Last-Translator: sbrianti <Unknown>\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: 2010-02-22 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1340,7 +1340,7 @@ msgstr "Modelo"
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
 msgid "Close a Fiscal Year"
-msgstr "Fechar ano fiscal"
+msgstr "Fechar um ano fiscal"
 
 #. module: account
 #: field:account.journal,centralisation:0
@@ -1355,7 +1355,7 @@ msgstr "Mensagem:"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Select invoices you want to pay and manages advances"
-msgstr "Selecionar faturaa s pagar e administrar vantagens"
+msgstr "Selecionar as faturas que você quer pagar e adiantamentos a fazer"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1389,7 +1389,7 @@ msgstr "O método de calculo para o valor do imposto."
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Validated accounting entries."
-msgstr "Lançamentos de conta validado"
+msgstr "Lançamentos contábeis validados"
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
@@ -1398,8 +1398,9 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
 msgstr ""
-"Se você não concilia transações, você também deve verificar todas as ações "
-"que estão ligadas a essas operações, porque não será desativaadas"
+"Se você desfazer a reconciliação de transações, você deve também verificar "
+"todas as ações que estão ligadas a essas operações, porque elas não serão "
+"desfeitas pelo sistema"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
diff --git a/addons/account_balance/i18n/bs.po b/addons/account_balance/i18n/bs.po
index 4092eee07c8..b13ebd52784 100644
--- a/addons/account_balance/i18n/bs.po
+++ b/addons/account_balance/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-16 14:07+0000\n"
+"PO-Revision-Date: 2010-02-22 12:42+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.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: 2010-02-17 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
@@ -73,27 +73,27 @@ msgstr "Odaberite razdoblja"
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Percentage"
-msgstr ""
+msgstr "Procenat"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Compare Selected Years In Terms Of"
-msgstr ""
+msgstr "Usporedi odabrane godine pod uvjetima"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Fiscal Year(s)(Maximum Three Years)"
-msgstr ""
+msgstr "Odaberite fiskalne godine (Maksimalno 3 godine)"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,select_account:0
 msgid "Select Reference Account(for  % comparision)"
-msgstr ""
+msgstr "Izaberi odgovarajuća konta (za poređenje u %)"
 
 #. module: account_balance
 #: model:ir.actions.wizard,name:account_balance.wizard_account_balance_report
 msgid "Account balance-Compare Years"
-msgstr ""
+msgstr "Saldo konta - poredi godine"
 
 #. module: account_balance
 #: model:ir.module.module,description:account_balance.module_meta_information
@@ -120,108 +120,108 @@ msgstr ""
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You have to select 'Landscape' option. Please Check it."
-msgstr ""
+msgstr "Morate odabrati opciju 'Položeno'. Molimo označite je."
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,landscape:0
 msgid "Show Report in Landscape Form"
-msgstr ""
+msgstr "Prikaži izvješće u položenoj formi"
 
 #. module: account_balance
 #: help:account.balance.account.balance.report,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Ako je prazno, sva razdoblja"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "With balance is not equal to 0"
-msgstr ""
+msgstr "Sa saldom različit od 0"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Total :"
-msgstr ""
+msgstr "Ukupno :"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Account Balance -"
-msgstr ""
+msgstr "Saldo računa -"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
 msgid "Show Comparision in %"
-msgstr ""
+msgstr "Prikaži usporedbu u %"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period"
-msgstr ""
+msgstr "Odaberite razdoblje"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Report Options"
-msgstr ""
+msgstr "Postavke izvješća"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "With movements"
-msgstr ""
+msgstr "Sa kretanjima"
 
 #. module: account_balance
 #: wizard_button:account.balance.account.balance.report,backtoinit,end:0
 #: wizard_button:account.balance.account.balance.report,zero_years,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Uredu"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Cash"
-msgstr ""
+msgstr "Gotovina"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Don't Compare"
-msgstr ""
+msgstr "Ne uspoređuj"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,account_choice:0
 msgid "Show Accounts"
-msgstr ""
+msgstr "Prikaži račune"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Credit"
-msgstr ""
+msgstr "Potražuje"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "1. You have selected more than 3 years in any case."
-msgstr ""
+msgstr "1. Odabrali ste više od 3 godine u svakom slučaju."
 
 #. module: account_balance
 #: model:ir.module.module,shortdesc:account_balance.module_meta_information
 msgid "Accounting and financial management-Compare Accounts"
-msgstr ""
+msgstr "Upravljanje računovodstvom i finansijama - Usporedi konta"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr ""
+msgstr "Godina:"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You can select maximum 3 years. Please check again."
-msgstr ""
+msgstr "Možete odabrati maksimalno 3 godine. Molimo pokušajte ponovno."
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Saldo"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -229,27 +229,30 @@ msgid ""
 "3. You have selected 'Percentage' option with more than 2 years, but you "
 "have not selected landscape format."
 msgstr ""
+"Izabrali ste \"Postotak\" opciju sa više od dvije godine, ali niste odabrali "
+"\"Položeni\" format."
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid ""
 "You might have done following mistakes. Please correct them and try again."
 msgstr ""
+"Možda ste napravili sljedeće pogreške. Ispravite ih i pokušajte ponovno."
 
 #. module: account_balance
 #: help:account.balance.account.balance.report,init,select_account:0
 msgid "Keep empty for comparision to its parent"
-msgstr ""
+msgstr "Ostavite prazno za usporedbu sa roditeljem"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Datum kreiranja"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,fiscalyear:0
 msgid "Fiscal year"
-msgstr ""
+msgstr "Fiskalna godina"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -257,11 +260,12 @@ msgid ""
 "2. You have not selected 'Percentage' option, but you have selected more "
 "than 2 years."
 msgstr ""
+"2. Niste odabrali opciju 'Postotak', ali ste odabrali više od 2 godine."
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,periods:0
 msgid "Periods"
-msgstr ""
+msgstr "Razdoblja"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,zero_years:0
@@ -270,18 +274,21 @@ msgid ""
 "credit/debit columns and % option.This can lead contents to be printed out "
 "of the paper.Please try again."
 msgstr ""
+"Postoji mogućnost da ste odabrali postavke usporedbe sa više od 1 godine sa "
+"stupcima duguje/potražuje i % opcijom. Ovo može biti uzrok ispisa van "
+"papira. Molimo pokušajte ponovno."
 
 #. module: account_balance
 #: wizard_button:account.balance.account.balance.report,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "You have to select at least 1 Fiscal Year. Try again."
-msgstr ""
+msgstr "Morate odabrati bar 1 fiskalnu godinu. Pokušajte ponovno."
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Customize Report"
-msgstr ""
+msgstr "Prilagodite izvješće"
diff --git a/addons/mrp_operations/i18n/ko.po b/addons/mrp_operations/i18n/ko.po
index f40d09a609c..39ffc581907 100644
--- a/addons/mrp_operations/i18n/ko.po
+++ b/addons/mrp_operations/i18n/ko.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:10+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"PO-Revision-Date: 2010-02-22 13:22+0000\n"
+"Last-Translator: barge <Unknown>\n"
 "Language-Team: Korean <ko@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: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
-msgstr "오퍼레이션 시작"
+msgstr "작업 시작"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,state:0
@@ -32,7 +32,7 @@ msgstr "진행 중"
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Pause"
-msgstr "중지"
+msgstr "일시정지"
 
 #. module: mrp_operations
 #: constraint:ir.model:0
diff --git a/addons/process/i18n/pt_BR.po b/addons/process/i18n/pt_BR.po
index 8476d1cbe8e..49b7146109e 100644
--- a/addons/process/i18n/pt_BR.po
+++ b/addons/process/i18n/pt_BR.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 06:55+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-22 18:07+0000\n"
+"Last-Translator: Luiz Fernando M.França <Unknown>\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: 2009-12-16 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Node"
-msgstr ""
+msgstr "Nó do processo"
 
 #. module: process
 #: constraint:ir.model:0
@@ -33,7 +33,7 @@ msgstr ""
 #. module: process
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da ação."
 
 #. module: process
 #: view:process.node:0
@@ -78,7 +78,7 @@ msgstr "URL de ajuda"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Nodes"
-msgstr ""
+msgstr "Nós do processo"
 
 #. module: process
 #: view:process.process:0
@@ -111,7 +111,7 @@ msgstr "Descrição"
 #. module: process
 #: model:ir.model,name:process.model_process_transition_action
 msgid "Process Transitions Actions"
-msgstr ""
+msgstr "Processar ações de transições"
 
 #. module: process
 #: field:process.condition,model_id:0
@@ -128,7 +128,7 @@ msgstr "Nó de origem"
 #. module: process
 #: field:process.transition,transition_ids:0
 msgid "Workflow Transitions"
-msgstr ""
+msgstr "Transições de Workflow"
 
 #. module: process
 #: field:process.transition.action,action:0
@@ -138,7 +138,7 @@ msgstr "Ação ID"
 #. module: process
 #: view:process.transition:0
 msgid "Process Transition"
-msgstr ""
+msgstr "Transição de processo"
 
 #. module: process
 #: model:ir.model,name:process.model_process_condition
@@ -251,7 +251,7 @@ msgstr "Processo"
 #. module: process
 #: model:ir.module.module,shortdesc:process.module_meta_information
 msgid "Enterprise Process"
-msgstr ""
+msgstr "Processos de negócios"
 
 #. module: process
 #: view:process.node:0
@@ -263,14 +263,14 @@ msgstr "Ações"
 #. module: process
 #: field:process.node,model_states:0
 msgid "States Expression"
-msgstr ""
+msgstr "Expressão de estado"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_transition_form
 #: model:ir.model,name:process.model_process_transition
 #: model:ir.ui.menu,name:process.menu_process_transition_form
 msgid "Process Transitions"
-msgstr ""
+msgstr "Transições de Processos"
 
 #. module: process
 #: field:process.transition,target_node_id:0
@@ -286,7 +286,7 @@ msgstr "Tipo de nó"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Outgoing Transitions"
-msgstr ""
+msgstr "Transições de saida"
 
 #. module: process
 #: model:ir.ui.menu,name:process.menu_process
diff --git a/addons/project/i18n/pt_BR.po b/addons/project/i18n/pt_BR.po
index f957931e039..3f23b2e8874 100644
--- a/addons/project/i18n/pt_BR.po
+++ b/addons/project/i18n/pt_BR.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 14:11+0000\n"
-"Last-Translator: Joe Pimentel <joe.b.pimentel@gmail.com>\n"
+"PO-Revision-Date: 2010-02-22 19:37+0000\n"
+"Last-Translator: Luiz Fernando M.França <Unknown>\n"
 "Language-Team: <pt@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: 2009-12-16 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -25,7 +25,7 @@ msgstr "Tarefas Atribuídas"
 #. module: project
 #: model:process.process,name:project.process_process_tasksprocess0
 msgid "Tasks Process"
-msgstr ""
+msgstr "Processo de Tarefas"
 
 #. module: project
 #: help:project.task.delegate,init,name:0
@@ -45,7 +45,7 @@ msgstr "Fechar Tarefa"
 #. module: project
 #: view:project.task:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Tarefas do Projeto"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
@@ -55,7 +55,7 @@ msgstr "Abrir tarefas concluída"
 #. module: project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da ação."
 
 #. module: project
 #: wizard_field:project.task.delegate,init,planned_hours_me:0
@@ -90,7 +90,7 @@ msgstr "Membros do Projeto"
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr "Dono da Tarefa"
+msgstr "Tarefas para delegar"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project_my_run
@@ -109,11 +109,13 @@ msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Cabeçalho adicionado ao início do email para a mensagem de aviso enviada ao "
+"cliente quando uma tarefa é encerrada."
 
 #. module: project
 #: field:project.task,priority:0
 msgid "Importance"
-msgstr ""
+msgstr "Importância"
 
 #. module: project
 #: view:config.compute.remaining:0
@@ -123,12 +125,12 @@ msgstr "Atualizar"
 #. module: project
 #: help:project.task.delegate,init,user_id:0
 msgid "User you want to delegate this task to."
-msgstr ""
+msgstr "Usuário ao qual deseja-se delegar esta tarefa"
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_attachment_task
 msgid "All Attachments"
-msgstr ""
+msgstr "Todos os anexos"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -154,7 +156,7 @@ msgstr "Novo Projeto Baseado no Molde"
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
 msgid "Project's tasks"
-msgstr ""
+msgstr "Tarefas do projeto"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -173,6 +175,10 @@ msgid ""
 "works done on tasks, eso. It is able to render planning, order tasks, eso.\n"
 "    "
 msgstr ""
+"Módulo de gerenciamento de projeto que rastreia projetos multi-nível,\n"
+"tarefas, trabalhos realizados em tarefas, etc.. Está apto a realizar "
+"planejamento, ordenar tarefas, etc.\n"
+"    "
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_prog
@@ -202,6 +208,8 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task."
 msgstr ""
+"Tempo estimado para você validar o trabalho realizado pelo usuario ao qual "
+"foi delegada esta tarefa."
 
 #. module: project
 #: view:project.project:0
@@ -245,6 +253,8 @@ msgstr "Meus esboços das Tarefas"
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
 msgstr ""
+"Variáveis automáticas para cabeçalho e rodapé. Utilizar exatamente a mesma "
+"notação."
 
 #. module: project
 #: selection:project.project,state:0
@@ -256,7 +266,7 @@ msgstr "Cancelado"
 #: view:project.project:0
 #: field:project.project,warn_header:0
 msgid "Mail Header"
-msgstr ""
+msgstr "Cabeçalho de Correspondência"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -284,11 +294,13 @@ msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
 msgstr ""
+"Se selecionado, o usuário vai visualizar uma janela quando fechando uma "
+"tarefa que irá propor que uma mensagem seja enviada por email para o cliente"
 
 #. module: project
 #: help:project.task.delegate,init,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user."
-msgstr ""
+msgstr "Reincluir a descrição da tarefa na tarefa do usuário."
 
 #. module: project
 #: field:project.project,category_id:0
@@ -298,7 +310,7 @@ msgstr "Conta analítica"
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr ""
+msgstr "Realizado por"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -310,39 +322,39 @@ msgstr "Todas as tarefas"
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr ""
+msgstr "Planejamento"
 
 #. module: project
 #: view:project.task:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Informações Adicionais"
 
 #. module: project
 #: field:project.project,partner_id:0
 #: field:project.task,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Parceiro"
 
 #. module: project
 #: field:project.task,planned_hours:0
 #: wizard_field:project.task.delegate,init,planned_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Horas planejadas"
 
 #. module: project
 #: view:project.project:0
 msgid "Task: %(name)s"
-msgstr ""
+msgstr "Tarefa: %(name)s"
 
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr ""
+msgstr "Reiniciar como Projeto"
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations"
-msgstr ""
+msgstr "Delegações"
 
 #. module: project
 #: help:project.project,members:0
@@ -355,140 +367,141 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "My projects"
-msgstr ""
+msgstr "Meus projetos"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 msgid "All projects"
-msgstr ""
+msgstr "Todos os Projetos"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
 msgid "From draft state, it will come into the open state."
-msgstr ""
+msgstr "A partir do estado Rascunho, mudará para o estado aberto."
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Delegated Task"
-msgstr ""
+msgstr "Tarefa delegada"
 
 #. module: project
 #: help:project.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
 msgstr ""
+"Percentual de tarefas fechadas em relação ao total das tarefas a realizar"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,new_task_description:0
 msgid "New Task Description"
-msgstr ""
+msgstr "Descrição de Nova Tarefa"
 
 #. module: project
 #: help:project.project,notes:0
 msgid "Internal description of the project."
-msgstr ""
+msgstr "Descrição interna do projeto"
 
 #. module: project
 #: field:project.project,parent_id:0
 msgid "Parent Project"
-msgstr ""
+msgstr "Projeto Pai"
 
 #. module: project
 #: help:project.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
+msgstr "Computado como: Tempo Gasto + Tempo Restante"
 
 #. module: project
 #: field:project.task,type:0
 #: field:project.task.type,name:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Weeks"
-msgstr ""
+msgstr "Semanas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog
 msgid "My Current Tasks"
-msgstr ""
+msgstr "Minhas Tarefas Atuais"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project
 #: model:ir.ui.menu,name:project.menu_open_view_project
 msgid "New Project"
-msgstr ""
+msgstr "Novo Projeto"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Medium"
-msgstr ""
+msgstr "Médio"
 
 #. module: project
 #: view:config.compute.remaining:0
 #: field:config.compute.remaining,remaining_hours:0
 #: field:project.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Horas Restantes"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
 msgid "Project task type"
-msgstr ""
+msgstr "Tipo de Tarefa do Projeto"
 
 #. module: project
 #: field:project.project,planned_hours:0
 msgid "Planned Time"
-msgstr ""
+msgstr "Tempo Planejado"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 #: view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
-msgstr ""
+msgstr "Trabalho na Tarefa"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Hours"
-msgstr ""
+msgstr "Horas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_pending
 #: model:ir.ui.menu,name:project.menu_tasks_yours_pending
 msgid "My Pending Tasks"
-msgstr ""
+msgstr "Minhas Tarefas Pendentes"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_opened
 #: model:ir.actions.act_window,name:project.action_view_task6_prog
 #: model:ir.ui.menu,name:project.menu_action_view_task6_prog
 msgid "Tasks in Progress"
-msgstr ""
+msgstr "Tarefas em Andamento"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task7
 #: model:ir.ui.menu,name:project.menu_action_view_task7
 msgid "Unassigned Tasks"
-msgstr ""
+msgstr "Tarefas não atribuídas"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,name:0
 msgid "Delegated Title"
-msgstr ""
+msgstr "Título Delegado"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project
 #: model:ir.ui.menu,name:project.menu_open_view_my_project
 msgid "My Projects"
-msgstr ""
+msgstr "Meus Projetos"
 
 #. module: project
 #: help:project.task.delegate,init,planned_hours:0
 msgid "Estimated time to close this task by the delegated user."
-msgstr ""
+msgstr "Tempo estimado para fechar esta tarefa pelo usuário delegado"
 
 #. module: project
 #: selection:project.project,state:0
@@ -505,54 +518,54 @@ msgstr "Configuração"
 #: field:project.project,date_start:0
 #: field:project.task,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Data de Início"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_all_project
 #: view:project.project:0
 msgid "Projects"
-msgstr ""
+msgstr "Projetos"
 
 #. module: project
 #: view:project.task:0
 msgid "Dates"
-msgstr ""
+msgstr "Datas"
 
 #. module: project
 #: field:project.task,history:0
 msgid "Task Details"
-msgstr ""
+msgstr "Detalhes da tarefa"
 
 #. module: project
 #: model:process.node,name:project.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "Disparar fatura"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
 msgid "Draft Open task"
-msgstr ""
+msgstr "Tarefa Rascunho Aberta"
 
 #. module: project
 #: view:project.project:0
 msgid "User: %(user_id)s"
-msgstr ""
+msgstr "Usuário: %(user_id)s"
 
 #. module: project
 #: field:project.task,delay_hours:0
 msgid "Delay Hours"
-msgstr ""
+msgstr "Horas de Atraso"
 
 #. module: project
 #: field:project.project,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Contato"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegar"
 
 #. module: project
 #: constraint:ir.ui.view:0
@@ -564,13 +577,13 @@ msgstr "Invalido XML para Arquitetura da View"
 #: model:ir.ui.menu,name:project.menu_main
 #: view:res.company:0
 msgid "Project Management"
-msgstr ""
+msgstr "Gerência de Projeto"
 
 #. module: project
 #: field:project.project,effective_hours:0
 #: field:project.task.work,hours:0
 msgid "Time Spent"
-msgstr ""
+msgstr "Tempo Gasto"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_tasks
@@ -581,33 +594,33 @@ msgstr "Tarefas"
 #. module: project
 #: view:project.task.type:0
 msgid "Task type"
-msgstr ""
+msgstr "Tipo de Tarefa"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_new
 #: model:ir.ui.menu,name:project.menu_action_view_task_new
 msgid "New Task"
-msgstr ""
+msgstr "Nova Tarefa"
 
 #. module: project
 #: help:project.project,timesheet_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
+msgstr "Tabela de horas trabalhadas para ajustar o gráfico de Gantt"
 
 #. module: project
 #: view:project.project:0
 msgid "Project's members"
-msgstr ""
+msgstr "Membros do Projeto"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr ""
+msgstr "Depois da tarefa concluída, Criar sua faturas"
 
 #. module: project
 #: help:project.task,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr ""
+msgstr "Calculado como: Tempo gasto / Tempo total."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task4
@@ -618,32 +631,33 @@ msgstr "Minhas Tarefas"
 #. module: project
 #: view:project.project:0
 msgid "Status: %(state)s"
-msgstr ""
+msgstr "Estado: %(estado)s"
 
 #. module: project
 #: view:project.task:0
 msgid "Planned"
-msgstr ""
+msgstr "Planejado"
 
 #. module: project
 #: help:project.project,total_hours:0
 msgid "Sum of total hours of all tasks related to this project."
 msgstr ""
+"Soma do total de horas de todas as tarefas relacionadas com este projeto."
 
 #. module: project
 #: view:project.task:0
 msgid "Delegated tasks"
-msgstr ""
+msgstr "Tarefas delegadas"
 
 #. module: project
 #: view:project.task:0
 msgid "Information"
-msgstr ""
+msgstr "Informação"
 
 #. module: project
 #: view:project.task:0
 msgid "Review"
-msgstr ""
+msgstr "Rever"
 
 #. module: project
 #: view:project.project:0
@@ -653,29 +667,29 @@ msgstr "Administração"
 #. module: project
 #: wizard_field:project.task.close,mail_ask,email:0
 msgid "E-Mails"
-msgstr ""
+msgstr "E-Mails"
 
 #. module: project
 #: model:process.node,note:project.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Disparar faturas a partir os itens da ordem de venda"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
 #: view:project.task:0
 #: selection:project.task,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Rascunho"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Baixo"
 
 #. module: project
 #: field:project.project,manager:0
 msgid "Project Manager"
-msgstr ""
+msgstr "Gerente do Projeto"
 
 #. module: project
 #: view:project.project:0
@@ -684,12 +698,12 @@ msgstr ""
 #: selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendente"
 
 #. module: project
 #: field:project.task,state:0
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: project
 #: help:project.task.delegate,init,state:0
@@ -697,47 +711,49 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed."
 msgstr ""
+"Novo estado de sua própria tarefa: Pendente será reberta automáticamente "
+"quando a tarefa delegada for fechada."
 
 #. module: project
 #: field:res.company,project_time_mode:0
 msgid "Project Time Unit"
-msgstr ""
+msgstr "Unidade de Tempo do Projeto"
 
 #. module: project
 #: field:project.project,complete_name:0
 #: field:project.project,name:0
 msgid "Project Name"
-msgstr ""
+msgstr "Nome do Projeto"
 
 #. module: project
 #: wizard_button:project.task.close,mail_ask,mail_send:0
 msgid "Send Message"
-msgstr ""
+msgstr "Enviar mensagem"
 
 #. module: project
 #: field:project.project,total_hours:0
 msgid "Total Time"
-msgstr ""
+msgstr "Tempo total"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Active"
-msgstr ""
+msgstr "Ativo"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_bug
 msgid "Bug"
-msgstr ""
+msgstr "Bug"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_quote
 msgid "Quotation"
-msgstr ""
+msgstr "Cotação"
 
 #. module: project
 #: view:project.task:0
 msgid "Task edition"
-msgstr ""
+msgstr "Ediçào de tarefa"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -745,31 +761,33 @@ msgid ""
 "Computed as: Total Time - Estimated Time. It gives the difference of the "
 "time estimated by the project manager and the real time to close the task."
 msgstr ""
+"Calculado como: Tempo total - Tempo estimado. Mostra a diferença entre o "
+"tempo estimado pelo responsável do projeto e o tempo real ao fechar a tarefa."
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
-msgstr ""
+msgstr "Abrir tarefa"
 
 #. module: project
 #: field:project.project,timesheet_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Tempo de trabalho"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Months"
-msgstr ""
+msgstr "Meses"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
 msgid "When task is completed, it will come into the done state."
-msgstr ""
+msgstr "Quando uma tarefa é completada, se converte no estado realizada."
 
 #. module: project
 #: field:project.task.work,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: project
 #: help:res.company,project_time_mode:0
@@ -778,21 +796,25 @@ msgid ""
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
 msgstr ""
+"Isto irá ajustar a unidade de medida utilizada nos projetos e tarefas.\n"
+"Utiliza-se as planilhas de horas relacionadas com projetos (módulo "
+"project_timesheet), não esqueça de configurar a unidade de medida correta "
+"nos seus empregados."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
 msgid "User's projects"
-msgstr ""
+msgstr "Projetos do usuário"
 
 #. module: project
 #: view:project.project:0
 msgid "Reactivate Project"
-msgstr ""
+msgstr "Reativar projeto"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "Urgente"
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
@@ -802,17 +824,17 @@ msgstr "Delegar esta tarefa ao usuário"
 #. module: project
 #: field:project.task,delegated_user_id:0
 msgid "Delegated To"
-msgstr ""
+msgstr "Delegado para"
 
 #. module: project
 #: field:project.task,date_close:0
 msgid "Date Closed"
-msgstr ""
+msgstr "Data de Fechamento"
 
 #. module: project
 #: field:project.task,user_id:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Atribuída para"
 
 #. module: project
 #: help:project.task,planned_hours:0
@@ -820,11 +842,14 @@ msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
 msgstr ""
+"Tempo estimado para efetuar a tarefa, usualmente ajustado pelo gestor do "
+"projeto quando a tarefa está no estado de rascunho"
 
 #. module: project
 #: help:project.project,effective_hours:0
 msgid "Sum of spent hours of all tasks related to this project."
 msgstr ""
+"Soma das horas gastas em todas as tarefas relacionadas a este projeto"
 
 #. module: project
 #: help:project.task,project_id:0
@@ -832,22 +857,25 @@ msgid ""
 "If you have [?] in the project name, it means there are no analytic account "
 "linked to this project."
 msgstr ""
+"Se existir [?] no nome do projeto, isto significa que não há conta analítica "
+"associada a este projeto."
 
 #. module: project
 #: help:project.project,planned_hours:0
 msgid "Sum of planned hours of all tasks related to this project."
 msgstr ""
+"Soma das horas planejadas para as tarefas relacionadas a este projeto"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
 msgid "Month works"
-msgstr ""
+msgstr "Trabalhos do mês"
 
 #. module: project
 #: model:ir.actions.report.xml,name:project.report_project_project_gantt
 #: model:ir.actions.report.xml,name:project.report_project_task_gantt
 msgid "Gantt Representation"
-msgstr ""
+msgstr "Representação Gantt"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -857,17 +885,17 @@ msgstr "Advirta o Parceiro"
 #. module: project
 #: field:project.project,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: project
 #: field:project.task,name:0
 msgid "Task summary"
-msgstr ""
+msgstr "Sumário da tarefa"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Start: %(date_start)s"
-msgstr ""
+msgstr "Data de inicio: %(data_inicio)s"
 
 #. module: project
 #: help:project.project,category_id:0
@@ -876,6 +904,9 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
+"Associe este projeto a uma conta analítica se precisar gerencia financeira "
+"nos projetos com análise de orçamentos, planejamento, custo e retorno, "
+"planilha de tempo em projetos, etc."
 
 #. module: project
 #: view:project.project:0
@@ -884,7 +915,7 @@ msgstr ""
 #: selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
-msgstr ""
+msgstr "Concluído"
 
 #. module: project
 #: view:config.compute.remaining:0
@@ -895,27 +926,27 @@ msgstr ""
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_new
 msgid "Create a Task"
-msgstr ""
+msgstr "Criar una tarefa"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 msgid "Open"
-msgstr ""
+msgstr "Abrir"
 
 #. module: project
 #: view:project.project:0
 msgid "ID: %(task_id)s"
-msgstr ""
+msgstr "ID: %(task_id)s"
 
 #. module: project
 #: selection:project.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Em andamento"
 
 #. module: project
 #: constraint:ir.model:0
@@ -928,64 +959,64 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Reactivate"
-msgstr ""
+msgstr "Reativar"
 
 #. module: project
 #: field:project.task,parent_id:0
 msgid "Parent Task"
-msgstr ""
+msgstr "Tarefa Pai"
 
 #. module: project
 #: view:project.task:0
 msgid "Delay"
-msgstr ""
+msgstr "Atraso"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very Low"
-msgstr ""
+msgstr "Muito Baixa"
 
 #. module: project
 #: wizard_view:project.task.close,mail_ask:0
 msgid "Send mail to customer"
-msgstr ""
+msgstr "Enviar correspondencia ao cliente"
 
 #. module: project
 #: field:project.project,warn_manager:0
 msgid "Warn Manager"
-msgstr ""
+msgstr "Avisar o Gestor"
 
 #. module: project
 #: model:ir.model,name:project.model_config_compute_remaining
 msgid "config.compute.remaining"
-msgstr ""
+msgstr "config.compute.remaining"
 
 #. module: project
 #: wizard_button:project.task.close,mail_ask,close:0
 msgid "Quiet close"
-msgstr ""
+msgstr "Fechar silenciosamente"
 
 #. module: project
 #: help:project.task.delegate,init,prefix:0
 msgid "New title of your own task to validate the work done."
-msgstr ""
+msgstr "Novo título de sua própria tarefa para validar o trabalho realizado."
 
 #. module: project
 #: field:project.task,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "Progresso (%)"
 
 #. module: project
 #: field:project.task,description:0
 #: wizard_field:project.task.close,mail_ask,description:0
 #: field:project.task.type,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descrição"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Fatura deTarefa"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project_open
@@ -996,17 +1027,17 @@ msgstr "Estruturas dos Projetos"
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Validation Task"
-msgstr ""
+msgstr "Validação da tarefa"
 
 #. module: project
 #: field:project.task,work_ids:0
 msgid "Work done"
-msgstr ""
+msgstr "Trabalho concluído"
 
 #. module: project
 #: selection:project.project,state:0
 msgid "Running"
-msgstr ""
+msgstr "Executando"
 
 #. module: project
 #: help:project.project,parent_id:0
@@ -1014,6 +1045,8 @@ msgid ""
 "If you have [?] in the name, it means there are no analytic account linked "
 "to project."
 msgstr ""
+"Se existir [?] no nome, isto significa que não há conta analítica associada "
+"a este projeto."
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_delegate_task
@@ -1023,7 +1056,7 @@ msgstr "Delegar Tarefa"
 #. module: project
 #: field:project.project,tasks:0
 msgid "Project tasks"
-msgstr ""
+msgstr "Tarefas do projeto"
 
 #. module: project
 #: help:project.project,warn_manager:0
@@ -1031,48 +1064,50 @@ msgid ""
 "If you check this field, the project manager will receive a request each "
 "time a task is completed by his team."
 msgstr ""
+"Se marcar este campo, o gestor do projeto receberá uma requisição cada vez "
+"que uma tarefa for completada por este time"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_feature
 msgid "New Feature"
-msgstr ""
+msgstr "Nova Característica"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
-msgstr ""
+msgstr "Codifique suas horas trabalhadas."
 
 #. module: project
 #: wizard_field:project.task.delegate,init,prefix:0
 msgid "Your Task Title"
-msgstr ""
+msgstr "Título da Sua Tarefa"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
-msgstr ""
+msgstr "Tarefa do Projeto"
 
 #. module: project
 #: field:project.task,effective_hours:0
 msgid "Hours Spent"
-msgstr ""
+msgstr "Horas Gastas"
 
 #. module: project
 #: field:project.task,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Horas Totais"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 #: model:ir.ui.menu,name:project.menu_template_project
 msgid "Template of Projects"
-msgstr ""
+msgstr "Modelo de Projetos"
 
 #. module: project
 #: field:project.project,priority:0
 #: field:project.task,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seqüência"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1080,62 +1115,64 @@ msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Rodapé adicionado no email para a mensagem de aviso envaiada para o cliente "
+"quando a tarefa é encerrada."
 
 #. module: project
 #: view:project.project:0
 msgid "Partner Info"
-msgstr ""
+msgstr "Informação do Parceiro"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_config_compute_remaining
 msgid "Compute Remaining Hours"
-msgstr ""
+msgstr "Calcular horas restantes"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,state:0
 msgid "Validation State"
-msgstr ""
+msgstr "Estado de validação"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error ! You can not create recursive projects."
-msgstr ""
+msgstr "Erro ! Você não pode criar projetos recursivos."
 
 #. module: project
 #: field:project.task,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Prazo limite"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Atribuir para"
 
 #. module: project
 #: field:project.task.work,name:0
 msgid "Work summary"
-msgstr ""
+msgstr "Sumário do trabalho"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date_stop)s"
-msgstr ""
+msgstr "Data de término: %(data_de_termino)s"
 
 #. module: project
 #: field:project.project,date_end:0
 msgid "Expected End"
-msgstr ""
+msgstr "Término Previsto"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
 msgid "Delegate your task to the other user"
-msgstr ""
+msgstr "Delegar sua tarefa para outro usuário"
 
 #. module: project
 #: view:project.project:0
 #: field:project.project,warn_footer:0
 msgid "Mail Footer"
-msgstr ""
+msgstr "Rodapé de Correspondëncia"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project_open
diff --git a/addons/project/i18n/sv.po b/addons/project/i18n/sv.po
index 6897406c25b..bc538d6fcec 100644
--- a/addons/project/i18n/sv.po
+++ b/addons/project/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-21 19:41+0000\n"
+"PO-Revision-Date: 2010-02-22 17:33+0000\n"
 "Last-Translator: Anders Eriksson <ae@mobilasystem.se>\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: 2010-02-22 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -146,7 +146,7 @@ msgstr "Aktivtetstyoer"
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr ""
+msgstr "Nytt projekt baserat på en mall"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
@@ -235,7 +235,7 @@ msgstr "Starta aktivitet"
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_draft
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_draft
 msgid "My Draft Tasks"
-msgstr ""
+msgstr "Mina preliminära aktiviteter"
 
 #. module: project
 #: view:project.project:0
diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po
index 3f4b4479887..edd58a76b88 100644
--- a/addons/purchase/i18n/bg.po
+++ b/addons/purchase/i18n/bg.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:29+0000\n"
+"PO-Revision-Date: 2010-02-22 21:23+0000\n"
 "Last-Translator: lem0na <nickyk@gmx.net>\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: 2009-12-16 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
-msgstr ""
+msgstr "Фактуриран и платен"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
@@ -29,7 +29,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,location_id:0
 msgid "Destination"
-msgstr ""
+msgstr "Назначение"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -39,52 +39,52 @@ msgstr ""
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Validated By"
-msgstr ""
+msgstr "Проверрено от"
 
 #. module: purchase
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаване на действие"
 
 #. module: purchase
 #: field:purchase.order,partner_id:0
 msgid "Supplier"
-msgstr ""
+msgstr "Доставчик"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery"
-msgstr ""
+msgstr "Доставка"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
 msgid "Quantity"
-msgstr ""
+msgstr "Количество"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Order"
-msgstr ""
+msgstr "От поръчка"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_confirmpurchaseorder0
 msgid "Confirmed Purchase"
-msgstr ""
+msgstr "Потвърдена поръчка"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Грешка при фактуриране"
 
 #. module: purchase
 #: model:product.pricelist,name:purchase.list0
 msgid "Default Purchase Pricelist"
-msgstr ""
+msgstr "Ценова листа при покупка (по подрабиране)"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
 msgid "Create invoice"
-msgstr ""
+msgstr "Създаване на фактура"
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -92,11 +92,13 @@ msgid ""
 "This pricelist will be used, instead of the default one, for purchases from "
 "the current partner"
 msgstr ""
+"За поръчки от текущия партньор ще се използва тази ценова листа вместо тази "
+"по подразбиране"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Fax :"
-msgstr ""
+msgstr "Факс :"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -113,33 +115,33 @@ msgstr ""
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
 msgid "Purchase Process"
-msgstr ""
+msgstr "Обработка на покупка"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
 msgid "Invoice from Packing list"
-msgstr ""
+msgstr "Фактура от списък за пакетиране"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approve Purchase"
-msgstr ""
+msgstr "Одобряване на покупказ"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Одобрен"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_form_action4
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
 msgid "Purchase Orders in Progress"
-msgstr ""
+msgstr "Активни заявки за покупка"
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Необложена сума"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -147,14 +149,14 @@ msgstr ""
 #: view:purchase.order.line:0
 #: field:purchase.order.line,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Бележки"
 
 #. module: purchase
 #: rml:purchase.order:0
 #: field:purchase.order,amount_tax:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "Данъци"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
@@ -163,22 +165,22 @@ msgstr ""
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
 msgid "Purchase Order"
-msgstr ""
+msgstr "Поръчка за покупка"
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Regards,"
-msgstr ""
+msgstr "Благодарности,"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Общо нето :"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Отказан"
 
 #. module: purchase
 #: help:purchase.order,state:0
diff --git a/addons/scrum/i18n/pt_BR.po b/addons/scrum/i18n/pt_BR.po
index 419945ef908..5b00bd84b30 100644
--- a/addons/scrum/i18n/pt_BR.po
+++ b/addons/scrum/i18n/pt_BR.po
@@ -7,61 +7,61 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 17:29+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-22 19:01+0000\n"
+"Last-Translator: Luiz Fernando M.França <Unknown>\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: 2009-12-16 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
 #: view:scrum.product.backlog:0
 msgid "Scrum Product backlog"
-msgstr ""
+msgstr "Backlog de Produto do Scrum"
 
 #. module: scrum
 #: field:scrum.meeting,name:0
 msgid "Meeting Name"
-msgstr ""
+msgstr "Nome da Reunião"
 
 #. module: scrum
 #: model:process.transition,note:scrum.process_transition_backlogtask0
 msgid "From backlog create task."
-msgstr ""
+msgstr "A partir do backlog criar tarefa"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_view_task4
 #: model:ir.ui.menu,name:scrum.menu_action_view_task4
 msgid "My tasks"
-msgstr ""
+msgstr "Minhas tarefas"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
 msgid "My opened sprints (Product Owner)"
-msgstr ""
+msgstr "Meus Sprints abertos (Proprietário do Produto)"
 
 #. module: scrum
 #: model:process.node,note:scrum.process_node_productbacklog0
 msgid "Create task from backlogs"
-msgstr ""
+msgstr "Criar tarefas a partir dos backlogs"
 
 #. module: scrum
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da ação."
 
 #. module: scrum
 #: model:ir.module.module,shortdesc:scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
-msgstr ""
+msgstr "Método de Desenvolvimento Ágil, Scrum"
 
 #. module: scrum
 #: field:scrum.project,progress_rate:0
 msgid "Progress"
-msgstr ""
+msgstr "Progresso"
 
 #. module: scrum
 #: help:scrum.task,remaining_hours:0
@@ -69,36 +69,38 @@ msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
 msgstr ""
+"Tempo total restante, pode ser re-estimado periodicamente pelo executor da "
+"tarefa"
 
 #. module: scrum
 #: field:scrum.project,child_id:0
 msgid "Subproject"
-msgstr ""
+msgstr "Subprojeto"
 
 #. module: scrum
 #: view:scrum.meeting:0
 msgid "What have you accomplished since yesterday ?"
-msgstr ""
+msgstr "O que você realizou desde ontem?"
 
 #. module: scrum
 #: view:scrum.meeting:0
 msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
+msgstr "A sua estimativa do Sprint Backlog está precisa?"
 
 #. module: scrum
 #: field:scrum.project,members:0
 msgid "Project Members"
-msgstr ""
+msgstr "Membros do Projeto"
 
 #. module: scrum
 #: view:scrum.project:0
 msgid "Scrum Projects"
-msgstr ""
+msgstr "Projetos Scrum"
 
 #. module: scrum
 #: field:scrum.task,child_ids:0
 msgid "Delegated Tasks"
-msgstr ""
+msgstr "Tarefas Delegadas"
 
 #. module: scrum
 #: help:scrum.project,warn_header:0
@@ -106,43 +108,47 @@ msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Cabeçalho adicionado ao início do email para a mensagem de aviso enviada ao "
+"cliente quando uma tarefa é encerrada."
 
 #. module: scrum
 #: field:scrum.task,priority:0
 msgid "Importance"
-msgstr ""
+msgstr "Importância"
 
 #. module: scrum
 #: model:ir.model,name:scrum.model_scrum_task
 msgid "Scrum Task"
-msgstr ""
+msgstr "Tarefa Scrum"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.dblc_proj
 msgid "View project's backlog"
-msgstr ""
+msgstr "Visualizar o backlog do projeto"
 
 #. module: scrum
 #: help:scrum.project,members:0
 msgid ""
 "Project's member. Not used in any computation, just for information purpose."
 msgstr ""
+"Membros do Projeto. Não usado em alguma computação, apenas para a finalidade "
+"da informação."
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
 #: selection:scrum.task,priority:0
 msgid "Very urgent"
-msgstr ""
+msgstr "Urgentíssimo"
 
 #. module: scrum
 #: field:scrum.sprint,retrospective:0
 msgid "Sprint Retrospective"
-msgstr ""
+msgstr "Retrospectiva do Sprint"
 
 #. module: scrum
 #: field:scrum.sprint,name:0
 msgid "Sprint Name"
-msgstr ""
+msgstr "Nome do Sprint"
 
 #. module: scrum
 #: help:scrum.task,planned_hours:0
@@ -150,24 +156,26 @@ msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
 msgstr ""
+"Tempo estimado para efetuar a tarefa, usualmente ajustado pelo gestor do "
+"projeto quando a tarefa está no estado de rascunho"
 
 #. module: scrum
 #: field:scrum.project,notes:0
 #: field:scrum.task,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Anotações"
 
 #. module: scrum
 #: model:ir.model,name:scrum.model_scrum_product_backlog
 #: field:scrum.task,product_backlog_id:0
 msgid "Product Backlog"
-msgstr ""
+msgstr "Backlog do Produto"
 
 #. module: scrum
 #: field:scrum.sprint,project_id:0
 #: field:scrum.task,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Projeto"
 
 #. module: scrum
 #: help:scrum.project,warn_manager:0
@@ -175,37 +183,39 @@ msgid ""
 "If you check this field, the project manager will receive a request each "
 "time a task is completed by his team."
 msgstr ""
+"Se marcar este campo, o gestor do projeto receberá uma requisição cada vez "
+"que uma tarefa for completada por este time"
 
 #. module: scrum
 #: selection:scrum.project,state:0
 #: selection:scrum.task,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelada"
 
 #. module: scrum
 #: field:scrum.team,name:0
 msgid "Team Name"
-msgstr ""
+msgstr "Nome da equipe"
 
 #. module: scrum
 #: field:scrum.project,warn_header:0
 msgid "Mail Header"
-msgstr ""
+msgstr "Cabeçalho de Correspondência"
 
 #. module: scrum
 #: field:scrum.project,sprint_size:0
 msgid "Sprint Days"
-msgstr ""
+msgstr "Dias do Sprint"
 
 #. module: scrum
 #: field:scrum.sprint,date_stop:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Data Final"
 
 #. module: scrum
 #: help:scrum.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr ""
+msgstr "Calculado usando a soma do trabalho realizado da tarefa."
 
 #. module: scrum
 #: help:scrum.project,warn_customer:0
@@ -213,347 +223,351 @@ msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
 msgstr ""
+"Se selecionado, o usuário vai visualizar uma janela quando fechando uma "
+"tarefa que irá propor que uma mensagem seja enviada por email para o cliente"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_task_open
 msgid "View sprint Tasks"
-msgstr ""
+msgstr "Ver Tarefas do Sprint"
 
 #. module: scrum
 #: field:scrum.project,category_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Conta Analítica"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_view_task
 #: model:ir.ui.menu,name:scrum.menu_action_view_task
 msgid "All Tasks"
-msgstr "Todas as tarefas"
+msgstr "Todas as Tarefas"
 
 #. module: scrum
 #: field:scrum.task,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Prazo limite"
 
 #. module: scrum
 #: field:scrum.project,partner_id:0
 #: field:scrum.task,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Parceiro"
 
 #. module: scrum
 #: field:scrum.product.backlog,planned_hours:0
 #: field:scrum.sprint,planned_hours:0
 #: field:scrum.task,planned_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Horas planejadas"
 
 #. module: scrum
 #: selection:scrum.project,state:0
 msgid "Template"
-msgstr ""
+msgstr "Modelo"
 
 #. module: scrum
 #: field:scrum.product.backlog,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioridade"
 
 #. module: scrum
 #: field:scrum.project,state:0
 #: view:scrum.sprint:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: scrum
 #: help:scrum.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
 msgstr ""
+"Percentual de tarefas fechadas em relação ao total das tarefas a realizar"
 
 #. module: scrum
 #: help:scrum.project,notes:0
 msgid "Internal description of the project."
-msgstr ""
+msgstr "Descrição interna do projeto"
 
 #. module: scrum
 #: field:scrum.sprint,meetings_id:0
 msgid "Daily Scrum"
-msgstr ""
+msgstr "Scrum Diário"
 
 #. module: scrum
 #: help:scrum.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
+msgstr "Calculado como: Tempo Gasto + Tempo Restante"
 
 #. module: scrum
 #: field:scrum.task,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: scrum
 #: view:scrum.project:0
 msgid "Scrum Data"
-msgstr ""
+msgstr "Dados do Scrum"
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
 #: selection:scrum.task,priority:0
 msgid "Medium"
-msgstr ""
+msgstr "Médio"
 
 #. module: scrum
 #: field:scrum.project,total_hours:0
 msgid "Total Time"
-msgstr ""
+msgstr "Tempo Total"
 
 #. module: scrum
 #: model:ir.ui.menu,name:scrum.next_id_67
 msgid "Scrum"
-msgstr ""
+msgstr "Scrum"
 
 #. module: scrum
 #: field:scrum.project,planned_hours:0
 msgid "Planned Time"
-msgstr ""
+msgstr "Tempo Planejado"
 
 #. module: scrum
 #: field:scrum.meeting,question_today:0
 msgid "Tasks for today"
-msgstr ""
+msgstr "Tarefas para hoje"
 
 #. module: scrum
 #: field:scrum.meeting,question_yesterday:0
 msgid "Tasks since yesterday"
-msgstr ""
+msgstr "Tarefas desde ontem"
 
 #. module: scrum
 #: field:scrum.project,date_start:0
 #: field:scrum.sprint,date_start:0
 #: field:scrum.task,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Data de Início"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
 #: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
 msgid "Projects"
-msgstr ""
+msgstr "Projetos"
 
 #. module: scrum
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
+msgstr "XML inválido para Arquitetura da View"
 
 #. module: scrum
 #: field:scrum.task,history:0
 msgid "Task Details"
-msgstr ""
+msgstr "Detalhes da Tarefa"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.dblc_proj2
 msgid "View project's tasks"
-msgstr ""
+msgstr "Ver tarefas do projeto"
 
 #. module: scrum
 #: field:scrum.task,delay_hours:0
 msgid "Delay Hours"
-msgstr ""
+msgstr "Horas de Atraso"
 
 #. module: scrum
 #: field:scrum.project,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Contato"
 
 #. module: scrum
 #: field:scrum.project,tasks:0
 msgid "Scrum Tasks"
-msgstr ""
+msgstr "Tarefas do Scrum"
 
 #. module: scrum
 #: field:scrum.meeting,date:0
 msgid "Meeting Date"
-msgstr ""
+msgstr "Data da Reunião"
 
 #. module: scrum
 #: view:scrum.product.backlog:0
 msgid "Tasks"
-msgstr ""
+msgstr "Tarefas"
 
 #. module: scrum
 #: view:scrum.sprint:0
 msgid "Retrospective"
-msgstr ""
+msgstr "Retrospectiva"
 
 #. module: scrum
 #: wizard_view:scrum.product.backlog.task.create,init:0
 #: wizard_button:scrum.product.backlog.task.create,init,create:0
 msgid "Create Tasks"
-msgstr ""
+msgstr "Criar Tarefas"
 
 #. module: scrum
 #: field:scrum.task,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "Progresso (%)"
 
 #. module: scrum
 #: help:scrum.task,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr ""
+msgstr "Calculado como: Tempo Gasto / Tempo Total."
 
 #. module: scrum
 #: field:scrum.project,scrum:0
 #: field:scrum.task,scrum:0
 msgid "Is Scrum"
-msgstr ""
+msgstr "É Scrum"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
 #: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
 msgid "Draft Backlogs"
-msgstr ""
+msgstr "Backlogs  Esboçados"
 
 #. module: scrum
 #: field:scrum.sprint,backlog_ids:0
 msgid "Sprint Backlog"
-msgstr ""
+msgstr "Backlog do Sprint"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_view_task6
 #: model:ir.ui.menu,name:scrum.menu_action_view_task6
 msgid "Opened tasks"
-msgstr ""
+msgstr "Tarefas Abertas"
 
 #. module: scrum
 #: field:scrum.meeting,question_blocks:0
 msgid "Blocks encountered"
-msgstr ""
+msgstr "Bloqueios encontrados"
 
 #. module: scrum
 #: view:scrum.meeting:0
 msgid "Optionnal Info"
-msgstr ""
+msgstr "Informação Opcional"
 
 #. module: scrum
 #: help:scrum.project,total_hours:0
 msgid "Sum of total hours of all tasks related to this project."
 msgstr ""
+"Soma do total de horas de todas as tarefas relacionadas com este projeto."
 
 #. module: scrum
 #: model:ir.model,name:scrum.model_scrum_sprint
 #: view:scrum.meeting:0
 #: view:scrum.sprint:0
 msgid "Scrum Sprint"
-msgstr ""
+msgstr "Scrum Sprint"
 
 #. module: scrum
 #: view:scrum.sprint:0
 msgid "Review"
-msgstr ""
+msgstr "Rever"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
 msgid "My opened sprints (Scrum Master)"
-msgstr ""
+msgstr "Meus sprints abertos"
 
 #. module: scrum
 #: field:scrum.product.backlog,note:0
 msgid "Note"
-msgstr ""
+msgstr "Anotação"
 
 #. module: scrum
 #: selection:scrum.product.backlog,state:0
 #: selection:scrum.sprint,state:0
 #: selection:scrum.task,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Esboço"
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
 #: selection:scrum.task,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Baixo"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_view_task5
 #: model:ir.ui.menu,name:scrum.menu_tasks_yours
 msgid "My opened tasks"
-msgstr ""
+msgstr "Minhas tarefas abertas"
 
 #. module: scrum
 #: field:scrum.project,manager:0
 msgid "Project Manager"
-msgstr ""
+msgstr "Gerente do Projeto"
 
 #. module: scrum
 #: selection:scrum.project,state:0
 #: selection:scrum.task,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendente"
 
 #. module: scrum
 #: view:scrum.meeting:0
 msgid "Is there anything blocking you ?"
-msgstr ""
+msgstr "Existe algo lhe bloqueando?"
 
 #. module: scrum
 #: field:scrum.product.backlog,state:0
 #: field:scrum.sprint,state:0
 #: field:scrum.task,state:0
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
 msgid "Opened Sprints"
-msgstr ""
+msgstr "Sprints Abertos"
 
 #. module: scrum
 #: field:scrum.project,effective_hours:0
 msgid "Time Spent"
-msgstr ""
+msgstr "Tempo Gasto"
 
 #. module: scrum
 #: field:scrum.project,complete_name:0
 #: field:scrum.project,name:0
 msgid "Project Name"
-msgstr ""
+msgstr "Nome do Projeto"
 
 #. module: scrum
 #: field:scrum.project,product_owner_id:0
 #: field:scrum.sprint,product_owner_id:0
 msgid "Product Owner"
-msgstr ""
+msgstr "Proprietário do Produto"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
 msgid "My Sprints (Scrum Master)"
-msgstr ""
+msgstr "Meus Sprints"
 
 #. module: scrum
 #: model:process.node,name:scrum.process_node_productbacklog0
 #: view:scrum.product.backlog:0
 msgid "Product backlog"
-msgstr ""
+msgstr "Backlog do Produto"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_product_backlog_form
 #: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
 msgid "Backlogs"
-msgstr ""
+msgstr "Backlogs"
 
 #. module: scrum
 #: field:scrum.product.backlog,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
 #. module: scrum
 #: field:scrum.product.backlog,active:0
 #: field:scrum.project,active:0
 #: field:scrum.task,active:0
 msgid "Active"
-msgstr ""
+msgstr "Ativo"
 
 #. module: scrum
 #: help:scrum.task,delay_hours:0
@@ -561,57 +575,60 @@ msgid ""
 "Computed as: Total Time - Estimated Time. It gives the difference of the "
 "time estimated by the project manager and the real time to close the task."
 msgstr ""
+"Calculado como: Tempo total - Tempo estimado. Mostra a diferença entre o "
+"tempo estimado pelo responsável do projeto e o tempo real ao fechar a tarefa."
 
 #. module: scrum
 #: field:scrum.task,timebox_id:0
 msgid "Timebox"
-msgstr ""
+msgstr "Janela de Tempo"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
 msgid "Draft Sprints"
-msgstr ""
+msgstr "Esboço de Sprints"
 
 #. module: scrum
 #: field:scrum.project,timesheet_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Tempo Trabalhado"
 
 #. module: scrum
 #: field:scrum.task,work_ids:0
 msgid "Work done"
-msgstr ""
+msgstr "Trabalho concluído"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
-msgstr ""
+msgstr "Ver o backlog do sprint"
 
 #. module: scrum
 #: field:scrum.task,delegated_user_id:0
 msgid "Delegated To"
-msgstr ""
+msgstr "Delegado para"
 
 #. module: scrum
 #: field:scrum.task,date_close:0
 msgid "Date Closed"
-msgstr ""
+msgstr "Data de Fechamento"
 
 #. module: scrum
 #: field:scrum.task,user_id:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Atribuída para"
 
 #. module: scrum
 #: field:scrum.meeting,question_backlog:0
 msgid "Backlog Accurate"
-msgstr ""
+msgstr "Precisão do Backlog"
 
 #. module: scrum
 #: help:scrum.project,effective_hours:0
 msgid "Sum of spent hours of all tasks related to this project."
 msgstr ""
+"Soma das horas gastas em todas as tarefas relacionadas a este projeto"
 
 #. module: scrum
 #: help:scrum.task,project_id:0
@@ -619,27 +636,30 @@ msgid ""
 "If you have [?] in the project name, it means there are no analytic account "
 "linked to this project."
 msgstr ""
+"Se existir [?] no nome do projeto, isto significa que não há conta analítica "
+"associada a este projeto."
 
 #. module: scrum
 #: help:scrum.project,planned_hours:0
 msgid "Sum of planned hours of all tasks related to this project."
 msgstr ""
+"Soma das horas planejadas para as tarefas relacionadas a este projeto"
 
 #. module: scrum
 #: field:scrum.project,warn_customer:0
 msgid "Warn Partner"
-msgstr ""
+msgstr "Alerte o Parceiro"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
 msgid "My Sprints (Product Owner)"
-msgstr ""
+msgstr "Meus Sprints"
 
 #. module: scrum
 #: field:scrum.task,name:0
 msgid "Task summary"
-msgstr ""
+msgstr "Sumário da tarefa"
 
 #. module: scrum
 #: help:scrum.project,category_id:0
@@ -648,6 +668,9 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
+"Associe este projeto a uma conta analítica se precisar gerencia financeira "
+"nos projetos com análise de orçamentos, planejamento, custo e retorno, "
+"planilha de tempo em projetos, etc."
 
 #. module: scrum
 #: selection:scrum.product.backlog,state:0
@@ -655,18 +678,18 @@ msgstr ""
 #: selection:scrum.sprint,state:0
 #: selection:scrum.task,state:0
 msgid "Done"
-msgstr ""
+msgstr "Concluído"
 
 #. module: scrum
 #: wizard_button:scrum.product.backlog.task.create,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: scrum
 #: selection:scrum.product.backlog,state:0
 #: selection:scrum.sprint,state:0
 msgid "Open"
-msgstr ""
+msgstr "Abrir"
 
 #. module: scrum
 #: view:scrum.product.backlog:0
@@ -675,22 +698,22 @@ msgstr ""
 #: view:scrum.sprint:0
 #: field:scrum.sprint,effective_hours:0
 msgid "Effective hours"
-msgstr ""
+msgstr "Horas efetivas"
 
 #. module: scrum
 #: field:scrum.project,warn_manager:0
 msgid "Warn Manager"
-msgstr ""
+msgstr "Avisar o Gestor"
 
 #. module: scrum
 #: selection:scrum.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Em progresso"
 
 #. module: scrum
 #: field:scrum.sprint,review:0
 msgid "Sprint Review"
-msgstr ""
+msgstr "Revisão do Sprint"
 
 #. module: scrum
 #: constraint:ir.model:0
@@ -703,52 +726,52 @@ msgstr ""
 #. module: scrum
 #: field:scrum.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Horas Restantes"
 
 #. module: scrum
 #: field:scrum.task,parent_id:0
 msgid "Parent Task"
-msgstr ""
+msgstr "Tarefa Pai"
 
 #. module: scrum
 #: field:scrum.product.backlog,name:0
 msgid "Feature"
-msgstr ""
+msgstr "Característica"
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
 #: selection:scrum.task,priority:0
 msgid "Very Low"
-msgstr ""
+msgstr "Muito Baixa"
 
 #. module: scrum
 #: help:scrum.project,timesheet_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
+msgstr "Tabela de horas trabalhadas para ajustar o gráfico de Gantt"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
 msgid "Sprints Done"
-msgstr ""
+msgstr "Sprints Terminados"
 
 #. module: scrum
 #: model:process.transition,name:scrum.process_transition_backlogtask0
 msgid "Backlog Task"
-msgstr ""
+msgstr "Tarefa de Backlog"
 
 #. module: scrum
 #: view:scrum.product.backlog:0
 #: view:scrum.project:0
 #: view:scrum.sprint:0
 msgid "Planned hours"
-msgstr ""
+msgstr "Horas Planejadas"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_scrum_project_form
 #: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
 msgid "Edit Projects"
-msgstr ""
+msgstr "Editar Projetos"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_meeting_form
@@ -756,97 +779,97 @@ msgstr ""
 #: model:ir.ui.menu,name:scrum.menu_action_meeting_form
 #: view:scrum.meeting:0
 msgid "Scrum Meeting"
-msgstr ""
+msgstr "Reunião de Scrum"
 
 #. module: scrum
 #: field:scrum.task,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descrição"
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
 #: selection:scrum.task,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "Urgente"
 
 #. module: scrum
 #: view:scrum.sprint:0
 msgid "Daily Meetings"
-msgstr ""
+msgstr "Reuniões Diárias"
 
 #. module: scrum
 #: view:scrum.meeting:0
 msgid "What are you working on today ?"
-msgstr ""
+msgstr "No que você está trabalhando hoje?"
 
 #. module: scrum
 #: selection:scrum.project,state:0
 msgid "Running"
-msgstr ""
+msgstr "Em execução"
 
 #. module: scrum
 #: field:scrum.product.backlog,progress:0
 #: field:scrum.sprint,progress:0
 msgid "Progress (0-100)"
-msgstr ""
+msgstr "Progresso (0-100)"
 
 #. module: scrum
 #: model:ir.model,name:scrum.model_scrum_team
 msgid "Scrum Team"
-msgstr ""
+msgstr "Equipe do Scrum"
 
 #. module: scrum
 #: model:ir.model,name:scrum.model_scrum_project
 #: field:scrum.product.backlog,project_id:0
 msgid "Scrum Project"
-msgstr ""
+msgstr "Projeto Scrum"
 
 #. module: scrum
 #: field:scrum.project,parent_id:0
 msgid "Parent project"
-msgstr ""
+msgstr "Projeto pai"
 
 #. module: scrum
 #: view:scrum.sprint:0
 msgid "Sprint Info"
-msgstr ""
+msgstr "Informação do Sprint"
 
 #. module: scrum
 #: field:scrum.sprint,scrum_master_id:0
 msgid "Scrum Master"
-msgstr ""
+msgstr "Scrum Master"
 
 #. module: scrum
 #: field:scrum.product.backlog,tasks_id:0
 msgid "Tasks Details"
-msgstr ""
+msgstr "Detalhes das Tarefas"
 
 #. module: scrum
 #: field:scrum.task,effective_hours:0
 msgid "Hours Spent"
-msgstr ""
+msgstr "Horas Gastas"
 
 #. module: scrum
 #: field:scrum.task,context_id:0
 msgid "Context"
-msgstr ""
+msgstr "Contexto"
 
 #. module: scrum
 #: field:scrum.task,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Total de Horas"
 
 #. module: scrum
 #: field:scrum.team,users_id:0
 msgid "Users"
-msgstr ""
+msgstr "Usuários"
 
 #. module: scrum
 #: field:scrum.product.backlog,sequence:0
 #: field:scrum.project,priority:0
 #: field:scrum.task,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seqüência"
 
 #. module: scrum
 #: help:scrum.project,warn_footer:0
@@ -854,27 +877,29 @@ msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Rodapé adicionado no email para a mensagem de aviso envaiada para o cliente "
+"quando a tarefa é encerrada."
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
 #: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
 msgid "Opened Backlogs"
-msgstr ""
+msgstr "Backlogs Abertos"
 
 #. module: scrum
 #: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
 msgid "Created tasks"
-msgstr ""
+msgstr "Tarefas Criadas"
 
 #. module: scrum
 #: constraint:scrum.project:0
 msgid "Error ! You can not create recursive projects."
-msgstr ""
+msgstr "Erro ! Você não pode criar projetos recursivos."
 
 #. module: scrum
 #: wizard_field:scrum.product.backlog.task.create,init,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Atribuir para"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_form
@@ -882,14 +907,14 @@ msgstr ""
 #: field:scrum.meeting,sprint_id:0
 #: field:scrum.product.backlog,sprint_id:0
 msgid "Sprint"
-msgstr ""
+msgstr "Sprint"
 
 #. module: scrum
 #: field:scrum.project,date_end:0
 msgid "Expected End"
-msgstr ""
+msgstr "Término Previsto"
 
 #. module: scrum
 #: field:scrum.project,warn_footer:0
 msgid "Mail Footer"
-msgstr ""
+msgstr "Rodapé de Correspondëncia"
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index 29ed303af3c..27afa608099 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-04 12:56+0000\n"
-"Last-Translator: Hilario J. Montoliu (hjmf) <Unknown>\n"
+"PO-Revision-Date: 2010-02-22 23:58+0000\n"
+"Last-Translator: Rodrigo Testa <rod-95@live.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: 2010-01-05 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -658,6 +658,11 @@ msgstr "Fecha realizado"
 msgid "Expected Shipping Date"
 msgstr "Fecha de envío prevista"
 
+#. module: stock
+#: rml:stock.picking.list:0
+msgid "Shipping Address :"
+msgstr "Dirección de envío:"
+
 #. module: stock
 #: view:stock.tracking:0
 msgid "Tracking/Serial"
diff --git a/addons/wiki/i18n/ko.po b/addons/wiki/i18n/ko.po
index c2848621910..a1a92cedc32 100644
--- a/addons/wiki/i18n/ko.po
+++ b/addons/wiki/i18n/ko.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:52+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"PO-Revision-Date: 2010-02-23 04:46+0000\n"
+"Last-Translator: CSro <choongsan@gmail.com>\n"
 "Language-Team: Korean <ko@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: 2009-12-16 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -89,7 +89,7 @@ msgstr "위키 구성"
 #. module: wiki
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "액션 정의에서 유효하지 않은 모델 이름"
 
 #. module: wiki
 #: field:wiki.groups,name:0

From 819831d71c770971ab7908be5d1c6dca2dff0950 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Tue, 23 Feb 2010 11:12:19 +0530
Subject: [PATCH 10/11] [IMP] mrp: imp. production order view

bzr revid: hmo@tinyerp.com-20100223054219-hq0tvz3b38war7l1
---
 addons/mrp/mrp_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index c7b701920e1..6c36b4c6acf 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -548,7 +548,7 @@
                         <page string="Finished Products">
                             <field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list"
                             	mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
-                            	<tree string="Products to Consume">
+                            	<tree string="Products to Finish">
                             		<field name="product_id" />
                             		<field name="product_qty" />
                             		<field name="product_uom" />
@@ -563,7 +563,7 @@
                             			icon="gtk-justify-fill" context="{'scrap': True}"
                             			states="draft,waiting,confirmed,assigned" />
                             	</tree>
-                            	<form string="Products to Consume">
+                            	<form string="Products to Finish">
                             		<field name="product_id" />
                             		<field name="product_qty" />
                             		<field name="product_uom" />
@@ -572,7 +572,7 @@
 
                             <field colspan="2" name="move_created_ids2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
                            			widget="one2many_list" mode="tree,form" height="275">
-                           		<tree string="Consumed Products" editable="bottom">
+                           		<tree string="Finished Products" editable="bottom">
                            			<field name="product_id" readonly="1"/>
                            			<field name="product_qty" readonly="1"/>
                            			<field name="product_uom" readonly="1" />
@@ -585,7 +585,7 @@
                            				string="D" type="action" icon="gtk-go-forward" 
                            				states="done,cancel" />
                            		</tree>
-                           		<form string="Consumed Products">
+                           		<form string="Finished Products">
                            			<field name="product_id" />
                            			<field name="product_qty" />
                            			<field name="product_uom" />

From 2138f7608d6061eaebfac460e688fc6f649a1a77 Mon Sep 17 00:00:00 2001
From: "HDA (OpenERP)" <hda@tinyerp.com>
Date: Tue, 23 Feb 2010 12:03:50 +0530
Subject: [PATCH 11/11] Added customer price field in product list view

bzr revid: hda@tinyerp.com-20100223063350-y1ngdbpys6tfzs2v
---
 addons/product/product_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 1f7fc3f3c72..9b13ceaf152 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -37,6 +37,7 @@
                     <field name="virtual_available"/>
                     <field name="lst_price"/>
                     <field name="standard_price"/>
+                    <field name="price" invisible="not context.get('pricelist',False)"/>
                     <field name="state"/>
                 </tree>
             </field>