From 62d3ab394166e42365b5a2b6b08d712da2a29114 Mon Sep 17 00:00:00 2001
From: niv <niv@niv-laptop>
Date: Fri, 15 Oct 2010 17:46:03 +0200
Subject: [PATCH 001/114] [ADD] Added possibility to set a default account tax
 to new products.

bzr revid: niv@niv-laptop-20101015154603-mm39x167qtoitgxd
---
 addons/account/account.py       | 25 +++++++++++++++++++++++++
 addons/account/account_view.xml |  5 ++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 5de913c45a7..0afd89a48a3 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2537,7 +2537,22 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts', required=True),
         'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
         'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."),
+        "sale_tax": fields.many2one("account.tax.template", "Sale Tax"),
+        "purchase_tax": fields.many2one("account.tax.template", "Purchase Tax"),
     }
+    def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None):
+        res = {}
+        res['value'] = {}
+        res['value']["sale_tax"] = False
+        res['value']["purchase_tax"] = False
+        if chart_template_id:
+            ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
+                                          , "=", chart_template_id)], order="sequence")
+            if len(ids) > 0:
+                id=ids[0]
+                res['value']["sale_tax"] = id
+                res['value']["purchase_tax"] = id
+        return res
 
     def _get_chart(self, cr, uid, context={}):
         ids = self.pool.get('account.chart.template').search(cr, uid, [], context=context)
@@ -2553,6 +2568,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
     def execute(self, cr, uid, ids, context=None):
         obj_multi = self.browse(cr, uid, ids[0])
+        
         obj_acc = self.pool.get('account.account')
         obj_acc_tax = self.pool.get('account.tax')
         obj_journal = self.pool.get('account.journal')
@@ -2591,6 +2607,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             tax_code_template_ref[tax_code_template.id] = new_tax_code
 
         #create all the tax
+        tax_template_to_tax = {}
         for tax in obj_multi.chart_template_id.tax_template_ids:
             #create it
             vals_tax = {
@@ -2619,8 +2636,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'type_tax_use': tax.type_tax_use
             }
             new_tax = obj_acc_tax.create(cr, uid, vals_tax)
+            tax_template_to_tax[tax.id] = new_tax
             #as the accounts have not been created yet, we have to wait before filling these fields
             todo_dict[new_tax] = {
+                                  
                 'account_collected_id': tax.account_collected_id and tax.account_collected_id.id or False,
                 'account_paid_id': tax.account_paid_id and tax.account_paid_id.id or False,
             }
@@ -2842,6 +2861,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                         'position_id': new_fp,
                     }
                     obj_ac_fp.create(cr, uid, vals_acc)
+        
+        ir_values = self.pool.get('ir.values')
+        ir_values.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id
+                      , models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.sale_tax.id]])
+        ir_values.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=obj_multi.company_id.id
+                      , models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.purchase_tax.id]])
 
 wizard_multi_charts_accounts()
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 49de367122b..ce0985ab7ec 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2412,8 +2412,11 @@
                 <group string="res_config_contents" position="replace">
                   <field name="company_id" widget="selection"/>
                   <field name ="code_digits" />
-                  <field name="chart_template_id" widget="selection"/>
+                  <field name="chart_template_id" widget="selection"
+                  		on_change="onchange_chart_template_id(chart_template_id)"/>
                   <field name ="seq_journal" />
+                  <field name="sale_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False)]"/>
+                  <field name="purchase_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False)]"/>
                   <field colspan="4" mode="tree" name="bank_accounts_id"
                          nolabel="1" widget="one2many_list">
                     <form string="Bank Information">

From e5fb3a0780c8ce5b0fbd9373c167d782c0914db5 Mon Sep 17 00:00:00 2001
From: niv <niv@niv-laptop>
Date: Mon, 18 Oct 2010 11:37:58 +0200
Subject: [PATCH 002/114] [FIX] Fixed incorrect merge

bzr revid: niv@niv-laptop-20101018093758-j99jast7cjx934s2
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 2a7af0b9e5b..ce2053e69a3 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2415,7 +2415,7 @@
                 <group string="res_config_contents" position="replace">
                     <field name="company_id" widget="selection"/>
                     <field name ="code_digits" groups="base.group_extended"/>
-                    <field name="chart_template_id" widget="selection"/>
+                    <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)"/>
                     <field name ="seq_journal" groups="base.group_extended"/>
                   <field name="sale_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False)]"/>
                   <field name="purchase_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False)]"/>

From 9e7d695c3f403dacf09d6f105ffeae69552d1f5e Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 18 Oct 2010 16:16:39 +0530
Subject: [PATCH 003/114] [FIX]

bzr revid: mra@mra-laptop-20101018104639-r9jhqu31ar79nbih
---
 addons/account/account_move_line.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 6bed1f0f396..7e5f9742746 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -177,7 +177,7 @@ class account_move_line(osv.osv):
                     for item in i[2]:
                             data[item] = i[2][item]
             if context['journal']:
-                journal_data = obj_journal.browse(cr, uid, context['journal'])
+                journal_data = journal_obj.browse(cr, uid, context['journal'])
                 if journal_data.type == 'purchase':
                     if total_new > 0:
                         account = journal_data.default_credit_account_id

From ac690626e00fb0a2d53e09647dc54383fed5fdc2 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 18 Oct 2010 16:33:56 +0530
Subject: [PATCH 004/114] [FIX]

bzr revid: mra@mra-laptop-20101018110356-8t6yqcdi84zbr8lh
---
 addons/account/account_move_line.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 7e5f9742746..41d413fbbf5 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -293,6 +293,8 @@ class account_move_line(osv.osv):
         return data
 
     def on_create_write(self, cr, uid, id, context={}):
+        if not id:
+            return []
         ml = self.browse(cr, uid, id, context)
         return map(lambda x: x.id, ml.move_id.line_id)
 

From 3e828804235ee9a7865990d9dab12910a2a61185 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 18 Oct 2010 18:13:04 +0530
Subject: [PATCH 005/114] [FIX] account coda: if there is not coda statement
 raise error

bzr revid: ara@tinyerp.com-20101018124304-3jl0c1uy39b146xl
---
 addons/account_coda/account_coda.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/account_coda/account_coda.py b/addons/account_coda/account_coda.py
index 8dd4067c571..caafe9f30da 100644
--- a/addons/account_coda/account_coda.py
+++ b/addons/account_coda/account_coda.py
@@ -22,6 +22,7 @@
 import time
 
 from osv import osv,fields
+from tools.translate import _
 
 class account_coda(osv.osv):
     _name = "account.coda"
@@ -41,6 +42,13 @@ class account_coda(osv.osv):
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.coda', context=c),
     }
 
+    def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
+        res = super(account_coda, self).search(cr, user, args=args, offset=offset, limit=limit, order=order,
+                context=context, count=count)
+        if not res:
+            raise osv.except_osv('Error', _('Coda file not found for bank statement !!'))
+        return res
+
 account_coda()
 
 class account_bank_statement(osv.osv):

From b7eb35f51588db1a1c410a5727bf5ef2c29a0d4a Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Tue, 19 Oct 2010 11:01:59 +0530
Subject: [PATCH 006/114] [FIX] account coda: if there is not coda statement
 raise error

bzr revid: ara@tinyerp.com-20101019053159-kl96unqmg03l6trv
---
 addons/account_coda/account_coda.py       |  2 +-
 addons/account_coda/account_coda_view.xml | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/account_coda/account_coda.py b/addons/account_coda/account_coda.py
index caafe9f30da..24d928a2fd0 100644
--- a/addons/account_coda/account_coda.py
+++ b/addons/account_coda/account_coda.py
@@ -45,7 +45,7 @@ class account_coda(osv.osv):
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         res = super(account_coda, self).search(cr, user, args=args, offset=offset, limit=limit, order=order,
                 context=context, count=count)
-        if not res:
+        if context.get('bank_statement', False) and not res:
             raise osv.except_osv('Error', _('Coda file not found for bank statement !!'))
         return res
 
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 7c7a10a05a3..a16e68d5ee0 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -80,12 +80,13 @@
      id="menu_account_coda_import" sequence="20"/>
 
     <act_window name="Coda File"
-        domain="[('statement_ids', 'in', [active_id])]"
-        res_model="account.coda"
-        src_model="account.bank.statement"
-        view_type="form"
-        view_mode="tree,form"
-         id="act_account_payment_account_bank_statement"/>
+		domain="[('statement_ids', 'in', [active_id])]"
+		context="{'bank_statement': 1}"
+		res_model="account.coda"
+		src_model="account.bank.statement"
+		view_type="form"
+		view_mode="tree,form"
+		id="act_account_payment_account_bank_statement"/>
 
     </data>
 </openerp>

From 69549b1571f4b6e03e6e91268bf36f7d091efbe0 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Tue, 19 Oct 2010 11:18:51 +0530
Subject: [PATCH 007/114] [FIX] account :
 accout/configration/miscellanious/recurring models  add default value to the
 company_id

bzr revid: vth@tinyerp.com-20101019054851-cqupju2q8vgeil9n
---
 addons/account/account.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index ecadfaf37f9..3eedfc7ce65 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -458,7 +458,7 @@ class account_account(osv.osv):
                 ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit)
             if not ids and len(name.split()) >= 2:
                 #Separating code and name of account for searching
-                operand1,operand2 = name.split(' ',1) #name can contain spaces e.g. OpenERP S.A. 
+                operand1,operand2 = name.split(' ',1) #name can contain spaces e.g. OpenERP S.A.
                 ids = self.search(cr, user, [('code', operator, operand1), ('name', operator, operand2)]+ args, limit=limit)
         else:
             ids = self.search(cr, user, args, context=context, limit=limit)
@@ -2025,6 +2025,7 @@ class account_model(osv.osv):
 
     _defaults = {
         'legend': lambda self, cr, uid, context:_('You can specify year, month and date in the name of the model using the following labels:\n\n%(year)s: To Specify Year \n%(month)s: To Specify Month \n%(date)s: Current Date\n\ne.g. My model on %(date)s'),
+         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.model', context=c),
     }
     def generate(self, cr, uid, ids, datas={}, context=None):
         move_ids = []

From 3ce4c36d04e3ab5e01041a14691e4ea282279db6 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 19 Oct 2010 14:37:55 +0530
Subject: [PATCH 008/114] [IMP] l10n_lu:-improvement in yml

bzr revid: mtr@mtr-20101019090755-wwsmqfxojpurmlc6
---
 addons/l10n_lu/test/l10n_lu_report.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_lu/test/l10n_lu_report.yml b/addons/l10n_lu/test/l10n_lu_report.yml
index 43b1ce35df1..b6b273c5a76 100644
--- a/addons/l10n_lu/test/l10n_lu_report.yml
+++ b/addons/l10n_lu/test/l10n_lu_report.yml
@@ -9,6 +9,10 @@
 -
   !python {model: res.partner}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.l10n_lu.tax.report.print').create(cr, uid, [], {'model':'ir.ui.menu', 'form':{'tax_code_id': ref('account_tax_code_id_r1'), 'period_id': ref('account.period_1')}}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'l10n_lu-vat_report.'+format), 'wb+').write(data)
+    try:
+        (data, format) = netsvc.LocalService('report.l10n_lu.tax.report.print').create(cr, uid, [], {'model':'ir.ui.menu', 'form':{'tax_code_id': ref('account_tax_code_id_r1'), 'period_id': ref('account.period_1')}}, {})
+        if tools.config['test_report_directory']:
+            file(os.path.join(tools.config['test_report_directory'], 'l10n_lu-vat_report.'+format), 'wb+').write(data)
+    except:
+        pass
+    

From c232ca85b3812004dd1fe5fa73f6fcd08d335f96 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Tue, 19 Oct 2010 14:42:45 +0530
Subject: [PATCH 009/114] [FIX] account: remove warning from 
 account/wizard/account_chart.py

bzr revid: vth@tinyerp.com-20101019091245-tepif0h5z8lwwjkq
---
 addons/account/wizard/account_chart.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index b87c11f02f3..fdf684b2522 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import time
 from osv import fields, osv
 
 class account_chart(osv.osv_memory):

From 378fb690e3c4fb0a0a7f225b1b11e9c39637a981 Mon Sep 17 00:00:00 2001
From: ssi <ssi@tinyerp.com>
Date: Tue, 19 Oct 2010 14:43:05 +0530
Subject: [PATCH 010/114] [FIX]account: Open current refunded invoice after
 invoice refund.

bzr revid: ssi@tinyerp.com-20101019091305-lh1uaiykp0bkxc9s
---
 addons/account/wizard/account_invoice_refund.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index 0c866853594..b5059447ebc 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -210,9 +210,11 @@ class account_invoice_refund(osv.osv_memory):
             result = mod_obj._get_id(cr, uid, 'account', xml_id)
             id = mod_obj.read(cr, uid, result, ['res_id'], context=context)['res_id']
             result = act_obj.read(cr, uid, id, context=context)
-            result['res_id'] = created_inv
+            invoice_domain = eval(result['domain'])
+            invoice_domain.append(('id', '=', created_inv))
+            result['domain'] = invoice_domain
             return result
-
+        
     def invoice_refund(self, cr, uid, ids, context=None):
         data_refund = self.read(cr, uid, ids, [],context=context)[0]['filter_refund']
         return self.compute_refund(cr, uid, ids, data_refund, context=context)

From 74dc9a43786b367b0c8508e2cf1c46ad50d31e4c Mon Sep 17 00:00:00 2001
From: ssi <ssi@tinyerp.com>
Date: Tue, 19 Oct 2010 15:08:21 +0530
Subject: [PATCH 011/114] [FIX]hr_evaluation: removed unsued variables

bzr revid: ssi@tinyerp.com-20101019093821-ax5rhud1f8cna492
---
 addons/hr_evaluation/hr_evaluation.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 3c5a150691e..cca922304aa 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -200,14 +200,12 @@ class hr_evaluation(osv.osv):
             for employee in employee_obj.browse(cr, uid, [employee_id], context=context):
                 if employee and employee.evaluation_plan_id and employee.evaluation_plan_id.id:
                     evaluation_plan_id=employee.evaluation_plan_id.id
-                employee_ids=employee_obj.search(cr, uid, [('parent_id','=',employee.id)], context=context)
         return {'value': {'plan_id':evaluation_plan_id}}
 
     def button_plan_in_progress(self, cr, uid, ids, context=None):
         hr_eval_inter_obj = self.pool.get('hr.evaluation.interview')
         if context is None:
             context = {}
-        apprai_id = []
         for evaluation in self.browse(cr, uid, ids, context=context):
             wait = False
             for phase in evaluation.plan_id.phase_ids:

From dafd8d70f9b6949925a04f9100683fbce1114822 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Tue, 19 Oct 2010 15:53:06 +0530
Subject: [PATCH 012/114] [IMP] Event: Remove the repeated user_id and change
 the position of state in tree view

bzr revid: ara@tinyerp.com-20101019102306-0x89ew6rjzx7tana
---
 addons/event/event_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 918147b79cb..f900cb7b3a6 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -171,7 +171,6 @@
             <field name="arch" type="xml">
                 <tree string="Events" colors="red:register_min>register_current;black:register_min&lt;=register_current">
                     <field name="name" string="Name"/>
-                    <field name="user_id"/>
                     <field name="main_speaker_id"/>
                     <field name="language"/>
                     <field name="type"/>
@@ -180,8 +179,8 @@
                     <field name="register_min"/>
                     <field name="register_current"/>
                     <field name="section_id" invisible="context.get('invisible_section', True)"/>
-                    <field name="state"/>
                     <field name="user_id"/>
+                    <field name="state"/>
                     <button string="Confirm Event" help="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
                     <button string="Cancel Event" help="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
                     <button string="Event Done" help="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>

From f3ed9143b98b30b4057b902a9988519ef72c4035 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 19 Oct 2010 16:04:33 +0530
Subject: [PATCH 013/114] [IMP] sale_analytic_plans:-removed unwanted attribute

bzr revid: mtr@mtr-20101019103433-vfqzst2zwta9sxdm
---
 addons/sale_analytic_plans/sale_analytic_plans_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index 932b54898e9..c912f5edb81 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -30,7 +30,7 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="sale.view_order_line_form2"/>
         <field name="arch" type="xml">
-            <field name="product_id" readonly="1" select="1" position="after">
+            <field name="product_id" position="after">
                 <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
             </field>
         </field>

From a6f62d8d1ed22825fe387896b3ff599b9a6c6273 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 19 Oct 2010 16:20:40 +0530
Subject: [PATCH 014/114] [REF] account: invoice analysis report

bzr revid: mra@mra-laptop-20101019105040-c3dgbzqs8nxnw6i3
---
 .../report/account_invoice_report_view.xml    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 839bfb2ed26..8f9e582c321 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -98,17 +98,6 @@
                    <field name="categ_id" />
                 </group>
                 <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="product_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="journal_id" widget="selection"/>
-                    <field name="account_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="date_due"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                </group>
-                <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
                     <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
@@ -130,6 +119,17 @@
                     <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/>
                     <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>
                 </group>
+                <newline/>
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="product_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="journal_id" widget="selection"/>
+                    <field name="account_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="date_due"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </group>
             </search>
         </field>
     </record>

From f85650ec7fabf4f4c79674810835177a7d155e97 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Tue, 19 Oct 2010 16:32:07 +0530
Subject: [PATCH 015/114] [FIX] event: act_window of registration add domain
 instead of context

bzr revid: vth@tinyerp.com-20101019110207-25cwcemt7div1mh0
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index f900cb7b3a6..04ea01915e2 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -280,7 +280,7 @@
             res_model="event.registration"
             src_model="event.event"
             view_mode="tree,form,calendar,graph"
-            context="{'search_default_event_id': active_id}"
+            domain="[('event_id','=',active_id)]"
             view_type="form"/>
 
       <act_window

From 5601e8e984615953e0b8a80f8831b3001dfca7e4 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Tue, 19 Oct 2010 16:44:23 +0530
Subject: [PATCH 016/114] [FIX]
 account,account_invoice_layout,l10n_ch,report_intrastate: Fix the warning of
 account.invoice

bzr revid: ara@tinyerp.com-20101019111423-lv2fndb2rvuw920v
---
 addons/account/test/account_report.yml        | 17 ++++++++++++--
 .../test/account_invoice_layout_report.yml    | 23 +++++++++++++++----
 addons/l10n_ch/test/l10n_ch_report.yml        | 19 ++++++++++++---
 .../test/report_instratat_report.yml          | 17 ++++++++++++--
 4 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 26888cc69c1..c780bf94682 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -1,9 +1,22 @@
+-
+  In order to test the PDF reports defined on an invoice, we will create a Invoice Record
+-
+  !record {model: account.invoice, id: test_invoice_1}:
+	currency_id: base.EUR
+    company_id: base.main_company
+    address_invoice_id: base.res_partner_address_tang
+    partner_id: base.res_partner_asus
+    state: draft
+    type: out_invoice
+    account_id: account.a_recv
+    name: Test invoice 1
+    address_contact_id: base.res_partner_address_tang
 -
   In order to test the PDF reports defined on an invoice, we will print an Invoice Report
 -
   !python {model: account.invoice}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
+    (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('test_invoice_1')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account-invoice.'+format), 'wb+').write(data)
 
@@ -56,7 +69,7 @@
 -
   !python {model: account.invoice}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
+    (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('test_invoice_1')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account-invoice.'+format), 'wb+').write(data)
 
diff --git a/addons/account_invoice_layout/test/account_invoice_layout_report.yml b/addons/account_invoice_layout/test/account_invoice_layout_report.yml
index b7b1c1e76cc..0c1f2df7954 100644
--- a/addons/account_invoice_layout/test/account_invoice_layout_report.yml
+++ b/addons/account_invoice_layout/test/account_invoice_layout_report.yml
@@ -1,9 +1,22 @@
+-
+  In order to Print the Invoice layout report in Normal Mode, we will create a invoice record
+-
+  !record {model: account.invoice, id: test_invoice_1}:
+	currency_id: base.EUR
+    company_id: base.main_company
+    address_invoice_id: base.res_partner_address_tang
+    partner_id: base.res_partner_asus
+    state: draft
+    type: out_invoice
+    account_id: account.a_recv
+    name: Test invoice 1
+    address_contact_id: base.res_partner_address_tang
 -
   Print the Invoice layout report in Normal Mode
-- 
+-
   !python {model: account.invoice}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.account.invoice.layout').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
+    (data, format) = netsvc.LocalService('report.account.invoice.layout').create(cr, uid, [ref('test_invoice_1')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account_invoice_layout.'+format), 'wb+').write(data)
 -
@@ -11,7 +24,7 @@
 -
   !python {model: account.invoice}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'account.invoice', 'form': {'message':ref('account_invoice_layout.demo_message1'),'id':ref('account.test_invoice_1'),'context':{}}}
-    (data, format) = netsvc.LocalService('report.notify_account.invoice').create(cr, uid, [ref('account.test_invoice_1')], data_dict, {})
+    data_dict = {'model': 'account.invoice', 'form': {'message':ref('account_invoice_layout.demo_message1'),'id':ref('test_invoice_1'),'context':{}}}
+    (data, format) = netsvc.LocalService('report.notify_account.invoice').create(cr, uid, [ref('test_invoice_1')], data_dict, {})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account_invoice_layout_message_report.'+format), 'wb+').write(data) 
\ No newline at end of file
+       file(os.path.join(tools.config['test_report_directory'], 'account_invoice_layout_message_report.'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/l10n_ch/test/l10n_ch_report.yml b/addons/l10n_ch/test/l10n_ch_report.yml
index a8a976bc424..24f7a9154ec 100644
--- a/addons/l10n_ch/test/l10n_ch_report.yml
+++ b/addons/l10n_ch/test/l10n_ch_report.yml
@@ -1,11 +1,24 @@
+-
+  In order to test the PDF reports defined on a l10n_ch, we will create a invoice record
+-
+  !record {model: account.invoice, id: test_invoice_1}:
+  	currency_id: base.EUR
+	company_id: base.main_company
+	address_invoice_id: base.res_partner_address_tang
+	partner_id: base.res_partner_asus
+	state: draft
+	type: out_invoice
+	account_id: account.a_recv
+	name: Test invoice 1
+	address_contact_id: base.res_partner_address_tang
 -
   In order to test the PDF reports defined on a l10n_ch, we will print BVR Report
 -
   !python {model: account.invoice}: |
     import netsvc, tools, os
-    run_str = 'cp ' + tools.config['addons_path'] + '/l10n_ch/report/ocrbb.ttf' + ' ' + '/tmp/ocrbb.ttf' 
+    run_str = 'cp ' + tools.config['addons_path'] + '/l10n_ch/report/ocrbb.ttf' + ' ' + '/tmp/ocrbb.ttf'
     os.system(run_str)
-    (data, format) = netsvc.LocalService('report.l10n_ch.bvr').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
+    (data, format) = netsvc.LocalService('report.l10n_ch.bvr').create(cr, uid, [ref('test_invoice_1')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'l10ch-bvr_report.'+format), 'wb+').write(data)
 
@@ -14,6 +27,6 @@
 -
   !python {model: account.invoice}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.l10n_ch.invoice.bvr').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
+    (data, format) = netsvc.LocalService('report.l10n_ch.invoice.bvr').create(cr, uid, [ref('test_invoice_1')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'l10ch-bvr_invoice_report.'+format), 'wb+').write(data)
diff --git a/addons/report_intrastat/test/report_instratat_report.yml b/addons/report_intrastat/test/report_instratat_report.yml
index c6162f51c25..858f9330358 100644
--- a/addons/report_intrastat/test/report_instratat_report.yml
+++ b/addons/report_intrastat/test/report_instratat_report.yml
@@ -1,8 +1,21 @@
+-
+  In order to test the PDF reports defined using report_instratat module, we will create a invoice record
+-
+  !record {model: account.invoice, id: test_invoice_1}:
+	currency_id: base.EUR
+    company_id: base.main_company
+    address_invoice_id: base.res_partner_address_tang
+    partner_id: base.res_partner_asus
+    state: draft
+    type: out_invoice
+    account_id: account.a_recv
+    name: Test invoice 1
+    address_contact_id: base.res_partner_address_tang
 -
   In order to test the PDF reports defined using report_instratat module, we print a Instratat Report
-- 
+-
   !python {model: account.invoice}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.account.invoice.intrastat').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
+    (data, format) = netsvc.LocalService('report.account.invoice.intrastat').create(cr, uid, [ref('test_invoice_1')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'report_instratat-instrastat_report.'+format), 'wb+').write(data)

From 4b4daa0294b948b25b5d718db19d57f60492514b Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Tue, 19 Oct 2010 16:52:15 +0530
Subject: [PATCH 017/114] [FIX] membership : remove state field from search
 view as it is not appear in the column of the report.membership object

bzr revid: vth@tinyerp.com-20101019112215-426j15f9d0btxdr5
---
 addons/membership/report/report_membership_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index d36b4af0afe..6e217dd1f51 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -46,7 +46,6 @@
                         <separator orientation="vertical"/>
                         <field name="partner_id"/>
                         <field name="membership_id"/>
-                        <field name="state"/>
                         <field name="user_id"/>
                     </group>
                     <newline/>

From 10df4b2f16803b061d33d7dc54885bcd6c6220dd Mon Sep 17 00:00:00 2001
From: ssi <ssi@tinyerp.com>
Date: Tue, 19 Oct 2010 17:16:32 +0530
Subject: [PATCH 018/114] [IMP]membership: added membership field to membership
 product and improved module according to pep-8

bzr revid: ssi@tinyerp.com-20101019114632-d9nt67foknp10p2s
---
 addons/membership/membership.py               | 39 +++++++++----------
 addons/membership/membership_view.xml         |  1 +
 addons/membership/report/__init__.py          |  1 +
 addons/membership/report/report_membership.py |  2 +-
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 4cd16b72322..85cc0df43b7 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -74,7 +74,7 @@ class membership_line(osv.osv):
                 )
             JOIN account_invoice ai ON (
             ai.id = ail.invoice_id)
-            WHERE ml.id IN %s''',(tuple(ids),))
+            WHERE ml.id IN %s''', (tuple(ids),))
         res = cr.fetchall()
         for r in res:
             if r[0] and r[0] < 0:
@@ -139,14 +139,13 @@ class membership_line(osv.osv):
         'date_to': fields.date('To', readonly=True),
         'date_cancel': fields.date('Cancel date'),
         'date': fields.date('Join Date'),
-        'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True),
+        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True),
         'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
         'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
-        'state': fields.function(
-                        _state, method=True,
+        'state': fields.function(_state, method=True,
                         string='Membership State', type='selection',
                         selection=STATE, store = {
-                        'account.invoice':(_get_membership_lines, ['state'], 10),
+                        'account.invoice': (_get_membership_lines, ['state'], 10),
                         }),
         'company_id': fields.related('account_invoice_line', 'invoice_id', 'company_id', type="many2one", relation="res.company", string="Company", readonly=True, store=True)
     }
@@ -172,7 +171,7 @@ class Partner(osv.osv):
             list_partner.append(data.partner.id)
         ids2 = list_partner
         while ids2:
-            ids2 = res_obj.search(cr, uid, [('associate_member','in',ids2)], context=context)
+            ids2 = res_obj.search(cr, uid, [('associate_member', 'in', ids2)], context=context)
             list_partner += ids2
         return list_partner
 
@@ -185,7 +184,7 @@ class Partner(osv.osv):
             list_partner.append(data.partner_id.id)
         ids2 = list_partner
         while ids2:
-            ids2 = res_obj.search(cr, uid, [('associate_member','in',ids2)], context=context)
+            ids2 = res_obj.search(cr, uid, [('associate_member', 'in', ids2)], context=context)
             list_partner += ids2
         return list_partner
 
@@ -232,7 +231,7 @@ class Partner(osv.osv):
                                 s = 3
                 if s==4:
                     for mline in partner_data.member_lines:
-                        if mline.date_from < today and mline.date_to < today and mline.date_from<=mline.date_to and (mline.account_invoice_line and mline.account_invoice_line.invoice_id.state) == 'paid':
+                        if mline.date_from < today and mline.date_to < today and mline.date_from <= mline.date_to and (mline.account_invoice_line and mline.account_invoice_line.invoice_id.state) == 'paid':
                             s = 5
                         else:
                             s = 6
@@ -294,7 +293,7 @@ class Partner(osv.osv):
     def _get_partners(self, cr, uid, ids, context=None):
         ids2 = ids
         while ids2:
-            ids2 = self.search(cr, uid, [('associate_member','in',ids2)], context=context)
+            ids2 = self.search(cr, uid, [('associate_member', 'in', ids2)], context=context)
             ids += ids2
         return ids
 
@@ -331,7 +330,7 @@ class Partner(osv.osv):
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
-                        'res.partner': (lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)
+                        'res.partner': (lambda self, cr, uid, ids, c={}:ids, ['free_member'], 10)
                     }),
         'membership_cancel': fields.function(
                     _membership_date, method = True,
@@ -339,7 +338,7 @@ class Partner(osv.osv):
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 11),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
-                        'res.partner': (lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)
+                        'res.partner': (lambda self, cr, uid, ids, c={}:ids, ['free_member'], 10)
                     }),
     }
     _defaults = {
@@ -380,12 +379,12 @@ class Partner(osv.osv):
         invoice_obj = self.pool.get('account.invoice')
         invoice_line_obj = self.pool.get('account.invoice.line')
         invoice_tax_obj = self.pool.get('account.invoice.tax')
-        product_id = product_id or datas.get('membership_product_id',False)
+        product_id = product_id or datas.get('membership_product_id', False)
         amount = datas.get('amount', 0.0)
         if not context:
             context={}
         invoice_list = []
-        if type(ids) in (int,long,):
+        if type(ids) in (int, long,):
             ids = [ids]
         for partner in self.browse(cr, uid, ids, context=context):
             account_id = partner.property_account_receivable and partner.property_account_receivable.id or False
@@ -442,7 +441,7 @@ class Product(osv.osv):
         model_obj = self.pool.get('ir.model.data')
 
         if ('product' in context) and (context['product']=='membership_product'):
-            model_data_ids_form = model_obj.search(cr, user, [('model','=','ir.ui.view'), ('name','in',['membership_products_form', 'membership_products_tree'])], context=context)
+            model_data_ids_form = model_obj.search(cr, user, [('model','=','ir.ui.view'), ('name', 'in', ['membership_products_form', 'membership_products_tree'])], context=context)
             resource_id_form = model_obj.read(cr, user, model_data_ids_form, fields=['res_id', 'name'], context=context)
             dict_model = {}
             for i in resource_id_form:
@@ -462,7 +461,7 @@ class Product(osv.osv):
     }
 
     _defaults = {
-        'membership': False
+        'membership': False,
     }
 Product()
 
@@ -477,8 +476,8 @@ class Invoice(osv.osv):
         today = time.strftime('%Y-%m-%d')
         for invoice in self.browse(cr, uid, ids):
             mlines = member_line_obj.search(cr, uid,
-                    [('account_invoice_line','in',
-                        [ l.id for l in invoice.invoice_line])])
+                    [('account_invoice_line', 'in',
+                        [l.id for l in invoice.invoice_line])])
             member_line_obj.write(cr, uid, mlines, {'date_cancel': today})
         return super(Invoice, self).action_cancel(cr, uid, ids)
 Invoice()
@@ -495,7 +494,7 @@ class account_invoice_line(osv.osv):
         member_line_obj = self.pool.get('membership.membership_line')
         for line in self.browse(cr, uid, ids, context=context):
             if line.invoice_id.type == 'out_invoice':
-                ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)], context=context)
+                ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line', '=', line.id)], context=context)
                 if line.product_id and line.product_id.membership and not ml_ids:
                     # Product line has changed to a membership product
                     date_from = line.product_id.membership_date_from
@@ -523,7 +522,7 @@ class account_invoice_line(osv.osv):
             context={}
         member_line_obj = self.pool.get('membership.membership_line')
         for id in ids:
-            ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',id)], context=context)
+            ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line', '=', id)], context=context)
             member_line_obj.unlink(cr, uid, ml_ids, context=context)
         return super(account_invoice_line, self).unlink(cr, uid, ids, context=context)
 
@@ -534,7 +533,7 @@ class account_invoice_line(osv.osv):
         line = self.browse(cr, uid, result, context=context)
         member_line_obj = self.pool.get('membership.membership_line')
         if line.invoice_id.type == 'out_invoice':
-            ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)], context=context)
+            ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line', '=', line.id)], context=context)
             if line.product_id and line.product_id.membership and not ml_ids:
                 # Product line is a membership product
                 date_from = line.product_id.membership_date_from
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index b9d99e6cdb7..b42a81ac2ec 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -63,6 +63,7 @@
                       <field name="active"/>
                       <field name="membership_date_from" required="1"/>
                       <field name="membership_date_to" required="1"/>
+					  <field name="membership"/>	
                       <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
diff --git a/addons/membership/report/__init__.py b/addons/membership/report/__init__.py
index dd247c52f3a..05c893ae400 100644
--- a/addons/membership/report/__init__.py
+++ b/addons/membership/report/__init__.py
@@ -20,3 +20,4 @@
 ##############################################################################
 
 import report_membership
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py
index 4718866d8a3..34ca21e0e9c 100644
--- a/addons/membership/report/report_membership.py
+++ b/addons/membership/report/report_membership.py
@@ -44,7 +44,7 @@ class report_membership(osv.osv):
     _rec_name = 'year'
     _columns = {
         'year': fields.char('Year', size=4, readonly=True, select=1),
-        'month':fields.selection([('01', 'January'), ('02', 'February'), \
+        'month': fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
                                   ('07', 'July'), ('08', 'August'),\

From 4fb47235f6a7027506092cece3436322ef537351 Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Tue, 19 Oct 2010 17:33:26 +0530
Subject: [PATCH 019/114] [IMP] hr modules: removed unused vars

bzr revid: pso@tinyerp.com-20101019120326-9or5zt16zo4g4ayz
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index b152e0112eb..d4cf10263f2 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -261,7 +261,7 @@ class hr_timesheet_sheet(osv.osv):
             raise osv.except_osv(_('Error !'), _('You can not sign in from an other date than today'))
         emp_ids = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
         context['sheet_id']=ids[0]
-        success = emp_obj.attendance_action_change(cr, uid, emp_ids, type='sign_in', context=context,)
+        emp_obj.attendance_action_change(cr, uid, emp_ids, type='sign_in', context=context,)
         return True
 
     def sign_out(self, cr, uid, ids, context=None):
@@ -272,7 +272,7 @@ class hr_timesheet_sheet(osv.osv):
             raise osv.except_osv(_('Error !'), _('You can not sign out from an other date than today'))
         emp_ids = emp_obj.search(cr, uid, [('user_id', '=', uid)])
         context['sheet_id']=ids[0]
-        success = emp_obj.attendance_action_change(cr, uid, emp_ids, type='sign_out', context=context,)
+        emp_obj.attendance_action_change(cr, uid, emp_ids, type='sign_out', context=context,)
         return True
 
     _columns = {

From fddbe3c3de2fdff47ec6b366ec7f9e55cddddae0 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 19 Oct 2010 17:38:05 +0530
Subject: [PATCH 020/114] [IMP] l10n_lu:-revert the changes of yml

bzr revid: mtr@mtr-20101019120805-ekfkj96a08brz93f
---
 addons/l10n_lu/test/l10n_lu_report.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/l10n_lu/test/l10n_lu_report.yml b/addons/l10n_lu/test/l10n_lu_report.yml
index b6b273c5a76..f3a35253850 100644
--- a/addons/l10n_lu/test/l10n_lu_report.yml
+++ b/addons/l10n_lu/test/l10n_lu_report.yml
@@ -9,10 +9,8 @@
 -
   !python {model: res.partner}: |
     import netsvc, tools, os
-    try:
-        (data, format) = netsvc.LocalService('report.l10n_lu.tax.report.print').create(cr, uid, [], {'model':'ir.ui.menu', 'form':{'tax_code_id': ref('account_tax_code_id_r1'), 'period_id': ref('account.period_1')}}, {})
-        if tools.config['test_report_directory']:
-            file(os.path.join(tools.config['test_report_directory'], 'l10n_lu-vat_report.'+format), 'wb+').write(data)
-    except:
-        pass
+    (data, format) = netsvc.LocalService('report.l10n_lu.tax.report.print').create(cr, uid, [], {'model':'ir.ui.menu', 'form':{'tax_code_id': ref('account_tax_code_id_r1'), 'period_id': ref('account.period_1')}}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'l10n_lu-vat_report.'+format), 'wb+').write(data)
+   
     

From 9323bf71e6b336de7301dc9f025338eea271ca88 Mon Sep 17 00:00:00 2001
From: ssi <ssi@tinyerp.com>
Date: Tue, 19 Oct 2010 17:51:04 +0530
Subject: [PATCH 021/114] [IMP]membership: added domain on income_account of
 membership product

bzr revid: ssi@tinyerp.com-20101019122104-ahlhvruepoveb1ac
---
 addons/membership/membership_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index b42a81ac2ec..1c552306fc6 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -72,7 +72,7 @@
                         <separator string="Categorization" colspan="2"/>
                         <field name="list_price" string="Membership Fee"/>
                         <field name="type" />
-                        <field name="property_account_income"/>
+                        <field name="property_account_income" domain="[('type', '!=', 'view')]"/>
                         <field name="categ_id"/>
                         <separator string="Sale Taxes" colspan="2"/>
                         <newline/>

From 7a8f457406d155dd1e8175ff53bd9e94016096e7 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 19 Oct 2010 18:21:56 +0530
Subject: [PATCH 022/114] [IMP] sale:-removed try and except block from the
 yaml for 'sale_make_invoice' wizard

bzr revid: mtr@mtr-20101019125156-8tk43nb36krggeoi
---
 addons/sale/test/so_make_invoice.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/addons/sale/test/so_make_invoice.yml b/addons/sale/test/so_make_invoice.yml
index 0133391395b..5dfe16d2fac 100644
--- a/addons/sale/test/so_make_invoice.yml
+++ b/addons/sale/test/so_make_invoice.yml
@@ -78,13 +78,10 @@
     sale_order_obj = self.pool.get('sale.order')
     so = sale_order_obj.browse(cr, uid, ref("sale_order_so4"))
     sol = so.order_line[1] 
-    try:
-        self.button_cancel(cr, uid, [sol.id], {"lang": "en_US", "tz": False, "active_model":
-          "ir.ui.menu", "active_ids": [ref("sale.menu_invoicing_sales_order_lines")],
-          "search_default_uninvoiced": 1, "active_id": ref("sale.menu_invoicing_sales_order_lines"),
-          })  
-    except:
-        pass
+    self.button_cancel(cr, uid, [sol.id], {"lang": "en_US", "tz": False, "active_model":
+      "ir.ui.menu", "active_ids": [ref("sale.menu_invoicing_sales_order_lines")],
+      "search_default_uninvoiced": 1, "active_id": ref("sale.menu_invoicing_sales_order_lines"),
+      })  
 -   
   I verify that picking has been generated for the sale order.
 - 

From 2ae556a213d8fd005a8351e5b8bedd2497cf7d05 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Tue, 19 Oct 2010 18:41:09 +0530
Subject: [PATCH 023/114] [FIX] account: add exception if no lines found in
 account.voucher object

bzr revid: vth@tinyerp.com-20101019131109-wrosvxj31ihkc1ya
---
 addons/account_voucher/account_voucher.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 1760978b8c2..169a489bfa2 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -574,6 +574,8 @@ class account_voucher(osv.osv):
         currency_pool = self.pool.get('res.currency')
         tax_obj = self.pool.get('account.tax')
         for inv in self.browse(cr, uid, ids):
+            if not inv.line_ids:
+                raise osv.except_osv(_('No Lines !'), _('Please create some lines'))
             if inv.move_id:
                 continue
             if inv.number:

From c733ad0139143aa2a537cd8008aa0cb7e0de11ed Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 20 Oct 2010 10:14:12 +0530
Subject: [PATCH 024/114] [REF] Account: Recator code

bzr revid: mra@mra-laptop-20101020044412-4afed6lwseaqs8c3
---
 addons/account/invoice.py         | 15 +++++----------
 addons/account/project/project.py |  2 +-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index ab9b90d7361..202e39df5b3 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -57,17 +57,13 @@ class account_invoice(osv.osv):
                                             ('company_id', '=', company_id),
                                             ('refund_journal', '=', refund_journal.get(type_inv, False))],
                                                 limit=1)
-        if res:
-            return res[0]
-        else:
-            return False
+        return res and res[0] or False
 
     def _get_currency(self, cr, uid, context=None):
         user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, [uid])[0]
         if user.company_id:
             return user.company_id.currency_id.id
-        else:
-            return pooler.get_pool(cr.dbname).get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]
+        return pooler.get_pool(cr.dbname).get('res.currency').search(cr, uid, [('rate','=', 1.0)])[0]
 
     def _get_journal_analytic(self, cr, uid, type_inv, context=None):
         type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale', 'in_refund': 'purchase'}
@@ -134,7 +130,6 @@ class account_invoice(osv.osv):
                 result = inv.amount_total - amount
             # Use is_zero function to avoid rounding trouble => should be fixed into ORM
             res[inv.id] = not self.pool.get('res.currency').is_zero(cr, uid, inv.company_id.currency_id, result) and result or 0.0
-
         return res
 
     # Give Journal Items related to the payment reconciled to this invoice
@@ -491,7 +486,6 @@ class account_invoice(osv.osv):
             res = {'value':{'date_due': pterm_list[-1]}}
         else:
              raise osv.except_osv(_('Data Insufficient !'), _('The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !'))
-
         return res
 
     def onchange_invoice_line(self, cr, uid, ids, lines):
@@ -504,6 +498,8 @@ class account_invoice(osv.osv):
         val = {}
         dom = {}
         obj_journal = self.pool.get('account.journal')
+        account_obj = self.pool.get('account.account')
+        inv_line_obj = self.pool.get('account.invoice.line')
         if company_id and part_id and type:
             acc_id = False
             partner_obj = self.pool.get('res.partner').browse(cr,uid,part_id)
@@ -528,7 +524,6 @@ class account_invoice(osv.osv):
                     else:
                         acc_id = pay_res_id
                     val= {'account_id': acc_id}
-            account_obj = self.pool.get('account.account')
             if ids:
                 if company_id:
                     inv_obj = self.browse(cr,uid,ids)
@@ -539,7 +534,7 @@ class account_invoice(osv.osv):
                                 if not result_id:
                                     raise osv.except_osv(_('Configuration Error !'),
                                         _('Can not find account chart for this company in invoice line account, Please Create account.'))
-                                self.pool.get('account.invoice.line').write(cr, uid, [line.id], {'account_id': result_id[0]})
+                                inv_line_obj.write(cr, uid, [line.id], {'account_id': result_id[0]})
             else:
                 if invoice_line:
                     for inv_line in invoice_line:
diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index ee142903c87..27836d72a1e 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -44,7 +44,7 @@ class account_journal(osv.osv):
     _inherit="account.journal"
 
     _columns = {
-        'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal',help="Journal for analytic entries"),
+        'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal', help="Journal for analytic entries"),
     }
 
 account_journal()

From 3f9b1be31c82e516ae75f42063229838b41fedc0 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 20 Oct 2010 10:43:53 +0530
Subject: [PATCH 025/114] [REF] account: clean code on installer.py

bzr revid: psi@tinyerp.co.in-20101020051353-2lnm99j3htjktqjt
---
 addons/account/installer.py | 39 ++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/addons/account/installer.py b/addons/account/installer.py
index 65c6738da12..25d57d56214 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -35,19 +35,19 @@ class account_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     def _get_default_accounts(self, cr, uid, context=None):
-        accounts = [{'acc_name':'Current','account_type':'bank'},
-                    {'acc_name':'Deposit','account_type':'bank'},
-                    {'acc_name':'Cash','account_type':'cash'}]
+        accounts = [{'acc_name':'Current', 'account_type':'bank'},
+                    {'acc_name':'Deposit', 'account_type':'bank'},
+                    {'acc_name':'Cash', 'account_type':'cash'}]
         return accounts
 
     def _get_charts(self, cr, uid, context=None):
         modules = self.pool.get('ir.module.module')
-        ids = modules.search(cr, uid, [('category_id','=','Account Charts')])
+        ids = modules.search(cr, uid, [('category_id', '=', 'Account Charts')], context=context)
         charts = list(
             sorted(((m.name, m.shortdesc)
                     for m in modules.browse(cr, uid, ids)),
                    key=itemgetter(1)))
-        charts.insert(0,('configurable','Generic Chart Of Account'))
+        charts.insert(0, ('configurable','Generic Chart Of Account'))
         return charts
 
     _columns = {
@@ -59,7 +59,7 @@ class account_installer(osv.osv_memory):
                  "country."),
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
-        'period': fields.selection([('month','Monthly'), ('3months','3 Monthly')], 'Periods', required=True),
+        'period': fields.selection([('month', 'Monthly'), ('3months','3 Monthly')], 'Periods', required=True),
         'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Your Bank and Cash Accounts'),
         'sale_tax': fields.float('Sale Tax(%)'),
         'purchase_tax': fields.float('Purchase Tax(%)'),
@@ -75,21 +75,21 @@ class account_installer(osv.osv_memory):
     def _get_default_charts(self, cr, uid, context=None):
         module_name = False
         company_id = self._default_company(cr, uid, context=context)
-        company = self.pool.get('res.company').browse(cr, uid, company_id)
+        company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
         address_id = self.pool.get('res.partner').address_get(cr, uid, [company.partner_id.id])
         if address_id['default']:
-            address = self.pool.get('res.partner.address').browse(cr, uid, address_id['default'])
+            address = self.pool.get('res.partner.address').browse(cr, uid, address_id['default'], context=context)
             code = address.country_id.code
             module_name = (code and 'l10n_' + code.lower()) or False
         if module_name:
-            module_id = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', module_name)])
+            module_id = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', module_name)], context=context)
             if module_id:
                 return module_name
         return 'configurable'
 
     _defaults = {
-        'date_start': lambda *a: time.strftime('%Y-01-01'),
-        'date_stop': lambda *a: time.strftime('%Y-12-31'),
+        'date_start': time.strftime('%Y-01-01'),
+        'date_stop': time.strftime('%Y-12-31'),
         'period': 'month',
         'sale_tax': 0.0,
         'purchase_tax': 0.0,
@@ -105,23 +105,26 @@ class account_installer(osv.osv_memory):
         if start_date:
             start_date = datetime.datetime.strptime(start_date, "%Y-%m-%d")
             end_date = (start_date + relativedelta(months=12)) - relativedelta(days=1)
-            return {'value':{'date_stop':end_date.strftime('%Y-%m-%d')}}
+            return {'value': {'date_stop': end_date.strftime('%Y-%m-%d')}}
         return {}
 
     def generate_configurable_chart(self, cr, uid, ids, context=None):
         obj_acc = self.pool.get('account.account')
         obj_acc_tax = self.pool.get('account.tax')
         obj_journal = self.pool.get('account.journal')
-        obj_sequence = self.pool.get('ir.sequence')
         obj_acc_template = self.pool.get('account.account.template')
+        obj_acc_tax_template = self.pool.get('account.tax.code.template')
         obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
         obj_fiscal_position = self.pool.get('account.fiscal.position')
-        mod_obj = self.pool.get('ir.model.data')
         analytic_journal_obj = self.pool.get('account.analytic.journal')
+        obj_acc_chart_template = self.pool.get('account.chart.template')
+        mod_obj = self.pool.get('ir.model.data')
+        obj_sequence = self.pool.get('ir.sequence')
+
 
         result = mod_obj._get_id(cr, uid, 'account', 'configurable_chart_template')
-        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
-        obj_multi = self.pool.get('account.chart.template').browse(cr, uid, id)
+        id = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id']
+        obj_multi = obj_acc_chart_template.browse(cr, uid, id, context=context)
 
         record = self.browse(cr, uid, ids, context=context)[0]
 
@@ -141,9 +144,9 @@ class account_installer(osv.osv_memory):
         todo_dict = {}
 
         #create all the tax code
-        children_tax_code_template = self.pool.get('account.tax.code.template').search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id')
+        children_tax_code_template = obj_acc_tax_template.search(cr, uid, [('parent_id', 'child_of', [tax_code_root_id])], order='id')
         children_tax_code_template.sort()
-        for tax_code_template in self.pool.get('account.tax.code.template').browse(cr, uid, children_tax_code_template):
+        for tax_code_template in obj_acc_tax_template.browse(cr, uid, children_tax_code_template):
             vals={
                 'name': (tax_code_root_id == tax_code_template.id) and company_id.name or tax_code_template.name,
                 'code': tax_code_template.code,

From 1ca477d722913b8612d1ddc0029fe4a912992658 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Wed, 20 Oct 2010 11:13:57 +0530
Subject: [PATCH 026/114] [FIX] account:Balance sheet

bzr revid: vth@tinyerp.com-20101020054357-7804qwmve4urni7m
---
 addons/account/report/account_balance_sheet.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index 820ddfb473d..056305cdba0 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -78,6 +78,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
         db_pool = pooler.get_pool(self.cr.dbname)
 
         #Getting Profit or Loss Balance from profit and Loss report
+        self.obj_pl.get_data(data)
         self.res_bl = self.obj_pl.final_result()
 
         account_pool = db_pool.get('account.account')

From e152553153a4ad16203017c9e7b85f7802be3f09 Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Wed, 20 Oct 2010 12:06:52 +0530
Subject: [PATCH 027/114] [IMP] account_reporting: cleaning module

bzr revid: pso@tinyerp.com-20101020063652-3pze1frj02vjxda1
---
 addons/account_reporting/__init__.py          |  2 +-
 addons/account_reporting/__openerp__.py       |  5 +-
 addons/account_reporting/account_report.xml   |  6 --
 .../{account.py => account_reporting.py}      | 85 +++++++++----------
 ...nt_data.xml => account_reporting_data.xml} |  0
 ...nt_view.xml => account_reporting_view.xml} | 63 +++++++-------
 .../report/account_report_bs.py               | 52 ++++++------
 .../account_reporting_balance_report.py       |  5 +-
 .../account_reporting_balance_report_view.xml |  4 +-
 9 files changed, 108 insertions(+), 114 deletions(-)
 delete mode 100644 addons/account_reporting/account_report.xml
 rename addons/account_reporting/{account.py => account_reporting.py} (58%)
 rename addons/account_reporting/{account_data.xml => account_reporting_data.xml} (100%)
 rename addons/account_reporting/{account_view.xml => account_reporting_view.xml} (57%)

diff --git a/addons/account_reporting/__init__.py b/addons/account_reporting/__init__.py
index 65ca37b6d51..2e6645ed66e 100644
--- a/addons/account_reporting/__init__.py
+++ b/addons/account_reporting/__init__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 import report
-import account
+import account_reporting
 import wizard
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_reporting/__openerp__.py b/addons/account_reporting/__openerp__.py
index fb05e755ac2..b5bbaa3bf3f 100644
--- a/addons/account_reporting/__openerp__.py
+++ b/addons/account_reporting/__openerp__.py
@@ -31,9 +31,8 @@
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
-        'account_view.xml',
-        'account_report.xml',
-        'account_data.xml',
+        'account_reporting_view.xml',
+        'account_reporting_data.xml',
         'wizard/account_reporting_balance_report_view.xml',
     ],
     'demo_xml': ['account_reporting_demo.xml'],
diff --git a/addons/account_reporting/account_report.xml b/addons/account_reporting/account_report.xml
deleted file mode 100644
index ebfe70e4c50..00000000000
--- a/addons/account_reporting/account_report.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-	<data>
-
-	</data>
-</openerp>
diff --git a/addons/account_reporting/account.py b/addons/account_reporting/account_reporting.py
similarity index 58%
rename from addons/account_reporting/account.py
rename to addons/account_reporting/account_reporting.py
index 7fc08401496..ec1f370e05b 100644
--- a/addons/account_reporting/account.py
+++ b/addons/account_reporting/account_reporting.py
@@ -18,19 +18,19 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
+
 import netsvc
 from osv import fields, osv
-
 from tools.misc import currency
 
-
 class color_rml(osv.osv):
     _name = "color.rml"
     _description = "Rml Color"
     _columns = {
         'name': fields.char('Name', size=64, required=True),
-        'code': fields.char('code',size=64,required=True),
+        'code': fields.char('code', size=64, required=True),
         }
 
 color_rml()
@@ -39,44 +39,44 @@ class account_report_bs(osv.osv):
     _name = "account.report.bs"
     _description = "Account reporting for Balance Sheet"
     _font = [
-             ('',''),
-             ('Courier','Courier'),
-             ('Courier-Bold','Courier-Bold'),
-             ('Courier-BoldOblique','Courier-BoldOblique'),
-             ('Courier-Oblique','Courier-Oblique'),
-             ('Helvetica','Helvetica'),
-             ('Helvetica-Bold','Helvetica-Bold'),
-             ('Helvetica-Oblique','Helvetica-Oblique'),
-             ('Times-Bold','Times-Bold'),
-             ('Times-BoldItalic','Times-BoldItalic'),
-             ('Times-Italic','Times-Italic'),
-             ('Times-Roman','Times-Roman'),
+             ('', ''),
+             ('Courier', 'Courier'),
+             ('Courier-Bold', 'Courier-Bold'),
+             ('Courier-BoldOblique', 'Courier-BoldOblique'),
+             ('Courier-Oblique', 'Courier-Oblique'),
+             ('Helvetica', 'Helvetica'),
+             ('Helvetica-Bold', 'Helvetica-Bold'),
+             ('Helvetica-Oblique', 'Helvetica-Oblique'),
+             ('Times-Bold', 'Times-Bold'),
+             ('Times-BoldItalic', 'Times-BoldItalic'),
+             ('Times-Italic', 'Times-Italic'),
+             ('Times-Roman', 'Times-Roman'),
             ]
     _color = [
             ('', ''),
-            ('green','Green'),
-            ('red','Red'),
-            ('pink','Pink'),
-            ('blue','Blue'),
-            ('yellow','Yellow'),
-            ('cyan','Cyan'),
-            ('lightblue','Light Blue'),
-            ('orange','Orange'),
+            ('green', 'Green'),
+            ('red', 'Red'),
+            ('pink', 'Pink'),
+            ('blue', 'Blue'),
+            ('yellow', 'Yellow'),
+            ('cyan', 'Cyan'),
+            ('lightblue', 'Light Blue'),
+            ('orange', 'Orange'),
             ]
     _style = [
             ('', ''),
-            ('h1','Header 1'),
-            ('h2','Header 2'),
-            ('h3','Header 3'),
+            ('h1', 'Header 1'),
+            ('h2', 'Header 2'),
+            ('h3', 'Header 3'),
             ]
 
     def onchange_parent_id(self, cr, uid, ids, parent_id):
-        v={}
+        v = {}
         if parent_id:
-            acc=self.pool.get('account.report.report').browse(cr, uid, parent_id)
-            v['type']=acc.type
+            acc = self.pool.get('account.report.report').browse(cr, uid, parent_id)
+            v['type'] = acc.type
             if int(acc.style) < 6:
-                v['style'] = str(int(acc.style)+1)
+                v['style'] = str(int(acc.style) + 1)
         return {'value': v}
 
     _columns = {
@@ -85,36 +85,35 @@ class account_report_bs(osv.osv):
         'code': fields.char('Code', size=64, required=True),
         'account_id': fields.many2many('account.account', 'account_report_rel', 'report_id', 'account_id', 'Accounts'),
         'note': fields.text('Note'),
-        'color_font' : fields.many2one('color.rml','Font Color'),
-        'color_back' : fields.many2one('color.rml','Back Color'),
-        'font_style' : fields.selection(_font, 'Font'),
+        'color_font': fields.many2one('color.rml', 'Font Color'),
+        'color_back': fields.many2one('color.rml', 'Back Color'),
+        'font_style': fields.selection(_font, 'Font'),
         'parent_id': fields.many2one('account.report.bs', 'Parent'),
         'child_id': fields.one2many('account.report.bs', 'parent_id', 'Children'),
-        'report_type' : fields.selection([('only_obj', 'Report Objects Only'),('with_account', 'Report Objects With Accounts'),('acc_with_child', 'Report Objects With Accounts and child of Accounts')],"Report Type")
+        'report_type': fields.selection([('only_obj', 'Report Objects Only'), ('with_account', 'Report Objects With Accounts'), ('acc_with_child', 'Report Objects With Accounts and child of Accounts')], "Report Type")
     }
     _defaults = {
-        'report_type': lambda *a :'only_obj',
-        'color_font': lambda *a :'',
-        'color_back': lambda *a :'',
-        'font_style': lambda *a :'',
+        'report_type': 'only_obj',
+        'color_font': '',
+        'color_back': '',
+        'font_style': '',
     }
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
-            args=[]
+            args = []
         if not context:
-            context={}
+            context = {}
         ids = []
         if name:
-            ids = self.search(cr, user, [('code','=',name)]+ args, limit=limit, context=context)
+            ids = self.search(cr, user, [('code', '=', name)]+ args, limit=limit, context=context)
             if not ids:
-                ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
+                ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit, context=context)
         else:
             ids = self.search(cr, user, args, limit=limit, context=context)
         return self.name_get(cr, user, ids, context=context)
 
 account_report_bs()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_reporting/account_data.xml b/addons/account_reporting/account_reporting_data.xml
similarity index 100%
rename from addons/account_reporting/account_data.xml
rename to addons/account_reporting/account_reporting_data.xml
diff --git a/addons/account_reporting/account_view.xml b/addons/account_reporting/account_reporting_view.xml
similarity index 57%
rename from addons/account_reporting/account_view.xml
rename to addons/account_reporting/account_reporting_view.xml
index f02ed221e42..b12217f84e5 100644
--- a/addons/account_reporting/account_view.xml
+++ b/addons/account_reporting/account_reporting_view.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
+    <data>
 
-    <record model="ir.ui.view" id="view_account_report_bs_form">
-        <field name="name">account.report.bs.form</field>
-        <field name="model">account.report.bs</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Account reporting">
-                <notebook>
-                <page string="General">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="parent_id" select="1"/>
-                    <field name="sequence"/>
-                    <field name="color_font"/>
-                    <field name="color_back"/>
-                    <field name="font_style"/>
-                    <field name="report_type"/>
-                    <newline/>
-                    <separator string="Accounts" colspan="4"/>
-                        <field name="account_id" colspan="4" nolabel="1"/>
-                </page>
-                <page string="Notes">
-                    <field name="note" nolabel="1" colspan="4"/>
-                </page>
-                </notebook>
-            </form>
-        </field>
-    </record>
+        <record model="ir.ui.view" id="view_account_report_bs_form">
+            <field name="name">account.report.bs.form</field>
+            <field name="model">account.report.bs</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account reporting">
+                    <notebook>
+                    <page string="General">
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="parent_id" select="1"/>
+                        <field name="sequence"/>
+                        <field name="color_font"/>
+                        <field name="color_back"/>
+                        <field name="font_style"/>
+                        <field name="report_type"/>
+                        <newline/>
+                        <separator string="Accounts" colspan="4"/>
+                            <field name="account_id" colspan="4" nolabel="1"/>
+                    </page>
+                    <page string="Notes">
+                        <field name="note" nolabel="1" colspan="4"/>
+                    </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
 
         <record model="ir.ui.view" id="view_account_report_tree_bs">
             <field name="name">account.report.report.tree.bs</field>
@@ -42,6 +42,7 @@
             </tree>
             </field>
         </record>
+
         <record model="ir.actions.act_window" id="action_account_tree_bs">
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.report.bs</field>
@@ -49,6 +50,7 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_account_report_tree_bs"/>
         </record>
+
         <menuitem name="Balance Sheet Report" id="menu_finan_config_BSheet" parent="account.menu_finance_configuration"/>
         <menuitem name="Balance Sheet Report" id="action_account_report_bs_form" action="action_account_tree_bs" parent="menu_finan_config_BSheet"/>
 
@@ -58,9 +60,8 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_account_report_bs_form"/>
         </record>
+
         <menuitem name="Balance Sheet Report Form" id="bs_report_action_form" action="acc_bs_report_action_form" parent="menu_finan_config_BSheet"/>
 
-
-
-</data>
+    </data>
 </openerp>
diff --git a/addons/account_reporting/report/account_report_bs.py b/addons/account_reporting/report/account_report_bs.py
index 22628224306..9fe74586633 100644
--- a/addons/account_reporting/report/account_report_bs.py
+++ b/addons/account_reporting/report/account_report_bs.py
@@ -20,14 +20,14 @@
 ##############################################################################
 
 import time
-import pooler
 import locale
+
+import pooler
 from report import report_sxw
 
-
 parents = {
-    'tr':1,
-    'li':1,
+    'tr': 1,
+    'li': 1,
     'story': 0,
     'section': 0
 }
@@ -42,18 +42,18 @@ class account_report_bs(report_sxw.rml_parse):
         self.context = context
 
 
-    def line_total(self,line_id,ctx):
+    def line_total(self, line_id, ctx):
         _total = 0
-        bsline= self.pool.get('account.report.bs').browse(self.cr,self.uid,[line_id])[0]
+        bsline = self.pool.get('account.report.bs').browse(self.cr, self.uid, [line_id])[0]
         bsline_accids = bsline.account_id
-        res =self.pool.get('account.report.bs').read(self.cr,self.uid,[line_id],['account_id','child_id'])[0]
+        res = self.pool.get('account.report.bs').read(self.cr, self.uid, [line_id], ['account_id', 'child_id'])[0]
         for acc_id in res['account_id']:
-            acc = self.pool.get('account.account').browse(self.cr,self.uid,[acc_id],ctx)[0]
+            acc = self.pool.get('account.account').browse(self.cr, self.uid, [acc_id], ctx)[0]
             _total += acc.balance
         bsline_reportbs = res['child_id']
 
         for report in bsline_reportbs:
-            _total +=self.line_total(report,ctx)
+            _total += self.line_total(report,ctx)
         return  _total
 
     def lines(self, form, ids={}, done=None, level=1, object=False):
@@ -64,14 +64,14 @@ class account_report_bs(report_sxw.rml_parse):
         if not ids:
             return []
         if not done:
-            done={}
+            done = {}
         result = []
         ctx = self.context.copy()
         ctx['fiscalyear'] = form['fiscalyear']
         ctx['periods'] = form['periods']
         report_objs = self.pool.get('account.report.bs').browse(self.cr, self.uid, ids)
         title_name = False
-        if level==1:
+        if level == 1:
             title_name = report_objs[0].name
         def cmp_code(x, y):
             return cmp(x.code, y.code)
@@ -92,41 +92,41 @@ class account_report_bs(report_sxw.rml_parse):
                 'name': report_obj.name,
                 'level': level,
                 'balance': self.line_total(report_obj.id,ctx),
-                'parent_id':False,
-                'color_font':color_font,
-                'color_back':color_back,
-                'font_style' : report_obj.font_style
+                'parent_id': False,
+                'color_font': color_font,
+                'color_back': color_back,
+                'font_style': report_obj.font_style
             }
             result.append(res)
             report_type = report_obj.report_type
             if report_type != 'only_obj':
-                account_ids = self.pool.get('account.report.bs').read(self.cr,self.uid,[report_obj.id],['account_id'])[0]['account_id']
+                account_ids = self.pool.get('account.report.bs').read(self.cr, self.uid, [report_obj.id], ['account_id'])[0]['account_id']
                 if report_type == 'acc_with_child':
-                    acc_ids = self.pool.get('account.account')._get_children_and_consol(self.cr, self.uid, account_ids )
+                    acc_ids = self.pool.get('account.account')._get_children_and_consol(self.cr, self.uid, account_ids)
                     account_ids = acc_ids
-                account_objs = self.pool.get('account.account').browse(self.cr,self.uid,account_ids,ctx)
+                account_objs = self.pool.get('account.account').browse(self.cr, self.uid, account_ids, ctx)
                 for acc_obj in account_objs:
-                    res1={}
+                    res1 = {}
                     res1 = {
                         'code': acc_obj.code,
                         'name': acc_obj.name,
                         'level': level+1,
                         'balance': acc_obj.balance,
-                        'parent_id':acc_obj.parent_id,
-                        'color_font' : 'black',
-                        'color_back' :'white',
-                        'font_style' : 'Helvetica',
+                        'parent_id': acc_obj.parent_id,
+                        'color_font': 'black',
+                        'color_back': 'white',
+                        'font_style': 'Helvetica',
                         }
                     if acc_obj.parent_id:
                         for r in result:
-                            if r['name']== acc_obj.parent_id.name:
+                            if r['name'] == acc_obj.parent_id.name:
                                 res1['level'] = r['level'] + 1
                                 break
                     result.append(res1)
             if report_obj.child_id:
-                ids2 = [(x.code,x.id) for x in report_obj.child_id]
+                ids2 = [(x.code, x.id) for x in report_obj.child_id]
                 ids2.sort()
-                result += self.lines(form,[x[1] for x in ids2], done, level+1,object=False)
+                result += self.lines(form, [x[1] for x in ids2], done, level+1, object=False)
 
         return result
 
diff --git a/addons/account_reporting/wizard/account_reporting_balance_report.py b/addons/account_reporting/wizard/account_reporting_balance_report.py
index 3f67c64b64b..780ad212dda 100644
--- a/addons/account_reporting/wizard/account_reporting_balance_report.py
+++ b/addons/account_reporting/wizard/account_reporting_balance_report.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 from tools.translate import _
 
@@ -33,7 +34,7 @@ class account_reporting_balance_report(osv.osv_memory):
     _description = 'Account balance report'
     _columns = {
         'fiscalyear': fields.many2one('account.fiscalyear', 'Fiscal year', required=True),
-        'periods': fields.many2many('account.period', 'acc_reporting_relation', 'acc_id','period_id', 'Periods', help='All periods if empty'),
+        'periods': fields.many2many('account.period', 'acc_reporting_relation', 'acc_id', 'period_id', 'Periods', help='All periods if empty'),
             }
     _defaults = {
         'fiscalyear' : _get_fiscalyear,
@@ -45,7 +46,7 @@ class account_reporting_balance_report(osv.osv_memory):
             context = {}
         data = self.read(cr, uid, ids)[0]
         datas = {
-             'ids': context.get('active_ids',[]),
+             'ids': context.get('active_ids', []),
              'model': 'account.report.bs',
              'form': data
             }
diff --git a/addons/account_reporting/wizard/account_reporting_balance_report_view.xml b/addons/account_reporting/wizard/account_reporting_balance_report_view.xml
index 5d7ef7dfbdb..31444e17e4e 100644
--- a/addons/account_reporting/wizard/account_reporting_balance_report_view.xml
+++ b/addons/account_reporting/wizard/account_reporting_balance_report_view.xml
@@ -7,8 +7,8 @@
              <field name="model">account.reporting.balance.report</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-	             <form string="Select Dates Period">
-                 	<field name="fiscalyear" colspan="4"/>
+	             <form string="Account Report Balance Sheet">
+                 	<field name="fiscalyear" colspan="4" widget="selection"/>
                  	<newline/>
                  	<separator string="Periods" colspan="4"/>
 					<field name="periods" nolabel="1" colspan="4"/>

From 3420208ecde5f667f10954ea469cf8cac92f6c9c Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 20 Oct 2010 12:30:04 +0530
Subject: [PATCH 028/114] [REF] account

bzr revid: mra@mra-laptop-20101020070004-c28dsk1vo5j2nbz6
---
 addons/account/account_bank_statement.py       |  2 +-
 addons/account/invoice.py                      | 16 +++++++---------
 addons/account/report/account_balance_sheet.py |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index c6548a36872..40018ec6596 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -496,4 +496,4 @@ class account_bank_statement_line(osv.osv):
 
 account_bank_statement_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 202e39df5b3..922e01963e5 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -24,8 +24,8 @@ from lxml import etree
 import decimal_precision as dp
 
 import netsvc
-from osv import fields, osv, orm
 import pooler
+from osv import fields, osv, orm
 from tools.translate import _
 
 class account_invoice(osv.osv):
@@ -575,7 +575,7 @@ class account_invoice(osv.osv):
             else:
                 val['currency_id'] = company.currency_id.id
 
-        return {'value': val, 'domain': dom }
+        return {'value': val, 'domain': dom}
 
     # go from canceled state to draft state
     def action_cancel_draft(self, cr, uid, ids, *args):
@@ -787,7 +787,6 @@ class account_invoice(osv.osv):
             line = []
             for key, val in line2.items():
                 line.append((0,0,val))
-
         return line
 
     def action_move_create(self, cr, uid, ids, *args):
@@ -1484,8 +1483,8 @@ class account_invoice_line(osv.osv):
         taxes = self.pool.get('account.account').browse(cr, uid, account_id).tax_ids
         fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id) or False
         res = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
-        r = {'value':{'invoice_line_tax_id': res}}
-        return r
+        return {'value':{'invoice_line_tax_id': res}}
+
 account_invoice_line()
 
 class account_invoice_tax(osv.osv):
@@ -1517,7 +1516,6 @@ class account_invoice_tax(osv.osv):
         'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
         'manual': fields.boolean('Manual'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of invoice tax."),
-
         'base_code_id': fields.many2one('account.tax.code', 'Base Code', help="The account basis of the tax declaration."),
         'base_amount': fields.float('Base Code Amount', digits_compute=dp.get_precision('Account')),
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', help="The tax basis of the tax declaration."),
@@ -1555,9 +1553,9 @@ class account_invoice_tax(osv.osv):
 
     _order = 'sequence'
     _defaults = {
-        'manual': lambda *a: 1,
-        'base_amount': lambda *a: 0.0,
-        'tax_amount': lambda *a: 0.0,
+        'manual': 1,
+        'base_amount': 0.0,
+        'tax_amount': 0.0,
     }
     def compute(self, cr, uid, invoice_id, context={}):
         tax_grouped = {}
diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index 056305cdba0..5b83fd32269 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -200,4 +200,4 @@ report_sxw.report_sxw('report.account.balancesheet', 'account.account',
     'addons/account/report/account_balance_sheet.rml',parser=report_balancesheet_horizontal,
     header='internal')
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 3912fe4dd884f89fee62f4779c1803471cad6c62 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Wed, 20 Oct 2010 13:24:08 +0530
Subject: [PATCH 029/114] [FIX] account: Profit and loss

bzr revid: vth@tinyerp.com-20101020075408-zmfiyhpblxtsycdy
---
 addons/account/report/account_profit_horizontal.rml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml
index f92f9e07983..886d58aa092 100644
--- a/addons/account/report/account_profit_horizontal.rml
+++ b/addons/account/report/account_profit_horizontal.rml
@@ -199,7 +199,7 @@
           <para style="terp_default_Bold_9">Code</para>
         </td>
         <td>
-          <para style="terp_default_Bold_9">Perticular</para>
+          <para style="terp_default_Bold_9">Particular</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Balance</para>
@@ -208,7 +208,7 @@
           <para style="terp_default_Bold_9">Code</para>
         </td>
         <td>
-          <para style="terp_default_Bold_9">Perticular</para>
+          <para style="terp_default_Bold_9">Particular</para>
         </td>
         <td>
           <para style="P1">Balance</para>

From 6bfda323bab6ea016e88731f3a1f4719f2155f81 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Wed, 20 Oct 2010 10:54:13 +0200
Subject: [PATCH 030/114] [FIX + REF] analytic: fixed the computation of debit,
 credit, balance and quantity displayed on the chart of analytic account with
 refactoring of the code

bzr revid: qdp-launchpad@tinyerp.com-20101020085413-7l93t70eotxs7p2x
---
 addons/analytic/analytic.py | 172 ++++++++++++------------------------
 1 file changed, 55 insertions(+), 117 deletions(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index f6263bfeb0d..8370af159dd 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -28,130 +28,68 @@ class account_analytic_account(osv.osv):
     _name = 'account.analytic.account'
     _description = 'Analytic Account'
 
-    def _compute_currency_for_level_tree(self, cr, uid, ids, ids2, res, context=None):
-        # Handle multi-currency on each level of analytic account
-        # This is a refactoring of _balance_calc computation
-        cr.execute("SELECT a.id, r.currency_id FROM account_analytic_account a INNER JOIN res_company r ON (a.company_id = r.id) where a.id IN %s" , (tuple(ids2),))
-        currency = dict(cr.fetchall())
-        res_currency= self.pool.get('res.currency')
+    def _compute_level_tree(self, cr, uid, ids, child_ids, res, field_names, context=None):
+        def recursive_computation(account_id, res):
+            account = self.browse(cr, uid, account_id)
+            for son in account.child_ids:
+                res = recursive_computation(son.id, res)
+                for field in field_names:
+                    res[account.id][field] += res[son.id][field]
+            return res
         for account in self.browse(cr, uid, ids, context=context):
-            if account.id not in ids2:
+            if account.id not in child_ids:
                 continue
-            for child in account.child_ids:
-                if child.id != account.id:
-                    res.setdefault(account.id, 0.0)
-                    if  currency[child.id] != currency[account.id]:
-                        res[account.id] += res_currency.compute(cr, uid, currency[child.id], currency[account.id], res.get(child.id, 0.0), context=context)
-                    else:
-                        res[account.id] += res.get(child.id, 0.0)
+            res = recursive_computation(account.id, res)
+        return res
 
-        cur_obj = res_currency.browse(cr, uid, currency.values(), context=context)
-        cur_obj = dict([(o.id, o) for o in cur_obj])
-        for id in ids:
-            if id in ids2:
-                res[id] = res_currency.round(cr, uid, cur_obj[currency[id]], res.get(id,0.0))
-
-        return dict([(i, res[i]) for i in ids ])
-
-    def _credit_calc(self, cr, uid, ids, name, arg, context=None):
+    def _debit_credit_bal_qtty(self, cr, uid, ids, name, arg, context=None):
         res = {}
         if context is None:
             context = {}
-        parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
-        for i in ids:
-            res.setdefault(i,0.0)
+        child_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
+        for i in child_ids:
+            res[i] =  {}
+            for n in name:
+                res[i][n] = 0.0
 
-        if not parent_ids:
+        if not child_ids:
             return res
 
-        where_date = ''
+        where_date = where_date_sub = ''
+        where_clause_args = []
         if context.get('from_date', False):
-            where_date += " AND l.date >= '" + context['from_date'] + "'"
+            where_date += " AND l.date >= %s"
+            where_date_sub += " AND l2.date >= %s"
+            where_clause_args  += [context['from_date']]
         if context.get('to_date', False):
-            where_date += " AND l.date <= '" + context['to_date'] + "'"
-        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE l.amount<0 and a.id IN %s GROUP BY a.id",(tuple(parent_ids),))
-        r = dict(cr.fetchall())
-        return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, r, context)
-
-    def _debit_calc(self, cr, uid, ids, name, arg, context=None):
-        res = {}
-        if context is None:
-            context = {}
-        parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
-        for i in ids:
-            res.setdefault(i,0.0)
-
-        if not parent_ids:
-            return res
-
-        where_date = ''
-        if context.get('from_date',False):
-            where_date += " AND l.date >= '" + context['from_date'] + "'"
-        if context.get('to_date',False):
-            where_date += " AND l.date <= '" + context['to_date'] + "'"
-        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE l.amount>0 and a.id IN %s GROUP BY a.id" ,(tuple(parent_ids),))
-        r = dict(cr.fetchall())
-        return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, r, context=context)
-
-    def _balance_calc(self, cr, uid, ids, name, arg, context=None):
-        res = {}
-        if context is None:
-            context = {}
-
-        parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
-        for i in ids:
-            res.setdefault(i,0.0)
-
-        if not parent_ids:
-            return res
-
-        where_date = ''
-        if context.get('from_date',False):
-            where_date += " AND l.date >= '" + context['from_date'] + "'"
-        if context.get('to_date',False):
-            where_date += " AND l.date <= '" + context['to_date'] + "'"
-        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE a.id IN %s GROUP BY a.id",(tuple(parent_ids),))
-
-        for account_id, sum in cr.fetchall():
-            res[account_id] = sum
-        return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context=context)
-
-    def _quantity_calc(self, cr, uid, ids, name, arg, context=None):
-        #XXX must convert into one uom
-        res = {}
-        if context is None:
-            context = {}
-
-        parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
-
-        for i in ids:
-            res.setdefault(i,0.0)
-
-        if not parent_ids:
-            return res
-
-        where_date = ''
-        if context.get('from_date',False):
-            where_date += " AND l.date >= '" + context['from_date'] + "'"
-        if context.get('to_date',False):
-            where_date += " AND l.date <= '" + context['to_date'] + "'"
-
-        cr.execute('SELECT a.id, COALESCE(SUM(l.unit_amount), 0) \
-                FROM account_analytic_account a \
-                    LEFT JOIN account_analytic_line l ON (a.id = l.account_id ' + where_date + ') \
-                WHERE a.id IN %s GROUP BY a.id',(tuple(parent_ids),))
-
-        for account_id, sum in cr.fetchall():
-            res[account_id] = sum
-
-        for account in self.browse(cr, uid, ids, context=context):
-            if account.id not in parent_ids:
-                continue
-            for child in account.child_ids:
-                if child.id != account.id:
-                    res.setdefault(account.id, 0.0)
-                    res[account.id] += res.get(child.id, 0.0)
-        return dict([(i, res[i]) for i in ids])
+            where_date += " AND l.date <= %s"
+            where_date_sub += " AND l2.date <= %s"
+            where_clause_args += [context['to_date']]
+        where_clause_args += where_clause_args + [tuple(child_ids)] + where_clause_args 
+        cr.execute("""
+              SELECT a.id,
+                     ( SELECT coalesce(sum(l2.amount),0) 
+                       FROM account_analytic_line l2  
+                       WHERE l2.account_id = a.id 
+                       AND l2.amount >0
+                       """ + where_date_sub + """
+                     ) AS debit, 
+                     ( SELECT coalesce(sum(-l2.amount),0) 
+                       FROM account_analytic_line l2  
+                       WHERE l2.account_id = a.id 
+                       AND l2.amount <0
+                       """ + where_date_sub + """
+                     ) AS credit, 
+                     COALESCE(SUM(l.amount),0) AS balance,
+                     COALESCE(SUM(l.unit_amount),0) AS quantity
+              FROM account_analytic_account a 
+                  LEFT JOIN account_analytic_line l ON (a.id=l.account_id) 
+              WHERE a.id IN %s 
+              """ + where_date + """
+              GROUP BY a.id""", where_clause_args)
+        for ac_id, debit, credit, balance, quantity in cr.fetchall():
+            res[ac_id] = {'debit': debit, 'credit': credit, 'balance': balance, 'quantity': quantity}
+        return self._compute_level_tree(cr, uid, ids, child_ids, res, ['debit', 'credit', 'balance', 'quantity'], context)
 
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
@@ -180,10 +118,10 @@ class account_analytic_account(osv.osv):
         'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
         'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'),
         'line_ids': fields.one2many('account.analytic.line', 'account_id', 'Analytic Entries'),
-        'balance': fields.function(_balance_calc, method=True, type='float', string='Balance'),
-        'debit': fields.function(_debit_calc, method=True, type='float', string='Debit'),
-        'credit': fields.function(_credit_calc, method=True, type='float', string='Credit'),
-        'quantity': fields.function(_quantity_calc, method=True, type='float', string='Quantity'),
+        'balance': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Balance', multi='debit_credit_bal_qtty'),
+        'debit': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Debit', multi='debit_credit_bal_qtty'),
+        'credit': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Credit', multi='debit_credit_bal_qtty'),
+        'quantity': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
         'quantity_max': fields.float('Maximum Quantity', help='Sets the higher limit of quantity of hours.'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'contact_id': fields.many2one('res.partner.address', 'Contact'),

From 91b5200c8cea4dc2423eb750fcf80f367d7b9ee7 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Wed, 20 Oct 2010 15:42:02 +0530
Subject: [PATCH 031/114] [REF] account

bzr revid: vth@tinyerp.com-20101020101202-rawxy5lwtqnvqnkh
---
 addons/account/account_bank_statement.py    | 6 ++++--
 addons/account/report/account_tax_report.py | 1 -
 addons/account/wizard/account_vat.py        | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 40018ec6596..ded29c27e89 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -38,12 +38,13 @@ class account_bank_statement(osv.osv):
 
     def write(self, cr, uid, ids, vals, context=None):
         res = super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
+        account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
         for statement in self.browse(cr, uid, ids, context):
             seq = 0
             for line in statement.line_ids:
                 seq += 1
                 if not line.sequence:
-                    self.pool.get('account.bank.statement.line').write(cr, uid, [line.id], {'sequence': seq}, context=context)
+                    account_bank_statement_line_obj.write(cr, uid, [line.id], {'sequence': seq}, context=context)
         return res
 
     def button_import_invoice(self, cr, uid, ids, context=None):
@@ -381,13 +382,14 @@ class account_bank_statement(osv.osv):
 
     def button_cancel(self, cr, uid, ids, context=None):
         done = []
+        account_move_obj = self.pool.get('account.move')
         for st in self.browse(cr, uid, ids, context):
             if st.state=='draft':
                 continue
             ids = []
             for line in st.line_ids:
                 ids += [x.id for x in line.move_ids]
-            self.pool.get('account.move').unlink(cr, uid, ids, context)
+            account_move_obj.unlink(cr, uid, ids, context)
             done.append(st.id)
         return self.write(cr, uid, done, {'state':'draft'}, context=context)
 
diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index d968ee9029e..c96b380868b 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import time
-import copy
 
 import rml_parse
 from report import report_sxw
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 0c33517d428..e464a9cddd4 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -39,7 +39,7 @@ class account_vat_declaration(osv.osv_memory):
         company_obj = self.pool.get('res.company')
         user = user_obj.browse(cr, uid, uid, context=context)
         if user.company_id:
-    	    return user.company_id.id
+            return user.company_id.id
         else:
             return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
 

From aaa65b3136608854217787ac655f8bd03737eec0 Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Wed, 20 Oct 2010 16:23:29 +0530
Subject: [PATCH 032/114] [IMP] account_reporting: Removed unused vars

bzr revid: pso@tinyerp.com-20101020105329-o5m2fu973fs5rznq
---
 addons/account_reporting/report/account_report_bs.py           | 3 ---
 .../wizard/account_reporting_balance_report.py                 | 1 -
 2 files changed, 4 deletions(-)

diff --git a/addons/account_reporting/report/account_report_bs.py b/addons/account_reporting/report/account_report_bs.py
index 9fe74586633..d21bfbf4f37 100644
--- a/addons/account_reporting/report/account_report_bs.py
+++ b/addons/account_reporting/report/account_report_bs.py
@@ -20,9 +20,7 @@
 ##############################################################################
 
 import time
-import locale
 
-import pooler
 from report import report_sxw
 
 parents = {
@@ -45,7 +43,6 @@ class account_report_bs(report_sxw.rml_parse):
     def line_total(self, line_id, ctx):
         _total = 0
         bsline = self.pool.get('account.report.bs').browse(self.cr, self.uid, [line_id])[0]
-        bsline_accids = bsline.account_id
         res = self.pool.get('account.report.bs').read(self.cr, self.uid, [line_id], ['account_id', 'child_id'])[0]
         for acc_id in res['account_id']:
             acc = self.pool.get('account.account').browse(self.cr, self.uid, [acc_id], ctx)[0]
diff --git a/addons/account_reporting/wizard/account_reporting_balance_report.py b/addons/account_reporting/wizard/account_reporting_balance_report.py
index 780ad212dda..d6461a8b9dc 100644
--- a/addons/account_reporting/wizard/account_reporting_balance_report.py
+++ b/addons/account_reporting/wizard/account_reporting_balance_report.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 from osv import fields, osv
-from tools.translate import _
 
 class account_reporting_balance_report(osv.osv_memory):
 

From f33edb9fde3723893132ca2d93d2d1bf24c4f577 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 20 Oct 2010 17:47:19 +0530
Subject: [PATCH 033/114] [IMP] Account: Tax report converted to common report
 and make some improvents (make same as other account repots)

bzr revid: mra@mra-laptop-20101020121719-e8z153wy65r2f8xg
---
 addons/account/report/account_tax_report.py  | 31 ++++++++------
 addons/account/report/account_tax_report.rml |  6 +--
 addons/account/wizard/account_vat.py         | 45 +++++++++++---------
 addons/account/wizard/account_vat_view.xml   | 16 +++----
 4 files changed, 55 insertions(+), 43 deletions(-)

diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index c96b380868b..49a11096789 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -26,7 +26,8 @@ from report import report_sxw
 
 class tax_report(rml_parse.rml_parse):
     _name = 'report.account.vat.declaration'
-    def __init__(self, cr, uid, name, context={}):
+
+    def __init__(self, cr, uid, name, context=None):
         super(tax_report, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
@@ -39,24 +40,31 @@ class tax_report(rml_parse.rml_parse):
             'get_years': self.get_years,
         })
 
+    def get_years(self, form):
+        res = {}
+        self.period_ids = []
+        period_obj = self.pool.get('account.period')
+        fy_obj = self.pool.get('account.fiscalyear')
+        res['periods'] = ''
+        res['fname'] = ''
 
-    def get_years(self,form):
-        res={}
-        fiscal_year_name = self.pool.get('account.fiscalyear').name_get(self.cr,self.uid,form['fiscalyear'])
-
+        fiscal_year_name = fy_obj.name_get(self.cr, self.uid, form['fiscalyear_id'])
         if fiscal_year_name:
             res['fname'] = fiscal_year_name[0][1]
             res['periods'] = ''
-        if form['periods']:
-            periods_l = self.pool.get('account.period').read(self.cr, self.uid, form['periods'], ['name'])
+
+        if form['period_from'] and form['period_to']:
+            self.period_ids = period_obj.build_ctx_periods(self.cr, self.uid, form['period_from'], form['period_to'])
+            periods_l = period_obj.read(self.cr, self.uid, self.period_ids, ['name'])
             for period in periods_l:
-                if res['periods']=='':
+                if res['periods'] == '':
                     res['periods'] = period['name']
                 else:
                     res['periods'] += ", "+ period['name']
         return res
 
-    def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}):
+    def _get_lines(self, based_on, company_id=False, parent=False, level=0, context=None):
+        period_list = self.period_ids
         res = self._get_codes(based_on, company_id, parent, level, period_list, context=context)
 
         if period_list:
@@ -95,12 +103,11 @@ class tax_report(rml_parse.rml_parse):
                 ind_general+=1
             i+=1
         return top_result
-        #return array_result
 
     def _get_period(self, period_id, context={}):
         return self.pool.get('account.period').browse(self.cr, self.uid, period_id, context=context).name
 
-    def _get_general(self, tax_code_id, period_list,company_id, based_on, context={}):
+    def _get_general(self, tax_code_id, period_list, company_id, based_on, context={}):
         res=[]
         obj_account = self.pool.get('account.account')
         periods_ids = tuple(period_list)
@@ -232,4 +239,4 @@ class tax_report(rml_parse.rml_parse):
 report_sxw.report_sxw('report.account.vat.declaration', 'account.tax.code',
     'addons/account/report/account_tax_report.rml', parser=tax_report, header="internal")
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/report/account_tax_report.rml b/addons/account/report/account_tax_report.rml
index 47df92cc3bc..7079dc81ad8 100644
--- a/addons/account/report/account_tax_report.rml
+++ b/addons/account/report/account_tax_report.rml
@@ -108,13 +108,13 @@
   <para style="P2"><font color="white"> </font></para>
 	<blockTable colWidths="538" style="Tableau1">
       <tr>
-        <td><para style="P12">Year : [[ get_years(data['form'])['fname'] ]]</para></td>
+        <td><para style="P12">Fiscal Year : [[ get_years(data['form'])['fname'] ]]</para></td>
       </tr>
       <tr>
         <td><para style="P12">Periods : [[ get_years(data['form'])['periods'] or removeParentNode('tr')]]</para></td>
       </tr>
     </blockTable>
-  <para style="P2"><font color="white"> </font></para>    	
+  <para style="P2"><font color="white"> </font></para>
 	<blockTable colWidths="340.0,55.0,55.0,90.0" style="Table2" repeatRows="1">
 	  <tr>
 	    <td><para style="P12">Tax Name</para></td>
@@ -123,7 +123,7 @@
 	    <td><para style="P12a">Tax Amount</para></td>
 	  </tr>
 	  <tr>
-	       <td><para style="P5"><font>[[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]]</font><font color="white">[[ (o['level']) ]]</font> <font>[[ (len(o['level'])&lt;5 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ o['code'] ]]  [[ o['name'] ]] </font></para></td>
+	       <td><para style="P5"><font>[[ repeatIn(get_lines(data['form']['based_on'], data['form']['company_id']), 'o') ]]</font><font color="white">[[ (o['level']) ]]</font> <font>[[ (len(o['level'])&lt;5 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ o['code'] ]]  [[ o['name'] ]] </font></para></td>
            <td><para style="P6"><font>[[ len(o['level'])&lt;5 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font></para></td>
            <td><para style="P6"><font>[[ len(o['level'])&lt;5 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['credit']) ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['credit'])]]</font></para></td>
            <td><para style="P6"><font>[[ len(o['level'])&lt;5 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]] [[ company.currency_id.symbol ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]] [[ company.currency_id.symbol ]]</font> </para></td>
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index e464a9cddd4..8c4751d79e5 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -24,41 +24,48 @@ from osv import osv, fields
 class account_vat_declaration(osv.osv_memory):
     _name = 'account.vat.declaration'
     _description = 'Account Vat Declaration'
-    _inherit = "account.common.account.report"
+    _inherit = "account.common.report"
     _columns = {
-	    'based_on': fields.selection([('invoices','Invoices'),
-                                      ('payments','Payments'),],
+	    'based_on': fields.selection([('invoices', 'Invoices'),
+                                      ('payments', 'Payments'),],
                                       'Based On', required=True),
-        'company_id': fields.many2one('res.company', 'Company', required=True),
-        'periods': fields.many2many('account.period', 'vat_period_rel', 'vat_id', 'period_id', 'Periods', help="All periods if empty"),
-        'fiscalyear': fields.many2many('account.fiscalyear','vat_fiscal_rel','fiscal_id','Fiscal Year',required=True),
-        }
+#        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'chart_tax_id': fields.many2one('account.tax.code', 'Chart of Tax', help='Select Charts of Taxes', required=True, domain = [('parent_id','=',False)]),
+    }
 
-    def _get_company(self, cr, uid, context={}):
-        user_obj = self.pool.get('res.users')
-        company_obj = self.pool.get('res.company')
-        user = user_obj.browse(cr, uid, uid, context=context)
-        if user.company_id:
-            return user.company_id.id
-        else:
-            return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
+    def _get_tax(self, cr, uid, context=None):
+        taxes = self.pool.get('account.tax.code').search(cr, uid, [('parent_id','=',False)], limit=1)
+        return taxes and taxes[0] or False
+
+#    def _get_company(self, cr, uid, context={}):
+#        user_obj = self.pool.get('res.users')
+#        company_obj = self.pool.get('res.company')
+#        user = user_obj.browse(cr, uid, uid, context=context)
+#        if user.company_id:
+#            company_id = user.company_id.id
+#        else:
+#            company_id = company_obj.search(cr, uid, [('parent_id', '=', False)])
+#            company_id = company_id and company_id[0] or False
+#        return company_id
 
     _defaults = {
         'based_on': 'invoices',
-        'company_id': _get_company
-		}
+        'chart_tax_id': _get_tax
+    }
 
-    def create_vat(self, cr, uid, ids, context={}):
+    def create_vat(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
         datas = {'ids': context.get('active_ids', [])}
         datas['model'] = 'account.tax.code'
         datas['form'] = self.read(cr, uid, ids)[0]
+        datas['form']['company_id'] = self.pool.get('account.tax.code').browse(cr, uid, [datas['form']['chart_tax_id']], context=context)[0].company_id.id
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'account.vat.declaration',
             'datas': datas,
         }
+
 account_vat_declaration()
 
-#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 41c0faa2c79..c6d0307fbaa 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -7,15 +7,13 @@
             <field name="model">account.vat.declaration</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Select Period">
-                <field name="company_id" groups="base.group_multi_company" widget='selection'/>
-                <newline/>
+            <form string="Taxes Report">
+                <field name="chart_tax_id" widget='selection'/>
+                <field name="fiscalyear_id"/>
                 <field name="based_on"/>
-                <newline/>
-                <separator string="Select Period(s)" colspan="4"/>
-                	<field name="periods" nolabel="1" colspan="4"/>
-                <separator string="Select FiscalYear(s)" colspan="4"/>                	                
-                    <field name="fiscalyear" nolabel="1" colspan="4"/>
+                <separator string="Periods"  colspan="4"/>
+                <field name="period_from"  domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" />
+                <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" />
                 <group col="2" colspan="4">
                     <button icon='gtk-cancel' special="cancel"  string="Cancel" />
                     <button name="create_vat" string="Print Tax Statement" colspan="1" type="object" icon="gtk-ok"/>
@@ -42,4 +40,4 @@
             icon="STOCK_PRINT"/>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file

From 9f5cdc0919163d0a604cf2df913edaf8cc749334 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Wed, 20 Oct 2010 18:39:40 +0530
Subject: [PATCH 034/114] [IMP] membership:-added tooltip

bzr revid: mtr@mtr-20101020130940-4fmq1o0cuzlrrrkm
---
 addons/membership/membership.py | 38 ++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 85cc0df43b7..1e92781d57d 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -138,15 +138,21 @@ class membership_line(osv.osv):
         'date_from': fields.date('From', readonly=True),
         'date_to': fields.date('To', readonly=True),
         'date_cancel': fields.date('Cancel date'),
-        'date': fields.date('Join Date'),
-        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True),
+        'date': fields.date('Join Date', help="Date on which member has joined the membership"),
+        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True,  help='Amount for the membership'),
         'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
         'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
         'state': fields.function(_state, method=True,
                         string='Membership State', type='selection',
                         selection=STATE, store = {
                         'account.invoice': (_get_membership_lines, ['state'], 10),
-                        }),
+                        }, help="""It indicates the membership state.
+    -Non Member: A member who has not applied for any membership.
+    -Cancelled Member: A member who has cancelled his membership.
+    -Old Member: A member whose membership date has expired.
+    -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.
+    -Invoiced Member: A member whose invoice has been created.
+    -Paid Member: A member who has paid the membership amount."""),
         'company_id': fields.related('account_invoice_line', 'invoice_id', 'company_id', type="many2one", relation="res.company", string="Company", readonly=True, store=True)
     }
     _rec_name = 'partner'
@@ -301,12 +307,12 @@ class Partner(osv.osv):
         return self._membership_state(*args, **kwargs)
 
     _columns = {
-        'associate_member': fields.many2one('res.partner', 'Associate member'),
+        'associate_member': fields.many2one('res.partner', 'Associate member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."),
         'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'),
-        'free_member': fields.boolean('Free member'),
+        'free_member': fields.boolean('Free member', help = "Select if you want to give membership free of cost."),
         'membership_amount': fields.float(
                     'Membership amount', digits=(16, 2),
-                    help = 'The price negociated by the partner'),
+                    help = 'The price negotiated by the partner'),
         'membership_state': fields.function(
                     __get_membership_state, method = True,
                     string = 'Current Membership State', type = 'selection',
@@ -315,7 +321,13 @@ class Partner(osv.osv):
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
                         'res.partner': (_get_partners, ['free_member', 'membership_state', 'associate_member'], 10)
-                    }),
+                    }, help="""It indicates the membership state.
+    -Non Member: A member who has not applied for any membership.
+    -Cancelled Member: A member who has cancelled his membership.
+    -Old Member: A member whose membership date has expired.
+    -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.
+    -Invoiced Member: A member whose invoice has been created.
+    -Paid Member: A member who has paid the membership amount."""),
         'membership_start': fields.function(
                     _membership_date, method = True, multi = 'membeship_start',
                     string = 'Start membership date', type = 'date',
@@ -323,7 +335,7 @@ class Partner(osv.osv):
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10, ),
                         'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
-                    }),
+                    }, help="Date from which membership becomes active."),
         'membership_stop': fields.function(
                     _membership_date, method = True,
                     string = 'Stop membership date', type = 'date', multi='membership_stop',
@@ -331,7 +343,7 @@ class Partner(osv.osv):
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
                         'res.partner': (lambda self, cr, uid, ids, c={}:ids, ['free_member'], 10)
-                    }),
+                    }, help="Date until which membership remains active."),
         'membership_cancel': fields.function(
                     _membership_date, method = True,
                     string = 'Cancel membership date', type='date', multi='membership_cancel',
@@ -339,7 +351,7 @@ class Partner(osv.osv):
                         'account.invoice': (_get_invoice_partner, ['state'], 11),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
                         'res.partner': (lambda self, cr, uid, ids, c={}:ids, ['free_member'], 10)
-                    }),
+                    }, help="Date on which membership has been cancelled"),
     }
     _defaults = {
         'free_member': False,
@@ -455,9 +467,9 @@ class Product(osv.osv):
     '''Product'''
     _inherit = 'product.product'
     _columns = {
-        'membership': fields.boolean('Membership', help='Specify if this product is a membership product'),
-        'membership_date_from': fields.date('Date from', help='Active Membership since this date'),
-        'membership_date_to': fields.date('Date to', help='Expired date of Membership'),
+        'membership': fields.boolean('Membership', help='Select if a product is a membership product.'),
+        'membership_date_from': fields.date('Date from', help='Date from which membership becomes active.'),
+        'membership_date_to': fields.date('Date to', help='Date until which membership remains active.'),
     }
 
     _defaults = {

From 898403119b25c9d08edd7fb7adaddc1b4e622182 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Wed, 20 Oct 2010 19:06:16 +0530
Subject: [PATCH 035/114] [FIX] account_voucher: Fix yml test warning and code
 clean of account_payment

bzr revid: ara@tinyerp.com-20101020133616-ggxbfq6rw7m20ln9
---
 addons/account_payment/__openerp__.py         |  3 +-
 addons/account_payment/account_invoice.py     |  2 +-
 addons/account_payment/account_move_line.py   |  4 +-
 addons/account_payment/account_payment.py     | 41 +++++++++++++------
 .../account_payment/report/payment_order.py   |  1 +
 addons/account_payment/wizard/__init__.py     |  1 +
 .../wizard/account_payment_order.py           |  1 +
 .../wizard/account_payment_pay.py             |  1 +
 .../account_payment_populate_statement.py     |  3 +-
 addons/account_voucher/__openerp__.py         |  8 ++--
 .../account_voucher/test/account_voucher.yml  | 29 ++++---------
 11 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py
index 7ccafd90eb4..c0579c19eec 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-
 {
     "name": "Payment Management",
     "version": "1.1",
@@ -56,4 +55,4 @@ This module provides :
     'active': False,
     'certificate': '0061703998541',
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_payment/account_invoice.py b/addons/account_payment/account_invoice.py
index c05721ce6dc..ca874e26894 100644
--- a/addons/account_payment/account_invoice.py
+++ b/addons/account_payment/account_invoice.py
@@ -49,4 +49,4 @@ class Invoice(osv.osv):
 
 Invoice()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index 2b9ea22d824..09208892d67 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from operator import itemgetter
 from osv import fields, osv
 from tools.translate import _
@@ -116,5 +117,4 @@ class account_move_line(osv.osv):
 
 account_move_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index a70e8fb75c3..3d3bd8f7b38 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -113,9 +113,11 @@ class payment_order(osv.osv):
         return True
 
     def action_open(self, cr, uid, ids, *args):
+        ir_seq_obj = self.pool.get('ir.sequence')
+
         for order in self.read(cr, uid, ids, ['reference']):
             if not order['reference']:
-                reference = self.pool.get('ir.sequence').get(cr, uid, 'payment.order')
+                reference = ir_seq_obj.get(cr, uid, 'payment.order')
                 self.write(cr, uid, order['id'],{'reference':reference})
         return True
 
@@ -138,6 +140,7 @@ class payment_order(osv.osv):
             context = {}
         payment_line_obj = self.pool.get('payment.line')
         payment_line_ids = []
+
         if (vals.get('date_prefered', False) == 'fixed' and not vals.get('date_scheduled', False)) or vals.get('date_scheduled', False):
             for order in self.browse(cr, uid, ids, context=context):
                 for line in order.line_ids:
@@ -169,6 +172,8 @@ class payment_line(osv.osv):
 
     def info_owner(self, cr, uid, ids, name=None, args=None, context=None):
         if not ids: return {}
+        partner_zip_obj = self.pool.get('res.partner.zip')
+
         result = {}
         info=''
         for line in self.browse(cr, uid, ids, context=context):
@@ -180,7 +185,7 @@ class payment_line(osv.osv):
                         st=ads.street and ads.street or ''
                         st1=ads.street2 and ads.street2 or ''
                         if 'zip_id' in ads:
-                            zip_city= ads.zip_id and self.pool.get('res.partner.zip').name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
+                            zip_city= ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
                         else:
                             zip=ads.zip and ads.zip or ''
                             city= ads.city and ads.city or  ''
@@ -193,8 +198,10 @@ class payment_line(osv.osv):
 
     def info_partner(self, cr, uid, ids, name=None, args=None, context=None):
         if not ids: return {}
+        partner_zip_obj = self.pool.get('res.partner.zip')
         result = {}
         info=''
+
         for line in self.browse(cr, uid, ids, context=context):
             result[line.id]=False
             if not line.partner_id:
@@ -206,7 +213,7 @@ class payment_line(osv.osv):
                         st=ads.street and ads.street or ''
                         st1=ads.street2 and ads.street2 or ''
                         if 'zip_id' in ads:
-                            zip_city= ads.zip_id and self.pool.get('res.partner.zip').name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
+                            zip_city= ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
                         else:
                             zip=ads.zip and ads.zip or ''
                             city= ads.city and ads.city or  ''
@@ -219,8 +226,8 @@ class payment_line(osv.osv):
 
     def select_by_name(self, cr, uid, ids, name, args, context=None):
         if not ids: return {}
-
         partner_obj = self.pool.get('res.partner')
+
         cr.execute("""SELECT pl.id, ml.%s
             from account_move_line ml
                 inner join payment_line pl
@@ -252,6 +259,7 @@ class payment_line(osv.osv):
         if context is None:
             context = {}
         res = {}
+
         for line in self.browse(cursor, user, ids, context=context):
             ctx = context.copy()
             ctx['date'] = line.order_id.date_done or time.strftime('%Y-%m-%d')
@@ -261,18 +269,23 @@ class payment_line(osv.osv):
         return res
 
     def _get_currency(self, cr, uid, context):
-        user = self.pool.get('res.users').browse(cr, uid, uid)
+        user_obj = self.pool.get('res.users')
+        currency_obj = self.pool.get('res.currency')
+        user = user_obj.browse(cr, uid, uid)
+
         if user.company_id:
             return user.company_id.currency_id.id
         else:
-            return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]
+            return currency_obj.search(cr, uid, [('rate','=',1.0)])[0]
 
     def _get_date(self, cr, uid, context=None):
         if context is None:
             context = {}
+        payment_order_obj = self.pool.get('payment.order')
         date = False
+
         if context.get('order_id') and context['order_id']:
-            order = self.pool.get('payment.order').browse(cr, uid, context['order_id'], context)
+            order = payment_order_obj.browse(cr, uid, context['order_id'], context)
             if order.date_prefered == 'fixed':
                 date = order.date_scheduled
             else:
@@ -347,12 +360,13 @@ class payment_line(osv.osv):
 
     def onchange_move_line(self, cr, uid, ids, move_line_id, payment_type, date_prefered, date_scheduled, currency=False, company_currency=False, context=None):
         data={}
+        move_line_obj = self.pool.get('account.move.line')
 
         data['amount_currency']=data['communication']=data['partner_id']=data['reference']=data['date_created']=data['bank_id']=data['amount']=False
 
         if move_line_id:
-            line = self.pool.get('account.move.line').browse(cr, uid, move_line_id)
-            data['amount_currency']=line.amount_to_pay
+            line = move_line_obj.browse(cr, uid, move_line_id)
+            data['amount_currency'] = line.amount_to_pay
 
             res = self.onchange_amount(cr, uid, ids, data['amount_currency'], currency,
                                        company_currency, context)
@@ -394,10 +408,13 @@ class payment_line(osv.osv):
 
     def onchange_partner(self, cr, uid, ids, partner_id, payment_type, context=None):
         data={}
+        partner_zip_obj = self.pool.get('res.partner.zip')
+        partner_obj = self.pool.get('res.partner')
+        payment_mode_obj = self.pool.get('payment.mode')
         data['info_partner']=data['bank_id']=False
 
         if partner_id:
-            part_obj=self.pool.get('res.partner').browse(cr, uid, partner_id)
+            part_obj=partner_obj.browse(cr, uid, partner_id)
             partner=part_obj.name or ''
 
             if part_obj.address:
@@ -407,7 +424,7 @@ class payment_line(osv.osv):
                         st1=ads.street2 and ads.street2 or ''
 
                         if 'zip_id' in ads:
-                            zip_city= ads.zip_id and self.pool.get('res.partner.zip').name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
+                            zip_city= ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
                         else:
                             zip=ads.zip and ads.zip or ''
                             city= ads.city and ads.city or  ''
@@ -419,7 +436,7 @@ class payment_line(osv.osv):
                         data['info_partner']=info
 
             if part_obj.bank_ids and payment_type:
-                bank_type = self.pool.get('payment.mode').suitable_bank_types(cr, uid, payment_type, context=context)
+                bank_type = payment_mode_obj.suitable_bank_types(cr, uid, payment_type, context=context)
                 for bank in part_obj.bank_ids:
                     if bank.state in bank_type:
                         data['bank_id'] = bank.id
diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py
index f0f6030b0f3..3734e4268d1 100644
--- a/addons/account_payment/report/payment_order.py
+++ b/addons/account_payment/report/payment_order.py
@@ -38,6 +38,7 @@ class payment_order(report_sxw.rml_parse):
             'get_account_name': self._get_account_name,
 
         })
+
     def _get_invoice_name(self, invoice_id):
         if invoice_id:
             pool = pooler.get_pool(self.cr.dbname)
diff --git a/addons/account_payment/wizard/__init__.py b/addons/account_payment/wizard/__init__.py
index c5f7be51231..1c5aefacc78 100644
--- a/addons/account_payment/wizard/__init__.py
+++ b/addons/account_payment/wizard/__init__.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import account_payment_order
 import account_payment_populate_statement
 import account_payment_pay
diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py
index 4a070f05a27..b1ae0717dd2 100644
--- a/addons/account_payment/wizard/account_payment_order.py
+++ b/addons/account_payment/wizard/account_payment_order.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 from lxml import etree
 
diff --git a/addons/account_payment/wizard/account_payment_pay.py b/addons/account_payment/wizard/account_payment_pay.py
index 09ea68e7d30..33706e8458f 100644
--- a/addons/account_payment/wizard/account_payment_pay.py
+++ b/addons/account_payment/wizard/account_payment_pay.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 
 class account_payment_make_payment(osv.osv_memory):
diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index 7697d4eea6d..6119b9ea5d9 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -56,6 +56,7 @@ class account_payment_populate_statement(osv.osv_memory):
         currency_obj = self.pool.get('res.currency')
         voucher_obj = self.pool.get('account.voucher')
         voucher_line_obj = self.pool.get('account.voucher.line')
+        move_line_obj = self.pool.get('account.move.line')
 
         if context is None:
             context = {}
@@ -98,7 +99,7 @@ class account_payment_populate_statement(osv.osv_memory):
                 voucher_line_dict =  False
                 if result['value']['line_ids']:
                     for line_dict in result['value']['line_ids']:
-                        move_line = self.pool.get('account.move.line').browse(cr, uid, line_dict['move_line_id'], context)
+                        move_line = move_line_obj.browse(cr, uid, line_dict['move_line_id'], context)
                         if line.move_line_id.move_id.id == move_line.move_id.id:
                             voucher_line_dict = line_dict
                 if voucher_line_dict:
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 76c05efbe6d..6d6203d3d69 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -51,10 +51,10 @@
         "security/account_voucher_security.xml"
     ],
     "test" : [
-#         "test/account_voucher.yml",
-          "test/sales_receipt.yml",
-          "test/sales_payment.yml",
-          "test/account_voucher_report.yml"
+        "test/account_voucher.yml",
+        "test/sales_receipt.yml",
+        "test/sales_payment.yml",
+        "test/account_voucher_report.yml"
     ],
     'certificate': '0037580727101',
     "active": False,
diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml
index 424ec0e5cc7..ce34733dda7 100644
--- a/addons/account_voucher/test/account_voucher.yml
+++ b/addons/account_voucher/test/account_voucher.yml
@@ -1,21 +1,21 @@
-
 -
   In order to check account voucher module in OpenERP I create a customer voucher
 -
   !record {model: account.voucher, id: account_voucher_voucherforaxelor0}:
     account_id: account.cash
+    amount: 1000.0
     company_id: base.main_company
     currency_id: base.EUR
     journal_id: account.bank_journal
     name: Voucher for Axelor
     narration: Basic Pc
-    line_ids:
+    line_cr_ids:
       - account_id: account.a_recv
         amount: 1000.0
         name: Voucher for Axelor
-        partner_id: base.res_partner_desertic_hispafuentes
+    partner_id: base.res_partner_desertic_hispafuentes
     period_id: account.period_6
-    reference_type: none
+    reference: none
 
 -
   I check that Initially customer voucher is in the "Draft" state
@@ -26,11 +26,7 @@
   I compute the voucher to calculate the taxes by clicking Compute button
 -
   !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucherforaxelor0}
--
-  I check that the voucher state is now "proforma"
--
-  !assert {model: account.voucher, id: account_voucher_voucherforaxelor0}:
-    - state == 'proforma'
+
 -
   I create voucher by clicking on Create button
 -
@@ -54,32 +50,25 @@
 -
   !record {model: account.voucher, id: account_voucher_voucheraxelor0}:
     account_id: account.cash
+    amount: 1000.0
     company_id: base.main_company
     currency_id: base.EUR
     journal_id: account.bank_journal
     name: Voucher Axelor
     narration: Basic PC
-    line_ids:
+    line_dr_ids:
       - account_id: account.cash
         amount: 1000.0
         name: Voucher Axelor
+    partner_id: base.res_partner_desertic_hispafuentes
     period_id: account.period_6
-    reference_type: none
+    reference: none
 
 -
   I check that Initially vendor voucher is in the "Draft" state
 -
   !assert {model: account.voucher, id: account_voucher_voucheraxelor0}:
     - state == 'draft'
--
-  I change the state of voucher to "proforma" by clicking PRO-FORMA button
--
-  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucheraxelor0}
--
-  I check that the voucher state is now "proforma"
--
-  !assert {model: account.voucher, id: account_voucher_voucheraxelor0}:
-    - state == 'proforma'
 -
   I create voucher by clicking on Create button
 -

From 701a010bb1f249982a3683c8ce5c1f0e32c5d555 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 21 Oct 2010 11:03:51 +0530
Subject: [PATCH 036/114] [REM] Account: Tax report removed unused methods

bzr revid: mra@mra-laptop-20101021053351-fbesnyy6706s5wzn
---
 addons/account/report/account_tax_report.py | 26 ++++++---------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index 49a11096789..45ba56bf446 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -31,10 +31,8 @@ class tax_report(rml_parse.rml_parse):
         super(tax_report, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
-            'get_period': self._get_period,
             'get_codes': self._get_codes,
             'get_general': self._get_general,
-            'get_company': self._get_company,
             'get_currency': self._get_currency,
             'get_lines': self._get_lines,
             'get_years': self.get_years,
@@ -66,7 +64,6 @@ class tax_report(rml_parse.rml_parse):
     def _get_lines(self, based_on, company_id=False, parent=False, level=0, context=None):
         period_list = self.period_ids
         res = self._get_codes(based_on, company_id, parent, level, period_list, context=context)
-
         if period_list:
             res = self._add_codes(based_on, res, period_list, context=context)
         else:
@@ -104,11 +101,8 @@ class tax_report(rml_parse.rml_parse):
             i+=1
         return top_result
 
-    def _get_period(self, period_id, context={}):
-        return self.pool.get('account.period').browse(self.cr, self.uid, period_id, context=context).name
-
-    def _get_general(self, tax_code_id, period_list, company_id, based_on, context={}):
-        res=[]
+    def _get_general(self, tax_code_id, period_list, company_id, based_on, context=None):
+        res = []
         obj_account = self.pool.get('account.account')
         periods_ids = tuple(period_list)
         if based_on == 'payments':
@@ -161,7 +155,7 @@ class tax_report(rml_parse.rml_parse):
             i+=1
         return res
 
-    def _get_codes(self, based_on, company_id, parent=False, level=0, period_list=[], context={}):
+    def _get_codes(self, based_on, company_id, parent=False, level=0, period_list=[], context=None):
         obj_tc = self.pool.get('account.tax.code')
         ids = obj_tc.search(self.cr, self.uid, [('parent_id','=',parent),('company_id','=',company_id)], context=context)
 
@@ -172,7 +166,7 @@ class tax_report(rml_parse.rml_parse):
             res += self._get_codes(based_on, company_id, code.id, level+1, context=context)
         return res
 
-    def _add_codes(self, based_on, account_list=[], period_list=[], context={}):
+    def _add_codes(self, based_on, account_list=[], period_list=[], context=None):
         res = []
         obj_tc = self.pool.get('account.tax.code')
         for account in account_list:
@@ -187,16 +181,10 @@ class tax_report(rml_parse.rml_parse):
             res.append((account[0], code))
         return res
 
+    def _get_currency(self, form, context=None):
+        return self.pool.get('res.company').browse(self.cr, self.uid, form['company_id'], context=context).currency_id.name
 
-    def _get_company(self, form, context={}):
-        obj_company = self.pool.get('res.company')
-        return obj_company.browse(self.cr, self.uid, form['company_id'], context=context).name
-
-    def _get_currency(self, form, context={}):
-        obj_company = self.pool.get('res.company')
-        return obj_company.browse(self.cr, self.uid, form['company_id'], context=context).currency_id.name
-
-    def sort_result(self, accounts, context={}):
+    def sort_result(self, accounts, context=None):
         # On boucle sur notre rapport
         result_accounts = []
         ind=0

From 4843ea000b174ca2c4b9ba192e4785c19844822a Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Thu, 21 Oct 2010 11:09:17 +0530
Subject: [PATCH 037/114] [REF] account_payment: Remove warnings

bzr revid: psi@tinyerp.co.in-20101021053917-rnxocx1skd71k1yf
---
 .../account_payment/report/payment_order.py   |  4 +--
 .../wizard/account_payment_order.py           | 18 +++++------
 .../wizard/account_payment_pay.py             |  2 +-
 .../account_payment_populate_statement.py     | 32 ++++++++-----------
 4 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py
index 3734e4268d1..a9412b832a4 100644
--- a/addons/account_payment/report/payment_order.py
+++ b/addons/account_payment/report/payment_order.py
@@ -20,13 +20,13 @@
 ##############################################################################
 
 import time
-import datetime
+
 import pooler
 from report import report_sxw
 
 class payment_order(report_sxw.rml_parse):
 
-    def __init__(self, cr, uid, name, context):
+    def __init__(self, cr, uid, name, context=None):
         super(payment_order, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'time': time,
diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py
index b1ae0717dd2..8ef89beefb5 100644
--- a/addons/account_payment/wizard/account_payment_order.py
+++ b/addons/account_payment/wizard/account_payment_order.py
@@ -40,10 +40,10 @@ class payment_order_create(osv.osv_memory):
     _columns = {
         'duedate': fields.date('Due Date', required=True),
         'entries': fields.many2many('account.move.line', 'line_pay_rel', 'pay_id', 'line_id', 'Entries')
-                }
+    }
     _defaults = {
          'duedate': time.strftime('%Y-%m-%d'),
-                 }
+    }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         res = super(payment_order_create, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
@@ -64,7 +64,8 @@ class payment_order_create(osv.osv_memory):
             context = {}
         data = self.read(cr, uid, ids, [])[0]
         line_ids = data['entries']
-        if not line_ids: return {}
+        if not line_ids:
+            return {}
 
         payment = order_obj.browse(cr, uid, context['active_id'], context=context)
         t = None
@@ -100,16 +101,13 @@ class payment_order_create(osv.osv_memory):
         data = self.read(cr, uid, ids, [], context=context)[0]
         search_due_date = data['duedate']
         payment = order_obj.browse(cr, uid, context['active_id'], context=context)
-        ctx = ''
-        if payment.mode:
-            ctx = '''context="{'journal_id': %d}"''' % payment.mode.journal.id
 
         # Search for move line to pay:
-        domain = [('reconcile_id', '=', False),('account_id.type', '=', 'payable'),('amount_to_pay', '>', 0)]
-        domain = domain + ['|',('date_maturity','<=',search_due_date),('date_maturity','=',False)]
+        domain = [('reconcile_id', '=', False), ('account_id.type', '=', 'payable'), ('amount_to_pay', '>', 0)]
+        domain = domain + ['|', ('date_maturity', '<=', search_due_date), ('date_maturity', '=', False)]
         line_ids = line_obj.search(cr, uid, domain, context=context)
         context.update({'line_ids': line_ids})
-        model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_create_payment_order_lines')], context=context)
+        model_data_ids = mod_obj.search(cr, uid,[('model', '=', 'ir.ui.view'), ('name', '=', 'view_create_payment_order_lines')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
         return {'name': ('Entrie Lines'),
                 'context': context,
@@ -119,7 +117,7 @@ class payment_order_create(osv.osv_memory):
                 'views': [(resource_id,'form')],
                 'type': 'ir.actions.act_window',
                 'target': 'new',
-                }
+        }
 
 payment_order_create()
 
diff --git a/addons/account_payment/wizard/account_payment_pay.py b/addons/account_payment/wizard/account_payment_pay.py
index 33706e8458f..8e524c78959 100644
--- a/addons/account_payment/wizard/account_payment_pay.py
+++ b/addons/account_payment/wizard/account_payment_pay.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
 
 class account_payment_make_payment(osv.osv_memory):
     _name = "account.payment.make.payment"
diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index 6119b9ea5d9..bd61d58be3f 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -29,7 +29,7 @@ class account_payment_populate_statement(osv.osv_memory):
     _description = "Account Payment Populate Statement"
     _columns = {
         'lines': fields.many2many('payment.line', 'payment_line_rel_', 'payment_id', 'line_id', 'Payment Lines')
-               }
+    }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         line_obj = self.pool.get('payment.line')
@@ -76,24 +76,18 @@ class account_payment_populate_statement(osv.osv_memory):
             context.update({'move_line_ids': [line.move_line_id.id]})
             result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype='payment', context=context)
 
-            if line.partner_id:
-#                line['partner_id'] = mv.partner_id.id
-                if amount < 0:
-                    account = line.partner_id.property_account_payable.id
-                else:
-                    account = line.partner_id.property_account_receivable.id
-
             if line.move_line_id:
-                voucher_res = { 'type': 'payment',
-                'name': line.name,
-                'partner_id': line.partner_id.id,
-                'journal_id': statement.journal_id.id,
-                'account_id': result.get('account_id', statement.journal_id.default_credit_account_id.id),
-                'company_id': statement.company_id.id,
-                'currency_id': statement.currency.id,
-                'date': line.date or time.strftime('%Y-%m-%d'),
-                'amount': abs(amount),
-                'period_id': statement.period_id.id
+                voucher_res = {
+                        'type': 'payment',
+                        'name': line.name,
+                        'partner_id': line.partner_id.id,
+                        'journal_id': statement.journal_id.id,
+                        'account_id': result.get('account_id', statement.journal_id.default_credit_account_id.id),
+                        'company_id': statement.company_id.id,
+                        'currency_id': statement.currency.id,
+                        'date': line.date or time.strftime('%Y-%m-%d'),
+                        'amount': abs(amount),
+                        'period_id': statement.period_id.id
                 }
                 voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)
                 voucher_line_dict =  False
@@ -103,7 +97,7 @@ class account_payment_populate_statement(osv.osv_memory):
                         if line.move_line_id.move_id.id == move_line.move_id.id:
                             voucher_line_dict = line_dict
                 if voucher_line_dict:
-                    voucher_line_dict.update({'voucher_id':voucher_id})
+                    voucher_line_dict.update({'voucher_id': voucher_id})
                     voucher_line_obj.create(cr, uid, voucher_line_dict, context=context)
 
                 st_line_id = statement_line_obj.create(cr, uid, {

From 7bc15edf3992ab34c3ea8008de4098d77a2be18f Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Thu, 21 Oct 2010 11:17:10 +0530
Subject: [PATCH 038/114] [IMP] account: Removed unused import statements from
 wizard and report

bzr revid: pso@tinyerp.com-20101021054710-vgt2i8680jfsshx3
---
 addons/account/report/account_partner_balance.py              | 3 +--
 addons/account/report/account_print_overdue.py                | 3 +--
 addons/account/report/account_tax_code.py                     | 3 +--
 addons/account/report/rml_parse.py                            | 3 ---
 addons/account/wizard/account_move_line_select.py             | 3 +--
 addons/account/wizard/account_move_line_unreconcile_select.py | 2 --
 addons/account/wizard/account_state_open.py                   | 2 +-
 addons/account/wizard/account_unreconcile.py                  | 2 +-
 addons/account/wizard/account_use_model.py                    | 1 -
 9 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/addons/account/report/account_partner_balance.py b/addons/account/report/account_partner_balance.py
index c17de597e1c..cc6d9e6e0de 100644
--- a/addons/account/report/account_partner_balance.py
+++ b/addons/account/report/account_partner_balance.py
@@ -20,8 +20,6 @@
 ##############################################################################
 
 import time
-import re
-import copy
 
 from tools.translate import _
 from report import report_sxw
@@ -53,6 +51,7 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
         })
 
     def set_context(self, objects, data, ids, report_type=None):
+        print "SET"
         self.display_partner = data['form'].get('display_partner', 'non-zero_balance')
         obj_move = self.pool.get('account.move.line')
         self.query = obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context', {}))
diff --git a/addons/account/report/account_print_overdue.py b/addons/account/report/account_print_overdue.py
index 3e1f0b54de1..af55018cf11 100644
--- a/addons/account/report/account_print_overdue.py
+++ b/addons/account/report/account_print_overdue.py
@@ -21,8 +21,6 @@
 
 import time
 
-import ir
-from osv import osv
 from report import report_sxw
 import pooler
 
@@ -38,6 +36,7 @@ class Overdue(report_sxw.rml_parse):
         })
         self.context = context
     def _adr_get(self, partner, type):
+        print "ADDRESS"
         res = []
         res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
         res_partner_address = pooler.get_pool(self.cr.dbname).get('res.partner.address')
diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py
index 2f123fd00be..a154bbec009 100644
--- a/addons/account/report/account_tax_code.py
+++ b/addons/account/report/account_tax_code.py
@@ -21,13 +21,12 @@
 ##############################################################################
 
 import time
-import pooler
 import rml_parse
-import copy
 from report import report_sxw
 import re
 
 def _get_country(record):
+    print "TEST"
     if record.partner_id \
             and record.partner_id.address \
             and record.partner_id.address[0].country_id:
diff --git a/addons/account/report/rml_parse.py b/addons/account/report/rml_parse.py
index 1d3cc629cfa..91fc986e7ea 100644
--- a/addons/account/report/rml_parse.py
+++ b/addons/account/report/rml_parse.py
@@ -20,11 +20,8 @@
 ##############################################################################
 
 from report import report_sxw
-import xml.dom.minidom
 import time
-import osv
 import re
-import pooler
 import sys
 
 
diff --git a/addons/account/wizard/account_move_line_select.py b/addons/account/wizard/account_move_line_select.py
index 86345703f6f..556a688f867 100644
--- a/addons/account/wizard/account_move_line_select.py
+++ b/addons/account/wizard/account_move_line_select.py
@@ -19,8 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
-from tools.translate import _
+from osv import osv
 
 class account_move_line_select(osv.osv_memory):
     """
diff --git a/addons/account/wizard/account_move_line_unreconcile_select.py b/addons/account/wizard/account_move_line_unreconcile_select.py
index c445828d0ae..826a5a654b1 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select.py
+++ b/addons/account/wizard/account_move_line_unreconcile_select.py
@@ -20,8 +20,6 @@
 ##############################################################################
 
 from osv import fields, osv
-from tools.translate import _
-import tools
 
 class account_move_line_unreconcile_select(osv.osv_memory):
     _name = "account.move.line.unreconcile.select"
diff --git a/addons/account/wizard/account_state_open.py b/addons/account/wizard/account_state_open.py
index 4703ea18c61..2a03a80aefa 100644
--- a/addons/account/wizard/account_state_open.py
+++ b/addons/account/wizard/account_state_open.py
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from osv import osv, fields
+from osv import osv
 
 import netsvc
 from tools.translate import _
diff --git a/addons/account/wizard/account_unreconcile.py b/addons/account/wizard/account_unreconcile.py
index 2a77cd8fb66..88b58b68a1e 100644
--- a/addons/account/wizard/account_unreconcile.py
+++ b/addons/account/wizard/account_unreconcile.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
 
 class account_unreconcile(osv.osv_memory):
     _name = "account.unreconcile"
diff --git a/addons/account/wizard/account_use_model.py b/addons/account/wizard/account_use_model.py
index edac082f32e..baf09f5ac16 100644
--- a/addons/account/wizard/account_use_model.py
+++ b/addons/account/wizard/account_use_model.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 import time
-import datetime
 
 from osv import fields, osv
 from tools.translate import _

From 449af5cb996c1654c3f1f1f8b13cce197ebeca1b Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Thu, 21 Oct 2010 11:20:17 +0530
Subject: [PATCH 039/114] [REF] account

bzr revid: psi@tinyerp.co.in-20101021055017-yrmgb3pzunpxlg0u
---
 addons/account/wizard/account_validate_account_move.py | 4 ++--
 addons/account/wizard/account_vat.py                   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py
index 0fac7387db9..0f963b44fa6 100644
--- a/addons/account/wizard/account_validate_account_move.py
+++ b/addons/account/wizard/account_validate_account_move.py
@@ -25,8 +25,8 @@ class validate_account_move(osv.osv_memory):
     _name = "validate.account.move"
     _description = "Validate Account Move"
     _columns = {
-       'journal_id': fields.many2one('account.journal', 'Journal', required=True),
-       'period_id': fields.many2one('account.period', 'Period', required=True, domain=[('state','<>','done')]),
+        'journal_id': fields.many2one('account.journal', 'Journal', required=True),
+        'period_id': fields.many2one('account.period', 'Period', required=True, domain=[('state','<>','done')]),
     }
 
     def validate_move(self, cr, uid, ids, context=None):
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 8c4751d79e5..96c6efb9a93 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -26,15 +26,15 @@ class account_vat_declaration(osv.osv_memory):
     _description = 'Account Vat Declaration'
     _inherit = "account.common.report"
     _columns = {
-	    'based_on': fields.selection([('invoices', 'Invoices'),
+        'based_on': fields.selection([('invoices', 'Invoices'),
                                       ('payments', 'Payments'),],
                                       'Based On', required=True),
 #        'company_id': fields.many2one('res.company', 'Company', required=True),
-        'chart_tax_id': fields.many2one('account.tax.code', 'Chart of Tax', help='Select Charts of Taxes', required=True, domain = [('parent_id','=',False)]),
+        'chart_tax_id': fields.many2one('account.tax.code', 'Chart of Tax', help='Select Charts of Taxes', required=True, domain = [('parent_id','=', False)]),
     }
 
     def _get_tax(self, cr, uid, context=None):
-        taxes = self.pool.get('account.tax.code').search(cr, uid, [('parent_id','=',False)], limit=1)
+        taxes = self.pool.get('account.tax.code').search(cr, uid, [('parent_id', '=', False)], limit=1)
         return taxes and taxes[0] or False
 
 #    def _get_company(self, cr, uid, context={}):

From ce77a74bc989885371eb602de5b32263a6d97bc1 Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Thu, 21 Oct 2010 11:26:20 +0530
Subject: [PATCH 040/114] [IMP] account: Removed print statements

bzr revid: pso@tinyerp.com-20101021055620-8xwy3u928thpzu9p
---
 addons/account/report/account_partner_balance.py | 1 -
 addons/account/report/account_print_overdue.py   | 1 -
 addons/account/report/account_tax_code.py        | 1 -
 3 files changed, 3 deletions(-)

diff --git a/addons/account/report/account_partner_balance.py b/addons/account/report/account_partner_balance.py
index cc6d9e6e0de..ab1c6f656f2 100644
--- a/addons/account/report/account_partner_balance.py
+++ b/addons/account/report/account_partner_balance.py
@@ -51,7 +51,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
         })
 
     def set_context(self, objects, data, ids, report_type=None):
-        print "SET"
         self.display_partner = data['form'].get('display_partner', 'non-zero_balance')
         obj_move = self.pool.get('account.move.line')
         self.query = obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context', {}))
diff --git a/addons/account/report/account_print_overdue.py b/addons/account/report/account_print_overdue.py
index af55018cf11..0a03801d409 100644
--- a/addons/account/report/account_print_overdue.py
+++ b/addons/account/report/account_print_overdue.py
@@ -36,7 +36,6 @@ class Overdue(report_sxw.rml_parse):
         })
         self.context = context
     def _adr_get(self, partner, type):
-        print "ADDRESS"
         res = []
         res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
         res_partner_address = pooler.get_pool(self.cr.dbname).get('res.partner.address')
diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py
index a154bbec009..e59839f8267 100644
--- a/addons/account/report/account_tax_code.py
+++ b/addons/account/report/account_tax_code.py
@@ -26,7 +26,6 @@ from report import report_sxw
 import re
 
 def _get_country(record):
-    print "TEST"
     if record.partner_id \
             and record.partner_id.address \
             and record.partner_id.address[0].country_id:

From 759f31ed3c005591d72b3fe57e55573813c32c8b Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 21 Oct 2010 11:32:07 +0530
Subject: [PATCH 041/114] [FIX] Account: creation of journal items with
 refrence field on it ..remove the ref field on create ..

bzr revid: mra@mra-laptop-20101021060207-1z44kagx1z6vukew
---
 addons/account/account_move_line.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 3b459a4e986..8200a7fc321 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1128,6 +1128,8 @@ class account_move_line(osv.osv):
                         'period_id': context['period_id'],
                         'journal_id': context['journal_id']
                     }
+                    if vals.get('ref', ''):
+                        v.update({'ref': vals['ref']})
                     move_id = move_obj.create(cr, uid, v, context)
                     vals['move_id'] = move_id
                 else:

From f603f8e3635ca7bce6b4ab02bd7dfd8003912512 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Thu, 21 Oct 2010 12:19:39 +0530
Subject: [PATCH 042/114] [FIX] account: supplier invoice value of reference
 field of account.move.line is not created

bzr revid: vth@tinyerp.com-20101021064939-yifdessflr827nct
---
 addons/account/invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 9ce9b593f0f..4b09f6fbad1 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -970,7 +970,7 @@ class account_invoice(osv.osv):
             invtype = obj_inv.type
             number = obj_inv.number
             move_id = obj_inv.move_id and obj_inv.move_id.id or False
-            reference = obj_inv.reference or ''
+            reference = obj_inv.reference or number or ''
 
             self.write(cr, uid, ids, {'internal_number':number})
 

From 8add10403c5d9277ae93b84db9928f7a04035f35 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Thu, 21 Oct 2010 12:28:57 +0530
Subject: [PATCH 043/114] [FIX] account: supplier invoice

bzr revid: vth@tinyerp.com-20101021065857-cn9j5h2lpzppwm4e
---
 addons/account/invoice.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 4b09f6fbad1..0552701f28e 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -970,12 +970,15 @@ class account_invoice(osv.osv):
             invtype = obj_inv.type
             number = obj_inv.number
             move_id = obj_inv.move_id and obj_inv.move_id.id or False
-            reference = obj_inv.reference or number or ''
+            reference = obj_inv.reference or ''
 
             self.write(cr, uid, ids, {'internal_number':number})
 
             if invtype in ('in_invoice', 'in_refund'):
-                ref = reference
+                if not reference:
+                    ref = self._convert_ref(cr, uid, number)
+                else:
+                    ref = reference
             else:
                 ref = self._convert_ref(cr, uid, number)
 

From 60d218eb27da83a26e34dec5a98a58b904a1d345 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 21 Oct 2010 12:31:35 +0530
Subject: [PATCH 044/114] [REF] clean vat

bzr revid: mra@mra-laptop-20101021070135-auy20xw9l8uoj70e
---
 addons/account/wizard/account_vat.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 96c6efb9a93..863ae055428 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -29,7 +29,6 @@ class account_vat_declaration(osv.osv_memory):
         'based_on': fields.selection([('invoices', 'Invoices'),
                                       ('payments', 'Payments'),],
                                       'Based On', required=True),
-#        'company_id': fields.many2one('res.company', 'Company', required=True),
         'chart_tax_id': fields.many2one('account.tax.code', 'Chart of Tax', help='Select Charts of Taxes', required=True, domain = [('parent_id','=', False)]),
     }
 
@@ -37,17 +36,6 @@ class account_vat_declaration(osv.osv_memory):
         taxes = self.pool.get('account.tax.code').search(cr, uid, [('parent_id', '=', False)], limit=1)
         return taxes and taxes[0] or False
 
-#    def _get_company(self, cr, uid, context={}):
-#        user_obj = self.pool.get('res.users')
-#        company_obj = self.pool.get('res.company')
-#        user = user_obj.browse(cr, uid, uid, context=context)
-#        if user.company_id:
-#            company_id = user.company_id.id
-#        else:
-#            company_id = company_obj.search(cr, uid, [('parent_id', '=', False)])
-#            company_id = company_id and company_id[0] or False
-#        return company_id
-
     _defaults = {
         'based_on': 'invoices',
         'chart_tax_id': _get_tax

From 7f62b372586e36b3ea309ec6cb52e3a06ca95998 Mon Sep 17 00:00:00 2001
From: "HMO(Openerp), MTR(OpenERP)" <>
Date: Thu, 21 Oct 2010 12:38:55 +0530
Subject: [PATCH 045/114] [IMP] account,point_of_sale:-improvements in the
 account.bank.statement and code cleaning

bzr revid: mtr@mtr-20101021070855-tkvwmvmywbgyof2f
---
 addons/account/account_cash_statement.py      | 39 ++++++++++---------
 .../point_of_sale/account_bank_statement.py   | 33 ++++++++++------
 2 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index f88d38734f2..95706351ffa 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -242,7 +242,7 @@ class account_cash_statement(osv.osv):
 
     def create(self, cr, uid, vals, context=None):
         sql = [
-                ('journal_id', '=', vals['journal_id']),
+                ('journal_id', '=', vals.get('journal_id', False)),
                 ('state', '=', 'open')
         ]
         open_jrnl = self.search(cr, uid, sql)
@@ -317,34 +317,35 @@ class account_cash_statement(osv.osv):
         else:
             return True
 
-    def _user_allow(self, cr, uid, ids, statement, context={}):
+    def _user_allow(self, cr, uid, statement_id, context=None):
         return True
 
     def button_open(self, cr, uid, ids, context=None):
-
         """ Changes statement state to Running.
         @return: True
         """
-        cash_pool = self.pool.get('account.cashbox.line')
+        if context is None:
+            context = {}
         statement_pool = self.pool.get('account.bank.statement')
-        statement = statement_pool.browse(cr, uid, ids[0])
-        vals = {}
+        for statement in statement_pool.browse(cr, uid, ids, context=context):
+            vals = {}
 
-        if not self._user_allow(cr, uid, ids, statement, context={}):
-            raise osv.except_osv(_('Error !'), _('User %s does not have rights to access %s journal !' % (statement.user_id.name, statement.journal_id.name)))
+            if not self._user_allow(cr, uid, statement.id, context=context):
+                raise osv.except_osv(_('Error !'), _('User %s does not have rights to access %s journal !' % (statement.user_id.name, statement.journal_id.name)))
+
+            if statement.name and statement.name == '/':
+                number = self.pool.get('ir.sequence').get(cr, uid, 'account.cash.statement')
+                vals.update({
+                    'name': number
+                })
 
-        if statement.name and statement.name == '/':
-            number = self.pool.get('ir.sequence').get(cr, uid, 'account.cash.statement')
             vals.update({
-                'name': number
+                'date':time.strftime("%Y-%m-%d %H:%M:%S"),
+                'state':'open',
+
             })
-
-        vals.update({
-            'date':time.strftime("%Y-%m-%d %H:%M:%S"),
-            'state':'open',
-
-        })
-        return self.write(cr, uid, ids, vals)
+            self.write(cr, uid, [statement.id], vals)
+        return True
 
     def balance_check(self, cr, uid, cash_id, journal_type='bank', context=None):
         if journal_type == 'bank':
@@ -381,4 +382,4 @@ class account_cash_statement(osv.osv):
 
 account_cash_statement()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index 1d5c833ccbf..28d3befe3c2 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -28,13 +28,13 @@ class account_journal(osv.osv):
     _inherit = 'account.journal'
     _columns = {
         'auto_cash': fields.boolean('Automatic Opening', help="This field authorize the automatic creation of the cashbox"),
-        'special_journal':fields.boolean('Special Journal', help="Will put all the orders in waiting status till being accepted"),
+        'special_journal': fields.boolean('Special Journal', help="Will put all the orders in waiting status till being accepted"),
         'check_dtls': fields.boolean('Check Details', help="This field authorize Validation of Cashbox without checking ending details"),
         'journal_users': fields.many2many('res.users','pos_journal_users','journal_id','user_id','Users'),
     }
     _defaults = {
-        'check_dtls': lambda *a:False,
-        'auto_cash': lambda *a:True,
+        'check_dtls': False,
+        'auto_cash': True,
     }
 account_journal()
 
@@ -42,7 +42,9 @@ class account_cash_statement(osv.osv):
     
     _inherit = 'account.bank.statement'
 
-    def _equal_balance(self, cr, uid, cash_id, context={}):
+    def _equal_balance(self, cr, uid, cash_id, context=None):
+        if context is None:
+            context = {}
         statement = self.browse(cr, uid, cash_id, context=context)
         if not statement.journal_id.check_dtls:
             return True
@@ -52,9 +54,12 @@ class account_cash_statement(osv.osv):
         else:
             return True            
     
-    def _user_allow(self, cr, uid, ids, statement, context={}):
+    def _user_allow(self, cr, uid, statement_id, context=None):
+        if context is None:
+            context = {}
         res = False
         uids = []
+        statement = self.browse(cr, uid, statement_id, context=context)
         for user in statement.journal_id.journal_users:
             uids.append(user.id)
         
@@ -63,25 +68,29 @@ class account_cash_statement(osv.osv):
       
         return res
     
-    def _get_cash_open_box_lines(self, cr, uid, context={}):
+    def _get_cash_open_box_lines(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         res = super(account_cash_statement,self)._get_cash_open_box_lines(cr, uid, context)
         curr = [0.01, 0.02, 0.05, 0.10, 0.20, 0.50]
         for rs in curr:
             dct = {
-                'pieces':rs,
-                'number':0
+                'pieces': rs,
+                'number': 0
             }
             res.append(dct)
         res.sort()
         return res
     
-    def _get_default_cash_close_box_lines(self, cr, uid, context={}):
+    def _get_default_cash_close_box_lines(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         res = super(account_cash_statement,self)._get_default_cash_close_box_lines(cr, uid, context)
         curr = [0.01, 0.02, 0.05, 0.10, 0.20, 0.50]
         for rs in curr:
             dct = {
-                'pieces':rs,
-                'number':0
+                'pieces': rs,
+                'number': 0
             }
             res.append(dct)
         res.sort()
@@ -89,4 +98,4 @@ class account_cash_statement(osv.osv):
     
 account_cash_statement()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 5521e773ceefdbb685e61c1238d71993598c4f82 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Thu, 21 Oct 2010 14:49:25 +0530
Subject: [PATCH 046/114] [REF] account: clean installer.py

bzr revid: psi@tinyerp.co.in-20101021091925-4e50rlq7rn0ir838
---
 addons/account/installer.py | 455 +++++++++++++++++++-----------------
 1 file changed, 236 insertions(+), 219 deletions(-)

diff --git a/addons/account/installer.py b/addons/account/installer.py
index 25d57d56214..86d3c3d64e8 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -35,9 +35,9 @@ class account_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     def _get_default_accounts(self, cr, uid, context=None):
-        accounts = [{'acc_name':'Current', 'account_type':'bank'},
-                    {'acc_name':'Deposit', 'account_type':'bank'},
-                    {'acc_name':'Cash', 'account_type':'cash'}]
+        accounts = [{'acc_name': 'Current', 'account_type': 'bank'},
+                    {'acc_name': 'Deposit', 'account_type': 'bank'},
+                    {'acc_name': 'Cash', 'account_type': 'cash'}]
         return accounts
 
     def _get_charts(self, cr, uid, context=None):
@@ -47,7 +47,7 @@ class account_installer(osv.osv_memory):
             sorted(((m.name, m.shortdesc)
                     for m in modules.browse(cr, uid, ids)),
                    key=itemgetter(1)))
-        charts.insert(0, ('configurable','Generic Chart Of Account'))
+        charts.insert(0, ('configurable', 'Generic Chart Of Account'))
         return charts
 
     _columns = {
@@ -112,14 +112,20 @@ class account_installer(osv.osv_memory):
         obj_acc = self.pool.get('account.account')
         obj_acc_tax = self.pool.get('account.tax')
         obj_journal = self.pool.get('account.journal')
+        obj_acc_tax_code = self.pool.get('account.tax.code')
         obj_acc_template = self.pool.get('account.account.template')
         obj_acc_tax_template = self.pool.get('account.tax.code.template')
         obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
         obj_fiscal_position = self.pool.get('account.fiscal.position')
         analytic_journal_obj = self.pool.get('account.analytic.journal')
         obj_acc_chart_template = self.pool.get('account.chart.template')
+        obj_acc_journal_view = self.pool.get('account.journal.view')
         mod_obj = self.pool.get('ir.model.data')
         obj_sequence = self.pool.get('ir.sequence')
+        property_obj = self.pool.get('ir.property')
+        fields_obj = self.pool.get('ir.model.fields')
+        obj_tax_fp = self.pool.get('account.fiscal.position.tax')
+        obj_ac_fp = self.pool.get('account.fiscal.position.account')
 
 
         result = mod_obj._get_id(cr, uid, 'account', 'configurable_chart_template')
@@ -130,7 +136,7 @@ class account_installer(osv.osv_memory):
 
         if context is None:
             context = {}
-        company_id = self.browse(cr, uid, ids, context)[0].company_id
+        company_id = self.browse(cr, uid, ids, context=context)[0].company_id
         seq_journal = True
 
         # Creating Account
@@ -146,8 +152,8 @@ class account_installer(osv.osv_memory):
         #create all the tax code
         children_tax_code_template = obj_acc_tax_template.search(cr, uid, [('parent_id', 'child_of', [tax_code_root_id])], order='id')
         children_tax_code_template.sort()
-        for tax_code_template in obj_acc_tax_template.browse(cr, uid, children_tax_code_template):
-            vals={
+        for tax_code_template in obj_acc_tax_template.browse(cr, uid, children_tax_code_template, context=context):
+            vals = {
                 'name': (tax_code_root_id == tax_code_template.id) and company_id.name or tax_code_template.name,
                 'code': tax_code_template.code,
                 'info': tax_code_template.info,
@@ -155,7 +161,7 @@ class account_installer(osv.osv_memory):
                 'company_id': company_id.id,
                 'sign': tax_code_template.sign,
             }
-            new_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals)
+            new_tax_code = obj_acc_tax_code.create(cr, uid, vals, context=context)
             #recording the new tax code to do the mapping
             tax_code_template_ref[tax_code_template.id] = new_tax_code
 
@@ -163,7 +169,7 @@ class account_installer(osv.osv_memory):
         for tax in obj_multi.tax_template_ids:
             #create it
             vals_tax = {
-                'name':tax.name,
+                'name': tax.name,
                 'sequence': tax.sequence,
                 'amount': tax.amount,
                 'type': tax.type,
@@ -183,11 +189,11 @@ class account_installer(osv.osv_memory):
                 'ref_base_sign': tax.ref_base_sign,
                 'ref_tax_sign': tax.ref_tax_sign,
                 'include_base_amount': tax.include_base_amount,
-                'description':tax.description,
+                'description': tax.description,
                 'company_id': company_id.id,
                 'type_tax_use': tax.type_tax_use
             }
-            new_tax = obj_acc_tax.create(cr, uid, vals_tax)
+            new_tax = obj_acc_tax.create(cr, uid, vals_tax, context=context)
             #as the accounts have not been created yet, we have to wait before filling these fields
             todo_dict[new_tax] = {
                 'account_collected_id': tax.account_collected_id and tax.account_collected_id.id or False,
@@ -198,9 +204,9 @@ class account_installer(osv.osv_memory):
         #deactivate the parent_store functionnality on account_account for rapidity purpose
         self.pool._init = True
 
-        children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id]),('nocreate','!=',True)])
+        children_acc_template = obj_acc_template.search(cr, uid, [('parent_id', 'child_of', [obj_acc_root.id]), ('nocreate', '!=', True)], context=context)
         children_acc_template.sort()
-        for account_template in obj_acc_template.browse(cr, uid, children_acc_template):
+        for account_template in obj_acc_template.browse(cr, uid, children_acc_template, context=context):
             tax_ids = []
             for tax in account_template.tax_ids:
                 tax_ids.append(tax_template_ref[tax.id])
@@ -209,9 +215,9 @@ class account_installer(osv.osv_memory):
             dig = 6
             code_main = account_template.code and len(account_template.code) or 0
             code_acc = account_template.code or ''
-            if code_main>0 and code_main<=dig and account_template.type != 'view':
-                code_acc=str(code_acc) + (str('0'*(dig-code_main)))
-            vals={
+            if code_main > 0 and code_main <= dig and account_template.type != 'view':
+                code_acc = str(code_acc) + (str('0'*(dig-code_main)))
+            vals = {
                 'name': (obj_acc_root.id == account_template.id) and company_id.name or account_template.name,
                 #'sign': account_template.sign,
                 'currency_id': account_template.currency_id and account_template.currency_id.id or False,
@@ -225,10 +231,10 @@ class account_installer(osv.osv_memory):
                 'tax_ids': [(6, 0, tax_ids)],
                 'company_id': company_id.id,
             }
-            new_account = obj_acc.create(cr, uid, vals)
+            new_account = obj_acc.create(cr, uid, vals, context=context)
             acc_template_ref[account_template.id] = new_account
             if account_template.name == 'Bank Current Account':
-                b_vals={
+                b_vals = {
                     'name': 'Bank Accounts',
                     'code': '110500',
                     'type': 'view',
@@ -239,47 +245,52 @@ class account_installer(osv.osv_memory):
                     'tax_ids': [(6,0,tax_ids)],
                     'company_id': company_id.id,
                 }
-                bank_account = obj_acc.create(cr, uid, b_vals)
+                bank_account = obj_acc.create(cr, uid, b_vals, context=context)
 
-                view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name', '=', 'Bank/Cash Journal View')])[0] #why fixed name here?
-                view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')])[0] #Why Fixed name here?
+                view_id_cash = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #why fixed name here?
+                view_id_cur = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')], context=context)[0] #Why Fixed name here?
 
                 cash_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_cash')
-                cash_type_id = mod_obj.read(cr, uid, [cash_result], ['res_id'])[0]['res_id']
+                cash_type_id = mod_obj.read(cr, uid, [cash_result], ['res_id'], context=context)[0]['res_id']
 
                 bank_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_bnk')
-                bank_type_id = mod_obj.read(cr, uid, [bank_result], ['res_id'])[0]['res_id']
+                bank_type_id = mod_obj.read(cr, uid, [bank_result], ['res_id'], context=context)[0]['res_id']
 
                 check_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_chk')
-                check_type_id = mod_obj.read(cr, uid, [check_result], ['res_id'])[0]['res_id']
+                check_type_id = mod_obj.read(cr, uid, [check_result], ['res_id'], context=context)[0]['res_id']
 
 #                record = self.browse(cr, uid, ids, context=context)[0]
                 code_cnt = 1
                 vals_seq = {
-                        'name': _('Bank Journal '),
-                        'code': 'account.journal',
-                        'prefix': 'BNK/%(year)s/',
-                        'padding': 5
-                        }
-                seq_id = obj_sequence.create(cr, uid, vals_seq)
+                    'name': _('Bank Journal '),
+                    'code': 'account.journal',
+                    'prefix': 'BNK/%(year)s/',
+                    'padding': 5
+                }
+                seq_id = obj_sequence.create(cr, uid, vals_seq, context=context)
 
                 #create the bank journals
-                analitical_bank_ids = analytic_journal_obj.search(cr, uid, [('type','=','situation')])
+                analitical_bank_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context)
                 analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
-                vals_journal = {}
-                vals_journal['name'] = _('Bank Journal ')
-                vals_journal['code'] = _('BNK')
-                vals_journal['sequence_id'] = seq_id
-                vals_journal['type'] = 'bank'
-                vals_journal['analytic_journal_id'] = analitical_journal_bank
+                vals_journal = {
+                    'name': _('Bank Journal '),
+                    'code': _('BNK'),
+                    'sequence_id': seq_id,
+                    'type': 'bank',
+                    'analytic_journal_id': analitical_journal_bank
+                }
                 if vals.get('currency_id', False):
-                    vals_journal['view_id'] = view_id_cur
-                    vals_journal['currency'] = vals.get('currency_id', False)
+                    vals_journal.update({
+                        'view_id': view_id_cur,
+                        'currency': vals.get('currency_id', False)
+                    })
                 else:
-                    vals_journal['view_id'] = view_id_cash
-                vals_journal['default_credit_account_id'] = new_account
-                vals_journal['default_debit_account_id'] = new_account
-                obj_journal.create(cr, uid, vals_journal)
+                    vals_journal.update({'view_id': view_id_cash})
+                vals_journal.update({
+                    'default_credit_account_id': new_account,
+                    'default_debit_account_id': new_account,
+                })
+                obj_journal.create(cr, uid, vals_journal, context=context)
 
                 for val in record.bank_accounts_id:
                     seq_padding = 5
@@ -293,44 +304,52 @@ class account_installer(osv.osv_memory):
                         type = check_type_id
                         seq_padding = None
 
-                    vals_bnk = {'name': val.acc_name or '',
+                    vals_bnk = {
+                        'name': val.acc_name or '',
                         'currency_id': val.currency_id.id or False,
                         'code': str(110500 + code_cnt),
                         'type': 'liquidity',
                         'user_type': type,
-                        'parent_id':bank_account,
-                        'company_id': company_id.id }
-                    child_bnk_acc = obj_acc.create(cr, uid, vals_bnk)
+                        'parent_id': bank_account,
+                        'company_id': company_id.id
+                    }
+                    child_bnk_acc = obj_acc.create(cr, uid, vals_bnk, context=context)
                     vals_seq_child = {
                         'name': _(vals_bnk['name'] + ' ' + 'Journal'),
                         'code': 'account.journal',
                         'prefix': _((vals_bnk['name'][:3].upper()) + '/%(year)s/'),
                         'padding': seq_padding
-                        }
-                    seq_id = obj_sequence.create(cr, uid, vals_seq_child)
+                    }
+                    seq_id = obj_sequence.create(cr, uid, vals_seq_child, context=context)
 
                     #create the bank journal
                     vals_journal = {}
-                    vals_journal['name'] = vals_bnk['name'] + ' Journal'
-                    vals_journal['code'] = _(vals_bnk['name'][:3]).upper()
-                    vals_journal['sequence_id'] = seq_id
-                    vals_journal['type'] = 'cash'
+                    vals_journal = {
+                        'name': vals_bnk['name'] + ' Journal',
+                        'code': _(vals_bnk['name'][:3]).upper(),
+                        'sequence_id': seq_id,
+                        'type': 'cash',
+                    }
                     if vals.get('currency_id', False):
-                        vals_journal['view_id'] = view_id_cur
-                        vals_journal['currency'] = vals_bnk.get('currency_id', False)
+                        vals_journal.update({
+                                'view_id': view_id_cur,
+                                'currency': vals_bnk.get('currency_id', False),
+                        })
                     else:
-                        vals_journal['view_id'] = view_id_cash
-                    vals_journal['default_credit_account_id'] = child_bnk_acc
-                    vals_journal['default_debit_account_id'] = child_bnk_acc
-                    vals_journal['analytic_journal_id'] = analitical_journal_bank
-                    obj_journal.create(cr,uid,vals_journal)
+                        vals_journal.update({'view_id': view_id_cash})
+                    vals_journal.update({
+                        'default_credit_account_id': child_bnk_acc,
+                        'default_debit_account_id': child_bnk_acc,
+                        'analytic_journal_id': analitical_journal_bank
+                    })
+                    obj_journal.create(cr, uid, vals_journal, context=context)
                     code_cnt += 1
 
         #reactivate the parent_store functionality on account_account
         self.pool._init = False
-        self.pool.get('account.account')._parent_store_compute(cr)
+        obj_acc._parent_store_compute(cr)
 
-        for key,value in todo_dict.items():
+        for key, value in todo_dict.items():
             if value['account_collected_id'] or value['account_paid_id']:
                 obj_acc_tax.write(cr, uid, [key], {
                     'account_collected_id': acc_template_ref[value['account_collected_id']],
@@ -338,42 +357,41 @@ class account_installer(osv.osv_memory):
                 })
 
         # Creating Journals Sales and Purchase
-        vals_journal={}
-        data_id = mod_obj.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
-        data = mod_obj.browse(cr, uid, data_id[0])
+        vals_journal = {}
+        data_id = mod_obj.search(cr, uid, [('model', '=', 'account.journal.view'), ('name', '=', 'account_sp_journal_view')], context=context)
+        data = mod_obj.browse(cr, uid, data_id[0], context=context)
         view_id = data.res_id
-
-        seq_id = obj_sequence.search(cr,uid,[('name','=','Account Journal')])[0]
+        seq_id = obj_sequence.search(cr,uid,[('name', '=', 'Account Journal')], context=context)[0]
 
         if seq_journal:
             seq_sale = {
-                        'name': 'Sale Journal',
-                        'code': 'account.journal',
-                        'prefix': 'SAJ/%(year)s/',
-                        'padding': 3
-                        }
-            seq_id_sale = obj_sequence.create(cr, uid, seq_sale)
+                'name': 'Sale Journal',
+                'code': 'account.journal',
+                'prefix': 'SAJ/%(year)s/',
+                'padding': 3
+            }
+            seq_id_sale = obj_sequence.create(cr, uid, seq_sale, context=context)
             seq_purchase = {
-                        'name': 'Purchase Journal',
-                        'code': 'account.journal',
-                        'prefix': 'EXJ/%(year)s/',
-                        'padding': 3
-                        }
-            seq_id_purchase = obj_sequence.create(cr, uid, seq_purchase)
+                'name': 'Purchase Journal',
+                'code': 'account.journal',
+                'prefix': 'EXJ/%(year)s/',
+                'padding': 3
+            }
+            seq_id_purchase = obj_sequence.create(cr, uid, seq_purchase, context=context)
             seq_refund_sale = {
-                        'name': 'Sales Refund Journal',
-                        'code': 'account.journal',
-                        'prefix': 'SCNJ/%(year)s/',
-                        'padding': 3
-                        }
-            seq_id_sale_refund = obj_sequence.create(cr, uid, seq_refund_sale)
+                'name': 'Sales Refund Journal',
+                'code': 'account.journal',
+                'prefix': 'SCNJ/%(year)s/',
+                'padding': 3
+            }
+            seq_id_sale_refund = obj_sequence.create(cr, uid, seq_refund_sale, context=context)
             seq_refund_purchase = {
-                        'name': 'Purchase Refund Journal',
-                        'code': 'account.journal',
-                        'prefix': 'ECNJ/%(year)s/',
-                        'padding': 3
-                        }
-            seq_id_purchase_refund = obj_sequence.create(cr, uid, seq_refund_purchase)
+                'name': 'Purchase Refund Journal',
+                'code': 'account.journal',
+                'prefix': 'ECNJ/%(year)s/',
+                'padding': 3
+            }
+            seq_id_purchase_refund = obj_sequence.create(cr, uid, seq_refund_purchase, context=context)
         else:
             seq_id_sale = seq_id
             seq_id_purchase = seq_id
@@ -383,83 +401,89 @@ class account_installer(osv.osv_memory):
         vals_journal['view_id'] = view_id
 
         #Sales Journal
-        analitical_sale_ids = analytic_journal_obj.search(cr,uid,[('type','=','sale')])
+        analitical_sale_ids = analytic_journal_obj.search(cr, uid, [('type','=','sale')], context=context)
         analitical_journal_sale = analitical_sale_ids and analitical_sale_ids[0] or False
 
-        vals_journal['name'] = _('Sales Journal')
-        vals_journal['type'] = 'sale'
-        vals_journal['code'] = _('SAJ')
-        vals_journal['sequence_id'] = seq_id_sale
-        vals_journal['analytic_journal_id'] = analitical_journal_sale
-
+        vals_journal = {
+            'name': _('Sales Journal'),
+            'type': 'sale',
+            'code': _('SAJ'),
+            'sequence_id': seq_id_sale,
+            'analytic_journal_id': analitical_journal_sale
+        }
 
         if obj_multi.property_account_receivable:
-            vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id]
-            vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id]
-
-        obj_journal.create(cr,uid,vals_journal)
+            vals_journal.update({
+                    'default_credit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id],
+                    'default_debit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id],
+            })
+        obj_journal.create(cr, uid, vals_journal, context=context)
 
         # Purchase Journal
-        analitical_purchase_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')])
+        analitical_purchase_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'purchase')], context=context)
         analitical_journal_purchase = analitical_purchase_ids and analitical_purchase_ids[0] or False
 
-        vals_journal['name'] = _('Purchase Journal')
-        vals_journal['type'] = 'purchase'
-        vals_journal['code'] = _('EXJ')
-        vals_journal['sequence_id'] = seq_id_purchase
-        vals_journal['analytic_journal_id'] = analitical_journal_purchase
+        vals_journal = {
+            'name': _('Purchase Journal'),
+            'type': 'purchase',
+            'code': _('EXJ'),
+            'sequence_id': seq_id_purchase,
+            'analytic_journal_id': analitical_journal_purchase
+        }
 
         if obj_multi.property_account_payable:
-            vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id]
-            vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id]
-
-        obj_journal.create(cr,uid,vals_journal)
+            vals_journal.update({
+                'default_credit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id],
+                'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id]
+            })
 
+        obj_journal.create(cr, uid, vals_journal, context=context)
         # Creating Journals Sales Refund and Purchase Refund
-        vals_journal={}
-        data_id = mod_obj.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_refund_journal_view')])
-        data = mod_obj.browse(cr, uid, data_id[0])
+        vals_journal = {}
+        data_id = mod_obj.search(cr, uid, [('model', '=', 'account.journal.view'), ('name', '=', 'account_sp_refund_journal_view')], context=context)
+        data = mod_obj.browse(cr, uid, data_id[0], context=context)
         view_id = data.res_id
 
-        vals_journal['view_id'] = view_id
-
         #Sales Refund Journal
-        vals_journal['name'] = _('Sales Refund Journal')
-        vals_journal['type'] = 'sale_refund'
-        vals_journal['refund_journal'] = True
-        vals_journal['code'] = _('SCNJ')
-        vals_journal['sequence_id'] = seq_id_sale_refund
-        vals_journal['analytic_journal_id'] = analitical_journal_sale
-
+        vals_journal = {
+            'view_id': view_id,
+            'name': _('Sales Refund Journal'),
+            'type': 'sale_refund',
+            'refund_journal': True,
+            'code': _('SCNJ'),
+            'sequence_id': seq_id_sale_refund,
+            'analytic_journal_id': analitical_journal_sale
+        }
         if obj_multi.property_account_receivable:
-            vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id]
-            vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id]
+            vals_journal.update({
+                'default_credit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id],
+                'default_debit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id]
+            })
 
-        obj_journal.create(cr,uid,vals_journal)
+        obj_journal.create(cr, uid, vals_journal, context=context)
 
         # Purchase Refund Journal
-        vals_journal['name'] = _('Purchase Refund Journal')
-        vals_journal['type'] = 'purchase_refund'
-        vals_journal['refund_journal'] = True
-        vals_journal['code'] = _('ECNJ')
-        vals_journal['sequence_id'] = seq_id_purchase_refund
-        vals_journal['analytic_journal_id'] = analitical_journal_purchase
+        vals_journal = {
+            'name': _('Purchase Refund Journal'),
+            'type': 'purchase_refund',
+            'refund_journal': True,
+            'code': _('ECNJ'),
+            'sequence_id': seq_id_purchase_refund,
+            'analytic_journal_id': analitical_journal_purchase
+        }
 
         if obj_multi.property_account_payable:
-            vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id]
-            vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id]
-
-        obj_journal.create(cr, uid, vals_journal)
+            vals_journal.update({
+                'default_credit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id],
+                'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id]
+            })
+        obj_journal.create(cr, uid, vals_journal, context=context)
 
         # Bank Journals
-        view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: Why put fixed name ?
-        view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #TOFIX: why put fixed name?
-
+        view_id_cash = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #TOFIX: Why put fixed name ?
+        view_id_cur = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')], context=context)[0] #TOFIX: why put fixed name?
 
         #create the properties
-        property_obj = self.pool.get('ir.property')
-        fields_obj = self.pool.get('ir.model.fields')
-
         todo_list = [
             ('property_account_receivable', 'res.partner', 'account.account'),
             ('property_account_payable', 'res.partner', 'account.account'),
@@ -472,52 +496,45 @@ class account_installer(osv.osv_memory):
 
         for record in todo_list:
             r = []
-            r = property_obj.search(cr, uid, [('name', '=', record[0]), ('company_id', '=', company_id.id)])
+            r = property_obj.search(cr, uid, [('name', '=', record[0]), ('company_id', '=', company_id.id)], context=context)
             account = getattr(obj_multi, record[0])
-            field = fields_obj.search(cr, uid, [('name', '=', record[0]), ('model', '=', record[1]), ('relation', '=', record[2])])
+            field = fields_obj.search(cr, uid, [('name', '=', record[0]), ('model', '=', record[1]), ('relation', '=', record[2])], context=context)
             vals = {
                 'name': record[0],
                 'company_id': company_id.id,
                 'fields_id': field[0],
-                'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False,
+                'value': account and 'account.account, '+str(acc_template_ref[account.id]) or False,
             }
-
             if r:
                 #the property exist: modify it
-                property_obj.write(cr, uid, r, vals)
+                property_obj.write(cr, uid, r, vals, context=context)
             else:
                 #create the property
-                property_obj.create(cr, uid, vals)
-
-        fp_ids = obj_fiscal_position_template.search(cr, uid,[('chart_template_id', '=', obj_multi.id)])
+                property_obj.create(cr, uid, vals, context=context)
 
+        fp_ids = obj_fiscal_position_template.search(cr, uid, [('chart_template_id', '=', obj_multi.id)], context=context)
         if fp_ids:
-            for position in obj_fiscal_position_template.browse(cr, uid, fp_ids):
-
+            for position in obj_fiscal_position_template.browse(cr, uid, fp_ids, context=context):
                 vals_fp = {
-                           'company_id': company_id.id,
-                           'name': position.name,
-                           }
-                new_fp = obj_fiscal_position.create(cr, uid, vals_fp)
-
-                obj_tax_fp = self.pool.get('account.fiscal.position.tax')
-                obj_ac_fp = self.pool.get('account.fiscal.position.account')
-
+                    'company_id': company_id.id,
+                    'name': position.name,
+                }
+                new_fp = obj_fiscal_position.create(cr, uid, vals_fp, context=context)
                 for tax in position.tax_ids:
                     vals_tax = {
-                                'tax_src_id': tax_template_ref[tax.tax_src_id.id],
-                                'tax_dest_id': tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
-                                'position_id': new_fp,
-                                }
-                    obj_tax_fp.create(cr, uid, vals_tax)
+                        'tax_src_id': tax_template_ref[tax.tax_src_id.id],
+                        'tax_dest_id': tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
+                        'position_id': new_fp,
+                    }
+                    obj_tax_fp.create(cr, uid, vals_tax, context=context)
 
                 for acc in position.account_ids:
                     vals_acc = {
-                                'account_src_id': acc_template_ref[acc.account_src_id.id],
-                                'account_dest_id': acc_template_ref[acc.account_dest_id.id],
-                                'position_id': new_fp,
-                                }
-                    obj_ac_fp.create(cr, uid, vals_acc)
+                        'account_src_id': acc_template_ref[acc.account_src_id.id],
+                        'account_dest_id': acc_template_ref[acc.account_dest_id.id],
+                        'position_id': new_fp,
+                    }
+                    obj_ac_fp.create(cr, uid, vals_acc, context=context)
 
     def execute(self, cr, uid, ids, context=None):
         if context is None:
@@ -527,58 +544,58 @@ class account_installer(osv.osv_memory):
         obj_acc = self.pool.get('account.account')
         obj_tax_code = self.pool.get('account.tax.code')
         obj_temp_tax_code = self.pool.get('account.tax.code.template')
+        obj_tax = self.pool.get('account.tax')
+        obj_product = self.pool.get('product.product')
+        ir_values = self.pool.get('ir.values')
         super(account_installer, self).execute(cr, uid, ids, context=context)
         record = self.browse(cr, uid, ids, context=context)[0]
         company_id = record.company_id
-        for res in self.read(cr, uid, ids):
+        for res in self.read(cr, uid, ids, context=context):
             if record.charts == 'configurable':
-                fp = tools.file_open(opj('account','configurable_account_chart.xml'))
-                tools.convert_xml_import(cr, 'account', fp, {}, 'init',True, None)
+                fp = tools.file_open(opj('account', 'configurable_account_chart.xml'))
+                tools.convert_xml_import(cr, 'account', fp, {}, 'init', True, None)
                 fp.close()
                 self.generate_configurable_chart(cr, uid, ids, context=context)
-                obj_tax = self.pool.get('account.tax')
-                obj_product = self.pool.get('product.product')
-                ir_values = self.pool.get('ir.values')
                 s_tax = (res.get('sale_tax', 0.0))/100
                 p_tax = (res.get('purchase_tax', 0.0))/100
                 tax_val = {}
                 default_tax = []
 
                 pur_temp_tax = mod_obj._get_id(cr, uid, 'account', 'tax_code_base_purchases')
-                pur_temp_tax_id = mod_obj.read(cr, uid, [pur_temp_tax], ['res_id'])[0]['res_id']
-                pur_temp_tax_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_id], ['name'])
+                pur_temp_tax_id = mod_obj.read(cr, uid, [pur_temp_tax], ['res_id'], context=context)[0]['res_id']
+                pur_temp_tax_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_id], ['name'], context=context)
                 pur_tax_parent_name = pur_temp_tax_names and pur_temp_tax_names[0]['name'] or False
-                pur_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_parent_name)])
+                pur_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_parent_name)], context=context)
                 if pur_taxcode_parent_id:
                     pur_taxcode_parent_id = pur_taxcode_parent_id[0]
                 else:
                     pur_taxcode_parent_id = False
 
                 pur_temp_tax_paid = mod_obj._get_id(cr, uid, 'account', 'tax_code_input')
-                pur_temp_tax_paid_id = mod_obj.read(cr, uid, [pur_temp_tax_paid], ['res_id'])[0]['res_id']
-                pur_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_paid_id], ['name'])
+                pur_temp_tax_paid_id = mod_obj.read(cr, uid, [pur_temp_tax_paid], ['res_id'], context=context)[0]['res_id']
+                pur_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_paid_id], ['name'], context=context)
                 pur_tax_paid_parent_name = pur_temp_tax_names and pur_temp_tax_paid_names[0]['name'] or False
-                pur_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_paid_parent_name)])
+                pur_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_paid_parent_name)], context=context)
                 if pur_taxcode_paid_parent_id:
                     pur_taxcode_paid_parent_id = pur_taxcode_paid_parent_id[0]
                 else:
                     pur_taxcode_paid_parent_id = False
 
                 sale_temp_tax = mod_obj._get_id(cr, uid, 'account', 'tax_code_base_sales')
-                sale_temp_tax_id = mod_obj.read(cr, uid, [sale_temp_tax], ['res_id'])[0]['res_id']
-                sale_temp_tax_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_id], ['name'])
+                sale_temp_tax_id = mod_obj.read(cr, uid, [sale_temp_tax], ['res_id'], context=context)[0]['res_id']
+                sale_temp_tax_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_id], ['name'], context=context)
                 sale_tax_parent_name = sale_temp_tax_names and sale_temp_tax_names[0]['name'] or False
-                sale_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_parent_name)])
+                sale_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_parent_name)], context=context)
                 if sale_taxcode_parent_id:
                     sale_taxcode_parent_id = sale_taxcode_parent_id[0]
                 else:
                     sale_taxcode_parent_id = False
 
                 sale_temp_tax_paid = mod_obj._get_id(cr, uid, 'account', 'tax_code_output')
-                sale_temp_tax_paid_id = mod_obj.read(cr, uid, [sale_temp_tax_paid], ['res_id'])[0]['res_id']
-                sale_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_paid_id], ['name'])
+                sale_temp_tax_paid_id = mod_obj.read(cr, uid, [sale_temp_tax_paid], ['res_id'], context=context)[0]['res_id']
+                sale_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_paid_id], ['name'], context=context)
                 sale_tax_paid_parent_name = sale_temp_tax_paid_names and sale_temp_tax_paid_names[0]['name'] or False
-                sale_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_paid_parent_name)])
+                sale_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_paid_parent_name)], context=context)
                 if sale_taxcode_paid_parent_id:
                     sale_taxcode_paid_parent_id = sale_taxcode_paid_parent_id[0]
                 else:
@@ -593,8 +610,8 @@ class account_installer(osv.osv_memory):
                         'company_id': company_id.id,
                         'sign': 1,
                         'parent_id': sale_taxcode_parent_id
-                        }
-                    new_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_tax_code)
+                    }
+                    new_tax_code = obj_tax_code.create(cr, uid, vals_tax_code, context=context)
 
                     vals_paid_tax_code = {
                         'name': 'TAX Received %s%%'%(s_tax*100),
@@ -603,20 +620,20 @@ class account_installer(osv.osv_memory):
                         'sign': 1,
                         'parent_id': sale_taxcode_paid_parent_id
                         }
-                    new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code)
+                    new_paid_tax_code = obj_tax_code.create(cr, uid, vals_paid_tax_code, context=context)
 
                     sales_tax = obj_tax.create(cr, uid,
-                                           {'name':'TAX %s%%'%(s_tax*100),
-                                            'amount':s_tax,
-                                            'base_code_id':new_tax_code,
-                                            'tax_code_id':new_paid_tax_code,
-                                            'type_tax_use':'sale',
-                                            'account_collected_id':sales_tax_account_id,
-                                            'account_paid_id':sales_tax_account_id
-                                            })
-                    default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Product Sales')],context=context)
+                                           {'name': 'TAX %s%%'%(s_tax*100),
+                                            'amount': s_tax,
+                                            'base_code_id': new_tax_code,
+                                            'tax_code_id': new_paid_tax_code,
+                                            'type_tax_use': 'sale',
+                                            'account_collected_id': sales_tax_account_id,
+                                            'account_paid_id': sales_tax_account_id
+                                            }, context=context)
+                    default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Product Sales')], context=context)
                     if default_account_ids:
-                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [sales_tax])]})
+                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [sales_tax])]}, context=context)
                     tax_val.update({'taxes_id': [(6, 0, [sales_tax])]})
                     default_tax.append(('taxes_id', sales_tax))
                 if p_tax*100 > 0.0:
@@ -629,8 +646,7 @@ class account_installer(osv.osv_memory):
                         'sign': 1,
                         'parent_id': pur_taxcode_parent_id
                     }
-                    new_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_tax_code)
-
+                    new_tax_code = obj_tax_code.create(cr, uid, vals_tax_code, context=context)
                     vals_paid_tax_code = {
                         'name': 'TAX Paid %s%%'%(p_tax*100),
                         'code': 'TAX Paid %s%%'%(p_tax*100),
@@ -638,7 +654,7 @@ class account_installer(osv.osv_memory):
                         'sign': 1,
                         'parent_id': pur_taxcode_paid_parent_id
                     }
-                    new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code)
+                    new_paid_tax_code = obj_tax_code.create(cr, uid, vals_paid_tax_code, context=context)
 
                     purchase_tax = obj_tax.create(cr, uid,
                                             {'name': 'TAX%s%%'%(p_tax*100),
@@ -649,32 +665,33 @@ class account_installer(osv.osv_memory):
                                             'type_tax_use': 'purchase',
                                             'account_collected_id': purchase_tax_account_id,
                                             'account_paid_id': purchase_tax_account_id
-                                             })
+                                             }, context=context)
                     default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Expenses')], context=context)
                     if default_account_ids:
-                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [purchase_tax])]})
+                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [purchase_tax])]}, context=context)
                     tax_val.update({'supplier_taxes_id': [(6 ,0, [purchase_tax])]})
                     default_tax.append(('supplier_taxes_id', purchase_tax))
                 if tax_val:
-                    product_ids = obj_product.search(cr, uid, [])
-                    for product in obj_product.browse(cr, uid, product_ids):
-                        obj_product.write(cr, uid, product.id, tax_val)
+                    product_ids = obj_product.search(cr, uid, [], context=context)
+                    for product in obj_product.browse(cr, uid, product_ids, context=context):
+                        obj_product.write(cr, uid, product.id, tax_val, context=context)
                     for name, value in default_tax:
-                        ir_values.set(cr, uid, key='default', key2=False, name=name, models =[('product.product',False)], value=[value])
+                        ir_values.set(cr, uid, key='default', key2=False, name=name, models =[('product.product', False)], value=[value])
 
             if 'date_start' in res and 'date_stop' in res:
-                f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'])])
+                f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'])], context=context)
                 if not f_ids:
                     name = code = res['date_start'][:4]
                     if int(name) != int(res['date_stop'][:4]):
                         name = res['date_start'][:4] +'-'+ res['date_stop'][:4]
                         code = res['date_start'][2:4] +'-'+ res['date_stop'][2:4]
-                    vals = {'name': name,
-                            'code': code,
-                            'date_start': res['date_start'],
-                            'date_stop': res['date_stop'],
-                            'company_id': res['company_id']
-                           }
+                    vals = {
+                        'name': name,
+                        'code': code,
+                        'date_start': res['date_start'],
+                        'date_stop': res['date_stop'],
+                        'company_id': res['company_id']
+                    }
                     fiscal_id = fy_obj.create(cr, uid, vals, context=context)
                     if res['period'] == 'month':
                         fy_obj.create_period(cr, uid, [fiscal_id])
@@ -701,7 +718,7 @@ class account_bank_accounts_wizard(osv.osv_memory):
         'acc_name': fields.char('Account Name.', size=64, required=True),
         'bank_account_id': fields.many2one('account.installer', 'Bank Account', required=True),
         'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
-        'account_type': fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Account Type', size=32),
+        'account_type': fields.selection([('cash','Cash'), ('check','Check'), ('bank','Bank')], 'Account Type', size=32),
     }
 #    _defaults = {
 #        'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,

From a20240b078ee8b78eab25d17fc0d925322998183 Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Thu, 21 Oct 2010 15:00:04 +0530
Subject: [PATCH 047/114] [IMP] sale: cleaning module

bzr revid: pso@tinyerp.com-20101021093004-lcfd7eiq2tptqutm
---
 addons/sale/report/sale_report.py             | 33 ++++++-----
 addons/sale/sale.py                           | 55 +++++++------------
 addons/sale/stock.py                          | 11 +---
 addons/sale/wizard/sale_line_invoice.py       |  6 +-
 addons/sale/wizard/sale_make_invoice.py       |  4 +-
 .../sale/wizard/sale_make_invoice_advance.py  | 14 ++---
 6 files changed, 50 insertions(+), 73 deletions(-)

diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 25046063391..75c37ff9416 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -30,26 +30,26 @@ class sale_report(osv.osv):
     _columns = {
         'date': fields.date('Date Order', readonly=True),
         'date_confirm': fields.date('Date Confirm', readonly=True),
-        'shipped':fields.boolean('Shipped', readonly=True),
-        'shipped_qty_1':fields.integer('Shipped Qty', readonly=True),
+        'shipped': fields.boolean('Shipped', readonly=True),
+        'shipped_qty_1': fields.integer('Shipped Qty', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
-            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
-            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'),
+            ('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'),
+            ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
-        'product_id':fields.many2one('product.product', 'Product', readonly=True),
+        'product_id': fields.many2one('product.product', 'Product', readonly=True),
         'uom_name': fields.char('Default UoM', size=128, readonly=True),
-        'product_uom_qty':fields.float('# of Qty', readonly=True),
+        'product_uom_qty': fields.float('# of Qty', readonly=True),
 
-        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
-        'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True),
-        'company_id':fields.many2one('res.company', 'Company', readonly=True),
-        'user_id':fields.many2one('res.users', 'Salesman', readonly=True),
-        'price_total':fields.float('Total Price', readonly=True),
-        'delay':fields.float('Commitment Delay', digits=(16,2), readonly=True),
-        'price_average':fields.float('Average Price', readonly=True,group_operator="avg"),
+        'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
+        'shop_id': fields.many2one('sale.shop', 'Shop', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
+        'price_total': fields.float('Total Price', readonly=True),
+        'delay': fields.float('Commitment Delay', digits=(16,2), readonly=True),
+        'price_average': fields.float('Average Price', readonly=True,group_operator="avg"),
         'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
-        'nbr':fields.integer('# of Lines', readonly=True),
+        'nbr': fields.integer('# of Lines', readonly=True),
         'state': fields.selection([
             ('draft', 'Quotation'),
             ('waiting_date', 'Waiting Schedule'),
@@ -124,5 +124,4 @@ class sale_report(osv.osv):
         """)
 sale_report()
 
-
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index caee07d4aff..f96ddb054f6 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -65,7 +65,7 @@ class sale_order(osv.osv):
             'shipped': False,
             'invoice_ids': [],
             'picking_ids': [],
-            'date_confirm':False,
+            'date_confirm': False,
             'name': self.pool.get('ir.sequence').get(cr, uid, 'sale.order'),
         })
         return super(sale_order, self).copy(cr, uid, id, default, context=context)
@@ -345,7 +345,6 @@ class sale_order(osv.osv):
         payment_term = part.property_payment_term and part.property_payment_term.id or False
         fiscal_position = part.property_account_position and part.property_account_position.id or False
         dedicated_salesman = part.user_id and part.user_id.id or uid
-
         val = {
             'partner_invoice_id': addr['invoice'],
             'partner_order_id': addr['contact'],
@@ -354,10 +353,8 @@ class sale_order(osv.osv):
             'fiscal_position': fiscal_position,
             'user_id': dedicated_salesman,
         }
-
         if pricelist:
             val['pricelist_id'] = pricelist
-
         return {'value': val}
 
     def shipping_policy_change(self, cr, uid, ids, policy, context=None):
@@ -375,7 +372,7 @@ class sale_order(osv.osv):
     def write(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
-        if 'order_policy' in vals:
+        if vals.get('order_policy', False):
             if vals['order_policy'] == 'prepaid':
                 vals.update({'invoice_quantity': 'order'})
             elif vals['order_policy'] == 'picking':
@@ -385,7 +382,7 @@ class sale_order(osv.osv):
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
-        if 'order_policy' in vals:
+        if vals.get('order_policy', False):
             if vals['order_policy'] == 'prepaid':
                 vals.update({'invoice_quantity': 'order'})
             if vals['order_policy'] == 'picking':
@@ -418,10 +415,7 @@ class sale_order(osv.osv):
             raise osv.except_osv(_('Error !'),
                 _('There is no sale journal defined for this company: "%s" (id:%d)') % (order.company_id.name, order.company_id.id))
         a = order.partner_id.property_account_receivable.id
-        if order.payment_term:
-            pay_term = order.payment_term.id
-        else:
-            pay_term = False
+        pay_term = order.payment_term and order.payment_term.id or False
         invoiced_sale_line_ids = self.pool.get('sale.order.line').search(cr, uid, [('order_id', '=', order.id), ('invoiced', '=', True)], context=context)
         from_line_invoice_ids = []
         for invoiced_sale_line_id in self.pool.get('sale.order.line').browse(cr, uid, invoiced_sale_line_ids, context=context):
@@ -450,7 +444,7 @@ class sale_order(osv.osv):
             'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,
             'date_invoice': context.get('date_invoice',False),
             'company_id': order.company_id.id,
-            'user_id':order.user_id and order.user_id.id or False
+            'user_id': order.user_id and order.user_id.id or False
         }
         inv.update(self._inv_get(cr, uid, order))
         inv_id = inv_obj.create(cr, uid, inv, context=context)
@@ -485,11 +479,10 @@ class sale_order(osv.osv):
             'res_model': 'account.invoice',
             'context': "{'type':'out_invoice'}",
             'type': 'ir.actions.act_window',
-            'nodestroy' :True,
+            'nodestroy': True,
             'target': 'current',
             'res_id': inv_ids and inv_ids[0] or False,
         }
-
         return result
 
     def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False, context=None):
@@ -539,7 +532,6 @@ class sale_order(osv.osv):
                     if order.order_policy == 'picking':
                         picking_obj.write(cr, uid, map(lambda x: x.id, order.picking_ids), {'invoice_state': 'invoiced'})
                     cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%s,%s)', (order.id, res))
-
         return res
 
     def action_invoice_cancel(self, cr, uid, ids, context=None):
@@ -591,7 +583,6 @@ class sale_order(osv.osv):
             #
             if order.state == 'invoice_except':
                 self.write(cr, uid, [order.id], {'state': 'progress'}, context=context)
-
         return True
 
     def action_cancel(self, cr, uid, ids, context=None):
@@ -858,29 +849,29 @@ class sale_order_line(osv.osv):
     _description = 'Sale Order Line'
     _columns = {
         'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'name': fields.char('Description', size=256, required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'name': fields.char('Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sale order lines."),
-        'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer", readonly=True, states={'draft':[('readonly',False)]}),
+        'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer", readonly=True, states={'draft': [('readonly', False)]}),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
         'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'procurement_id': fields.many2one('procurement.order', 'Procurement'),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft':[('readonly',False)]}),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
         'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
-        'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft':[('readonly',False)]}),
-        'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft':[('readonly',False)]}),
+        'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}),
+        'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}),
         'address_allotment_id': fields.many2one('res.partner.address', 'Allotment Partner'),
-        'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'product_uos_qty': fields.float('Quantity (UoS)', readonly=True, states={'draft':[('readonly',False)]}),
+        'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'product_uos_qty': fields.float('Quantity (UoS)', readonly=True, states={'draft': [('readonly', False)]}),
         'product_uos': fields.many2one('product.uom', 'Product UoS'),
         'product_packaging': fields.many2one('product.packaging', 'Packaging'),
         'move_ids': fields.one2many('stock.move', 'sale_line_id', 'Inventory Moves', readonly=True),
-        'discount': fields.float('Discount (%)', digits=(16, 2), readonly=True, states={'draft':[('readonly',False)]}),
+        'discount': fields.float('Discount (%)', digits=(16, 2), readonly=True, states={'draft': [('readonly', False)]}),
         'number_packages': fields.function(_number_packages, method=True, type='integer', string='Number Packages'),
         'notes': fields.text('Notes'),
-        'th_weight': fields.float('Weight', readonly=True, states={'draft':[('readonly',False)]}),
+        'th_weight': fields.float('Weight', readonly=True, states={'draft': [('readonly', False)]}),
         'state': fields.selection([('draft', 'Draft'),('confirmed', 'Confirmed'),('done', 'Done'),('cancel', 'Cancelled'),('exception', 'Exception')], 'State', required=True, readonly=True,
                 help='* The \'Draft\' state is set when the related sale order in draft state. \
                     \n* The \'Confirmed\' state is set when the related sale order is confirmed. \
@@ -889,7 +880,7 @@ class sale_order_line(osv.osv):
                     \n* The \'Cancelled\' state is set when a user cancel the sale order related.'),
         'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
         'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', string='Salesman'),
-        'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft': [('readonly', False)]}),
     }
     _order = 'sequence, id desc'
     _defaults = {
@@ -897,7 +888,7 @@ class sale_order_line(osv.osv):
         'delay': 0.0,
         'product_uom_qty': 1,
         'product_uos_qty': 1,
-        'sequence':  10,
+        'sequence': 10,
         'invoiced': 0,
         'state': 'draft',
         'type': 'make_to_stock',
@@ -1049,7 +1040,6 @@ class sale_order_line(osv.osv):
             return {'value': {'th_weight': 0, 'product_packaging': False,
                 'product_uos_qty': qty}, 'domain': {'product_uom': [],
                    'product_uos': []}}
-
         if not date_order:
             date_order = time.strftime('%Y-%m-%d')
 
@@ -1081,7 +1071,6 @@ class sale_order_line(osv.osv):
             uom2 = product_uom_obj.browse(cr, uid, uom)
             if product_obj.uom_id.category_id.id != uom2.category_id.id:
                 uom = False
-
         if uos:
             if product_obj.uos_id:
                 uos2 = product_uom_obj.browse(cr, uid, uos)
@@ -1142,10 +1131,7 @@ class sale_order_line(osv.osv):
                      max(0,product_obj.virtual_available), product_obj.uom_id.name,
                      max(0,product_obj.qty_available), product_obj.uom_id.name)
             }
-
-
         # get unit price
-
         if not pricelist:
             warning = {
                 'title': 'No Pricelist !',
@@ -1189,12 +1175,11 @@ class sale_order_line(osv.osv):
         """Allows to delete sale order lines in draft,cancel states"""
         for rec in self.browse(cr, uid, ids, context=context):
             if rec.state not in ['draft', 'cancel']:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sale order line which is %s !')%(rec.state,))
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sale order line which is %s !') %(rec.state,))
         return super(sale_order_line, self).unlink(cr, uid, ids, context=context)
 
 sale_order_line()
 
-
 class sale_config_picking_policy(osv.osv_memory):
     _name = 'sale.config.picking_policy'
     _inherit = 'res.config'
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index ae29b70837b..f9e0c38494b 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -116,10 +116,8 @@ class stock_picking(osv.osv):
         result = super(stock_picking, self).action_invoice_create(cursor, user,
                 ids, journal_id=journal_id, group=group, type=type,
                 context=context)
-
         picking_ids = result.keys()
         invoice_ids = result.values()
-
         invoices = {}
         for invoice in invoice_obj.browse(cursor, user, invoice_ids,
                 context=context):
@@ -127,20 +125,16 @@ class stock_picking(osv.osv):
 
         for picking in picking_obj.browse(cursor, user, picking_ids,
                 context=context):
-
             if not picking.sale_id:
                 continue
             sale_lines = picking.sale_id.order_line
             invoice_created = invoices[result[picking.id]]
-
             for inv in invoice_obj.browse(cursor, user, [invoice_created.id], context=context):
                 if not inv.fiscal_position:
                     invoice_obj.write(cursor, user, [inv.id], {'fiscal_position': picking.sale_id.fiscal_position.id}, context=context)
-
             if picking.sale_id.client_order_ref:
                 inv_name = picking.sale_id.client_order_ref + " : " + invoice_created.name
                 invoice_obj.write(cursor, user, [invoice_created.id], {'name': inv_name}, context=context)
-
             for sale_line in sale_lines:
                 if sale_line.product_id.type == 'service' and sale_line.invoiced == False:
                     if group:
@@ -182,10 +176,9 @@ class stock_picking(osv.osv):
                         'account_analytic_id': account_analytic_id,
                         'notes':sale_line.notes
                     }, context=context)
-                    self.pool.get('sale.order.line').write(cursor, user, [sale_line.id], {'invoiced':True,
+                    self.pool.get('sale.order.line').write(cursor, user, [sale_line.id], {'invoiced': True,
                         'invoice_lines': [(6, 0, [invoice_line_id])],
                     })
-
         return result
 
     def action_cancel(self, cr, uid, ids, context={}):
@@ -194,7 +187,7 @@ class stock_picking(osv.osv):
             call_ship_end = True
             if pick.sale_id:
                 for picks in pick.sale_id.picking_ids:
-                    if picks.state not in ('done','cancel'):
+                    if picks.state not in ('done', 'cancel'):
                         call_ship_end = False
                         break
                 if call_ship_end:
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 4281e180970..c5a6a0e9846 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -68,7 +68,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
                 'partner_id': order.partner_id.id,
                 'address_invoice_id': order.partner_invoice_id.id,
                 'address_contact_id': order.partner_invoice_id.id,
-                'invoice_line': [(6,0,lines)],
+                'invoice_line': [(6, 0, lines)],
                 'currency_id' : order.pricelist_id.currency_id.id,
                 'comment': order.note,
                 'payment_term': pay_term,
@@ -81,7 +81,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
         sales_order_obj = self.pool.get('sale.order')
         wf_service = netsvc.LocalService('workflow')
         for line in sales_order_line_obj.browse(cr, uid, context['active_ids']):
-            if (not line.invoiced) and (line.state not in ('draft','cancel')):
+            if (not line.invoiced) and (line.state not in ('draft', 'cancel')):
                 if not line.order_id.id in invoices:
                     invoices[line.order_id.id] = []
                 line_id = sales_order_line_obj.invoice_line_create(cr, uid,
@@ -105,7 +105,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
                     break
             if flag:
                 wf_service.trg_validate(uid, 'sale.order', line.order_id.id, 'all_lines', cr)
-                sales_order_obj.write(cr, uid, [line.order_id.id], {'state' : 'progress'})
+                sales_order_obj.write(cr, uid, [line.order_id.id], {'state': 'progress'})
 
         if not invoices:
             raise osv.except_osv(_('Warning'), _('Invoice cannot be created for this Sale Order Line due to one of the following reasons:\n1.The state of this sale order line is either "draft" or "cancel"!\n2.The Sale Order Line is Invoiced!'))
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
index 8d0b191620b..242d83c72ef 100644
--- a/addons/sale/wizard/sale_make_invoice.py
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -27,7 +27,7 @@ class sale_make_invoice(osv.osv_memory):
     _description = "Sale Make Invoice"
     _columns = {
         'grouped': fields.boolean('Group the invoices', help='Check the box to group the invoices for the same customers'),
-        'invoice_date':fields.date('Invoice Date'),
+        'invoice_date': fields.date('Invoice Date'),
     }
     _defaults = {
         'grouped': False
@@ -66,7 +66,7 @@ class sale_make_invoice(osv.osv_memory):
             'view_mode': 'tree,form',
             'res_model': 'account.invoice',
             'view_id': False,
-            'context': "{'type':'out_refund'}",
+            'context': "{'type': 'out_refund'}",
             'type': 'ir.actions.act_window',
             'search_view_id': id['res_id']                
         }
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index ea7cdd56704..afb9edd3301 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -83,12 +83,12 @@ class sale_advance_payment_inv(osv.osv_memory):
                     'reference': False,
                     'account_id': sale.partner_id.property_account_receivable.id,
                     'partner_id': sale.partner_id.id,
-                    'address_invoice_id':sale.partner_invoice_id.id,
-                    'address_contact_id':sale.partner_order_id.id,
+                    'address_invoice_id': sale.partner_invoice_id.id,
+                    'address_contact_id': sale.partner_order_id.id,
                     'invoice_line': [(6, 0, create_ids)],
-                    'currency_id' :sale.pricelist_id.currency_id.id,
+                    'currency_id': sale.pricelist_id.currency_id.id,
                     'comment': '',
-                    'payment_term':sale.payment_term.id,
+                    'payment_term': sale.payment_term.id,
                     'fiscal_position': sale.fiscal_position.id or sale.partner_id.property_account_position.id
                 }
 
@@ -98,7 +98,7 @@ class sale_advance_payment_inv(osv.osv_memory):
                 for inv in sale.invoice_ids:
                     ids_inv.append(inv.id)
                 ids_inv.append(inv_id)
-                obj_sale.write(cr, uid, sale.id, {'invoice_ids':[(6, 0, ids_inv)]})
+                obj_sale.write(cr, uid, sale.id, {'invoice_ids': [(6, 0, ids_inv)]})
                 list_inv.append(inv_id)
         #
         # If invoice on picking: add the cost on the SO
@@ -127,7 +127,7 @@ class sale_advance_payment_inv(osv.osv_memory):
             'res_model': 'sale.open.invoice',
             'type': 'ir.actions.act_window',
             'target': 'new',
-            'context':context
+            'context': context
         }
 
 sale_advance_payment_inv()
@@ -164,7 +164,7 @@ class sale_open_invoice(osv.osv_memory):
             'res_id': int(context['invoice_id'][0]),
             'view_id': False,
             'views': [(form_res, 'form'), (tree_res, 'tree')],
-            'context': "{'type':'out_invoice'}",
+            'context': "{'type': 'out_invoice'}",
             'type': 'ir.actions.act_window',
          }
 

From ca2a251e90fb2d75d26f882d0404f02fd0e33a64 Mon Sep 17 00:00:00 2001
From: ssi <ssi@tinyerp.com>
Date: Thu, 21 Oct 2010 16:14:14 +0530
Subject: [PATCH 048/114] [IMP]account:modified account tax report

bzr revid: ssi@tinyerp.com-20101021104414-m3jrbyuh4nypepb6
---
 addons/account/report/account_tax_report.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/account_tax_report.rml b/addons/account/report/account_tax_report.rml
index 7079dc81ad8..7b062286310 100644
--- a/addons/account/report/account_tax_report.rml
+++ b/addons/account/report/account_tax_report.rml
@@ -108,7 +108,7 @@
   <para style="P2"><font color="white"> </font></para>
 	<blockTable colWidths="538" style="Tableau1">
       <tr>
-        <td><para style="P12">Fiscal Year : [[ get_years(data['form'])['fname'] ]]</para></td>
+        <td><para style="P12">Fiscal Year : [[ get_years(data['form'])['fname'] or removeParentNode('para')]]</para></td>
       </tr>
       <tr>
         <td><para style="P12">Periods : [[ get_years(data['form'])['periods'] or removeParentNode('tr')]]</para></td>

From 5ab64aae60c11ab9fdfdb4138c0554f2fdcc7a93 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Thu, 21 Oct 2010 16:32:12 +0530
Subject: [PATCH 049/114] [FIX] account: no value in  ref field of account.move
 object in Sales receipt, Customer payment, supplier voucher and Vender
 payment

bzr revid: vth@tinyerp.com-20101021110212-vi1atu6ryqu5ji00
---
 addons/account_voucher/account_voucher.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 169a489bfa2..9dca6fdd9c6 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -584,13 +584,17 @@ class account_voucher(osv.osv):
                 name = self.pool.get('ir.sequence').get_id(cr, uid, inv.journal_id.sequence_id.id)
             else:
                 raise osv.except_osv(_('Error !'), _('Please define a sequence on the journal !'))
+            if not inv.reference:
+                ref = name.replace('/','')
+            else:
+                ref = inv.reference
 
             move = {
                 'name': name,
                 'journal_id': inv.journal_id.id,
                 'narration': inv.narration,
-                'date':inv.date,
-                'ref':inv.reference,
+                'date': inv.date,
+                'ref': ref,
                 'period_id': inv.period_id and inv.period_id.id or False
             }
             move_id = move_pool.create(cr, uid, move)

From 27dfa78272552761cf4ceb4066e63728f5d9efbc Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 21 Oct 2010 17:01:12 +0530
Subject: [PATCH 050/114] [IMP] Account: Profit and loss report => string
 change Net profit cfbl to only net profit same for loss

bzr revid: mra@mra-laptop-20101021113112-f7hpi92hxktw512e
---
 addons/account/report/account_balance_sheet.py      | 2 +-
 addons/account/report/account_profit_horizontal.rml | 8 ++++----
 addons/account/report/account_profit_loss.py        | 8 ++++----
 addons/account/report/account_profit_loss.rml       | 8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index 5b83fd32269..6743cf4a7ac 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -104,7 +104,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
         account_ids = account_pool._get_children_and_consol(cr, uid, account_id, context=ctx)
         accounts = account_pool.browse(cr, uid, account_ids, context=ctx)
 
-        if self.res_bl['type'] == 'Net Profit C.F.B.L.':
+        if self.res_bl['type'] == 'Net Profit':
             self.res_bl['type'] = 'Net Profit'
         else:
             self.res_bl['type'] = 'Net Loss'
diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml
index 886d58aa092..89cbc4f8502 100644
--- a/addons/account/report/account_profit_horizontal.rml
+++ b/addons/account/report/account_profit_horizontal.rml
@@ -250,19 +250,19 @@
           <para style="terp_default_Bold_9"></para>
         </td>
         <td>
-          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]]</para>
+          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit' and final_result()['type'] or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(abs(final_result()['balance'])) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and  formatLang(abs(final_result()['balance'])) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9"></para>
         </td>
         <td>
-          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]]</para>
+          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss' and final_result()['type'] or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py
index 792b88053a1..3d4ff1accf6 100644
--- a/addons/account/report/account_profit_loss.py
+++ b/addons/account/report/account_profit_loss.py
@@ -62,12 +62,12 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header):
         return self.res_pl
 
     def sum_dr(self):
-        if self.res_pl['type'] == 'Net Profit C.F.B.L.':
+        if self.res_pl['type'] == 'Net Profit':
             self.result_sum_dr += self.res_pl['balance']
         return self.result_sum_dr
 
     def sum_cr(self):
-        if self.res_pl['type'] == 'Net Loss C.F.B.L.':
+        if self.res_pl['type'] == 'Net Loss':
             self.result_sum_cr += self.res_pl['balance']
         return self.result_sum_cr
 
@@ -114,10 +114,10 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header):
                     else:
                         accounts_temp.append(account)
             if self.result_sum_dr > self.result_sum_cr:
-                self.res_pl['type'] = 'Net Loss C.F.B.L.'
+                self.res_pl['type'] = 'Net Loss'
                 self.res_pl['balance'] = (self.result_sum_dr - self.result_sum_cr)
             else:
-                self.res_pl['type'] = 'Net Profit C.F.B.L.'
+                self.res_pl['type'] = 'Net Profit'
                 self.res_pl['balance'] = (self.result_sum_cr - self.result_sum_dr)
             self.result[typ] = accounts_temp
             cal_list[typ] = self.result[typ]
diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml
index 2d85dc590e6..c371ab4c638 100644
--- a/addons/account/report/account_profit_loss.rml
+++ b/addons/account/report/account_profit_loss.rml
@@ -228,10 +228,10 @@
           <para style="terp_default_Bold_9"></para>
         </td>
         <td>
-          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
+          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -283,10 +283,10 @@
           <para style="terp_default_Bold_9"></para>
         </td>
         <td>
-          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
+          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>

From ea61572b9a6b60bde18d0ffe1e0e242f14885faf Mon Sep 17 00:00:00 2001
From: ssi <ssi@tinyerp.com>
Date: Thu, 21 Oct 2010 17:16:31 +0530
Subject: [PATCH 051/114] [IMP]account: removed unused variables and imports

bzr revid: ssi@tinyerp.com-20101021114631-md6h3d21ceoboii8
---
 addons/account/account_cash_statement.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 95706351ffa..51b29574e5f 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -23,7 +23,6 @@
 import time
 
 from osv import osv, fields
-from decimal import Decimal
 from tools.translate import _
 import decimal_precision as dp
 
@@ -296,8 +295,6 @@ class account_cash_statement(osv.osv):
         @param journal_id: Changed journal_id
         @return:  Dictionary of changed values
         """
-        cash_pool = self.pool.get('account.cashbox.line')
-        statement_pool = self.pool.get('account.bank.statement')
         res = {}
         balance_start = 0.0
 

From 84a6dad5ced3d5a25e768c6bf6adbd592dfbe8ab Mon Sep 17 00:00:00 2001
From: ssi <ssi@tinyerp.com>
Date: Thu, 21 Oct 2010 17:38:26 +0530
Subject: [PATCH 052/114] [IMP]account: pep-8 in account cash statement

bzr revid: ssi@tinyerp.com-20101021120826-dpd7zuwcujb3rdk3
---
 addons/account/account_cash_statement.py | 60 ++++++++++++------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 51b29574e5f..8182d402522 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -52,14 +52,14 @@ class account_cashbox_line(osv.osv):
         @param number:
         """
         sub = pieces * number
-        return {'value':{'subtotal': sub or 0.0}}
+        return {'value': {'subtotal': sub or 0.0}}
 
     _columns = {
         'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')),
         'number': fields.integer('Number'),
         'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float', digits_compute=dp.get_precision('Account')),
-        'starting_id': fields.many2one('account.bank.statement',ondelete='cascade'),
-        'ending_id': fields.many2one('account.bank.statement',ondelete='cascade'),
+        'starting_id': fields.many2one('account.bank.statement', ondelete='cascade'),
+        'ending_id': fields.many2one('account.bank.statement', ondelete='cascade'),
      }
 
 account_cashbox_line()
@@ -85,7 +85,7 @@ class account_cash_statement(osv.osv):
             for line in statement.starting_details_ids:
                 amount_total+= line.pieces * line.number
             res[statement.id] = {
-                'balance_start':amount_total
+                'balance_start': amount_total
             }
         return res
 
@@ -165,13 +165,13 @@ class account_cash_statement(osv.osv):
         curr = [1, 2, 5, 10, 20, 50, 100, 500]
         for rs in curr:
             dct = {
-                'pieces':rs,
-                'number':0
+                'pieces': rs,
+                'number': 0
             }
             res.append(dct)
-        journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','cash')], context=context)
+        journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')], context=context)
         if journal_ids:
-            results = self.search(cr, uid, [('journal_id','in',journal_ids),('state','=','confirm')],context=context)
+            results = self.search(cr, uid, [('journal_id', 'in', journal_ids),('state', '=', 'confirm')], context=context)
             if results:
                 cash_st = self.browse(cr, uid, results, context)[0]
                 for cash_line in cash_st.ending_details_ids:
@@ -185,8 +185,8 @@ class account_cash_statement(osv.osv):
         curr = [1, 2, 5, 10, 20, 50, 100, 500]
         for rs in curr:
             dct = {
-                'pieces':rs,
-                'number':0
+                'pieces': rs,
+                'number': 0
             }
             res.append(dct)
         return res
@@ -196,10 +196,10 @@ class account_cash_statement(osv.osv):
         curr = [1, 2, 5, 10, 20, 50, 100, 500]
         for rs in curr:
             dct = {
-                'pieces':rs,
-                'number':0
+                'pieces': rs,
+                'number': 0
             }
-            res.append((0,0,dct))
+            res.append((0, 0, dct))
         return res
 
     def _get_cash_open_close_box_lines(self, cr, uid, context={}):
@@ -209,34 +209,34 @@ class account_cash_statement(osv.osv):
         starting_details = self._get_cash_open_box_lines(cr, uid, context)
         ending_details = self._get_default_cash_close_box_lines(cr, uid, context)
         for start in starting_details:
-            start_l.append((0,0,start))
+            start_l.append((0, 0, start))
         for end in ending_details:
-            end_l.append((0,0,end))
+            end_l.append((0, 0, end))
         res['start'] = start_l
         res['end'] = end_l
         return res
 
     _columns = {
-        'balance_end_real': fields.float('Closing Balance', digits_compute=dp.get_precision('Account'), states={'confirm':[('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
+        'balance_end_real': fields.float('Closing Balance', digits_compute=dp.get_precision('Account'), states={'confirm': [('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
         'state': fields.selection(
             [('draft', 'Draft'),
             ('confirm', 'Closed'),
             ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
-        'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, store=True, string="Cash Transaction", help="Total cash transactions"),
-        'closing_date':fields.datetime("Closed On"),
+        'total_entry_encoding': fields.function(_get_sum_entry_encoding, method=True, store=True, string="Cash Transaction", help="Total cash transactions"),
+        'closing_date': fields.datetime("Closed On"),
         'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance', help="Closing balance based on Starting Balance and Cash Transactions"),
         'balance_end_cash': fields.function(_balance_end_cash, method=True, store=True, string='Balance', help="Closing balance based on cashBox"),
         'starting_details_ids': fields.one2many('account.cashbox.line', 'starting_id', string='Opening Cashbox'),
         'ending_details_ids': fields.one2many('account.cashbox.line', 'ending_id', string='Closing Cashbox'),
         'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'),
-        'user_id':fields.many2one('res.users', 'Responsible', required=False),
+        'user_id': fields.many2one('res.users', 'Responsible', required=False),
     }
     _defaults = {
         'state': 'draft',
         'date': time.strftime("%Y-%m-%d %H:%M:%S"),
         'user_id': lambda self, cr, uid, context=None: uid,
-        'starting_details_ids':_get_cash_open_box_lines,
-        'ending_details_ids':_get_default_cash_close_box_lines
+        'starting_details_ids': _get_cash_open_box_lines,
+        'ending_details_ids': _get_default_cash_close_box_lines
      }
 
     def create(self, cr, uid, vals, context=None):
@@ -250,20 +250,20 @@ class account_cash_statement(osv.osv):
 
         if self.pool.get('account.journal').browse(cr, uid, vals['journal_id']).type == 'cash':
             open_close = self._get_cash_open_close_box_lines(cr, uid, context)
-            if vals.get('starting_details_ids',False):
+            if vals.get('starting_details_ids', False):
                 for start in vals.get('starting_details_ids'):
                     dict_val = start[2]
                     for end in open_close['end']:
                        if end[2]['pieces'] == dict_val['pieces']:
                            end[2]['number'] += dict_val['number']
             vals.update({
-                'ending_details_ids':open_close['start'],
-                'starting_details_ids':open_close['end']
+                'ending_details_ids': open_close['start'],
+                'starting_details_ids': open_close['end']
             })
         else:
             vals.update({
-                'ending_details_ids':False,
-                'starting_details_ids':False
+                'ending_details_ids': False,
+                'starting_details_ids': False
             })
         res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
         self.write(cr, uid, [res_id], {})
@@ -337,8 +337,8 @@ class account_cash_statement(osv.osv):
                 })
 
             vals.update({
-                'date':time.strftime("%Y-%m-%d %H:%M:%S"),
-                'state':'open',
+                'date': time.strftime("%Y-%m-%d %H:%M:%S"),
+                'state': 'open',
 
             })
             self.write(cr, uid, [statement.id], vals)
@@ -367,14 +367,14 @@ class account_cash_statement(osv.osv):
 
     def button_confirm_cash(self, cr, uid, ids, context=None):
         super(account_cash_statement, self).button_confirm_bank(cr, uid, ids, context=context)
-        return self.write(cr, uid, ids, {'closing_date':time.strftime("%Y-%m-%d %H:%M:%S")}, context=context)
+        return self.write(cr, uid, ids, {'closing_date': time.strftime("%Y-%m-%d %H:%M:%S")}, context=context)
 
     def button_cancel(self, cr, uid, ids, context=None):
         cash_box_line_pool = self.pool.get('account.cashbox.line')
         super(account_cash_statement, self).button_cancel(cr, uid, ids, context=context)
         for st in self.browse(cr, uid, ids, context):
             for end in st.ending_details_ids:
-                cash_box_line_pool.write(cr, uid, [end.id], {'number':0})
+                cash_box_line_pool.write(cr, uid, [end.id], {'number': 0})
         return True
 
 account_cash_statement()

From ba09551951279ed5ef86513352df96d23cd6c44e Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 21 Oct 2010 17:54:24 +0530
Subject: [PATCH 053/114] [REF]

bzr revid: mra@mra-laptop-20101021122424-337dz488sph0xwqw
---
 addons/account/installer.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/addons/account/installer.py b/addons/account/installer.py
index 86d3c3d64e8..b25a8e24c00 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -68,9 +68,7 @@ class account_installer(osv.osv_memory):
 
     def _default_company(self, cr, uid, context=None):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        if user.company_id:
-            return user.company_id.id
-        return False
+        return user.company_id and user.company_id.id or False
 
     def _get_default_charts(self, cr, uid, context=None):
         module_name = False
@@ -127,7 +125,6 @@ class account_installer(osv.osv_memory):
         obj_tax_fp = self.pool.get('account.fiscal.position.tax')
         obj_ac_fp = self.pool.get('account.fiscal.position.account')
 
-
         result = mod_obj._get_id(cr, uid, 'account', 'configurable_chart_template')
         id = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id']
         obj_multi = obj_acc_chart_template.browse(cr, uid, id, context=context)
@@ -720,9 +717,6 @@ class account_bank_accounts_wizard(osv.osv_memory):
         'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
         'account_type': fields.selection([('cash','Cash'), ('check','Check'), ('bank','Bank')], 'Account Type', size=32),
     }
-#    _defaults = {
-#        'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
-#    }
 
 account_bank_accounts_wizard()
 
@@ -730,7 +724,6 @@ class account_installer_modules(osv.osv_memory):
     _name = 'account.installer.modules'
     _inherit = 'res.config.installer'
     _columns = {
-        # Accounting
         'account_analytic_plans': fields.boolean('Multiple Analytic Plans',
             help="Allows invoice lines to impact multiple analytic accounts "
                  "simultaneously."),
@@ -747,9 +740,6 @@ class account_installer_modules(osv.osv_memory):
         'account_anglo_saxon': fields.boolean('Anglo-Saxon Accounting',
             help="This module will support the Anglo-Saxons accounting methodology by "
                 "changing the accounting logic with stock transactions."),
-#        'account_voucher_payment':fields.boolean('Voucher and Reconcile Management',
-#            help="Extension Account Voucher module includes allows to link payment / receipt "
-#                 "entries with voucher, also automatically reconcile during the payment and receipt entries."),
     }
 
     _defaults = {
@@ -758,4 +748,4 @@ class account_installer_modules(osv.osv_memory):
 
 account_installer_modules()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From e6203b0bbab2397d28bf01b1eada84634532665b Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 21 Oct 2010 18:36:51 +0530
Subject: [PATCH 054/114] [REF] sale: remove unused read operation from wizard

bzr revid: mra@mra-laptop-20101021130651-fxbcbucxlx0li6ky
---
 addons/sale/wizard/sale_make_invoice_advance.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index afb9edd3301..b60591b4fea 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -151,7 +151,6 @@ class sale_open_invoice(osv.osv_memory):
         mod_obj = self.pool.get('ir.model.data')
         for advance_pay in self.browse(cr, uid, ids):
             result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-            id = mod_obj.read(cr, uid, result, ['res_id'])
             form_id = mod_obj._get_id(cr, uid, 'account', 'invoice_form')
             form_res = mod_obj.browse(cr, uid, form_id, context=context).res_id
             tree_id = mod_obj._get_id(cr, uid, 'account', 'invoice_tree')

From 2d17946631a53b7437c7446f3ff1ae72b5b6a533 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 22 Oct 2010 11:15:16 +0530
Subject: [PATCH 055/114] [REF]

bzr revid: mra@mra-laptop-20101022054516-klol5g49os9ilazc
---
 addons/account_voucher/invoice.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
index 5560f57ce81..0230cac1009 100644
--- a/addons/account_voucher/invoice.py
+++ b/addons/account_voucher/invoice.py
@@ -24,8 +24,8 @@ from tools.translate import _
 
 class invoice(osv.osv):
     _inherit = 'account.invoice'
-    
-    def invoice_pay_customer(self, cr, uid, ids, context={}):
+
+    def invoice_pay_customer(self, cr, uid, ids, context=None):
         if not ids: return []
         inv = self.browse(cr, uid, ids[0], context=context)
         return {
@@ -46,7 +46,7 @@ class invoice(osv.osv):
                 'invoice_type':inv.type,
                 'invoice_id':inv.id,
                 'default_type': inv.type in ('out_invoice','out_refund') and 'receipt' or 'payment'
-            }
+                }
         }
 
 invoice()

From 471572043d1e38efd098b2b41775e0fe2114fa0e Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Fri, 22 Oct 2010 12:53:46 +0530
Subject: [PATCH 056/114] [IMP] sale modules: Cleaning modules

bzr revid: pso@tinyerp.com-20101022072346-ud8khvwiwhcjpcga
---
 addons/sale_crm/wizard/crm_make_sale.py       |  8 +----
 addons/sale_journal/sale_journal.py           |  2 +-
 .../sale_layout/report/report_sale_layout.py  |  3 +-
 addons/sale_layout/sale_layout.py             | 33 +++++++++----------
 addons/sale_margin/sale_margin.py             | 13 ++++----
 addons/sale_mrp/sale_mrp.py                   |  2 +-
 addons/sale_order_dates/sale_order_dates.py   |  3 +-
 7 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index c5317950f1a..0c72c3205cd 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -71,7 +71,6 @@ class crm_make_sale(osv.osv_memory):
         case_obj = self.pool.get('crm.lead')
         sale_obj = self.pool.get('sale.order')
         partner_obj = self.pool.get('res.partner')
-
         data = context and context.get('active_ids', []) or []
 
         for make in self.browse(cr, uid, ids, context=context):
@@ -81,7 +80,6 @@ class crm_make_sale(osv.osv_memory):
             pricelist = partner.property_product_pricelist.id
             fpos = partner.property_account_position and partner.property_account_position.id or False
             new_ids = []
-
             for case in case_obj.browse(cr, uid, data, context=context):
                 if not partner and case.partner_id:
                     partner = case.partner_id
@@ -89,7 +87,6 @@ class crm_make_sale(osv.osv_memory):
                     partner_addr = partner_obj.address_get(cr, uid, [partner.id], 
                             ['default', 'invoice', 'delivery', 'contact'])
                     pricelist = partner.property_product_pricelist.id
-
                 if False in partner_addr.values():
                     raise osv.except_osv(_('Data Insufficient!'), _('Customer has no addresses defined!'))
 
@@ -105,10 +102,8 @@ class crm_make_sale(osv.osv_memory):
                     'date_order': time.strftime('%Y-%m-%d'), 
                     'fiscal_position': fpos, 
                 }
-
                 if partner.id:
                     vals['user_id'] = partner.user_id and partner.user_id.id or uid
-
                 new_id = sale_obj.create(cr, uid, vals)
                 case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
                 new_ids.append(new_id)
@@ -118,7 +113,6 @@ class crm_make_sale(osv.osv_memory):
 
             if make.close:
                 case_obj.case_close(cr, uid, data)
-
             if not new_ids:
                 return {}
             if len(new_ids)<=1:
@@ -157,7 +151,7 @@ class crm_make_sale(osv.osv_memory):
     }
     _defaults = {
          'shop_id': _get_shop_id, 
-         'close': lambda *args: 1, 
+         'close': True, 
          'partner_id': _selectPartner, 
     }
 
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 00c3a77126d..5e66c74590b 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -31,7 +31,7 @@ class sale_journal_invoice_type(osv.osv):
         'name': fields.char('Invoice Type', size=64, required=True),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the invoice type without removing it."),
         'note': fields.text('Note'),
-        'invoicing_method': fields.selection([('simple','Non grouped'),('grouped','Grouped')], 'Invoicing method', required=True),
+        'invoicing_method': fields.selection([('simple', 'Non grouped'), ('grouped', 'Grouped')], 'Invoicing method', required=True),
     }
     _defaults = {
         'active': True,
diff --git a/addons/sale_layout/report/report_sale_layout.py b/addons/sale_layout/report/report_sale_layout.py
index 847c2cb4834..94b10c8ebf9 100755
--- a/addons/sale_layout/report/report_sale_layout.py
+++ b/addons/sale_layout/report/report_sale_layout.py
@@ -21,7 +21,6 @@
 import time
 from report import report_sxw
 
-
 rml_parents = {
     'tr': 1,
     'li': 1,
@@ -29,7 +28,6 @@ rml_parents = {
     'section': 0
 }
 
-
 class sale_order_1(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(sale_order_1, self).__init__(cr, uid, name, context)
@@ -131,6 +129,7 @@ class sale_order_1(report_sxw.rml_parse):
 
             result.append(res)
         return result
+
 report_sxw.report_sxw('report.sale.order.layout', 'sale.order', 'addons/sale_layout/report/report_sale_layout.rml', parser=sale_order_1)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py
index 6144ea13d05..1aedf83e618 100755
--- a/addons/sale_layout/sale_layout.py
+++ b/addons/sale_layout/sale_layout.py
@@ -20,10 +20,8 @@
 #
 ##############################################################################
 
-from osv import fields,osv
-from tools import config
+from osv import fields, osv
 import decimal_precision as dp
-from tools.translate import _
 
 class sale_order_line(osv.osv):
 
@@ -33,9 +31,10 @@ class sale_order_line(osv.osv):
         res = {}
         context = context or {}
         for line in self.browse(cr, uid, ids, context=context):
-            if line.layout_type=='article':
+            if line.layout_type == 'article':
                 return super(sale_order_line, self)._amount_line(cr, uid, ids, field_name, arg, context)
         return res
+    
     def invoice_line_create(self, cr, uid, ids, context={}):
         new_ids = []
         list_seq = []
@@ -52,8 +51,8 @@ class sale_order_line(osv.osv):
         return invoice_line_ids
 
     def onchange_sale_order_line_view(self, cr, uid, id, type, context={}, *args):
-            temp ={}
-            temp['value']= {}
+            temp = {}
+            temp['value'] = {}
             if (not type):
                 return {}
             if type != 'article':
@@ -68,7 +67,7 @@ class sale_order_line(osv.osv):
                     'discount': 0.0,
                     'invoice_line_tax_id': False,
                     'account_analytic_id': False,
-                    'product_uom_qty':0.0,
+                    'product_uom_qty': 0.0,
                     },
                 }
                 if type == 'line':
@@ -111,15 +110,15 @@ class sale_order_line(osv.osv):
     _inherit = "sale.order.line"
     _columns = {
         'layout_type': fields.selection([
-                ('article','Product'),
-                ('title','Title'),
-                ('text','Note'),
-                ('subtotal','Sub Total'),
-                ('line','Separator Line'),
-                ('break','Page Break'),]
+                ('article', 'Product'),
+                ('title', 'Title'),
+                ('text', 'Note'),
+                ('subtotal', 'Sub Total'),
+                ('line', 'Separator Line'),
+                ('break', 'Page Break'),]
             ,'Layout Type', select=True, required=True),
         'sequence': fields.integer('Sequence Number'),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft':[('readonly',False)]}),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
         'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2)),
         'product_uom': fields.many2one('product.uom', 'Product UoM'),
     }
@@ -139,7 +138,7 @@ class one2many_mod2(fields.one2many):
         res = {}
         for id in ids:
             res[id] = []
-        ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'in',ids),('layout_type','=','article')], limit=self._limit)
+        ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id, 'in', ids), ('layout_type', '=', 'article')], limit=self._limit)
         for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
             res[r[self._fields_id]].append( r['id'] )
         return res
@@ -155,8 +154,8 @@ class sale_order(osv.osv):
 
     _inherit = "sale.order"
     _columns = {
-        'abstract_line_ids': fields.one2many('sale.order.line', 'order_id', 'Order Lines',readonly=True, states={'draft':[('readonly',False)]}),
-        'order_line': one2many_mod2('sale.order.line', 'order_id', 'Order Lines',readonly=True, states={'draft':[('readonly',False)]}),
+        'abstract_line_ids': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}),
+        'order_line': one2many_mod2('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}),
     }
 
 sale_order()
diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index 03b16962a71..4ca88f9da19 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -18,8 +18,7 @@
 #
 ##############################################################################
 
-from osv import fields,osv
-import pooler
+from osv import fields, osv
 from tools import config
 
 class sale_order_line(osv.osv):
@@ -33,7 +32,7 @@ class sale_order_line(osv.osv):
             lang=lang, update_tax=update_tax, date_order=date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag)
         if product:
             purchase_price = self.pool.get('product.product').browse(cr, uid, product).standard_price
-            res['value'].update({'purchase_price':purchase_price})
+            res['value'].update({'purchase_price': purchase_price})
         return res
 
     def _product_margin(self, cr, uid, ids, field_name, arg, context=None):
@@ -42,9 +41,9 @@ class sale_order_line(osv.osv):
             res[line.id] = 0
             if line.product_id:
                 if line.purchase_price:
-                    res[line.id] = round((line.price_unit*line.product_uos_qty*(100.0-line.discount)/100.0) -(line.purchase_price*line.product_uos_qty),2)
+                    res[line.id] = round((line.price_unit*line.product_uos_qty*(100.0-line.discount)/100.0) -(line.purchase_price*line.product_uos_qty), 2)
                 else:
-                    res[line.id] = round((line.price_unit*line.product_uos_qty*(100.0-line.discount)/100.0) -(line.product_id.standard_price*line.product_uos_qty),2)
+                    res[line.id] = round((line.price_unit*line.product_uos_qty*(100.0-line.discount)/100.0) -(line.product_id.standard_price*line.product_uos_qty), 2)
         return res
 
     _columns = {
@@ -75,7 +74,7 @@ class stock_picking(osv.osv):
     _inherit = 'stock.picking'
 
     _columns = {
-        'invoice_ids': fields.many2many('account.invoice', 'picking_invoice_rel', 'picking_id', 'invoice_id', 'Invoices', domain=[('type','=','out_invoice')]),
+        'invoice_ids': fields.many2many('account.invoice', 'picking_invoice_rel', 'picking_id', 'invoice_id', 'Invoices', domain=[('type', '=', 'out_invoice')]),
     }
 
     def create_invoice(self, cr, uid, ids, *args):
@@ -86,7 +85,7 @@ class stock_picking(osv.osv):
         picking_obj.write(cr, uid, ids, {'invoice_state': '2binvoiced'})
         res = picking_obj.action_invoice_create(cr, uid, ids, type='out_invoice', context={})
         invoice_ids = res.values()
-        picking_obj.write(cr, uid, ids,{'invoice_ids': [[6,0,invoice_ids]]})
+        picking_obj.write(cr, uid, ids, {'invoice_ids': [[6, 0, invoice_ids]]})
         return True
 
 stock_picking()
diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index c278ef98db1..9e046b1f2f5 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -64,7 +64,7 @@ class mrp_production(osv.osv):
             if production.move_prod_id:
                 parent_move_line = get_parent_move(production.move_prod_id)
                 if parent_move_line:
-                    move = move_obj.browse(cr,uid,parent_move_line)
+                    move = move_obj.browse(cr, uid, parent_move_line)
                     if field_name == 'name':
                         res[production.id] = move.sale_line_id and move.sale_line_id.order_id.name or False
                     if field_name == 'client_order_ref':
diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py
index beca56b838e..011653abc01 100644
--- a/addons/sale_order_dates/sale_order_dates.py
+++ b/addons/sale_order_dates/sale_order_dates.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import time
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
@@ -39,7 +38,7 @@ class sale_order_dates(osv.osv):
             if dates_list:
                 res[order.id] = min(dates_list)
             else:
-                res[order.id] =False
+                res[order.id] = False
             return res
 
     def _get_commitment_date(self, cr, uid, ids, name, arg, context={}):

From da994fffd81c8c28e01a3837b26d99ce2c63d5e0 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 22 Oct 2010 13:06:20 +0530
Subject: [PATCH 057/114] [IMP] account:-On creation of new Cash Register
 record,the value of 'Cashbox Balance' remains zero

bzr revid: mtr@mtr-20101022073620-i1yqwvl35579m0zc
---
 addons/account/account_cash_statement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 8182d402522..13c6464f888 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -257,7 +257,7 @@ class account_cash_statement(osv.osv):
                        if end[2]['pieces'] == dict_val['pieces']:
                            end[2]['number'] += dict_val['number']
             vals.update({
-                'ending_details_ids': open_close['start'],
+#                'ending_details_ids': open_close['start'],
                 'starting_details_ids': open_close['end']
             })
         else:

From 99608428f8798699de8a678ed91f2ea221f5030b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 25 Oct 2010 10:04:47 +0200
Subject: [PATCH 058/114] [FIX] lint warnings

bzr revid: xmo@openerp.com-20101025080447-s5ulsom7fdbygwl4
---
 bin/osv/orm.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index da267c942ea..5c478e3f4b2 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1286,7 +1286,6 @@ class orm_template(object):
                     'fields': xfields
                 }
                 attrs = {'views': views}
-                view = False
                 fields = views.get('field', False) and views['field'].get('fields', False)
             if node.get('name'):
                 attrs = {}
@@ -2212,7 +2211,6 @@ class orm(orm_template):
 
         fget = self.fields_get(cr, uid, fields)
         float_int_fields = filter(lambda x: fget[x]['type'] in ('float', 'integer'), fields)
-        sum = {}
         flist = ''
         group_by = groupby
         if groupby:
@@ -2233,10 +2231,10 @@ class orm(orm_template):
                 or (f in self._columns and getattr(self._columns[f], '_classic_write'))]
         for f in fields_pre:
             if f not in ['id', 'sequence']:
-                operator = fget[f].get('group_operator', 'sum')
+                group_operator = fget[f].get('group_operator', 'sum')
                 if flist:
                     flist += ','
-                flist += operator+'('+f+') as '+f
+                flist += group_operator+'('+f+') as '+f
 
         gb = groupby and (' GROUP BY '+groupby) or ''
 

From a6cab7ac444c4ceea880abeb586b2a38049a3ea7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 25 Oct 2010 10:20:31 +0200
Subject: [PATCH 059/114] [REM] code having become noop and generating lint
 warnings following commenting of related code

bzr revid: xmo@openerp.com-20101025082031-pqrlih2gd6nnqstr
---
 bin/osv/orm.py | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 5c478e3f4b2..c24de8c07c2 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -2969,26 +2969,6 @@ class orm(orm_template):
             for key, v in r.items():
                 if v is None:
                     r[key] = False
-                if key in self._columns:
-                    column = self._columns[key]
-                elif key in self._inherit_fields:
-                    column = self._inherit_fields[key][2]
-                else:
-                    continue
-# TODO: removed this, it's too slow
-#                if v and column._type == 'reference':
-#                    model_name, ref_id = v.split(',', 1)
-#                    model = self.pool.get(model_name)
-#                    if not model:
-#                        reset = True
-#                    else:
-#                        cr.execute('SELECT count(1) FROM "%s" WHERE id=%%s' % (model._table,), (ref_id,))
-#                        reset = not cr.fetchone()[0]
-#                    if reset:
-#                        if column._classic_write:
-#                            query = 'UPDATE "%s" SET "%s"=NULL WHERE id=%%s' % (self._table, key)
-#                            cr.execute(query, (r['id'],))
-#                        r[key] = False
 
         if isinstance(ids, (int, long, dict)):
             return result and result[0] or False

From a3e293cf87f69854d22df7e9a9e283d8323a664c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 22 Oct 2010 09:59:35 +0200
Subject: [PATCH 060/114] [IMP] ir.actions.act_window: help text should be
 translatable

bzr revid: odo@openerp.com-20101022075935-x8quvw2vtgoy7lh4
---
 bin/addons/base/ir/ir_actions.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 5e37c1fa614..84419d25b51 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -253,7 +253,8 @@ class act_window(osv.osv):
         'search_view' : fields.function(_search_view, type='text', method=True, string='Search View'),
         'menus': fields.char('Menus', size=4096),
         'help': fields.text('Action description',
-            help='Optional help text for the users with a description of the target view, such as its usage and purpose.'),
+            help='Optional help text for the users with a description of the target view, such as its usage and purpose.',
+            translate=True),
         'display_menu_tip':fields.function(_get_help_status, type='boolean', method=True, string='Display Menu Tips',
             help='It gives the status if the tip has to be displayed or not when a user executes an action'),
         'multi': fields.boolean('Action on Multiple Doc.', help="If set to true, the action will not be displayed on the right toolbar of a form view"),

From 9a49fa6ea8eeb5fffa43df689d97428725412e52 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 22 Oct 2010 15:01:57 +0530
Subject: [PATCH 061/114] [FIX] account

bzr revid: mra@mra-laptop-20101022093157-x99vazqlb266j63e
---
 addons/account/installer.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/account/installer.py b/addons/account/installer.py
index b25a8e24c00..5bd6a881e07 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -401,13 +401,13 @@ class account_installer(osv.osv_memory):
         analitical_sale_ids = analytic_journal_obj.search(cr, uid, [('type','=','sale')], context=context)
         analitical_journal_sale = analitical_sale_ids and analitical_sale_ids[0] or False
 
-        vals_journal = {
+        vals_journal.update({
             'name': _('Sales Journal'),
             'type': 'sale',
             'code': _('SAJ'),
             'sequence_id': seq_id_sale,
             'analytic_journal_id': analitical_journal_sale
-        }
+        })
 
         if obj_multi.property_account_receivable:
             vals_journal.update({
@@ -420,13 +420,13 @@ class account_installer(osv.osv_memory):
         analitical_purchase_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'purchase')], context=context)
         analitical_journal_purchase = analitical_purchase_ids and analitical_purchase_ids[0] or False
 
-        vals_journal = {
+        vals_journal.update({
             'name': _('Purchase Journal'),
             'type': 'purchase',
             'code': _('EXJ'),
             'sequence_id': seq_id_purchase,
             'analytic_journal_id': analitical_journal_purchase
-        }
+        })
 
         if obj_multi.property_account_payable:
             vals_journal.update({
@@ -461,6 +461,7 @@ class account_installer(osv.osv_memory):
 
         # Purchase Refund Journal
         vals_journal = {
+            'view_id': view_id,
             'name': _('Purchase Refund Journal'),
             'type': 'purchase_refund',
             'refund_journal': True,

From 14798ab61edee4d1eed9b079eefeda9a42e51f4a Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 22 Oct 2010 15:06:05 +0530
Subject: [PATCH 062/114] [IMP] account:-corrected the numeric values in yml

bzr revid: mtr@mtr-20101022093605-uq1t30hlvz9mk906
---
 addons/account/test/account_cash_statement.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/account/test/account_cash_statement.yml b/addons/account/test/account_cash_statement.yml
index 0932e214560..03d0d54db83 100644
--- a/addons/account/test/account_cash_statement.yml
+++ b/addons/account/test/account_cash_statement.yml
@@ -1,5 +1,5 @@
 -
-  In order to test Cash statement I create a Cash statement and and confirm it and check it's move created
+  In order to test Cash statement I create a Cash statement and confirm it and check it's move created
 -
  !record {model: account.bank.statement, id: account_bank_statement_1}:
     date: '2010-10-16'
@@ -13,9 +13,9 @@
          subtotal: 20.0
       -  pieces: 100.0
          number: 1
-         subtotal: 200.0
-    balance_start: 220.0
-    balance_end: 220.0
+         subtotal: 100.0
+    balance_start: 120.0
+    balance_end: 120.0
 -
   I check that Initially bank statement is in the "Draft" state
 -
@@ -46,18 +46,18 @@
         partner_id: base.res_partner_4
         sequence: 0.0
         type: general
-    balance_end: 1220.0
+    balance_end: 1120.0
     ending_details_ids:
       -  pieces: 10.0
          number: 2
          subtotal: 20.0
       -  pieces: 100.0
          number: 1
-         subtotal: 200.0
+         subtotal: 100.0
       -  pieces: 500.0
          number: 2
          subtotal: 1000.0
-    balance_end_cash: 1220.0
+    balance_end_cash: 1120.0
 
 -
   I clicked on Close CashBox button to close the cashbox

From ea4f948713ef1c5a1fbc1111c4ca80471ddeccb4 Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Fri, 22 Oct 2010 15:09:03 +0530
Subject: [PATCH 063/114] [IMP] sale_mrp: Improved multi and passed id insted
 of browse record

bzr revid: pso@tinyerp.com-20101022093903-40reflpmwuqjono7
---
 addons/sale_mrp/sale_mrp.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index 9e046b1f2f5..c11f62a1f03 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -62,7 +62,7 @@ class mrp_production(osv.osv):
         for production in productions:
             res[production.id] = False
             if production.move_prod_id:
-                parent_move_line = get_parent_move(production.move_prod_id)
+                parent_move_line = get_parent_move(production.move_prod_id.id)
                 if parent_move_line:
                     move = move_obj.browse(cr, uid, parent_move_line)
                     if field_name == 'name':
@@ -73,7 +73,7 @@ class mrp_production(osv.osv):
 
     _columns = {
         'sale_name': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sale Name', help='Indicate the name of sale order.'),
-        'sale_ref': fields.function(_ref_calc, method=True, multi='sale_ref', type='char', string='Sale Reference', help='Indicate the Customer Reference from sale order.'),
+        'sale_ref': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sale Reference', help='Indicate the Customer Reference from sale order.'),
     }
 
 mrp_production()

From 782090d36a5b4a1ea4a24be817aa285cb579496a Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 22 Oct 2010 15:12:11 +0530
Subject: [PATCH 064/114] [REF] account: Small change in sales receipt view

bzr revid: psi@tinyerp.co.in-20101022094211-2rxg60gqysu3wmxv
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index ed6e98ad17d..46db5747f94 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -153,9 +153,9 @@
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                        <group  colspan="2" attrs="{'invisible':[('pay_now','!=','pay_now')]}">
-			    <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('state','!=','posted')]}"/>
-			</group>
+                        <group attrs="{'invisible':[('state','!=','posted')]}">
+                           <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now')]}"/>
+                        </group>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </form>

From cc2725fee71f31b5982d1cdae4dcaba3fdaec7a9 Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Fri, 22 Oct 2010 17:04:27 +0530
Subject: [PATCH 065/114] [IMP] sale_layout: Removed lambda

bzr revid: pso@tinyerp.com-20101022113427-n8n0r5bgxlsthv9f
---
 addons/sale_layout/sale_layout.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py
index 1aedf83e618..5d3f7d65f9f 100755
--- a/addons/sale_layout/sale_layout.py
+++ b/addons/sale_layout/sale_layout.py
@@ -124,7 +124,7 @@ class sale_order_line(osv.osv):
     }
 
     _defaults = {
-        'layout_type': lambda *a: 'article',
+        'layout_type': 'article',
     }
 
 sale_order_line()

From 0f29cca5097b42a5aa7b6d9d135ef370d6d7f417 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 22 Oct 2010 17:38:56 +0530
Subject: [PATCH 066/114] [REF] account_payment

bzr revid: psi@tinyerp.co.in-20101022120856-vjvo4mqx26gfftts
---
 addons/account_payment/account_invoice.py     |   1 +
 addons/account_payment/account_move_line.py   |   8 +-
 addons/account_payment/account_payment.py     | 162 +++++++++---------
 .../account_payment/report/payment_order.py   |   1 -
 4 files changed, 85 insertions(+), 87 deletions(-)

diff --git a/addons/account_payment/account_invoice.py b/addons/account_payment/account_invoice.py
index ca874e26894..1f882b48421 100644
--- a/addons/account_payment/account_invoice.py
+++ b/addons/account_payment/account_invoice.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from datetime import datetime
+
 from osv import fields, osv
 
 class Invoice(osv.osv):
diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index 09208892d67..638b75dcaaa 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -41,10 +41,10 @@ class account_move_line(osv.osv):
                             INNER JOIN payment_order po
                                 ON (pl.order_id = po.id)
                         WHERE move_line_id = ml.id
-                        AND po.state != 'cancel') as amount
+                        AND po.state != 'cancel') AS amount
                     FROM account_move_line ml
                     WHERE id IN %s""", (tuple(ids),))
-        r=dict(cr.fetchall())
+        r = dict(cr.fetchall())
         return r
 
     def _to_pay_search(self, cr, uid, obj, name, args, context):
@@ -75,8 +75,8 @@ class account_move_line(osv.osv):
 
         res = cr.fetchall()
         if not res:
-            return [('id','=','0')]
-        return [('id','in',map(lambda x:x[0], res))]
+            return [('id', '=', '0')]
+        return [('id', 'in', map(lambda x:x[0], res))]
 
     def line2bank(self, cr, uid, ids, payment_type=None, context=None):
         """
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 3d3bd8f7b38..750edccf389 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -27,7 +27,7 @@ import netsvc
 class payment_mode(osv.osv):
     _name= 'payment.mode'
     _description= 'Payment Mode'
-    _columns= {
+    _columns = {
         'name': fields.char('Name', size=64, required=True, help='Mode of Payment'),
         'bank_id': fields.many2one('res.partner.bank', "Bank account",
             required=True,help='Bank Account for the Payment Mode'),
@@ -44,10 +44,10 @@ class payment_mode(osv.osv):
         for the given payment type code"""
         if not payment_code:
             return []
-        cr.execute(""" select pb.state
-            from res_partner_bank pb
-            join payment_mode pm on (pm.bank_id = pb.id)
-            where pm.id = %s """, [payment_code])
+        cr.execute(""" SELECT pb.state
+            FROM res_partner_bank pb
+            JOIN payment_mode pm ON (pm.bank_id = pb.id)
+            WHERE pm.id = %s """, [payment_code])
         return [x[0] for x in cr.fetchall()]
 
 payment_mode()
@@ -75,38 +75,37 @@ class payment_order(osv.osv):
         return res
 
     _columns = {
-        'date_scheduled': fields.date('Scheduled date if fixed', states={'done':[('readonly',True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'),
-        'reference': fields.char('Reference', size=128, required=1, states={'done':[('readonly',True)]}),
-        'mode': fields.many2one('payment.mode','Payment mode', select=True, required=1, states={'done':[('readonly',True)]}, help='Select the Payment Mode to be applied.'),
+        'date_scheduled': fields.date('Scheduled date if fixed', states={'done':[('readonly', True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'),
+        'reference': fields.char('Reference', size=128, required=1, states={'done': [('readonly', True)]}),
+        'mode': fields.many2one('payment.mode', 'Payment mode', select=True, required=1, states={'done': [('readonly', True)]}, help='Select the Payment Mode to be applied.'),
         'state': fields.selection([
             ('draft', 'Draft'),
-            ('open','Confirmed'),
-            ('cancel','Cancelled'),
-            ('done','Done')], 'State', select=True,
+            ('open', 'Confirmed'),
+            ('cancel', 'Cancelled'),
+            ('done', 'Done')], 'State', select=True,
             help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'),
-        'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done':[('readonly',True)]}),
-        'total': fields.function(_total, string="Total", method=True,
-            type='float'),
-        'user_id': fields.many2one('res.users', 'User', required=True, states={'done':[('readonly',True)]}),
+        'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}),
+        'total': fields.function(_total, string="Total", method=True, type='float'),
+        'user_id': fields.many2one('res.users', 'User', required=True, states={'done': [('readonly', True)]}),
         'date_prefered': fields.selection([
             ('now', 'Directly'),
             ('due', 'Due date'),
             ('fixed', 'Fixed date')
-            ], "Preferred date", change_default=True, required=True, states={'done':[('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
+            ], "Preferred date", change_default=True, required=True, states={'done': [('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
         'date_created': fields.date('Creation date', readonly=True),
         'date_done': fields.date('Execution date', readonly=True),
     }
 
     _defaults = {
         'user_id': lambda self,cr,uid,context: uid,
-        'state': lambda *a: 'draft',
-        'date_prefered': lambda *a: 'due',
-        'date_created': lambda *a: time.strftime('%Y-%m-%d'),
+        'state': 'draft',
+        'date_prefered': 'due',
+        'date_created': time.strftime('%Y-%m-%d'),
         'reference': lambda self,cr,uid,context: self.pool.get('ir.sequence').get(cr, uid, 'payment.order'),
     }
 
     def set_to_draft(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state':'draft'})
+        self.write(cr, uid, ids, {'state': 'draft'})
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
             wf_service.trg_create(uid, 'payment.order', id, cr)
@@ -118,7 +117,7 @@ class payment_order(osv.osv):
         for order in self.read(cr, uid, ids, ['reference']):
             if not order['reference']:
                 reference = ir_seq_obj.get(cr, uid, 'payment.order')
-                self.write(cr, uid, order['id'],{'reference':reference})
+                self.write(cr, uid, order['id'], {'reference':reference})
         return True
 
     def set_done(self, cr, uid, ids, *args):
@@ -129,7 +128,7 @@ class payment_order(osv.osv):
 
     def copy(self, cr, uid, id, default={}, context=None):
         default.update({
-            'state':'draft',
+            'state': 'draft',
             'line_ids': [],
             'reference': self.pool.get('ir.sequence').get(cr, uid, 'payment.order')
         })
@@ -145,14 +144,14 @@ class payment_order(osv.osv):
             for order in self.browse(cr, uid, ids, context=context):
                 for line in order.line_ids:
                     payment_line_ids.append(line.id)
-            payment_line_obj.write(cr, uid, payment_line_ids, {'date':vals.get('date_scheduled', False)}, context=context)
+            payment_line_obj.write(cr, uid, payment_line_ids, {'date': vals.get('date_scheduled', False)}, context=context)
         elif vals.get('date_prefered', False) == 'due':
-            vals.update({'date_scheduled':False})
+            vals.update({'date_scheduled': False})
             for order in self.browse(cr, uid, ids, context=context):
                 for line in order.line_ids:
-                    payment_line_obj.write(cr, uid, [line.id], {'date':line.ml_maturity_date}, context=context)
+                    payment_line_obj.write(cr, uid, [line.id], {'date': line.ml_maturity_date}, context=context)
         elif vals.get('date_prefered', False) == 'now':
-            vals.update({'date_scheduled':False})
+            vals.update({'date_scheduled': False})
             for order in self.browse(cr, uid, ids, context=context):
                 for line in order.line_ids:
                     payment_line_ids.append(line.id)
@@ -177,22 +176,22 @@ class payment_line(osv.osv):
         result = {}
         info=''
         for line in self.browse(cr, uid, ids, context=context):
-            owner=line.order_id.mode.bank_id.partner_id
-            result[line.id]=False
+            owner = line.order_id.mode.bank_id.partner_id
+            result[line.id] = False
             if owner.address:
                 for ads in owner.address:
-                    if ads.type=='default':
-                        st=ads.street and ads.street or ''
-                        st1=ads.street2 and ads.street2 or ''
+                    if ads.type == 'default':
+                        st = ads.street and ads.street or ''
+                        st1 = ads.street2 and ads.street2 or ''
                         if 'zip_id' in ads:
-                            zip_city= ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
+                            zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
                         else:
-                            zip=ads.zip and ads.zip or ''
-                            city= ads.city and ads.city or  ''
-                            zip_city= zip + ' ' + city
-                        cntry= ads.country_id and ads.country_id.name or ''
-                        info=owner.name + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
-                        result[line.id]=info
+                            zip = ads.zip and ads.zip or ''
+                            city = ads.city and ads.city or  ''
+                            zip_city = zip + ' ' + city
+                        cntry = ads.country_id and ads.country_id.name or ''
+                        info = owner.name + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
+                        result[line.id] = info
                         break
         return result
 
@@ -200,27 +199,27 @@ class payment_line(osv.osv):
         if not ids: return {}
         partner_zip_obj = self.pool.get('res.partner.zip')
         result = {}
-        info=''
+        info = ''
 
         for line in self.browse(cr, uid, ids, context=context):
-            result[line.id]=False
+            result[line.id] = False
             if not line.partner_id:
                 break
             partner = line.partner_id.name or ''
             if line.partner_id.address:
                 for ads in line.partner_id.address:
-                    if ads.type=='default':
-                        st=ads.street and ads.street or ''
-                        st1=ads.street2 and ads.street2 or ''
+                    if ads.type == 'default':
+                        st = ads.street and ads.street or ''
+                        st1 = ads.street2 and ads.street2 or ''
                         if 'zip_id' in ads:
-                            zip_city= ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
+                            zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
                         else:
-                            zip=ads.zip and ads.zip or ''
-                            city= ads.city and ads.city or  ''
-                            zip_city= zip + ' ' + city
-                        cntry= ads.country_id and ads.country_id.name or ''
-                        info=partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
-                        result[line.id]=info
+                            zip = ads.zip and ads.zip or ''
+                            city = ads.city and ads.city or  ''
+                            zip_city = zip + ' ' + city
+                        cntry = ads.country_id and ads.country_id.name or ''
+                        info = partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
+                        result[line.id] = info
                         break
         return result
 
@@ -229,10 +228,10 @@ class payment_line(osv.osv):
         partner_obj = self.pool.get('res.partner')
 
         cr.execute("""SELECT pl.id, ml.%s
-            from account_move_line ml
-                inner join payment_line pl
-                on (ml.id = pl.move_line_id)
-                where pl.id IN %%s"""% self.translate(name),
+            FROM account_move_line ml
+                INNER JOIN payment_line pl
+                ON (ml.id = pl.move_line_id)
+                WHERE pl.id IN %%s"""% self.translate(name),
                    (tuple(ids),))
         res = dict(cr.fetchall())
 
@@ -276,7 +275,7 @@ class payment_line(osv.osv):
         if user.company_id:
             return user.company_id.currency_id.id
         else:
-            return currency_obj.search(cr, uid, [('rate','=',1.0)])[0]
+            return currency_obj.search(cr, uid, [('rate', '=', 1.0)])[0]
 
     def _get_date(self, cr, uid, context=None):
         if context is None:
@@ -293,7 +292,7 @@ class payment_line(osv.osv):
         return date
 
     def _get_ml_inv_ref(self, cr, uid, ids, *a):
-        res={}
+        res = {}
         for id in self.browse(cr, uid, ids):
             res[id.id] = False
             if id.move_line_id:
@@ -302,7 +301,7 @@ class payment_line(osv.osv):
         return res
 
     def _get_ml_maturity_date(self, cr, uid, ids, *a):
-        res={}
+        res = {}
         for id in self.browse(cr, uid, ids):
             if id.move_line_id:
                 res[id.id] = id.move_line_id.date_maturity
@@ -311,7 +310,7 @@ class payment_line(osv.osv):
         return res
 
     def _get_ml_created_date(self, cr, uid, ids, *a):
-        res={}
+        res = {}
         for id in self.browse(cr, uid, ids):
             if id.move_line_id:
                 res[id.id] = id.move_line_id.date_created
@@ -323,8 +322,8 @@ class payment_line(osv.osv):
         'name': fields.char('Your Reference', size=64, required=True),
         'communication': fields.char('Communication', size=64, required=True, help="Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order ?'"),
         'communication2': fields.char('Communication 2', size=64, help='The successor message of Communication.'),
-        'move_line_id': fields.many2one('account.move.line', 'Entry line', domain=[('reconcile_id','=', False), ('account_id.type', '=','payable')], help='This Entry Line will be referred for the information of the ordering customer.'),
-        'amount_currency': fields.float('Amount in Partner Currency', digits=(16,2),
+        'move_line_id': fields.many2one('account.move.line', 'Entry line', domain=[('reconcile_id', '=', False), ('account_id.type', '=', 'payable')], help='This Entry Line will be referred for the information of the ordering customer.'),
+        'amount_currency': fields.float('Amount in Partner Currency', digits=(16, 2),
             required=True, help='Payment amount in the partner currency'),
         'currency': fields.many2one('res.currency','Partner Currency', required=True),
         'company_currency': fields.many2one('res.currency', 'Company Currency', readonly=True),
@@ -359,10 +358,10 @@ class payment_line(osv.osv):
     ]
 
     def onchange_move_line(self, cr, uid, ids, move_line_id, payment_type, date_prefered, date_scheduled, currency=False, company_currency=False, context=None):
-        data={}
+        data = {}
         move_line_obj = self.pool.get('account.move.line')
 
-        data['amount_currency']=data['communication']=data['partner_id']=data['reference']=data['date_created']=data['bank_id']=data['amount']=False
+        data['amount_currency'] = data['communication'] = data['partner_id'] = data['reference'] = data['date_created'] = data['bank_id'] = data['amount'] = False
 
         if move_line_id:
             line = move_line_obj.browse(cr, uid, move_line_id)
@@ -372,7 +371,7 @@ class payment_line(osv.osv):
                                        company_currency, context)
             if res:
                 data['amount'] = res['value']['amount']
-            data['partner_id']=line.partner_id.id
+            data['partner_id'] = line.partner_id.id
             temp = line.currency_id and line.currency_id.id or False
             if not temp:
                 if line.invoice:
@@ -381,12 +380,12 @@ class payment_line(osv.osv):
                 data['currency'] = temp
 
             # calling onchange of partner and updating data dictionary
-            temp_dict=self.onchange_partner(cr, uid, ids, line.partner_id.id, payment_type)
+            temp_dict = self.onchange_partner(cr, uid, ids, line.partner_id.id, payment_type)
             data.update(temp_dict['value'])
 
-            data['reference']=line.ref
+            data['reference'] = line.ref
             data['date_created'] = line.date_created
-            data['communication']=line.ref
+            data['communication'] = line.ref
 
             if date_prefered == 'now':
                 #no payment date => immediate payment
@@ -399,7 +398,7 @@ class payment_line(osv.osv):
 
     def onchange_amount(self, cr, uid, ids, amount, currency, cmpny_currency, context=None):
         if (not amount) or (not cmpny_currency):
-            return {'value': {'amount':False}}
+            return {'value': {'amount': False}}
         res = {}
         currency_obj = self.pool.get('res.currency')
         company_amount = currency_obj.compute(cr, uid, currency, cmpny_currency, amount)
@@ -407,33 +406,33 @@ class payment_line(osv.osv):
         return {'value': res}
 
     def onchange_partner(self, cr, uid, ids, partner_id, payment_type, context=None):
-        data={}
+        data = {}
         partner_zip_obj = self.pool.get('res.partner.zip')
         partner_obj = self.pool.get('res.partner')
         payment_mode_obj = self.pool.get('payment.mode')
-        data['info_partner']=data['bank_id']=False
+        data['info_partner'] = data['bank_id'] = False
 
         if partner_id:
-            part_obj=partner_obj.browse(cr, uid, partner_id)
-            partner=part_obj.name or ''
+            part_obj = partner_obj.browse(cr, uid, partner_id)
+            partner = part_obj.name or ''
 
             if part_obj.address:
                 for ads in part_obj.address:
-                    if ads.type=='default':
-                        st=ads.street and ads.street or ''
-                        st1=ads.street2 and ads.street2 or ''
+                    if ads.type == 'default':
+                        st = ads.street and ads.street or ''
+                        st1 = ads.street2 and ads.street2 or ''
 
                         if 'zip_id' in ads:
-                            zip_city= ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
+                            zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
                         else:
-                            zip=ads.zip and ads.zip or ''
-                            city= ads.city and ads.city or  ''
-                            zip_city= zip + ' ' + city
+                            zip = ads.zip and ads.zip or ''
+                            city = ads.city and ads.city or  ''
+                            zip_city = zip + ' ' + city
 
-                        cntry= ads.country_id and ads.country_id.name or ''
-                        info=partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
+                        cntry = ads.country_id and ads.country_id.name or ''
+                        info = partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
 
-                        data['info_partner']=info
+                        data['info_partner'] = info
 
             if part_obj.bank_ids and payment_type:
                 bank_type = payment_mode_obj.suitable_bank_types(cr, uid, payment_type, context=context)
@@ -449,7 +448,6 @@ class payment_line(osv.osv):
             res['communication2'].setdefault('states', {})
             res['communication2']['states']['structured'] = [('readonly', True)]
             res['communication2']['states']['normal'] = [('readonly', False)]
-
         return res
 
 payment_line()
diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py
index a9412b832a4..0b2a8061906 100644
--- a/addons/account_payment/report/payment_order.py
+++ b/addons/account_payment/report/payment_order.py
@@ -36,7 +36,6 @@ class payment_order(report_sxw.rml_parse):
             'get_amount_total_in_currency': self._get_amount_total_in_currency,
             'get_amount_total': self._get_amount_total,
             'get_account_name': self._get_account_name,
-
         })
 
     def _get_invoice_name(self, invoice_id):

From a31bc19aa082ee91e9deb43e79bcb6412b0d9b81 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Fri, 22 Oct 2010 17:47:55 +0530
Subject: [PATCH 067/114] [IMP] membership: graph view of Member analysis
 report

bzr revid: vth@tinyerp.com-20101022121755-ylv3xmrhdadtgywf
---
 addons/membership/report/report_membership_view.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 6e217dd1f51..dc8fe32cb0c 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -78,11 +78,10 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Membership" type="bar">
-                    <field name="year"/>
-                    <field name="canceled_number"/>
-                    <field name="waiting_number"/>
-                    <field name="invoiced_number"/>
-                    <field name="paid_number"/>
+                    <field name="year" />
+                    <field name="num_waiting" operator="+"/>
+                    <field name="num_invoiced" operator="+"/>
+                    <field name="num_paid" operator="+"/>
                 </graph>
             </field>
         </record>

From ea2a07ec5e6709f5aa4fa55c43816954b9bbdca1 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Fri, 22 Oct 2010 18:07:19 +0530
Subject: [PATCH 068/114] [FIX] membership: tree view -> write membership_state
 instead of state in tree view of Member analysis report

bzr revid: vth@tinyerp.com-20101022123719-ny0m90wmkiorktjw
---
 addons/membership/report/report_membership_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index dc8fe32cb0c..61e0d9ddd8b 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -9,7 +9,7 @@
             <field name="model">report.membership</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('open','free');gray:state in ('done','cancel') " string="Membership">
+                <tree colors="blue:membership_state in ('draft');black:membership_state in ('open','free');gray:membership_state in ('done','cancel') " string="Membership">
                     <field name="partner_id"/>
                     <field name="membership_state"/>
                     <field name="associate_member_id" invisible="1"/>

From 58f7dceab9fb3de5803519a9d63dddaf147ae7d3 Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Fri, 22 Oct 2010 18:21:43 +0530
Subject: [PATCH 069/114] [FIX] account: Fixed the Balance sheet report problem
 for blank chart.

bzr revid: vra@tinyerp.com-20101022125143-ze6shi5hqf0fld0n
---
 addons/account/report/account_balance_sheet.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index 6743cf4a7ac..8655c458724 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -104,6 +104,10 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
         account_ids = account_pool._get_children_and_consol(cr, uid, account_id, context=ctx)
         accounts = account_pool.browse(cr, uid, account_ids, context=ctx)
 
+        if not self.res_bl:
+            self.res_bl['type'] = 'Net Profit'
+            self.res_bl['balance'] = 0.0
+
         if self.res_bl['type'] == 'Net Profit':
             self.res_bl['type'] = 'Net Profit'
         else:

From f7eae25635f6966d88cdbfc057fef7ac01f12d3d Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 22 Oct 2010 18:46:15 +0530
Subject: [PATCH 070/114] [FIX] sale_order_dates: remove return from for loop
 and cleaning

bzr revid: mra@mra-laptop-20101022131615-35i9ss38tud6bylp
---
 addons/sale_order_dates/sale_order_dates.py       | 13 ++++++-------
 addons/sale_order_dates/sale_order_dates_view.xml |  3 ++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py
index 011653abc01..2877ba0967d 100644
--- a/addons/sale_order_dates/sale_order_dates.py
+++ b/addons/sale_order_dates/sale_order_dates.py
@@ -26,9 +26,8 @@ from osv import fields, osv
 
 class sale_order_dates(osv.osv):
     _inherit = 'sale.order'
-    _name = 'sale.order'
 
-    def _get_effective_date(self, cr, uid, ids, name, arg, context={}):
+    def _get_effective_date(self, cr, uid, ids, name, arg, context=None):
         res = {}
         dates_list = []
         for order in self.browse(cr, uid, ids):
@@ -39,9 +38,9 @@ class sale_order_dates(osv.osv):
                 res[order.id] = min(dates_list)
             else:
                 res[order.id] = False
-            return res
+        return res
 
-    def _get_commitment_date(self, cr, uid, ids, name, arg, context={}):
+    def _get_commitment_date(self, cr, uid, ids, name, arg, context=None):
         res = {}
         dates_list = []
         for order in self.browse(cr, uid, ids):
@@ -52,12 +51,12 @@ class sale_order_dates(osv.osv):
                 dates_list.append(dt_s)
             if dates_list:
                 res[order.id] = min(dates_list)
-            return res
+        return res
 
     _columns = {
-        'commitment_date': fields.function(_get_commitment_date, method=True,store=True, type='date', string='Commitment Date', help="Date on which delivery of products is to be made"),
+        'commitment_date': fields.function(_get_commitment_date, method=True, store=True, type='date', string='Commitment Date', help="Date on which delivery of products is to be made"),
         'requested_date': fields.date('Requested Date', help="Date on which customer has requested for sales"),
-        'effective_date': fields.function(_get_effective_date, method=True, type='date', store=True,string='Effective Date',help="Date on which picking is created"),
+        'effective_date': fields.function(_get_effective_date, method=True, type='date', store=True, string='Effective Date',help="Date on which picking is created"),
     }
 
 sale_order_dates()
diff --git a/addons/sale_order_dates/sale_order_dates_view.xml b/addons/sale_order_dates/sale_order_dates_view.xml
index 5bb53fe52ce..c6544d5238f 100644
--- a/addons/sale_order_dates/sale_order_dates_view.xml
+++ b/addons/sale_order_dates/sale_order_dates_view.xml
@@ -17,5 +17,6 @@
                 </field>
             </field>
         </record>
+
     </data>
-</openerp>
+</openerp>
\ No newline at end of file

From 91e31492d66533b1cb7fe856b924269d90bfa03e Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Fri, 22 Oct 2010 19:01:43 +0530
Subject: [PATCH 071/114] [IMP] Improve account taxes report

bzr revid: ara@tinyerp.com-20101022133143-ybscrpk48lwqjosa
---
 addons/account/report/account_tax_report.py  | 50 +++++++-------
 addons/account/report/account_tax_report.rml | 68 ++++++++++++++++++--
 2 files changed, 88 insertions(+), 30 deletions(-)

diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index 45ba56bf446..81778e12eb3 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -22,11 +22,30 @@
 import time
 
 import rml_parse
+from common_report_header import common_report_header
 from report import report_sxw
 
-class tax_report(rml_parse.rml_parse):
+class tax_report(rml_parse.rml_parse, common_report_header):
     _name = 'report.account.vat.declaration'
 
+    def set_context(self, objects, data, ids, report_type=None):
+        new_ids = ids
+        res = {}
+        self.period_ids = []
+        period_obj = self.pool.get('account.period')
+        res['periods'] = ''
+        res['fiscalyear'] = data['form']['fiscalyear_id']
+
+        if data['form']['period_from'] and data['form']['period_to']:
+            self.period_ids = period_obj.build_ctx_periods(self.cr, self.uid, data['form']['period_from'], data['form']['period_to'])
+            periods_l = period_obj.read(self.cr, self.uid, self.period_ids, ['name'])
+            for period in periods_l:
+                if res['periods'] == '':
+                    res['periods'] = period['name']
+                else:
+                    res['periods'] += ", "+ period['name']
+        return super(tax_report, self).set_context(objects, data, new_ids, report_type=report_type)
+
     def __init__(self, cr, uid, name, context=None):
         super(tax_report, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
@@ -35,31 +54,16 @@ class tax_report(rml_parse.rml_parse):
             'get_general': self._get_general,
             'get_currency': self._get_currency,
             'get_lines': self._get_lines,
-            'get_years': self.get_years,
+            'get_fiscalyear': self._get_fiscalyear,
+            'get_account': self._get_account,
+            'get_start_period': self.get_start_period,
+            'get_end_period': self.get_end_period,
+            'get_basedon': self._get_basedon,
         })
 
-    def get_years(self, form):
-        res = {}
-        self.period_ids = []
-        period_obj = self.pool.get('account.period')
-        fy_obj = self.pool.get('account.fiscalyear')
-        res['periods'] = ''
-        res['fname'] = ''
 
-        fiscal_year_name = fy_obj.name_get(self.cr, self.uid, form['fiscalyear_id'])
-        if fiscal_year_name:
-            res['fname'] = fiscal_year_name[0][1]
-            res['periods'] = ''
-
-        if form['period_from'] and form['period_to']:
-            self.period_ids = period_obj.build_ctx_periods(self.cr, self.uid, form['period_from'], form['period_to'])
-            periods_l = period_obj.read(self.cr, self.uid, self.period_ids, ['name'])
-            for period in periods_l:
-                if res['periods'] == '':
-                    res['periods'] = period['name']
-                else:
-                    res['periods'] += ", "+ period['name']
-        return res
+    def _get_basedon(self, form):
+        return form['form']['based_on']
 
     def _get_lines(self, based_on, company_id=False, parent=False, level=0, context=None):
         period_list = self.period_ids
diff --git a/addons/account/report/account_tax_report.rml b/addons/account/report/account_tax_report.rml
index 7b062286310..41790ea6f07 100644
--- a/addons/account/report/account_tax_report.rml
+++ b/addons/account/report/account_tax_report.rml
@@ -61,6 +61,42 @@
 
 
       <blockValign value="TOP"/>
+    </blockTableStyle>
+	<blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
     </blockTableStyle>
     <blockTableStyle id="Tableau1">
       <blockAlignment value="LEFT"/>
@@ -100,20 +136,38 @@
     <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Caption" fontName="Helvetica" fontSize="1.0" leading="1" spaceBefore="0" spaceAfter="0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
-
+	<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+	<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
 
   </stylesheet>
   <story>
 	<para style="P2">Tax Statement</para>
   <para style="P2"><font color="white"> </font></para>
-	<blockTable colWidths="538" style="Tableau1">
+    <blockTable colWidths="140.0,120.0,160.0,120.0" style="Table3">
       <tr>
-        <td><para style="P12">Fiscal Year : [[ get_years(data['form'])['fname'] or removeParentNode('para')]]</para></td>
+        <td><para style="terp_tblheader_General_Centre">Chart of Tax</para></td>
+        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
+    	<td><para style="terp_tblheader_General_Centre">Periods</para></td>
+        <td><para style="terp_tblheader_General_Centre">Based On</para></td>
       </tr>
-      <tr>
-        <td><para style="P12">Periods : [[ get_years(data['form'])['periods'] or removeParentNode('tr')]]</para></td>
-      </tr>
-    </blockTable>
+    <tr>
+		<td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
+       	<td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
+       	<td>
+	       	<blockTable colWidths="80.0,80.0" style="Table4">
+	       		<tr>
+					<td><para style="terp_tblheader_General_Centre">Start Period</para></td>
+				    <td><para style="terp_tblheader_General_Centre">End Period</para></td>
+				</tr>
+				<tr>
+	 				<td><para style="terp_default_Centre_8">[[ get_start_period(data) or '' ]]</para></td>
+					<td><para style="terp_default_Centre_8">[[ get_end_period(data) or '' ]]</para></td>
+				</tr>
+			</blockTable>
+		</td>
+		<td><para style="terp_default_Centre_8">[[ get_basedon(data)  or '' ]]</para></td>
+   </tr>
+  </blockTable>
   <para style="P2"><font color="white"> </font></para>
 	<blockTable colWidths="340.0,55.0,55.0,90.0" style="Table2" repeatRows="1">
 	  <tr>

From a8b160970d1cb288ffdd79b417a9265d545de144 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 25 Oct 2010 04:39:49 +0000
Subject: [PATCH 072/114] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101024045619-cjj3bsbu434hb1d9
bzr revid: launchpad_translations_on_behalf_of_openerp-20101025043949-v78iru42a2138ato
---
 addons/account/i18n/es.po                   |    9 +-
 addons/account/i18n/es_EC.po                |  680 +-
 addons/account/i18n/ru.po                   |    6 +-
 addons/account_analytic_analysis/i18n/el.po |    6 +-
 addons/account_analytic_analysis/i18n/es.po |  205 +-
 addons/account_analytic_analysis/i18n/tr.po |    6 +-
 addons/account_budget/i18n/es.po            |  749 ++-
 addons/account_followup/i18n/es.po          | 1027 +--
 addons/account_voucher/i18n/ru.po           |  913 ++-
 addons/analytic/i18n/el.po                  |    6 +-
 addons/claim_from_delivery/i18n/es.po       |   46 +
 addons/crm/i18n/nl.po                       |   75 +-
 addons/crm/i18n/pl.po                       | 6322 +++++++++++--------
 addons/google_map/i18n/sk.po                |    4 +-
 addons/hr/i18n/pl.po                        |  711 ++-
 addons/hr_holidays/i18n/pl.po               | 1436 +++--
 addons/hr_payroll/i18n/sv.po                | 1769 ++++++
 addons/hr_timesheet/i18n/it.po              |  978 +--
 addons/mrp/i18n/pl.po                       | 2849 ++++++---
 addons/point_of_sale/i18n/sv.po             | 2612 ++++++--
 addons/project_scrum/i18n/ru.po             |    4 +-
 addons/purchase/i18n/ru.po                  |   14 +-
 addons/purchase_analytic_plans/i18n/ru.po   |   36 +-
 addons/resource/i18n/de.po                  |   49 +-
 addons/sale/i18n/ru.po                      |  267 +-
 addons/sale_crm/i18n/it.po                  |  325 +-
 addons/stock/i18n/ru.po                     |    6 +-
 addons/stock_location/i18n/ru.po            |   21 +-
 addons/warning/i18n/ru.po                   |    4 +-
 addons/wiki_sale_faq/i18n/ru.po             |    4 +-
 30 files changed, 14054 insertions(+), 7085 deletions(-)
 create mode 100644 addons/claim_from_delivery/i18n/es.po
 create mode 100644 addons/hr_payroll/i18n/sv.po

diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 8c6efd7491e..34706585b02 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 09:09+0000\n"
-"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
-"tic.com>\n"
+"PO-Revision-Date: 2010-10-24 21:56+0000\n"
+"Last-Translator: Carlos @ smile.fr <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-09-30 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1055,7 +1054,7 @@ msgstr "Hijos"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Mapping"
-msgstr ""
+msgstr "Mapeo de impuestos ficales"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index bd1002b476e..d6551425629 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.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: 2010-10-19 20:43+0000\n"
+"PO-Revision-Date: 2010-10-25 00:31+0000\n"
 "Last-Translator: Cristian Salamea (GnuThink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -457,7 +457,7 @@ msgstr "Estado"
 #: model:ir.actions.act_window,name:account.action_invoice_tree13
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree13
 msgid "Unpaid Supplier Refunds"
-msgstr "Facturas de abono de proveedor sin pagar"
+msgstr "Notas de debito por pagar"
 
 #. module: account
 #: view:account.tax:0
@@ -4329,144 +4329,144 @@ msgstr "Aceptar"
 #. module: account
 #: rml:account.invoice:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Impuestos:"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree7
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree7
 msgid "Unpaid Customer Invoices"
-msgstr ""
+msgstr "Facturas de cliente sin cobrar"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2
 msgid "Supplier Invoices"
-msgstr ""
+msgstr "Facturas de proveedor"
 
 #. module: account
 #: field:account.analytic.line,product_id:0
 #: field:account.invoice.line,product_id:0
 #: field:account.move.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Producto"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: account
 #: field:res.partner,credit:0
 msgid "Total Receivable"
-msgstr ""
+msgstr "Total a cobrar"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period
 msgid "Account period"
-msgstr ""
+msgstr "Periodo de cuenta"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,journal_id:0
 msgid "Journal/Payment Mode"
-msgstr ""
+msgstr "Modo de Pago/Diario"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Canceled Invoice"
-msgstr ""
+msgstr "Factura cancelada"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Remove Lines"
-msgstr ""
+msgstr "Borrar detalle"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,soldeinit:0
 #: wizard_field:account.partner.balance.report,init,soldeinit:0
 #: wizard_field:account.third_party_ledger.report,init,soldeinit:0
 msgid "Include initial balances"
-msgstr ""
+msgstr "Incluir saldos iniciales"
 
 #. module: account
 #: view:account.account.template:0
 msgid "Account Template"
-msgstr ""
+msgstr "Plantilla de cuenta"
 
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
-msgstr ""
+msgstr "Suma Anual"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import file from your bank statement"
-msgstr ""
+msgstr "Importar archivo de tu estado de cuenta"
 
 #. module: account
 #: field:account.account,type:0
 #: field:account.account.template,type:0
 msgid "Internal Type"
-msgstr ""
+msgstr "Tipo interno"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "9"
-msgstr ""
+msgstr "9"
 
 #. module: account
 #: 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 "Suscripciones en ejecución"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Bank Payment"
-msgstr ""
+msgstr "Pago Bancario"
 
 #. module: account
 #: selection:account.move,state:0
 msgid "Posted"
-msgstr ""
+msgstr "Fijado"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr ""
+msgstr "Notas de Credito"
 
 #. module: account
 #: field:account.config.wizard,date2:0
 #: field:account.fiscalyear,date_stop:0
 msgid "End Date"
-msgstr ""
+msgstr "Fecha final"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_open_closed_fy
 msgid "Cancel Opening Entries"
-msgstr ""
+msgstr "Cancelar entradas abiertas"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manually statement"
-msgstr ""
+msgstr "Extracto manual"
 
 #. module: account
 #: field:account.payment.term.line,days2:0
 msgid "Day of the Month"
-msgstr ""
+msgstr "Dia del mes"
 
 #. module: account
 #: field:account.analytic.journal,line_ids:0
 #: field:account.tax.code,line_ids:0
 msgid "Lines"
-msgstr ""
+msgstr "Detalle"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Dear Sir/Madam,"
-msgstr ""
+msgstr "Estimado Sr./Sra."
 
 #. module: account
 #: help:account.tax,sequence:0
@@ -4480,101 +4480,101 @@ msgstr ""
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Declaration"
-msgstr ""
+msgstr "Declaración de Impuestos"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "File statement"
-msgstr ""
+msgstr "Archivo de estado de cuenta"
 
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequences"
-msgstr ""
+msgstr "Secuencias de ejercicio fiscal"
 
 #. module: account
 #: view:account.model.line:0
 msgid "Entry Model Line"
-msgstr ""
+msgstr "Detale de Asiento contable"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Account Tax Template"
-msgstr ""
+msgstr "Plantiall de cuentas de impuesto"
 
 #. module: account
 #: help:account.model,name:0
 msgid "This is a model for recurring accounting entries"
-msgstr ""
+msgstr "Este es el modelo para asiento recurrentes"
 
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "Abrir Factura"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
 msgid "Set starting and ending balance for control"
-msgstr ""
+msgstr "Configurar saldo inicial y final para control"
 
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "Are you sure you want to open this invoice ?"
-msgstr ""
+msgstr "Esta seguro de abrir esta factura ?"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 msgid "Partner Other Ledger"
-msgstr ""
+msgstr "Mayor por Empresas"
 
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Debit"
-msgstr ""
+msgstr "Debito de Proveedor"
 
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries"
-msgstr ""
+msgstr "Cantidad opcional en entradas"
 
 #. module: account
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "JNRL"
-msgstr ""
+msgstr "Diario"
 
 #. module: account
 #: view:account.fiscalyear:0
 #: view:account.period:0
 msgid "States"
-msgstr ""
+msgstr "Estados"
 
 #. module: account
 #: view:account.move:0
 #: model:process.node,name:account.process_node_accountingentries0
 #: model:process.node,name:account.process_node_supplieraccountingentries0
 msgid "Accounting Entries"
-msgstr ""
+msgstr "Entradas contables"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
 msgid "Receivables & Payables"
-msgstr ""
+msgstr "Por Cobrar & Por Pagar"
 
 #. module: account
 #: rml:account.general.ledger:0
 msgid "General Ledger -"
-msgstr ""
+msgstr "Diario General -"
 
 #. module: account
 #: field:report.hr.timesheet.invoice.journal,quantity:0
 msgid "Quantities"
-msgstr ""
+msgstr "Cantidades"
 
 #. module: account
 #: field:account.analytic.account,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Fecha de inicio"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -4584,13 +4584,13 @@ msgstr ""
 #: field:account.invoice,amount_total:0
 #: field:account.invoice,check_total:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Number of entries are generated"
-msgstr ""
+msgstr "Num. de entradas que son generadas"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
@@ -4603,12 +4603,12 @@ msgstr "Asientos válidos"
 #: 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 ""
+msgstr "Crear entradas desde modelo"
 
 #. module: account
 #: field:account.account.template,reconcile:0
 msgid "Allow Reconciliation"
-msgstr ""
+msgstr "Permitir conciliación"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -4616,33 +4616,33 @@ msgstr ""
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "By Date"
-msgstr ""
+msgstr "Por fecha"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr ""
+msgstr "Notas de Credito"
 
 #. module: account
 #: help:account.model.line,date:0
 msgid "The date of the generated entries"
-msgstr ""
+msgstr "Fecha de entradas generadas"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,modify_invoice:0
 msgid "Modify Invoice"
-msgstr ""
+msgstr "Modificar Factura"
 
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Accounting Properties"
-msgstr ""
+msgstr "Propiedades contables de proveedor"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Account Statistics"
-msgstr ""
+msgstr "Estadisticas de Cuentas de Costos"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4650,46 +4650,48 @@ msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
 msgstr ""
+"Esto configurara automaticamente su plan de cuentas, cuentas de banco "
+"impuestos y diarios deacuerdo con la plantilla seleccionada."
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement.line,statement_id:0
 #: field:account.move.line,statement_id:0
 msgid "Statement"
-msgstr ""
+msgstr "Extracto"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
 #: model:ir.ui.menu,name:account.menu_encode_entries_by_move
 msgid "Entries Encoding by Move"
-msgstr ""
+msgstr "Entradas por movimiento"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 msgid "Analytic Account Charts"
-msgstr ""
+msgstr "Plan de cuentas de Costos"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,result_selection:0
 msgid "Filter on Partners"
-msgstr ""
+msgstr "Filtro en Empresas"
 
 #. module: account
 #: field:account.tax,price_include:0
 msgid "Tax Included in Price"
-msgstr ""
+msgstr "Impuesto incluido en precio"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Entries by Journal"
-msgstr ""
+msgstr "Asientos analiticos por Diario"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Valid entries from invoice"
-msgstr ""
+msgstr "Validar asiento desde factura"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -4709,17 +4711,17 @@ msgstr ""
 #: field:wizard.company.setup,company_id:0
 #: field:wizard.multi.charts.accounts,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Compañia"
 
 #. module: account
 #: rml:account.general.ledger:0
 msgid "Crebit"
-msgstr ""
+msgstr "Credito"
 
 #. module: account
 #: selection:account.subscription,state:0
 msgid "Running"
-msgstr ""
+msgstr "En ejecución"
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -4731,71 +4733,71 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr ""
+msgstr "Extractos en borrador"
 
 #. module: account
 #: field:account.analytic.journal,name:0
 msgid "Journal name"
-msgstr ""
+msgstr "Nombre de Diario"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid "Import invoice from statement"
-msgstr ""
+msgstr "Importar factura desde extracto"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "4"
-msgstr ""
+msgstr "4"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
 #: view:ir.sequence:0
 #: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form
 msgid "Fiscal Years"
-msgstr ""
+msgstr "Ejercicio fiscal"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Import from invoices or payments"
-msgstr ""
+msgstr "Importar facturas o pagos"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile_select
 #: model:ir.ui.menu,name:account.menu_reconcile_select
 msgid "Reconcile entries"
-msgstr ""
+msgstr "Conciliar entradas"
 
 #. module: account
 #: xsl:account.transfer:0
 msgid "Change"
-msgstr ""
+msgstr "Cambiar"
 
 #. module: account
 #: field:account.journal.period,icon:0
 msgid "Icon"
-msgstr ""
+msgstr "Icono"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal - Period"
-msgstr ""
+msgstr "Diario - Periodo"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,credit:0
 #: wizard_field:account.move.line.reconcile,init_partial,credit:0
 msgid "Credit amount"
-msgstr ""
+msgstr "Credito"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create Monthly Periods"
-msgstr ""
+msgstr "Crear periodos mensuales"
 
 #. module: account
 #: wizard_button:account.aged.trial.balance,init,print:0
 msgid "Print Aged Trial Balance"
-msgstr ""
+msgstr "Imprimir Mayor de saldo anticipado"
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -4805,17 +4807,17 @@ msgstr ""
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Ref."
-msgstr ""
+msgstr "Ref."
 
 #. module: account
 #: field:account.invoice,address_invoice_id:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "Dirección de facturación"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "General Credit"
-msgstr ""
+msgstr "Credito general"
 
 #. module: account
 #: help:account.journal,centralisation:0
@@ -4828,63 +4830,63 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: account
 #: 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 ""
+msgstr "Estados de cuenta en borrador"
 
 #. module: account
 #: wizard_field:populate_statement_from_inv,init,date:0
 msgid "Date payment"
-msgstr ""
+msgstr "Fecha de pago"
 
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "A/c No."
-msgstr ""
+msgstr "A/c Num."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print_month
 msgid "Account cost and revenue by journal (This Month)"
-msgstr ""
+msgstr "Cuentas de costos y ganancias por diario (este mes)"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
 #: selection:account.third_party_ledger.report,init,result_selection:0
 msgid "Receivable Accounts"
-msgstr ""
+msgstr "Cuentas por Cobrar"
 
 #. module: account
 #: wizard_button:account.move.line.unreconcile.select,init,open:0
 msgid "Open for unreconciliation"
-msgstr ""
+msgstr "Abrir para desconciliacion"
 
 #. module: account
 #: field:account.bank.statement.reconcile,statement_line:0
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Detalle de extracto"
 
 #. module: account
 #: wizard_button:account.automatic.reconcile,reconcile,end:0
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierinvoiceinvoice0
 msgid "Control Invoice"
-msgstr ""
+msgstr "Control de factura"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
-msgstr ""
+msgstr "Por cobrar"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance
@@ -4892,18 +4894,18 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_balance_report
 #: model:ir.ui.menu,name:account.menu_account_balance_report
 msgid "Account Balance"
-msgstr ""
+msgstr "Saldo de cuenta"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_analytic_check
 #: model:ir.actions.wizard,name:account.account_analytic_account_analytic_check_report
 msgid "Analytic Check"
-msgstr ""
+msgstr "Revision Analitica"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "VAT:"
-msgstr ""
+msgstr "Impuesto"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -4912,45 +4914,45 @@ msgstr ""
 #: rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
-msgstr ""
+msgstr "Total:"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "account.analytic.journal"
-msgstr ""
+msgstr "Diario de Costos"
 
 #. module: account
 #: view:account.fiscal.position:0
 #: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
-msgstr ""
+msgstr "Configuracion de cuentas"
 
 #. module: account
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr ""
+msgstr "Impuestos en venta"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
 msgid "Account Reconciliation"
-msgstr ""
+msgstr "Cuenta de conciliacion"
 
 #. module: account
 #: view:account.bank.statement:0
 #: selection:account.bank.statement,state:0
 msgid "Confirm"
-msgstr ""
+msgstr "Confirmado"
 
 #. module: account
 #: wizard_view:account.account.balance.report,account_selection:0
 msgid "Select parent account"
-msgstr ""
+msgstr "Seleccionar cuenta padre"
 
 #. module: account
 #: field:account.account.template,parent_id:0
 msgid "Parent Account Template"
-msgstr ""
+msgstr "Plantilla de cuenta padre"
 
 #. module: account
 #: help:account.tax,domain:0
@@ -4959,28 +4961,31 @@ msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
 msgstr ""
+"Este campo es usado solo si desarrollas tu modulo y permitir a los "
+"desarrolladores para crear impuestos especificos con una clausula "
+"personalizada."
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_amount:0
 #: field:account.bank.statement.reconcile,total_second_amount:0
 msgid "Payment amount"
-msgstr ""
+msgstr "Monto de Pago"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Cuenta Analitica"
 
 #. module: account
 #: rml:account.invoice:0
 #: selection:account.invoice,type:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Factura de Proveedor"
 
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Valid"
-msgstr ""
+msgstr "Validado"
 
 #. module: account
 #: field:account.account,debit:0
@@ -5001,164 +5006,165 @@ msgstr ""
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
-msgstr ""
+msgstr "Debito"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_42
 msgid "All Months"
-msgstr ""
+msgstr "Todos los meses"
 
 #. module: account
 #: wizard_field:account.invoice.refund,init,date:0
 msgid "Operation date"
-msgstr ""
+msgstr "Fecha de realizacion"
 
 #. module: account
 #: field:account.invoice,invoice_line:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Detall de factura"
 
 #. module: account
 #: field:account.period,date_start:0
 msgid "Start of Period"
-msgstr ""
+msgstr "Inicio de periodo"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,report_name:0
 msgid "Name of new entries"
-msgstr ""
+msgstr "Nombre de nuevas entradas"
 
 #. module: account
 #: wizard_button:account_use_models,init_form,create:0
 msgid "Create Entries"
-msgstr ""
+msgstr "Crear entradas"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
-msgstr ""
+msgstr "Codigo de Impuesto para devolucion"
 
 #. module: account
 #: field:account.invoice.tax,name:0
 msgid "Tax Description"
-msgstr ""
+msgstr "Descripcion de impuesto"
 
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated account moves."
-msgstr ""
+msgstr "Ligar automaticamente asientos contables generados"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr ""
+msgstr "Transacciones conciliadas"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "Informes"
 
 #. module: account
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "/"
-msgstr ""
+msgstr "/"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0
 msgid "Have a number and entries are generated"
-msgstr ""
+msgstr "Numero y asiento generado"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Check -"
-msgstr ""
+msgstr "Revision Analitica -"
 
 #. module: account
 #: rml:account.account.balance:0
 msgid "Account Balance -"
-msgstr ""
+msgstr "Saldo de cuenta -"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group invoice lines"
-msgstr ""
+msgstr "Grupo de detalle de factura"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Configuración"
 
 #. module: account
 #: view:account.analytic.line:0
 #: view:account.invoice:0
 msgid "Total amount"
-msgstr ""
+msgstr "Total"
 
 #. module: account
 #: view:account.journal:0
 msgid "Account Journal"
-msgstr ""
+msgstr "Diario Contable"
 
 #. module: account
 #: view:account.subscription.line:0
 msgid "Subscription lines"
-msgstr ""
+msgstr "Detalle de suscripcion"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
 msgid "Income Account on Product Template"
-msgstr ""
+msgstr "Cuentas de ingreso en platilla de productos"
 
 #. module: account
 #: help:account.account,currency_id:0
 #: help:account.account.template,currency_id:0
 msgid "Force all moves for this account to have this secondary currency."
 msgstr ""
+"Forzar todo los movimientos de esta cuenta para usar moneda secundaria"
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,go,end:0
 #: wizard_button:populate_statement_from_inv,init,end:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancelar"
 
 #. module: account
 #: wizard_view:account.general.ledger.report,checktype:0
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "Select Date-Period"
-msgstr ""
+msgstr "Seleccionar Fecha-Periodo"
 
 #. module: account
 #: rml:account.analytic.account.inverted.balance:0
 msgid "Inverted Analytic Balance -"
-msgstr ""
+msgstr "Saldo de costos invertido -"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
 #: model:process.node,name:account.process_node_supplierpaidinvoice0
 msgid "Paid invoice"
-msgstr ""
+msgstr "Factura pagada"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Definition"
-msgstr ""
+msgstr "Definición de Impuesto"
 
 #. module: account
 #: field:account.tax,tax_group:0
 #: field:account.tax.template,tax_group:0
 msgid "Tax Group"
-msgstr ""
+msgstr "Grupo de Impuestos"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3_new
 msgid "New Customer Refund"
-msgstr ""
+msgstr "Nueva Nota de Debito"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -5170,51 +5176,51 @@ msgstr ""
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv
 msgid "Import invoices"
-msgstr ""
+msgstr "Importar Facturas"
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
 #: wizard_view:account.move.line.unreconcile.select,init:0
 #: wizard_view:account.reconcile.unreconcile,init:0
 msgid "Unreconciliation"
-msgstr ""
+msgstr "Desconciliación"
 
 #. module: account
 #: model:ir.model,name:account.model_fiscalyear_seq
 msgid "Maintains Invoice sequences with Fiscal Year"
-msgstr ""
+msgstr "Mantener la numeración de facturas para el ejercicio fiscal"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
 #: selection:account.general.ledger.report,checktype,display_account:0
 msgid "With movements"
-msgstr ""
+msgstr "Con movimientos"
 
 #. module: account
 #: field:account.tax,domain:0
 #: field:account.tax.template,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "Dominio"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Account Data"
-msgstr ""
+msgstr "Datos de cuenta"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr ""
+msgstr "Plantilla de Codigo de cuentas"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Subscription Periods"
-msgstr ""
+msgstr "Periodos de suscripcion"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
 msgid "Manually"
-msgstr ""
+msgstr "Manualmente"
 
 #. module: account
 #: view:account.invoice:0
@@ -5227,77 +5233,77 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_finance_invoice
 #: wizard_field:populate_statement_from_inv,go,lines:0
 msgid "Invoices"
-msgstr ""
+msgstr "Facturas"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
 #: selection:account.third_party_ledger.report,init,result_selection:0
 msgid "Payable Accounts"
-msgstr ""
+msgstr "Cuentas por pagar"
 
 #. module: account
 #: view:account.invoice.line:0
 #: field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
-msgstr ""
+msgstr "Detalle de Factura"
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,writeoff_journal_id:0
 msgid "Write-Off journal"
-msgstr ""
+msgstr "Diario de ajuste"
 
 #. module: account
 #: wizard_button:account.invoice.pay,init,writeoff_check:0
 msgid "Full Payment"
-msgstr ""
+msgstr "Pago total"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Purchase"
-msgstr ""
+msgstr "Diario de Compra"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Cash Receipt"
-msgstr ""
+msgstr "Recibo de efectivo"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
 #: field:account.fiscal.position.tax.template,tax_dest_id:0
 msgid "Replacement Tax"
-msgstr ""
+msgstr "Reemplazo de impuesto"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "Encode manually statement comes into the draft statement"
-msgstr ""
+msgstr "Asientos realizados manualmente para extracto borrador"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_43
 msgid "This Month"
-msgstr ""
+msgstr "Este mes"
 
 #. module: account
 #: field:account.account.type,sign:0
 msgid "Sign on Reports"
-msgstr ""
+msgstr "Signo en reportes"
 
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr ""
+msgstr "La moneda opcional si el asiento es multimoneda"
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
-msgstr ""
+msgstr "Pagos"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Accounting entries at statement's confirmation"
-msgstr ""
+msgstr "Confirmacion de asientos contables"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
@@ -5307,17 +5313,17 @@ msgstr "Usar modelo"
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,end:0
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move
 msgid "All account entries"
-msgstr ""
+msgstr "Todas las entradas contables"
 
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
 msgid "The tax basis of the tax declaration."
-msgstr ""
+msgstr "El impuesto basico para declaracion"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -5325,12 +5331,12 @@ msgstr ""
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "Date Filter"
-msgstr ""
+msgstr "Fecha para filtro"
 
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Choose Journal and Payment Date"
-msgstr ""
+msgstr "Seleccionar Diario y fecha de pago"
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -5343,65 +5349,65 @@ msgstr ""
 #: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Paid"
-msgstr ""
+msgstr "Pagado"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree11
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree11
 msgid "Unpaid Customer Refunds"
-msgstr ""
+msgstr "Notas de debito sin pagar"
 
 #. module: account
 #: help:account.invoice,residual:0
 msgid "Remaining amount due."
-msgstr ""
+msgstr "Recordatorio de fecha de vencimiento"
 
 #. module: account
 #: wizard_view:account.period.close,init:0
 msgid "Are you sure ?"
-msgstr ""
+msgstr "Esta seguro ?"
 
 #. module: account
 #: rml:account.invoice:0
 #: view:account.invoice:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PROFORMA"
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr ""
+msgstr "Detalle parcial de asiento"
 
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr ""
+msgstr "El estado de cuenta usado para conciliacion bancaria"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Fiscalyear"
-msgstr ""
+msgstr "Ejercicio Fiscal"
 
 #. module: account
 #: wizard_button:account.analytic.line,init,open:0
 msgid "Open Entries"
-msgstr ""
+msgstr "Abrir entradas"
 
 #. module: account
 #: selection:account.analytic.account,type:0
 #: selection:account.move.line,centralisation:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: account
 #: model:process.process,name:account.process_process_supplierinvoiceprocess0
 msgid "Supplier Invoice Process"
-msgstr ""
+msgstr "Proceso de factura de proveedor"
 
 #. module: account
 #: rml:account.account.balance:0
@@ -5415,40 +5421,40 @@ msgstr ""
 #: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "Page"
-msgstr ""
+msgstr "Pagina"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Optional Information"
-msgstr ""
+msgstr "Información opcional"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
-msgstr ""
+msgstr "Terminos de pago"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable and Payable"
-msgstr ""
+msgstr "Por cobrar y por pagar"
 
 #. module: account
 #: rml:account.account.balance:0
 #: rml:account.general.journal:0
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #. module: account
 #: field:account.bank.statement.line,reconcile_amount:0
 msgid "Amount reconciled"
-msgstr ""
+msgstr "Monto conciliado"
 
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "At Date"
-msgstr ""
+msgstr "A la fecha"
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -5457,40 +5463,44 @@ msgid ""
 "amount.If the tax account is base tax code,                    this field "
 "will contain the basic amount(without tax)."
 msgstr ""
+"Si la cuenta del impuesto es la cuenta del codigo, este campo contendra el "
+"monto del impuesto. Si la cuenta del impuesto es el cidigo de la base, este "
+"campo contendra la base imponible."
 
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
-msgstr ""
+msgstr "Calcular"
 
 #. module: account
 #: help:account.invoice.line,account_id:0
 msgid "The income or expense account related to the selected product."
 msgstr ""
+"La cuenta de ingreso o egreso seleccionada para el producto seleccionado"
 
 #. module: account
 #: field:account.tax,type_tax_use:0
 msgid "Tax Application"
-msgstr ""
+msgstr "Aplicacion de impuesto"
 
 #. module: account
 #: 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 "Entradas de suscripcion"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree6
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree6
 msgid "PRO-FORMA Customer Invoices"
-msgstr ""
+msgstr "PROFORMA de Factura de cliente"
 
 #. module: account
 #: field:account.subscription,period_total:0
 msgid "Number of Periods"
-msgstr ""
+msgstr "Num. de Periodos"
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
@@ -5501,19 +5511,19 @@ msgstr ""
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date2:0
 #: wizard_field:account.automatic.reconcile,init,date2:0
 msgid "End of period"
-msgstr ""
+msgstr "Fin de periodo"
 
 #. module: account
 #: view:account.move:0
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr ""
+msgstr "Entrada de cuenta"
 
 #. module: account
 #: rml:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr ""
+msgstr "Diario General"
 
 #. module: account
 #: field:account.account,balance:0
@@ -5533,33 +5543,33 @@ msgstr ""
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
-msgstr ""
+msgstr "Saldo"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Refund"
-msgstr ""
+msgstr "Reembolso"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
 msgid "Invoice Tax"
-msgstr ""
+msgstr "Impuestos de factura"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 msgid "Analytic Journal Definition"
-msgstr ""
+msgstr "Definicion de Diarios Analiticos"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "account.tax.template"
-msgstr ""
+msgstr "Plantilla de impuestos"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Bank Accounts"
-msgstr ""
+msgstr "Cuentas de banco"
 
 #. module: account
 #: constraint:account.period:0
@@ -5567,11 +5577,13 @@ msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
 msgstr ""
+"Periodo invalido ! Algunos periodos se cruzan o las fehcas no estan dentro "
+"del alcance del ejercicio fiscal. "
 
 #. module: account
 #: help:account.journal,invoice_sequence_id:0
 msgid "The sequence used for invoice numbers in this journal."
-msgstr ""
+msgstr "Secuencia de facturacion usada en este diario"
 
 #. module: account
 #: view:account.account:0
@@ -5580,7 +5592,7 @@ msgstr ""
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "General Information"
-msgstr ""
+msgstr "Información general"
 
 #. module: account
 #: help:populate_statement_from_inv,init,journal_id:0
@@ -5589,38 +5601,41 @@ msgid ""
 "filtering the invoices. If you left this field empty, it will search on all "
 "sale, purchase and cash journals."
 msgstr ""
+"Este campo te permite escojer los diarios contables que desees para filtrar "
+"las facturas. Si lo dejas vacio, buscara en todos, ventas, compras y diarios "
+"de efectivo."
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error ! The duration of the Fiscal Year is invalid. "
-msgstr ""
+msgstr "Error ! La duracion del ejercicio fiscal es invalida "
 
 #. module: account
 #: selection:account.analytic.account,state:0
 msgid "Close"
-msgstr ""
+msgstr "Cerrado"
 
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr ""
+msgstr "Asientos contables"
 
 #. module: account
 #: selection:account.invoice,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "Pro-forma"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_form
 #: model:ir.ui.menu,name:account.menu_action_account_form
 msgid "List of Accounts"
-msgstr ""
+msgstr "Listado de cuentas"
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 msgid "Sales Properties"
-msgstr ""
+msgstr "Propiedades de Venta"
 
 #. module: account
 #: rml:account.general.journal:0
@@ -5631,54 +5646,54 @@ msgstr "Fecha de impresión :"
 #: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
 #: model:ir.actions.wizard,name:account.account_analytic_account_quantity_cost_ledger_report
 msgid "Cost Ledger (Only quantities)"
-msgstr ""
+msgstr "Mayor de costo (solo cantidades)"
 
 #. module: account
 #: wizard_view:account.move.validate,init:0
 msgid "Validate Account Entries"
-msgstr ""
+msgstr "Validar entradas contables"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
 msgid "Reference Number"
-msgstr ""
+msgstr "Num. Ref"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Total amount due:"
-msgstr ""
+msgstr "Monto vencido"
 
 #. module: account
 #: wizard_field:account.analytic.account.chart,init,to_date:0
 #: wizard_field:account.analytic.line,init,to_date:0
 msgid "To"
-msgstr ""
+msgstr "Para"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 msgid "Entries of Open Analytic Journals"
-msgstr ""
+msgstr "Entradas de Diarios analiticos abiertos"
 
 #. module: account
 #: view:account.invoice.tax:0
 msgid "Manual Invoice Taxes"
-msgstr ""
+msgstr "Impuesto de factura"
 
 #. module: account
 #: field:account.model.line,date:0
 msgid "Current Date"
-msgstr ""
+msgstr "Fecha actual"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Sale"
-msgstr ""
+msgstr "Diario de Ventas"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy_id:0
 #: wizard_field:account.fiscalyear.close.state,init,fy_id:0
 msgid "Fiscal Year to close"
-msgstr ""
+msgstr "Ejercicio fiscal a cerrar"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
@@ -5690,22 +5705,22 @@ msgstr ""
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date1:0
 #: wizard_field:account.automatic.reconcile,init,date1:0
 msgid "Start of period"
-msgstr ""
+msgstr "Inicio de periodo"
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
 msgid "Templates"
-msgstr ""
+msgstr "Plantillas"
 
 #. module: account
 #: wizard_button:account.vat.declaration,init,report:0
 msgid "Print VAT Decl."
-msgstr ""
+msgstr "Imprimir Decl. de Impuestos"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_intracom
 msgid "IntraCom"
-msgstr ""
+msgstr "IntraCom"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -5721,7 +5736,7 @@ msgstr ""
 #: field:account.tax.code,info:0
 #: field:account.tax.code.template,info:0
 msgid "Description"
-msgstr ""
+msgstr "Descripcion"
 
 #. module: account
 #: help:product.template,property_account_income:0
@@ -5729,31 +5744,33 @@ msgid ""
 "This account will be used instead of the default one to value incoming stock "
 "for the current product"
 msgstr ""
+"Esta cuenta sera usada en ves de la cuenta por defecto para valorar el "
+"inventario entrante para el producto actual."
 
 #. module: account
 #: field:account.tax,child_ids:0
 msgid "Child Tax Accounts"
-msgstr ""
+msgstr "Cuentas de impuesto hijas"
 
 #. module: account
 #: field:account.account,parent_right:0
 msgid "Parent Right"
-msgstr ""
+msgstr "Padre derecho"
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_account_menu
 msgid "Financial Accounts"
-msgstr ""
+msgstr "Cuentas financieras"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Templates for Account Chart"
-msgstr ""
+msgstr "Plantilla de plan de cuentas"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Account Configure"
-msgstr ""
+msgstr "Configurar cuenta"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -5761,106 +5778,108 @@ msgid ""
 "This account will be used instead of the default one as the payable account "
 "for the current partner"
 msgstr ""
+"Esta cuenta sera usada en ves de la cuenta por defecto de la cuenta por "
+"pagar para la empresa actual"
 
 #. module: account
 #: field:account.tax.code,code:0
 #: field:account.tax.code.template,code:0
 msgid "Case Code"
-msgstr ""
+msgstr "Codigo de caso"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "5"
-msgstr ""
+msgstr "5"
 
 #. module: account
 #: field:product.category,property_account_income_categ:0
 #: field:product.template,property_account_income:0
 msgid "Income Account"
-msgstr ""
+msgstr "Cuenta de ingreso"
 
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr ""
+msgstr "Periodo de Cierre/Apertura"
 
 #. module: account
 #: rml:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr ""
+msgstr "Saldo analitico -"
 
 #. module: account
 #: wizard_field:account_use_models,init_form,model:0
 #: model:ir.model,name:account.model_account_model
 msgid "Account Model"
-msgstr ""
+msgstr "Cuenta modelo"
 
 #. module: account
 #: view:account.invoice:0
 #: model:ir.actions.act_window,name:account.act_account_analytic_account_2_account_invoice_line
 msgid "Invoice lines"
-msgstr ""
+msgstr "Detalle de factura"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 #. module: account
 #: field:account.subscription,period_type:0
 msgid "Period Type"
-msgstr ""
+msgstr "Tipo de periodo"
 
 #. module: account
 #: view:product.category:0
 msgid "Accounting Properties"
-msgstr ""
+msgstr "Propiedades contables"
 
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
 msgid "account.sequence.fiscalyear"
-msgstr ""
+msgstr "Ejercicio Fiscal"
 
 #. module: account
 #: wizard_field:account.print.journal.report,init,sort_selection:0
 msgid "Entries Sorted By"
-msgstr ""
+msgstr "Entradas ordenadas por"
 
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Print Journal -"
-msgstr ""
+msgstr "Imprimir Diario -"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
 #: field:account.chart.template,bank_account_view_id:0
 #: field:account.invoice,partner_bank:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Cuenta de banco"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models Definition"
-msgstr ""
+msgstr "Definición de modelos"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
 #: selection:account.analytic.journal,type:0
 #: selection:account.journal,type:0
 msgid "Cash"
-msgstr ""
+msgstr "Efectivo"
 
 #. module: account
 #: field:account.fiscal.position.account,account_dest_id:0
 #: field:account.fiscal.position.account.template,account_dest_id:0
 msgid "Account Destination"
-msgstr ""
+msgstr "Cuenta de destino"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Maturity"
-msgstr ""
+msgstr "Vencimiento"
 
 #. module: account
 #: field:account.fiscalyear,name:0
@@ -5870,12 +5889,12 @@ msgstr ""
 #: field:fiscalyear.seq,fiscalyear_id:0
 #: model:ir.model,name:account.model_account_fiscalyear
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Ejercicio Fiscal"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
 msgid "Future"
-msgstr ""
+msgstr "Futuro"
 
 #. module: account
 #: help:account.account.balance.report,checktype,fiscalyear:0
@@ -5884,24 +5903,24 @@ msgstr ""
 #: help:account.partner.balance.report,init,fiscalyear:0
 #: help:account.third_party_ledger.report,init,fiscalyear:0
 msgid "Keep empty for all open fiscal year"
-msgstr ""
+msgstr "Dejar vacío para todo el ejercicio fiscal"
 
 #. module: account
 #: rml:account.invoice:0
 #: selection:account.invoice,type:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Nota de Credito"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Reconcile Entries."
-msgstr ""
+msgstr "Conciliar entradas"
 
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr ""
+msgstr "Asiento contable"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -5909,23 +5928,23 @@ msgstr ""
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0
 msgid "Paid invoice when reconciled."
-msgstr ""
+msgstr "Factura pagada cuando se concilie"
 
 #. module: account
 #: field:account.tax,python_compute_inv:0
 #: field:account.tax.template,python_compute_inv:0
 msgid "Python Code (reverse)"
-msgstr ""
+msgstr "Codigo python (inverso)"
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Accounting and financial management"
-msgstr ""
+msgstr "Administracion Financiera Contable"
 
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Accounts Mapping"
-msgstr ""
+msgstr "Configuracion de cuentas"
 
 #. module: account
 #: help:product.category,property_account_expense_categ:0
@@ -5933,6 +5952,8 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category"
 msgstr ""
+"Esta cuenta sera usada para valorar el inventario saliente para la categoria "
+"actual de producto."
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -5944,32 +5965,32 @@ msgstr ""
 #: help:account.tax.template,ref_tax_sign:0
 #: help:account.tax.template,tax_sign:0
 msgid "Usually 1 or -1."
-msgstr ""
+msgstr "Comunmente 1 o -1."
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank Details"
-msgstr ""
+msgstr "Detalles de banco"
 
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr ""
+msgstr "Cuentas de egreso en pruducto platilla"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "General Debit"
-msgstr ""
+msgstr "Debito general"
 
 #. module: account
 #: field:account.analytic.account,code:0
 msgid "Account Code"
-msgstr ""
+msgstr "Codigo de Cuenta"
 
 #. module: account
 #: help:account.config.wizard,name:0
 msgid "Name of the fiscal year as displayed on screens."
-msgstr ""
+msgstr "Descripcion del ejercicio fiscal mostrado en pantalla"
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -5980,30 +6001,30 @@ msgstr ""
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
 msgid "Payment Term"
-msgstr ""
+msgstr "Término de pago"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Mappings"
-msgstr ""
+msgstr "Configuracion de Contribuyentes"
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement Process"
-msgstr ""
+msgstr "Proceso de estado de cuentas"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile
 msgid "Statement reconcile"
-msgstr ""
+msgstr "Cuentas para conciliar"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,sure:0
 #: wizard_field:account.fiscalyear.close.state,init,sure:0
 #: wizard_field:account.period.close,init,sure:0
 msgid "Check this box"
-msgstr ""
+msgstr "Revisar este cuadro"
 
 #. module: account
 #: help:account.tax,price_include:0
@@ -6011,11 +6032,12 @@ msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
 msgstr ""
+"Revisar si el precio que usas en el producto y la factura incluey impuesto."
 
 #. module: account
 #: field:account.journal.column,name:0
 msgid "Column Name"
-msgstr ""
+msgstr "Nombre de columna"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -6023,18 +6045,19 @@ msgstr ""
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "Filters"
-msgstr ""
+msgstr "Filtros"
 
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,yes:0
 msgid "Yes"
-msgstr ""
+msgstr "Si"
 
 #. module: account
 #: help:account.account,reconcile:0
 msgid ""
 "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
+"Revisar si usuario esta permitido para conciliar entradas en esta cuenta"
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
@@ -6044,122 +6067,122 @@ msgstr "Calcular fechas asiento"
 #. module: account
 #: view:board.board:0
 msgid "Analytic accounts to close"
-msgstr ""
+msgstr "Costos para cerrar"
 
 #. module: account
 #: view:board.board:0
 msgid "Draft invoices"
-msgstr ""
+msgstr "Facturas en borrador"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr ""
+msgstr "Tablero de Contabilidad"
 
 #. module: account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.act_my_account
 msgid "Accounts to invoice"
-msgstr ""
+msgstr "Cuentas a facturar"
 
 #. module: account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
 msgid "Costs to invoice"
-msgstr ""
+msgstr "Costos para facturar"
 
 #. module: account
 #: view:board.board:0
 msgid "Aged receivables"
-msgstr ""
+msgstr "Por cobar vencidas"
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Board for accountant"
-msgstr ""
+msgstr "Tablero para contador"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_income
 msgid "Income Accounts"
-msgstr ""
+msgstr "Cuentas de ingresos"
 
 #. module: account
 #: view:board.board:0
 msgid "My indicators"
-msgstr ""
+msgstr "Mis indicadores"
 
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr ""
+msgstr "Tablero contable"
 
 #. module: account
 #: view:board.board:0
 msgid "Aged income"
-msgstr ""
+msgstr "Ingresos vencidos"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,show_columns:0
 msgid "Show Debit/Credit Information"
-msgstr ""
+msgstr "Mostrar informacion debito/credito"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "All accounts"
-msgstr ""
+msgstr "Todas las cuentas"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,period_manner:0
 msgid "Entries Selection Based on"
-msgstr ""
+msgstr "Seleccion de entradas basadas en"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "Notification"
-msgstr ""
+msgstr "Notificacion"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Financial Period"
-msgstr ""
+msgstr "Periodo financiero"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr ""
+msgstr "Saldo de cuenta"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period(s)"
-msgstr ""
+msgstr "Seleccione Periodo(s)"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Percentage"
-msgstr ""
+msgstr "Porcentaje"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Compare Selected Years In Terms Of"
-msgstr ""
+msgstr "Comparar años seleccionados en terminos de"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Fiscal Year(s)(Maximum Three Years)"
-msgstr ""
+msgstr "Seleccionar Año fiscal (maximo tres años)"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,select_account:0
 msgid "Select Reference Account(for  % comparision)"
-msgstr ""
+msgstr "Seleccionar cuenta de ref. (para comparacion %)"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_balance_report
 msgid "Account balance-Compare Years"
-msgstr ""
+msgstr "Comparacion de saldos de cuentas por año"
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -6186,64 +6209,64 @@ msgstr ""
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You have to select 'Landscape' option. Please Check it."
-msgstr ""
+msgstr "Has seleccionado la opcion 'horizontal. Revisar'"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,landscape:0
 msgid "Show Report in Landscape Form"
-msgstr ""
+msgstr "Mostrar reporte en horizontal"
 
 #. module: account
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Total :"
-msgstr ""
+msgstr "Total :"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
 msgid "Show Comparision in %"
-msgstr ""
+msgstr "Mostrar comparacion en %"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period"
-msgstr ""
+msgstr "Seleccionar periodo"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Report Options"
-msgstr ""
+msgstr "Opciones de informe"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Don't Compare"
-msgstr ""
+msgstr "No comparar"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,account_choice:0
 msgid "Show Accounts"
-msgstr ""
+msgstr "Mostrar Cuentas"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "1. You have selected more than 3 years in any case."
-msgstr ""
+msgstr "1. Has selecciona mas de 3 años en todos los casos."
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Accounting and financial management-Compare Accounts"
-msgstr ""
+msgstr "Administracion de comparacion contable y financiera de cuentas."
 
 #. module: account
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr ""
+msgstr "Año :"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You can select maximum 3 years. Please check again."
-msgstr ""
+msgstr "Puedes seleccionar maximo 3 años. Por favor revise de nuevo."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6251,22 +6274,26 @@ msgid ""
 "3. You have selected 'Percentage' option with more than 2 years, but you "
 "have not selected landscape format."
 msgstr ""
+"3. Has seleccionado la opcion Porcentaje con mas de 2 años, y no has "
+"seleccionado el formato."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid ""
 "You might have done following mistakes. Please correct them and try again."
 msgstr ""
+"Talves cometio los siguientes errores, por favor corrijalos e intente de "
+"nuevo."
 
 #. module: account
 #: help:account.balance.account.balance.report,init,select_account:0
 msgid "Keep empty for comparision to its parent"
-msgstr ""
+msgstr "Dejar vacio para la comparacion con su padre"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Fecha de creacion"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6274,6 +6301,8 @@ msgid ""
 "2. You have not selected 'Percentage' option, but you have selected more "
 "than 2 years."
 msgstr ""
+"No ha seleccionado la opcion de porcentaje, pero has seleccionado mas de 2 "
+"años."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
@@ -6282,90 +6311,93 @@ msgid ""
 "credit/debit columns and % option.This can lead contents to be printed out "
 "of the paper.Please try again."
 msgstr ""
+"Talves has seleccionado las opciones de comparacion con mas de 1 año con "
+"debito/credito y la opcion %s. Esto puede llevar contenido para imprimir "
+"fuera de pagina. Trate de nuevo."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "You have to select at least 1 Fiscal Year. Try again."
-msgstr ""
+msgstr "Debes seleccionar al menos un año fiscal, Intente de nuevo"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Customize Report"
-msgstr ""
+msgstr "Reporte personalizado"
 
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "Rango mensual"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "Facturas creadas en los 15 dias pasados"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr ""
+msgstr "Reporte de facturas creadas en los ultimos 15 dias"
 
 #. module: account
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Total"
 
 #. module: account
 #: view:report.account.receivable:0
 msgid "Accounts by type"
-msgstr ""
+msgstr "Cuentas por tipo"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Por cobrar vencidas para hoy"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr ""
+msgstr "Cuenta por cobrar"
 
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "Rango"
 
 #. module: account
 #: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
-msgstr ""
+msgstr "Un modulo que agrega nuevos reportes basados en el modulo contable"
 
 #. module: account
 #: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
-msgstr ""
+msgstr "Reportes contables - Reportes"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
 #: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "Saldo por tipo de cuenta"
 
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "Semana del año"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Fecha de creacion"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "Por cobrar vencidos"
 
 #. module: account
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Base Impnible"
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index e23eb971e42..cbc4a421440 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-20 07:18+0000\n"
+"PO-Revision-Date: 2010-10-24 09:01+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2380,7 +2380,7 @@ msgstr ""
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Voucher No"
-msgstr ""
+msgstr "Ваучер №"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
diff --git a/addons/account_analytic_analysis/i18n/el.po b/addons/account_analytic_analysis/i18n/el.po
index 234a5b3087d..89de5de1680 100644
--- a/addons/account_analytic_analysis/i18n/el.po
+++ b/addons/account_analytic_analysis/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-22 22:02+0000\n"
-"Last-Translator: kotrotsios <Unknown>\n"
+"PO-Revision-Date: 2010-10-23 07:02+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Greek <el@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-10-23 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-24 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/es.po b/addons/account_analytic_analysis/i18n/es.po
index a1bfe55849b..f3e8c2fd5c7 100644
--- a/addons/account_analytic_analysis/i18n/es.po
+++ b/addons/account_analytic_analysis/i18n/es.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 20:31+0000\n"
-"Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-24 21:58+0000\n"
+"Last-Translator: Carlos @ smile.fr <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-09-29 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -26,14 +26,17 @@ msgstr ""
 "facturadas."
 
 #. module: account_analytic_analysis
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
-msgid "Hours summary by user"
-msgstr "Resumen de horas por usuario"
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
-msgstr "Fecha última factura"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nombre de modelo no válido en la definición de acción."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -47,25 +50,10 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 msgstr "Calculado utilizando la fórmula: Cantidad máxima - Horas totales."
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
-msgid "All Analytic Accounts"
-msgstr "Todas las cuentas analíticas"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
-msgid "My Current Accounts"
-msgstr "Mis cuentas actuales"
-
-#. module: account_analytic_analysis
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Fecha de la última factura creada para esta cuenta analítica."
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#, python-format
+msgid "AccessError"
+msgstr "Error de acceso"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -73,29 +61,25 @@ msgid "Theorical Revenue"
 msgstr "Ingresos teóricos"
 
 #. module: account_analytic_analysis
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr "Fecha última factura"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "Date of the last invoice created for this analytic account."
+msgstr "Fecha de la última factura creada para esta cuenta analítica."
+
+#. module: account_analytic_analysis
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "¡Error! No puede crear menús recursivos"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
 msgstr "Calculado usando la fórmula: Ingresos teóricos - Costes totales"
 
-#. module: account_analytic_analysis
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_new
-msgid "New Analytic Account"
-msgstr "Nueva cuenta analítica"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theorical Margin"
@@ -106,17 +90,6 @@ msgstr "Margen teórico"
 msgid "Real Margin Rate (%)"
 msgstr "Tasa de margen real (%)"
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
-msgid "Current Analytic Accounts"
-msgstr "Cuentas analíticas actuales"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_worked_date:0
-msgid "Date of the latest work done on this account."
-msgstr "Fecha del último trabajo realizado en esta cuenta."
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
 msgid ""
@@ -128,7 +101,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
-msgid "Invoicing"
+msgid "Billing"
 msgstr "Facturación"
 
 #. module: account_analytic_analysis
@@ -173,85 +146,56 @@ msgid "User"
 msgstr "Usuario"
 
 #. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
-msgid "My Pending Accounts"
-msgstr "Mis cuentas pendientes"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
-msgid "My Uninvoiced Entries"
-msgstr "Mis entradas no facturadas"
+#: field:account.analytic.account,ca_to_invoice:0
+msgid "Uninvoiced Amount"
+msgstr "Importe no facturado"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
 msgstr "Calculado utilizando la fórmula: Importe facturado - Costes totales."
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
-msgid "My Accounts"
-msgstr "Mis cuentas"
-
-#. module: account_analytic_analysis
-#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
-msgid ""
-"Modify account analytic view to show\n"
-"important data for project manager of services companies.\n"
-"Add menu to show relevant information for each manager."
-msgstr ""
-"Modifica la vista de cuenta analítica para mostrar\n"
-"datos importantes para el director de proyectos en empresas de servicios.\n"
-"Añade menú para mostrar información relevante para cada director."
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Hours"
 msgstr "Horas no facturadas"
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,hours_quantity:0
-msgid "Hours Tot"
-msgstr "Horas totales"
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
+msgstr "Fecha del último trabajo realizado en esta cuenta."
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_account
-msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
 msgstr "Informes contabilidad analítica"
 
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours Summary by User"
+msgstr "Resumen de horas por usuario"
+
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
 msgstr "Importe facturado"
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
-msgid "Financial Project Management"
-msgstr "Gestión de proyectos financieros"
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#, python-format
+msgid "You try to bypass an access rule (Document type: %s)."
+msgstr "Ha intentado saltarse una regla de acceso (tipo de documento: %s)."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
 msgstr "Fecha del último coste facturado"
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_to_invoice:0
-msgid "Uninvoiced Amount"
-msgstr "Importe no facturado"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
-msgid "Pending Analytic Accounts"
-msgstr "Cuentas analíticas pendientes"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Hours"
@@ -330,6 +274,7 @@ msgstr "Mes"
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,account_id:0
 #: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
 
@@ -345,6 +290,11 @@ msgstr "Cuentas caducadas"
 msgid "All Uninvoiced Entries"
 msgstr "Todas las entradas no facturadas"
 
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Hours Tot"
+msgstr "Horas totales"
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
 msgid ""
@@ -353,3 +303,48 @@ msgid ""
 msgstr ""
 "Costes totales para esta cuenta. Incluye costes reales (desde facturas) y "
 "costes indirectos, como el tiempo empleado en hojas de trabajo (horarios)."
+
+#~ msgid "Hours summary by user"
+#~ msgstr "Resumen de horas por usuario"
+
+#~ msgid "All Analytic Accounts"
+#~ msgstr "Todas las cuentas analíticas"
+
+#~ msgid "My Current Accounts"
+#~ msgstr "Mis cuentas actuales"
+
+#~ msgid "New Analytic Account"
+#~ msgstr "Nueva cuenta analítica"
+
+#~ msgid "Current Analytic Accounts"
+#~ msgstr "Cuentas analíticas actuales"
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturación"
+
+#~ msgid "My Pending Accounts"
+#~ msgstr "Mis cuentas pendientes"
+
+#~ msgid "My Uninvoiced Entries"
+#~ msgstr "Mis entradas no facturadas"
+
+#~ msgid "My Accounts"
+#~ msgstr "Mis cuentas"
+
+#~ msgid "Analytic Accounts"
+#~ msgstr "Cuentas analíticas"
+
+#~ msgid "Financial Project Management"
+#~ msgstr "Gestión de proyectos financieros"
+
+#~ msgid "Pending Analytic Accounts"
+#~ msgstr "Cuentas analíticas pendientes"
+
+#~ msgid ""
+#~ "Modify account analytic view to show\n"
+#~ "important data for project manager of services companies.\n"
+#~ "Add menu to show relevant information for each manager."
+#~ msgstr ""
+#~ "Modifica la vista de cuenta analítica para mostrar\n"
+#~ "datos importantes para el director de proyectos en empresas de servicios.\n"
+#~ "Añade menú para mostrar información relevante para cada director."
diff --git a/addons/account_analytic_analysis/i18n/tr.po b/addons/account_analytic_analysis/i18n/tr.po
index 27a7bfdb1e9..8b4f158bedc 100644
--- a/addons/account_analytic_analysis/i18n/tr.po
+++ b/addons/account_analytic_analysis/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-22 11:39+0000\n"
-"Last-Translator: Engin BAHADIR <Unknown>\n"
+"PO-Revision-Date: 2010-10-23 07:01+0000\n"
+"Last-Translator: OpenERP Administrators <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-10-23 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-24 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_budget/i18n/es.po b/addons/account_budget/i18n/es.po
index 40c6b273851..40fc2f92db2 100644
--- a/addons/account_budget/i18n/es.po
+++ b/addons/account_budget/i18n/es.po
@@ -6,15 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-12 15:02+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-24 22:06+0000\n"
+"Last-Translator: Carlos @ smile.fr <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-09-29 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
@@ -23,9 +22,9 @@ msgid "Responsible User"
 msgstr "Usuario responsable"
 
 #. module: account_budget
-#: rml:account.budget:0
-msgid "% performance"
-msgstr "% rendimiento"
+#: selection:crossovered.budget,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
@@ -39,8 +38,8 @@ msgid "Invalid model name in the action definition."
 msgstr "Nombre de modelo no válido en la definición de acción."
 
 #. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Printed at:"
 msgstr "Impreso el:"
 
@@ -54,6 +53,47 @@ msgstr "Confirmar"
 msgid "Validate User"
 msgstr "Validar usuario"
 
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
+msgid "Print Summary"
+msgstr "Imprimir resumen"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,paid_date:0
+msgid "Paid Date"
+msgstr "Fecha de pago"
+
+#. module: account_budget
+#: field:account.budget.analytic,date_to:0
+#: field:account.budget.crossvered.report,date_to:0
+#: field:account.budget.crossvered.summary.report,date_to:0
+#: field:account.budget.report,date_to:0
+msgid "End of period"
+msgstr "Fin del período"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "at"
+msgstr "a las"
+
+#. module: account_budget
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "¡Error! No puede crear menús recursivos"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Currency:"
+msgstr "Moneda:"
+
 #. module: account_budget
 #: constraint:ir.model:0
 msgid ""
@@ -63,81 +103,250 @@ msgstr ""
 "especial!"
 
 #. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: account_budget
-#: wizard_field:account.budget.report,init,date2:0
-#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
-#: wizard_field:wizard.crossovered.budget,init,date_to:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
-msgid "End of period"
-msgstr "Fin del período"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Printing date:"
-msgstr "Fecha impresión:"
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_report
+msgid "Account Budget crossvered report"
+msgstr ""
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "at"
-msgstr "a las"
-
-#. module: account_budget
-#: view:account.budget.post:0
-msgid "Dotations"
-msgstr "Dotaciones"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Performance"
-msgstr "Rendimiento"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Currency:"
-msgstr "Moneda:"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "From"
-msgstr "Desde"
+msgid "Validated"
+msgstr "Validado"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,percentage:0
 msgid "Percentage"
 msgstr "Porcentaje"
 
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Results"
-msgstr "Resultados"
-
 #. module: account_budget
 #: field:crossovered.budget,state:0
 msgid "Status"
 msgstr "Estado"
 
+#. module: account_budget
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
+msgstr ""
+"Este asistente es utilizado para imprimir el resúmen de los presupuestos"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "%"
+msgstr "%"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account_budget
+#: field:account.budget.post,company_id:0
+#: field:crossovered.budget,company_id:0
+#: field:crossovered.budget.lines,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,planned_amount:0
+msgid "Planned Amount"
+msgstr "Importe previsto"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Perc(%)"
+msgstr "Porc(%)"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Done"
+msgstr "Hecho"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Practical Amt"
+msgstr "Importe práctico"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,practical_amount:0
+msgid "Practical Amount"
+msgstr "Importe real"
+
+#. module: account_budget
+#: field:crossovered.budget,date_to:0
+#: field:crossovered.budget.lines,date_to:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: account_budget
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_analytic
+#: model:ir.model,name:account_budget.model_account_budget_report
+msgid "Account Budget report for analytic account"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,theoritical_amount:0
+msgid "Theoritical Amount"
+msgstr "Importe teórico"
+
+#. module: account_budget
+#: field:account.budget.post,name:0
+#: field:crossovered.budget,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget_lines
+msgid "Budget Line"
+msgstr "Línea de presupuesto"
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+msgid "Lines"
+msgstr "Líneas"
+
+#. module: account_budget
+#: report:account.budget:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,crossovered_budget_id:0
+#: report:crossovered.budget.report:0
+#: model:ir.actions.report.xml,name:account_budget.account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget
+msgid "Budget"
+msgstr "Presupuesto"
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:0
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: account_budget
+#: field:account.budget.post,code:0
+#: field:crossovered.budget,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+msgid "This wizard is used to print budget"
+msgstr "Este asistente es utilizado para imprimir el presupuesto"
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_report
+#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.next_id_31
+#: model:ir.ui.menu,name:account_budget.next_id_pos
+msgid "Budgets"
+msgstr "Presupuestos"
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:0
+#, python-format
+msgid "The General Budget '%s' has no Accounts!"
+msgstr "¡El presupuesto general '%s' no tiene cuentas!"
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr "Para aprobar"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:crossovered.budget.lines,general_budget_id:0
+#: model:ir.model,name:account_budget.model_account_budget_post
+msgid "Budgetary Position"
+msgstr "Posición presupuestaria"
+
+#. module: account_budget
+#: field:account.budget.analytic,date_from:0
+#: field:account.budget.crossvered.report,date_from:0
+#: field:account.budget.crossvered.summary.report,date_from:0
+#: field:account.budget.report,date_from:0
+msgid "Start of period"
+msgstr "Inicio del período"
+
+#. module: account_budget
+#: view:account.budget.report:0
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report
+msgid "Print Budgets"
+msgstr "Imprimir presupuestos"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
+msgid "Account Budget  crossvered summary report"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Theoretical Amt"
+msgstr "Importe teórico"
+
+#. module: account_budget
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr "¡Las reglas no están soportadas para los objetos osv_memory !"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Select Dates Period"
+msgstr "Seleccione fechas del período"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Print"
+msgstr "Imprimir"
+
 #. module: account_budget
 #: model:ir.module.module,description:account_budget.module_meta_information
 msgid ""
 "This module allows accountants to manage analytic and crossovered budgets.\n"
 "\n"
-"Once the Master Budgets and the Budgets defined (in Financial\n"
-"Management/Budgets/), the Project Managers can set the planned amount on "
-"each\n"
-"Analytic Account.\n"
+"Once the Master Budgets and the Budgets are defined (in "
+"Accounting/Budgets/),\n"
+"the Project Managers can set the planned amount on each Analytic Account.\n"
 "\n"
 "The accountant has the possibility to see the total of amount planned for "
 "each\n"
@@ -158,266 +367,24 @@ msgid ""
 "Budgets per Budgets.\n"
 "\n"
 msgstr ""
-"Este módulo permite a los contables gestionar presupuestos analíticos "
-"(costes) y cruzados.\n"
-"\n"
-"Una vez que se han definido los presupuestos principales y los presupuestos "
-"(en Gestión\n"
-"financiera/Presupuestos/), los gestores de proyecto pueden establecer el "
-"importe previsto en\n"
-"cada cuenta analítica.\n"
-"\n"
-"El contable tiene la posibilidad de ver el total del importe previsto para "
-"cada\n"
-"presupuesto y presupuesto principal a fin de garantizar el total previsto no "
-"es\n"
-"mayor/menor que lo que había previsto para este presupuesto / presupuesto "
-"principal.\n"
-"Cada lista de datos también puede cambiarse a una vista gráfica de la "
-"misma.\n"
-"\n"
-"Están disponibles tres informes:\n"
-"    1. El primero está disponible desde una lista de presupuestos. "
-"Proporciona la difusión, para estos presupuestos, de las cuentas analíticas "
-"por presupuestos principales.\n"
-"\n"
-"    2. El segundo es un resumen del anterior. Sólo indica la difusión, para "
-"los presupuestos seleccionados, de las cuentas analíticas.\n"
-"\n"
-"    3. El último está disponible desde un plan de cuentas analítico. Indica "
-"la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
-"principales por presupuestos.\n"
-"\n"
-
-#. module: account_budget
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "%"
-msgstr "%"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-msgid "Analytic Account :"
-msgstr "Cuenta analítica:"
-
-#. module: account_budget
-#: wizard_button:account.budget.report,init,report:0
-#: wizard_button:wizard.analytic.account.budget.report,init,report:0
-#: wizard_button:wizard.crossovered.budget,init,report:0
-#: wizard_button:wizard.crossovered.budget.summary,init,report:0
-msgid "Print"
-msgstr "Imprimir"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "A/c No."
-msgstr "Núm. de cuenta"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "to"
-msgstr "hasta"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: field:crossovered.budget.lines,planned_amount:0
-#: rml:crossovered.budget.report:0
-msgid "Planned Amount"
-msgstr "Importe previsto"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Perc(%)"
-msgstr "Porc(%)"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Period Budget"
-msgstr "Período del presupuesto"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Budget Analysis"
-msgstr "Análisis presupuestario"
-
-#. module: account_budget
-#: view:crossovered.budget:0
-#: selection:crossovered.budget,state:0
-msgid "Done"
-msgstr "Hecho"
-
-#. module: account_budget
-#: view:crossovered.budget:0
-msgid "Validate"
-msgstr "Validar"
-
-#. module: account_budget
-#: wizard_view:wizard.crossovered.budget,init:0
-#: wizard_view:wizard.crossovered.budget.summary,init:0
-msgid "Select Options"
-msgstr "Seleccionar opciones"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: field:crossovered.budget.lines,practical_amount:0
-#: rml:crossovered.budget.report:0
-msgid "Practical Amount"
-msgstr "Importe real"
-
-#. module: account_budget
-#: field:crossovered.budget,date_to:0
-#: field:crossovered.budget.lines,date_to:0
-msgid "End Date"
-msgstr "Fecha final"
-
-#. module: account_budget
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: account_budget
-#: field:crossovered.budget.lines,theoritical_amount:0
-msgid "Theoritical Amount"
-msgstr "Importe teórico"
-
-#. module: account_budget
-#: field:account.budget.post,name:0
-#: field:crossovered.budget,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: account_budget
-#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1
-msgid "Print Summary of Budgets"
-msgstr "Imprimir resumen de presupuestos"
-
-#. module: account_budget
-#: model:ir.actions.wizard,name:account_budget.wizard_budget_spread
-msgid "Spread amount"
-msgstr "Cantidad Extendida"
-
-#. module: account_budget
-#: view:account.analytic.account:0
-#: view:account.budget.post:0
-msgid "Lines"
-msgstr "Líneas"
-
-#. module: account_budget
-#: rml:account.budget:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,crossovered_budget_id:0
-#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
-#: model:ir.actions.wizard,name:account_budget.wizard_budget_report
-#: model:ir.model,name:account_budget.model_crossovered_budget
-#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
-msgid "Budget"
-msgstr "Presupuesto"
-
-#. module: account_budget
-#: field:crossovered.budget.lines,paid_date:0
-msgid "Paid Date"
-msgstr "Fecha de pago"
-
-#. module: account_budget
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
-#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
-#: model:ir.ui.menu,name:account_budget.next_id_31
-msgid "Budgets"
-msgstr "Presupuestos"
-
-#. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Budget Item Detail"
-msgstr "Detalle de elemento presupuestario"
-
-#. module: account_budget
-#: view:account.budget.post:0
-#: field:crossovered.budget.lines,general_budget_id:0
-#: model:ir.model,name:account_budget.model_account_budget_post
-msgid "Budgetary Position"
-msgstr "Posición presupuestaria"
-
-#. module: account_budget
-#: wizard_field:account.budget.report,init,date1:0
-#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0
-#: wizard_field:wizard.crossovered.budget,init,date_from:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
-msgid "Start of period"
-msgstr "Inicio del período"
-
-#. module: account_budget
-#: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
-#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
-#: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report
-#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu
-msgid "Print Budgets"
-msgstr "Imprimir presupuestos"
-
-#. module: account_budget
-#: field:account.budget.post,code:0
-#: field:crossovered.budget,code:0
-msgid "Code"
-msgstr "Código"
-
-#. module: account_budget
-#: wizard_view:wizard.analytic.account.budget.report,init:0
-msgid "Select Dates Period"
-msgstr "Seleccione fechas del período"
-
-#. module: account_budget
-#: field:account.budget.post,dotation_ids:0
-msgid "Spreading"
-msgstr "Difusión"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Theoretical Amount"
-msgstr "Importe teórico"
-
-#. module: account_budget
-#: wizard_field:account.budget.spread,init,fiscalyear:0
-msgid "Fiscal Year"
-msgstr "Ejercicio fiscal"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
+#: model:ir.model,name:account_budget.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
 
 #. module: account_budget
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Budget :"
 msgstr "Presupuesto :"
 
 #. module: account_budget
-#: rml:account.budget:0
-#: view:account.budget.post:0
-#: wizard_view:account.budget.spread,init:0
-#: wizard_button:account.budget.spread,init,spread:0
-msgid "Spread"
-msgstr "Extensión"
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Planned Amt"
+msgstr "Importe previsto"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -425,11 +392,6 @@ msgstr "Extensión"
 msgid "Accounts"
 msgstr "Cuentas"
 
-#. module: account_budget
-#: model:ir.actions.report.xml,name:account_budget.account_budget
-msgid "Print Budget"
-msgstr "Imprimir presupuestos"
-
 #. module: account_budget
 #: view:account.analytic.account:0
 #: field:account.analytic.account,crossovered_budget_line:0
@@ -440,18 +402,16 @@ msgstr "Imprimir presupuestos"
 #: view:crossovered.budget.lines:0
 #: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
-#: model:ir.model,name:account_budget.model_crossovered_budget_lines
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
 msgid "Budget Lines"
 msgstr "Líneas de presupuesto"
 
 #. module: account_budget
-#: wizard_button:account.budget.report,init,end:0
-#: wizard_button:account.budget.spread,init,end:0
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
 #: view:crossovered.budget:0
-#: wizard_button:wizard.analytic.account.budget.report,init,end:0
-#: wizard_button:wizard.crossovered.budget,init,end:0
-#: wizard_button:wizard.crossovered.budget.summary,init,end:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -467,17 +427,134 @@ msgid "Start Date"
 msgstr "Fecha de inicio"
 
 #. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Analysis from"
 msgstr "Análisis desde"
 
-#. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Validated"
-msgstr "Validado"
+#~ msgid "% performance"
+#~ msgstr "% rendimiento"
 
-#. module: account_budget
-#: wizard_view:account.budget.report,init:0
-msgid "Select period"
-msgstr "Seleccionar período"
+#~ msgid "Printing date:"
+#~ msgstr "Fecha impresión:"
+
+#~ msgid "Dotations"
+#~ msgstr "Dotaciones"
+
+#~ msgid "Performance"
+#~ msgstr "Rendimiento"
+
+#~ msgid "From"
+#~ msgstr "Desde"
+
+#~ msgid "Results"
+#~ msgstr "Resultados"
+
+#~ msgid "A/c No."
+#~ msgstr "Núm. de cuenta"
+
+#~ msgid "to"
+#~ msgstr "hasta"
+
+#~ msgid "Total :"
+#~ msgstr "Total :"
+
+#~ msgid "Period Budget"
+#~ msgstr "Período del presupuesto"
+
+#~ msgid "Budget Analysis"
+#~ msgstr "Análisis presupuestario"
+
+#~ msgid "Validate"
+#~ msgstr "Validar"
+
+#~ msgid "Select Options"
+#~ msgstr "Seleccionar opciones"
+
+#~ msgid "Print Summary of Budgets"
+#~ msgstr "Imprimir resumen de presupuestos"
+
+#~ msgid "Spread amount"
+#~ msgstr "Cantidad Extendida"
+
+#~ msgid "Theoretical Amount"
+#~ msgstr "Importe teórico"
+
+#~ msgid "Fiscal Year"
+#~ msgstr "Ejercicio fiscal"
+
+#~ msgid "Spread"
+#~ msgstr "Extensión"
+
+#~ msgid "Select period"
+#~ msgstr "Seleccionar período"
+
+#~ msgid "Analytic Account :"
+#~ msgstr "Cuenta analítica:"
+
+#~ msgid "Print Budget"
+#~ msgstr "Imprimir presupuestos"
+
+#~ msgid "Spreading"
+#~ msgstr "Difusión"
+
+#~ msgid "Budget Item Detail"
+#~ msgstr "Detalle de elemento presupuestario"
+
+#~ msgid ""
+#~ "This module allows accountants to manage analytic and crossovered budgets.\n"
+#~ "\n"
+#~ "Once the Master Budgets and the Budgets defined (in Financial\n"
+#~ "Management/Budgets/), the Project Managers can set the planned amount on "
+#~ "each\n"
+#~ "Analytic Account.\n"
+#~ "\n"
+#~ "The accountant has the possibility to see the total of amount planned for "
+#~ "each\n"
+#~ "Budget and Master Budget in order to ensure the total planned is not\n"
+#~ "greater/lower than what he planned for this Budget/Master Budget. Each list "
+#~ "of\n"
+#~ "record can also be switched to a graphical view of it.\n"
+#~ "\n"
+#~ "Three reports are available:\n"
+#~ "    1. The first is available from a list of Budgets. It gives the "
+#~ "spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
+#~ "\n"
+#~ "    2. The second is a summary of the previous one, it only gives the "
+#~ "spreading, for the selected Budgets, of the Analytic Accounts.\n"
+#~ "\n"
+#~ "    3. The last one is available from the Analytic Chart of Accounts. It "
+#~ "gives the spreading, for the selected Analytic Accounts, of the Master "
+#~ "Budgets per Budgets.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Este módulo permite a los contables gestionar presupuestos analíticos "
+#~ "(costes) y cruzados.\n"
+#~ "\n"
+#~ "Una vez que se han definido los presupuestos principales y los presupuestos "
+#~ "(en Gestión\n"
+#~ "financiera/Presupuestos/), los gestores de proyecto pueden establecer el "
+#~ "importe previsto en\n"
+#~ "cada cuenta analítica.\n"
+#~ "\n"
+#~ "El contable tiene la posibilidad de ver el total del importe previsto para "
+#~ "cada\n"
+#~ "presupuesto y presupuesto principal a fin de garantizar el total previsto no "
+#~ "es\n"
+#~ "mayor/menor que lo que había previsto para este presupuesto / presupuesto "
+#~ "principal.\n"
+#~ "Cada lista de datos también puede cambiarse a una vista gráfica de la "
+#~ "misma.\n"
+#~ "\n"
+#~ "Están disponibles tres informes:\n"
+#~ "    1. El primero está disponible desde una lista de presupuestos. "
+#~ "Proporciona la difusión, para estos presupuestos, de las cuentas analíticas "
+#~ "por presupuestos principales.\n"
+#~ "\n"
+#~ "    2. El segundo es un resumen del anterior. Sólo indica la difusión, para "
+#~ "los presupuestos seleccionados, de las cuentas analíticas.\n"
+#~ "\n"
+#~ "    3. El último está disponible desde un plan de cuentas analítico. Indica "
+#~ "la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
+#~ "principales por presupuestos.\n"
+#~ "\n"
diff --git a/addons/account_followup/i18n/es.po b/addons/account_followup/i18n/es.po
index d0f29e0685d..64d8204d602 100644
--- a/addons/account_followup/i18n/es.po
+++ b/addons/account_followup/i18n/es.po
@@ -6,73 +6,37 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:31+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-24 22:16+0000\n"
+"Last-Translator: Carlos @ smile.fr <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-09-29 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Date :"
-msgstr "Fecha :"
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Follwoup Summary"
+msgstr ""
 
 #. module: account_followup
-#: wizard_field:account_followup.followup.print.all,next,partner_ids:0
-msgid "Partners"
-msgstr "Empresas"
+#: view:account_followup.followup:0
+msgid "Search Followup"
+msgstr ""
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Customer Ref :"
-msgstr "Ref. cliente :"
+#: view:account_followup.stat:0
+msgid "Group By..."
+msgstr ""
 
 #. module: account_followup
-#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
-#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable
-msgid "All payable entries"
-msgstr "Todas los asientos cuentas a pagar"
-
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
-#. module: account_followup
-#: field:account_followup.followup.line,description:0
-msgid "Printed Message"
-msgstr "Mensaje impreso"
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Amount In Currency"
-msgstr "Importe en divisa"
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Due"
-msgstr "Debido"
-
-#. module: account_followup
-#: view:account.move.line:0
-msgid "Total debit"
-msgstr "Total debe"
-
-#. module: account_followup
-#: view:account_followup.followup.line:0
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(user_signature)s: User name"
-msgstr "%(user_signature)s: Nombre de usuario"
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "Select partners"
-msgstr "Seleccionar empresas"
+#: view:res.company:0
+#: field:res.company,follow_up_msg:0
+msgid "Follow-up Message"
+msgstr "Mensaje de seguimiento"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -80,194 +44,89 @@ msgstr "Seleccionar empresas"
 msgid "Follow-Up"
 msgstr "Seguimiento"
 
-#. module: account_followup
-#: field:account_followup.stat,debit:0
-msgid "Debit"
-msgstr "Debe"
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "Email Settings"
-msgstr "Configuración de correo electrónico"
-
-#. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Tipo de cuenta"
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Ref"
-msgstr "Ref."
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(followup_amount)s: Total Amount Due"
-msgstr "%(followup_amount)s: Total importe debido"
-
-#. module: account_followup
-#: view:account_followup.followup.line:0
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(date)s: Current Date"
-msgstr "%(date)s: Fecha actual"
-
-#. module: account_followup
-#: field:account.move.line,followup_date:0
-msgid "Latest Follow-up"
-msgstr "Último seguimiento"
-
-#. module: account_followup
-#: field:account_followup.followup.line,followup_id:0
-#: field:account_followup.stat,followup_id:0
-msgid "Follow Ups"
-msgstr "Seguimientos"
-
-#. module: account_followup
-#: wizard_field:account_followup.followup.print.all,init,date:0
-msgid "Follow-up Sending Date"
-msgstr "Fecha envío del seguimiento"
-
-#. module: account_followup
-#: view:account_followup.followup:0
-#: field:account_followup.followup,description:0
-#: rml:account_followup.followup.print:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Balance:"
-msgstr "Saldo pendiente:"
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "CIF/NIF:"
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
+#: view:account_followup.stat:0
+#: field:account_followup.stat,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
+#: report:account_followup.followup.print:0
 msgid "Invoice Date"
 msgstr "Fecha factura"
 
 #. module: account_followup
-#: wizard_field:account_followup.followup.print.all,next,email_subject:0
+#: field:account.followup.print.all,email_subject:0
 msgid "Email Subject"
 msgstr "Asunto correo electrónico"
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Paid"
-msgstr "Pagado"
+#: view:account.followup.print.all:0
+#: view:account_followup.followup.line:0
+msgid "Legend"
+msgstr "Leyenda"
 
 #. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(line)s: Account Move lines"
-msgstr "%(line)s: Líneas de movimientos contables"
-
-#. module: account_followup
-#: field:account_followup.stat,date_followup:0
-msgid "Latest followup"
-msgstr "Último seguimiento"
-
-#. module: account_followup
-#: view:account.move.line:0
-msgid "Partner entries"
-msgstr "Asientos de empresa"
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_account_followup_followup_line
-msgid "Follow-Ups Criteria"
-msgstr "Criterios de seguimientos"
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "Partner Selection"
-msgstr "Selección empresa"
-
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: account_followup
-#: field:account_followup.followup.line,start:0
-msgid "Type of Term"
-msgstr "Tipo de plazo"
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,init:0
-msgid "Follow-up and Date Selection"
-msgstr "Selección seguimiento y fecha"
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "Select partners to remind"
-msgstr "Seleccionar empresas para recordar"
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Li."
-msgstr "Li."
-
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount staid unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"consider the present one as void. Do not hesitate to contact our accounting "
-"department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"\t\t\t"
-msgstr ""
-"\n"
-"Estimado %(partner_name)s,\n"
-"\n"
-"Salvo si hubiera un error por parte nuestra, parece que los siguientes "
-"importes están pendientes de pago. Por favor, tome las medidas apropiadas "
-"para llevar a cabo este pago en los próximos 8 días.\n"
-"\n"
-"Si el pago hubiera sido realizado después de enviar este correo, por favor "
-"no lo tenga en cuenta. No dude en ponerse en contacto con nuestro "
-"departamento de contabilidad.\n"
-"\n"
-"Saludos cordiales,\n"
-"\t\t\t"
-
-#. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: account_followup
-#: wizard_button:account_followup.followup.print.all,summary,end:0
+#: view:account.followup.print.all:0
 msgid "Ok"
 msgstr "Aceptar"
 
 #. module: account_followup
-#: field:account_followup.followup,name:0
-#: field:account_followup.followup.line,name:0
-msgid "Name"
-msgstr "Nombre"
+#: field:account.followup.print,date:0
+msgid "Follow-up Sending Date"
+msgstr "Fecha envío del seguimiento"
 
 #. module: account_followup
-#: field:account_followup.stat,date_move:0
-msgid "First move"
-msgstr "Primer movimiento"
+#: selection:account_followup.followup.line,start:0
+msgid "Net Days"
+msgstr "Días naturales"
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
+#: model:ir.ui.menu,name:account_followup.account_followup_menu
+msgid "Follow-Ups"
+msgstr "Seguimientos"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "CIF/NIF:"
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr "Total debe"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(heading)s: Move line header"
+msgstr "%(heading)s: Cabecera línea movimiento"
+
+#. module: account_followup
+#: field:account.followup.print,followup_id:0
+msgid "Follow-up"
+msgstr "Seguimiento"
+
+#. module: account_followup
+#: field:account_followup.stat,name:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Date :"
+msgstr "Fecha :"
+
+#. module: account_followup
+#: field:account.followup.print.all,partner_ids:0
+msgid "Partners"
+msgstr "Empresas"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_followup
+msgid "Account Follow Up"
+msgstr ""
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
@@ -275,27 +134,40 @@ msgid "End of Month"
 msgstr "Fin de mes"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(company_name)s: User's Company name"
-msgstr "%(company_name): Nombre de la compañía del usuario"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
+msgstr ""
 
 #. module: account_followup
-#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
-#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile
-msgid "All receivable entries"
-msgstr "Todos los asientos cuentas a cobrar"
+#: view:account.followup.print.all:0
+msgid "%(user_signature)s: User name"
+msgstr "%(user_signature)s: Nombre de usuario"
 
 #. module: account_followup
-#: view:account_followup.followup:0
-msgid "Lines"
-msgstr "Líneas"
+#: field:account_followup.stat,debit:0
+msgid "Debit"
+msgstr "Debe"
 
 #. module: account_followup
-#: model:ir.actions.wizard,name:account_followup.action_account_followup_all_wizard
-#: model:ir.ui.menu,name:account_followup.account_followup_wizard_menu
-msgid "Send followups"
-msgstr "Enviar seguimientos"
+#: field:account_followup.stat,account_type:0
+msgid "Account Type"
+msgstr "Tipo de cuenta"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Ref"
+msgstr "Ref."
+
+#. module: account_followup
+#: help:account_followup.followup.line,sequence:0
+msgid "Gives the sequence order when displaying a list of follow-up lines."
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: field:account.followup.print.all,email_body:0
+msgid "Email body"
+msgstr "Texto correo electrónico"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
@@ -303,68 +175,9 @@ msgid "Follow-up Level"
 msgstr "Nivel seguimiento"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Haber"
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_account_followup_stat
-msgid "Followup statistics"
-msgstr "Estadísticas de seguimiento"
-
-#. module: account_followup
-#: wizard_button:account_followup.followup.print.all,init,next:0
-msgid "Continue"
-msgstr "Continuar"
-
-#. module: account_followup
-#: model:ir.module.module,shortdesc:account_followup.module_meta_information
-msgid "Accounting follow-ups management"
-msgstr "Gestión de los seguimientos/avisos contables"
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,summary:0
-#: wizard_field:account_followup.followup.print.all,summary,summary:0
-msgid "Summary"
-msgstr "Resumen"
-
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "Follow-Up Lines"
-msgstr "Líneas de seguimiento"
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Document : Customer account statement"
-msgstr "Documento: Estado contable del cliente"
-
-#. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-Up lines"
-msgstr "Líneas de seguimiento"
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(company_currency)s: User's Company Currency"
-msgstr "%(company_currency)s: Divisa de la compañía del usuario"
-
-#. module: account_followup
-#: field:account_followup.stat,balance:0
-msgid "Balance"
-msgstr "Saldo pendiente"
-
-#. module: account_followup
-#: help:account_followup.followup.print.all,init,date:0
-msgid ""
-"This field allow you to select a forecast date to plan your follow-ups"
-msgstr ""
-"Este campo le permite seleccionar una fecha de previsión para planificar sus "
-"seguimientos"
-
-#. module: account_followup
-#: view:account.move.line:0
-msgid "Total credit"
-msgstr "Total haber"
+#: field:account_followup.stat,date_followup:0
+msgid "Latest followup"
+msgstr "Último seguimiento"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -388,68 +201,74 @@ msgid ""
 "Details of due payments is printed below.\n"
 "\n"
 "Best Regards,\n"
-"\t\t\t"
 msgstr ""
-"\n"
-"Estimado %(partner_name)s,\n"
-"\n"
-"Estamos preocupados de ver que, a pesar de enviar un recordatorio, los pagos "
-"de su cuenta están ahora muy atrasados.\n"
-"\n"
-"Es esencial que realice el pago de forma inmediata, de lo contrario tendrá "
-"que considerar la suspensión de su cuenta, lo que significa que no seremos "
-"capaces de suministrar productos/servicios a su empresa.\n"
-"Por favor, tome las medidas apropiadas para llevar a cabo este pago en los "
-"próximos 8 días.\n"
-"\n"
-"Si hay un problema con el pago de la(s) factura(s) que desconocemos, no dude "
-"en ponerse en contacto con nuestro departamento de contabilidad de manera "
-"que podamos resolver el asunto lo más rápido posible.\n"
-"\n"
-"Los detalles de los pagos pendientes se listan a continuación.\n"
-"\n"
-"Saludos cordiales,\n"
-"\t\t\t"
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Sub-Total:"
-msgstr "Subtotal:"
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
 
 #. module: account_followup
-#: selection:account_followup.followup.line,start:0
-msgid "Net Days"
-msgstr "Días naturales"
+#: field:account.followup.print.all,partner_lang:0
+msgid "Send Email in Partner Language"
+msgstr "Enviar correo en el idioma de la empresa"
 
 #. module: account_followup
-#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
-#: model:ir.actions.act_window,name:account_followup.action_followup_stat
-#: model:ir.model,name:account_followup.model_account_followup_followup
-#: model:ir.ui.menu,name:account_followup.account_followup_menu
-#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat
-msgid "Follow-Ups"
+#: view:account.followup.print.all:0
+msgid "Select partners to remind"
+msgstr "Seleccionar empresas para recordar"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Partner Selection"
+msgstr "Selección empresa"
+
+#. module: account_followup
+#: field:account_followup.followup.line,description:0
+msgid "Printed Message"
+msgstr "Mensaje impreso"
+
+#. module: account_followup
+#: view:account.followup.print:0
+#: view:account.followup.print.all:0
+#: model:ir.actions.act_window,name:account_followup.action_account_followup_print
+#: model:ir.actions.act_window,name:account_followup.action_account_followup_print_all
+#: model:ir.ui.menu,name:account_followup.account_followup_print_menu
+msgid "Send followups"
+msgstr "Enviar seguimientos"
+
+#. module: account_followup
+#: field:account_followup.followup.line,followup_id:0
+#: field:account_followup.stat,followup_id:0
+msgid "Follow Ups"
 msgstr "Seguimientos"
 
 #. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-#: wizard_field:account_followup.followup.print.all,next,email_body:0
-msgid "Email body"
-msgstr "Texto correo electrónico"
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount staid unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"consider the present one as void. Do not hesitate to contact our accounting "
+"department at (+32).10.68.94.39.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,date_move_last:0
-msgid "Last move"
-msgstr "Último movimiento"
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Maturity"
-msgstr "Vencimiento"
-
-#. module: account_followup
-#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
-msgid "Followup Report"
-msgstr "Informe de seguimientos"
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+"Todos los correos han sido enviados a las empresas correctamente:.\n"
+"\n"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@@ -469,73 +288,309 @@ msgid ""
 "our accounting department at (+32).10.68.94.39.\n"
 "\n"
 "Best Regards,\n"
-"\t\t\t"
 msgstr ""
-"\n"
-"Estimado %(partner_name)s,\n"
-"\n"
-"A pesar de varios recordatorios, la deuda de su cuenta todavía no está "
-"resuelta.\n"
-"\n"
-"A menos que el pago total se realice en los próximos 8 días, las acciones "
-"legales para el cobro de la deuda se tomarán sin más aviso.\n"
-"\n"
-"Confiamos en que esta medida será innecesaria y los detalles de los pagos "
-"pendientes se listan a continuación.\n"
-"\n"
-"En caso de cualquier consulta relativa a este asunto, no dude en ponerse en "
-"contacto con nuestro departamento de contabilidad.\n"
-"\n"
-"Saludos cordiales,\n"
-"\t\t\t"
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
+#: view:account.followup.print.all:0
+msgid "Send Mails"
+msgstr "Enviar email"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.module.module,shortdesc:account_followup.module_meta_information
+msgid "Accounting follow-ups management"
+msgstr "Gestión de los seguimientos/avisos contables"
+
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Bloqueado"
+
+#. module: account_followup
+#: help:account.followup.print,date:0
+msgid ""
+"This field allow you to select a forecast date to plan your follow-ups"
+msgstr ""
+"Este campo le permite seleccionar una fecha de previsión para planificar sus "
+"seguimientos"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Due"
+msgstr "Debido"
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Select Partners"
+msgstr "Seleccionar empresas"
+
+#. module: account_followup
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "¡Error! No puede crear menús recursivos"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Email Settings"
+msgstr "Configuración de correo electrónico"
+
+#. module: account_followup
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nombre de modelo no válido en la definición de acción."
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Print Follow Ups"
+msgstr "Imprimir seguimientos"
+
+#. module: account_followup
+#: field:account.move.line,followup_date:0
+msgid "Latest Follow-up"
+msgstr "Último seguimiento"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Sub-Total:"
+msgstr "Subtotal:"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Balance:"
+msgstr "Saldo pendiente:"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat
+msgid "Followup Statistics"
+msgstr "Estadísticas de seguimiento"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s: User Name"
+msgstr "%(user_signature)s: Nombre del usuario"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_move_line
+msgid "Journal Items"
+msgstr "Detalles del diario"
+
+#. module: account_followup
+#: field:account.followup.print.all,email_conf:0
+msgid "Send email confirmation"
+msgstr "Enviar correo electrónico de confirmación"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(company_name)s: User's Company name"
+msgstr "%(company_name): Nombre de la compañía del usuario"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: account_followup
+#: view:account_followup.followup:0
+msgid "Followup Lines"
+msgstr "Líneas de seguimiento"
+
+#. module: account_followup
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Haber"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
 msgid "Maturity Date"
 msgstr "Fecha vencimiento"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "Legend"
-msgstr "Leyenda"
+msgid "%(partner_name)s: Partner Name"
+msgstr "%(partner_name)s: Nombre de empresa"
 
 #. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
+#: view:account_followup.stat:0
+msgid "Follow-Up lines"
+msgstr "Líneas de seguimiento"
 
 #. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(heading)s: Move line header"
-msgstr "%(heading)s: Cabecera línea movimiento"
+#: view:account.followup.print.all:0
+msgid "%(company_currency)s: User's Company Currency"
+msgstr "%(company_currency)s: Divisa de la compañía del usuario"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,balance:0
+msgid "Balance"
+msgstr "Saldo pendiente"
+
+#. module: account_followup
+#: field:account_followup.followup.line,start:0
+msgid "Type of Term"
+msgstr "Tipo de plazo"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_print
+#: model:ir.model,name:account_followup.model_account_followup_print_all
+msgid "Print Followup & Send Mail to Customers"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,date_move_last:0
+msgid "Last move"
+msgstr "Último movimiento"
+
+#. module: account_followup
+#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
+msgid "Followup Report"
+msgstr "Informe de seguimientos"
+
+#. module: account_followup
+#: field:account_followup.stat,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+"Correo no enviado a las empresas siguientes, su email no estaba disponible.\n"
+"\n"
+
+#. module: account_followup
+#: view:account.followup.print:0
+#: view:account.followup.print.all:0
+msgid "Cancel"
+msgstr "Cancelar"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(partner_name)s: Partner name"
-msgstr "%(partner_name)s: Nombre empresa"
+msgid "Follow-Up Lines"
+msgstr "Líneas de seguimiento"
 
 #. module: account_followup
-#: wizard_field:account_followup.followup.print.all,next,email_conf:0
-msgid "Send email confirmation"
-msgstr "Enviar correo electrónico de confirmación"
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"\n"
+"\n"
+"E-Mail sent to following Partners successfully. !\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"Correo enviado a las siguientes empresas correctamente.\n"
+"\n"
 
 #. module: account_followup
-#: wizard_field:account_followup.followup.print.all,init,followup_id:0
-msgid "Follow-up"
-msgstr "Seguimiento"
+#: view:account_followup.stat:0
+msgid "Litigation"
+msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
-msgid "Partner"
-msgstr "Empresa"
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
 
 #. module: account_followup
-#: wizard_button:account_followup.followup.print.all,init,end:0
-#: wizard_button:account_followup.followup.print.all,next,end:0
-msgid "Cancel"
-msgstr "Cancelar"
+#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
+msgid "Payable Items"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(followup_amount)s: Total Amount Due"
+msgstr "%(followup_amount)s: Total importe debido"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: view:account_followup.followup.line:0
+msgid "%(date)s: Current Date"
+msgstr "%(date)s: Fecha actual"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Followup Level"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup:0
+#: field:account_followup.followup,description:0
+#: report:account_followup.followup.print:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "This Fiscal year"
+msgstr ""
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Partner entries"
+msgstr "Asientos de empresa"
+
+#. module: account_followup
+#: help:account.followup.print.all,partner_lang:0
+msgid ""
+"Do not change message text, if you want to send email in partner language, "
+"or configure from company"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
+msgid "Receivable Items"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: model:ir.actions.act_window,name:account_followup.action_followup_stat
+#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow
+msgid "Follow-ups Sent"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.followup,name:0
+#: field:account_followup.followup.line,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_followup
+#: field:account_followup.stat,date_move:0
+msgid "First move"
+msgstr "Primer movimiento"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Li."
+msgstr "Li."
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity"
+msgstr "Vencimiento"
+
+#. module: account_followup
+#: view:account.followup.print:0
+msgid "Continue"
+msgstr "Continuar"
 
 #. module: account_followup
 #: field:account_followup.followup.line,delay:0
@@ -543,6 +598,190 @@ msgid "Days of delay"
 msgstr "Días de demora"
 
 #. module: account_followup
-#: wizard_button:account_followup.followup.print.all,next,print:0
-msgid "Print Follow Ups & Send Mails"
-msgstr "Imprimir seguimientos & Enviar correos"
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
+msgstr "Documento: Estado contable del cliente"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: field:account.followup.print.all,summary:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr "Total haber"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(line)s: Ledger Posting lines"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "%(company_name)s: User's Company Name"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Customer Ref :"
+msgstr "Ref. cliente :"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(partner_name)s: Partner name"
+msgstr "%(partner_name)s: Nombre empresa"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Latest Followup Date"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_followup_line
+msgid "Follow-Up Criteria"
+msgstr ""
+
+#~ msgid "All payable entries"
+#~ msgstr "Todas los asientos cuentas a pagar"
+
+#~ msgid "Select partners"
+#~ msgstr "Seleccionar empresas"
+
+#~ msgid "%(line)s: Account Move lines"
+#~ msgstr "%(line)s: Líneas de movimientos contables"
+
+#~ msgid "Follow-Ups Criteria"
+#~ msgstr "Criterios de seguimientos"
+
+#~ msgid "All receivable entries"
+#~ msgstr "Todos los asientos cuentas a cobrar"
+
+#~ msgid "Lines"
+#~ msgstr "Líneas"
+
+#~ msgid "Followup statistics"
+#~ msgstr "Estadísticas de seguimiento"
+
+#~ msgid "Follow-up and Date Selection"
+#~ msgstr "Selección seguimiento y fecha"
+
+#~ msgid "Amount In Currency"
+#~ msgstr "Importe en divisa"
+
+#~ msgid "Print Follow Ups & Send Mails"
+#~ msgstr "Imprimir seguimientos & Enviar correos"
+
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount staid unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "consider the present one as void. Do not hesitate to contact our accounting "
+#~ "department at (+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ "\t\t\t"
+#~ msgstr ""
+#~ "\n"
+#~ "Estimado %(partner_name)s,\n"
+#~ "\n"
+#~ "Salvo si hubiera un error por parte nuestra, parece que los siguientes "
+#~ "importes están pendientes de pago. Por favor, tome las medidas apropiadas "
+#~ "para llevar a cabo este pago en los próximos 8 días.\n"
+#~ "\n"
+#~ "Si el pago hubiera sido realizado después de enviar este correo, por favor "
+#~ "no lo tenga en cuenta. No dude en ponerse en contacto con nuestro "
+#~ "departamento de contabilidad.\n"
+#~ "\n"
+#~ "Saludos cordiales,\n"
+#~ "\t\t\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Despite several reminders, your account is still not settled.\n"
+#~ "\n"
+#~ "Unless full payment is made in next 8 days , then legal action for the "
+#~ "recovery of the debt, will be taken without further notice.\n"
+#~ "\n"
+#~ "I trust that this action will prove unnecessary and details of due payments "
+#~ "is printed below.\n"
+#~ "\n"
+#~ "In case of any queries concerning this matter, do not hesitate to contact "
+#~ "our accounting department at (+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ "\t\t\t"
+#~ msgstr ""
+#~ "\n"
+#~ "Estimado %(partner_name)s,\n"
+#~ "\n"
+#~ "A pesar de varios recordatorios, la deuda de su cuenta todavía no está "
+#~ "resuelta.\n"
+#~ "\n"
+#~ "A menos que el pago total se realice en los próximos 8 días, las acciones "
+#~ "legales para el cobro de la deuda se tomarán sin más aviso.\n"
+#~ "\n"
+#~ "Confiamos en que esta medida será innecesaria y los detalles de los pagos "
+#~ "pendientes se listan a continuación.\n"
+#~ "\n"
+#~ "En caso de cualquier consulta relativa a este asunto, no dude en ponerse en "
+#~ "contacto con nuestro departamento de contabilidad.\n"
+#~ "\n"
+#~ "Saludos cordiales,\n"
+#~ "\t\t\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "We are disappointed to see that despite sending a reminder, that your "
+#~ "account is now seriously overdue.\n"
+#~ "\n"
+#~ "It is essential that immediate payment is made, otherwise we will have to "
+#~ "consider placing a stop on your account which means that we will no longer "
+#~ "be able to supply your company with (goods/services).\n"
+#~ "Please, take appropriate measures in order to carry out this payment in the "
+#~ "next 8 days\n"
+#~ "\n"
+#~ "If there is a problem with paying invoice that we are not aware of, do not "
+#~ "hesitate to contact our accounting department at (+32).10.68.94.39. so that "
+#~ "we can resolve the matter quickly.\n"
+#~ "\n"
+#~ "Details of due payments is printed below.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ "\t\t\t"
+#~ msgstr ""
+#~ "\n"
+#~ "Estimado %(partner_name)s,\n"
+#~ "\n"
+#~ "Estamos preocupados de ver que, a pesar de enviar un recordatorio, los pagos "
+#~ "de su cuenta están ahora muy atrasados.\n"
+#~ "\n"
+#~ "Es esencial que realice el pago de forma inmediata, de lo contrario tendrá "
+#~ "que considerar la suspensión de su cuenta, lo que significa que no seremos "
+#~ "capaces de suministrar productos/servicios a su empresa.\n"
+#~ "Por favor, tome las medidas apropiadas para llevar a cabo este pago en los "
+#~ "próximos 8 días.\n"
+#~ "\n"
+#~ "Si hay un problema con el pago de la(s) factura(s) que desconocemos, no dude "
+#~ "en ponerse en contacto con nuestro departamento de contabilidad de manera "
+#~ "que podamos resolver el asunto lo más rápido posible.\n"
+#~ "\n"
+#~ "Los detalles de los pagos pendientes se listan a continuación.\n"
+#~ "\n"
+#~ "Saludos cordiales,\n"
+#~ "\t\t\t"
diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po
index 8614c2a8019..3a57fdc7327 100644
--- a/addons/account_voucher/i18n/ru.po
+++ b/addons/account_voucher/i18n/ru.po
@@ -6,37 +6,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 00:03+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-24 09:02+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@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-09-29 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_account_acount_move_line_open1
-msgid "Opening Balance Entry"
+#: view:account.voucher.unreconcile:0
+msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_bakreceipt_voucher_list
-msgid "Bank Receipts"
+#: view:account.voucher:0
+msgid "Form view not available for Payment Lines"
 msgstr ""
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: view:account.voucher:0
+msgid "Payment Ref"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Customer Journal Entries"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "Particulars"
 msgstr ""
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "State :"
-msgstr "Статус:"
+#: view:account.voucher:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid "Cannot delete Voucher(s) which are already opened or paid !"
+msgstr ""
 
 #. module: account_voucher
 #: constraint:ir.actions.act_window:0
@@ -44,57 +59,96 @@ msgid "Invalid model name in the action definition."
 msgstr "Недопустимое имя модели в определении действия."
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: report:voucher.cash_receipt.drcr:0
 msgid "Ref. :"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_cont_voucher_form
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_cont_voucher_form
-msgid "Contra Voucher"
+#: view:account.voucher:0
+msgid "Supplier"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_print
+msgid "Voucher Print"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.module.module,description:account_voucher.module_meta_information
+msgid ""
+"Account Voucher module includes all the basic requirements of\n"
+"    Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, "
+"etc...\n"
+"    * Voucher Entry\n"
+"    * Voucher Receipt\n"
+"    * Cheque Register\n"
+"    "
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_pay_bills
+msgid "Bill Payment"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,amount_original:0
+msgid "Originial Amount"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+#: code:addons/account_voucher/wizard/account_statement_from_invoice.py:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
+#, python-format
+msgid "Import Entries"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_voucher_unreconcile
+msgid "Account voucher unreconcile"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Pay Bill"
 msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0
+#: field:account.voucher.line,company_id:0
 msgid "Company"
 msgstr "Компания"
 
-#. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_jour_voucher_form
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_voucher_form
-msgid "Journal Voucher"
-msgstr "Журнальный ваучер"
-
-#. module: account_voucher
-#: rml:voucher.cash_receipt.drcr:0
-msgid ","
-msgstr ","
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Set to Draft"
 msgstr "Установить в 'Черновик'"
 
 #. module: account_voucher
-#: wizard_button:account.voucher.open,init,open:0
-msgid "Open Voucher Entries"
+#: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
+msgid "Unreconcile entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:ir.model,name:account_voucher.model_account_voucher_line
-msgid "Voucher Line"
+#: view:account.voucher:0
+msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: view:account.move:0
-msgid "Total Credit"
-msgstr "Всего кредит"
+#: view:account.voucher:0
+msgid "Validate"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Search Vouchers"
+msgstr "Искать ваучеры"
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+msgid "Purchase"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0
@@ -103,47 +157,92 @@ msgid "Account"
 msgstr "Счет"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-msgid "D"
+#: field:account.voucher,line_dr_ids:0
+msgid "Debits"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.account,level:0
-msgid "Level"
-msgstr "Уровень"
+#: view:account.statement.from.invoice.lines:0
+msgid "Ok"
+msgstr ""
 
 #. module: account_voucher
-#: view:account.move:0
-msgid "Account Entry Line"
-msgstr "Проводка по счету"
+#: field:account.voucher,date_due:0
+#: field:account.voucher.line,date_due:0
+msgid "Due Date"
+msgstr ""
 
 #. module: account_voucher
-#: view:account.move:0
-msgid "Total Debit"
-msgstr "Всего дебет"
+#: field:account.voucher,narration:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+msgid "Sale"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,move_line_id:0
+msgid "Journal Item"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,reference:0
+msgid "Ref #"
+msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher,amount:0
 #: field:account.voucher.line,amount:0
-#: rml:voucher.cash_amount:0
+#: report:voucher.print:0
 msgid "Amount"
 msgstr "Количество"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: view:account.voucher:0
+msgid "Payment Options"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Bill Information"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.statement.from.invoice,date:0
+msgid "Date payment"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "Receiver's Signature"
 msgstr ""
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "No."
+#: model:ir.model,name:account_voucher.model_account_bank_statement_line
+msgid "Bank Statement Line"
 msgstr ""
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Supplier Vouchers"
+msgstr "Ваучеры поставщика"
+
+#. module: account_voucher
+#: field:account.voucher,tax_id:0
+msgid "Tax"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "Amount (in words) :"
 msgstr ""
 
@@ -153,104 +252,132 @@ msgid "Analytic Account"
 msgstr "Счет аналитического учета"
 
 #. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_jour_sale_voucher_form
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_sale_voucher_form
-msgid "Journal Sale Voucher"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_receipt_vou_voucher_list
-#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_vou_voucher_list
-msgid "Receipt Vouchers"
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-msgid "Account :"
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "On Account of :"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_payments_bankpay_voucher_list
-#: model:ir.actions.act_window,name:account_voucher.action_payments_cashpay_voucher_list
-#: model:ir.actions.act_window,name:account_voucher.action_payments_voucher_list
-#: model:ir.ui.menu,name:account_voucher.menu_action_payments_voucher_list
-msgid "Payment Vouchers"
+#: report:voucher.cash_receipt.drcr:0
+msgid "Journal:"
 msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Create"
-msgstr "Создать"
+msgid "Payment Information"
+msgstr ""
 
 #. module: account_voucher
-#: selection:account.account,type1:0
-#: selection:account.account.template,type1:0
-msgid "None"
-msgstr "Отсутствует"
+#: view:account.statement.from.invoice:0
+msgid "Go"
+msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher,number:0
-msgid "Number"
-msgstr "Номер"
+#: view:account.voucher:0
+#: field:account.voucher,partner_id:0
+#: field:account.voucher.line,partner_id:0
+msgid "Partner"
+msgstr "Партнер"
 
 #. module: account_voucher
-#: view:account.move:0
+#: view:account.bank.statement:0
+msgid "Import Invoices"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid ""
+"You have to configure account base code and account tax code on the '%s' tax!"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Account :"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+msgid "Receipt"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
+msgid "On Account of :"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Sales Lines"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
+msgid "Date:"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,period_id:0
+msgid "Period"
+msgstr "Период"
+
+#. module: account_voucher
+#: view:account.voucher:0
 #: field:account.voucher,state:0
-#: wizard_field:account.voucher.open,init,state:0
 msgid "State"
 msgstr "Состояние"
 
 #. module: account_voucher
-#: selection:account.account,type1:0
-#: selection:account.account.template,type1:0
-#: selection:account.voucher.line,type:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Debit"
-msgstr "Дебет"
+#: model:ir.module.module,shortdesc:account_voucher.module_meta_information
+msgid "Accounting Voucher Entries"
+msgstr "Проводки по ваучерам"
 
 #. module: account_voucher
-#: field:account.voucher,type:0
-#: field:account.voucher.line,type:0
-msgid "Type"
-msgstr "Тип"
-
-#. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_voucher_list
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
 msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier Voucher"
+msgstr "Ваучер поставщика"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
+msgid "Vouchers Entries"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "Authorised Signatory"
 msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
-msgid "Vouchers"
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipt"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid "Invalid action !"
 msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher.line,voucher_id:0
-#: model:res.request.link,name:account_voucher.req_link_voucher
-msgid "Voucher"
-msgstr "Товарный чек"
+msgid "Other Information"
+msgstr ""
 
 #. module: account_voucher
-#: wizard_view:account.voucher.open,init:0
-#: model:ir.ui.menu,name:account_voucher.menu_wizard_account_voucher_open
-msgid "Open Vouchers"
+#: view:account.voucher.unreconcile:0
+msgid "Unreconciliation"
 msgstr ""
 
 #. module: account_voucher
@@ -259,30 +386,58 @@ msgid "Invalid XML for View Architecture!"
 msgstr "Неправильный XML для просмотра архитектуры!"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Dated :"
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Vendor Payment"
 msgstr ""
 
 #. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_cashreceipt_voucher_list
-msgid "Cash Receipts"
+#: view:account.invoice:0
+#: code:addons/account_voucher/invoice.py:0
+#, python-format
+msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher,partner_id:0
-#: field:account.voucher.line,partner_id:0
-msgid "Partner"
-msgstr "Партнер"
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid "No Account Base Code and Account Tax Code!"
+msgstr ""
 
 #. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_pay_voucher_form
-msgid "New Bank Payment"
+#: field:account.voucher,tax_amount:0
+msgid "Tax Amount"
 msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
+msgid "Voucher Entry"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Paid Amount"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,pay_now:0
+msgid "Pay Directly"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.statement.from.invoice,line_ids:0
+#: field:account.statement.from.invoice.lines,line_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.unreconcile,remove:0
+msgid "Want to remove accounting entries too ?"
+msgstr ""
+
+#. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr ""
 
@@ -292,154 +447,232 @@ msgid "Currency"
 msgstr "Валюта"
 
 #. module: account_voucher
-#: view:account.move:0
-#: field:account.move,narration:0
+#: view:account.statement.from.invoice.lines:0
+msgid "Payable and Receivables"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,pay_now:0
+msgid "Pay Later or Group Funds"
+msgstr ""
+
+#. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,narration:0
-msgid "Narration"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher,reference:0
-msgid "Voucher Reference"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_rec_voucher_form
-msgid "New Cash Receipt"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_amt
-msgid "Voucher Report"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.account,open_bal:0
-msgid "Opening Balance"
-msgstr "Начальное сальдо"
-
-#. module: account_voucher
 #: selection:account.voucher,state:0
-#: selection:account.voucher.open,init,state:0
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "Draft"
 msgstr "Черновик"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Currency:"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.move.line,amount_unreconciled:0
+msgid "Unreconciled Amount"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "PRO-FORMA"
 msgstr "Проформа"
 
 #. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_receipt_cashreceipt_voucher_list
-msgid "Cash Receipt"
+#: view:account.voucher:0
+msgid "Total Amount"
 msgstr ""
 
 #. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_pay_voucher_form
-msgid "New Cash Payment"
+#: field:account.voucher.line,type:0
+msgid "Cr/Dr"
 msgstr ""
 
 #. module: account_voucher
-#: view:account.move:0
-msgid "Optional Information"
-msgstr "Доп. информация"
+#: field:account.voucher,audit:0
+msgid "Audit Complete ?"
+msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "General Entries"
+msgid "Vendor"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Terms"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Compute Tax"
 msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,date:0
+#: field:account.voucher.line,date_original:0
 msgid "Date"
 msgstr "Дата"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid ":"
-msgstr ":"
-
-#. module: account_voucher
-#: field:account.account,type1:0
-#: field:account.account.template,type1:0
-msgid "Dr/Cr"
+#: view:account.voucher:0
+msgid "Post"
 msgstr ""
 
 #. module: account_voucher
-#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher
-msgid "Voucher Report (Cr/Dr)"
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
+msgid "Number:"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.move,voucher_type:0
-#: wizard_field:account.voucher.open,init,type:0
-msgid "Voucher Type"
+#: field:account.bank.statement.line,amount_reconciled:0
+msgid "Amount reconciled"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Expense Lines"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,pre_line:0
+msgid "Previous Payments ?"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
+#: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
+msgid "Journal Vouchers"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.account,type1:0
-#: selection:account.account.template,type1:0
 #: selection:account.voucher.line,type:0
-#: rml:voucher.cash_receipt.drcr:0
+#: report:voucher.cash_receipt.drcr:0
 msgid "Credit"
 msgstr "Кредит"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: view:account.voucher:0
+msgid "Extended options..."
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid "Please define a sequence on the journal !"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "Through :"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher,reference_type:0
-msgid "Reference Type"
-msgstr "Тип ссылки"
+#: help:account.voucher,reference:0
+msgid "Transaction reference number."
+msgstr ""
 
 #. module: account_voucher
+#: view:account.voucher:0
+msgid "Invoices and outstanding transactions"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Bill Date"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:account.voucher.unreconcile:0
+msgid "Unreconcile"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
 #: model:ir.model,name:account_voucher.model_account_voucher
 msgid "Accounting Voucher"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher,period_id:0
-msgid "Period"
-msgstr "Период"
+#: field:account.voucher,number:0
+msgid "Number"
+msgstr "Номер"
 
 #. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_payments_bankpay_voucher_list
-msgid "Bank Payments"
+#: model:ir.model,name:account_voucher.model_account_bank_statement
+msgid "Bank Statement"
 msgstr ""
 
 #. module: account_voucher
-#: view:account.move:0
-msgid "General Information"
-msgstr "Общая информация"
-
-#. module: account_voucher
-#: wizard_field:account.voucher.open,init,period_ids:0
-msgid "Periods"
-msgstr "Периоды"
+#: view:account.voucher:0
+msgid "To Review"
+msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: selection:account.voucher,state:0
-#: wizard_button:account.voucher.open,init,end:0
-#: selection:account.voucher.open,init,state:0
+msgid "Sales Information"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Vendor Journal Entries"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,voucher_id:0
+#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher
+#: model:res.request.link,name:account_voucher.req_link_voucher
+msgid "Voucher"
+msgstr "Товарный чек"
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Items"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.statement.from.invoice:0
+#: view:account.statement.from.invoice.lines:0
+#: view:account.voucher:0
+#: view:account.voucher.unreconcile:0
 msgid "Cancel"
 msgstr "Отмена"
 
 #. module: account_voucher
-#: view:account.voucher:0
 #: selection:account.voucher,state:0
-#: selection:account.voucher.open,init,state:0
 msgid "Pro-forma"
 msgstr "Проформа"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,move_ids:0
+#: model:ir.model,name:account_voucher.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payment"
+msgstr ""
+
 #. module: account_voucher
 #: constraint:ir.model:0
 msgid ""
@@ -448,25 +681,26 @@ msgstr ""
 "Название объекта должно начинаться с x_  и не должно содержать специальных "
 "символов !"
 
+#. module: account_voucher
+#: view:account.statement.from.invoice:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice
+msgid "Import Invoices in Statement"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Other Info"
-msgstr "Прочая информация"
-
-#. module: account_voucher
-#: model:ir.module.module,shortdesc:account_voucher.module_meta_information
-msgid "Accounting Voucher Entries"
+msgid "Pay"
 msgstr ""
 
 #. module: account_voucher
-#: field:res.currency,sub_name:0
-msgid "Sub Currency"
-msgstr ""
+#: selection:account.voucher.line,type:0
+#: report:voucher.cash_receipt.drcr:0
+msgid "Debit"
+msgstr "Дебет"
 
 #. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_other_voucher_list
-#: model:ir.ui.menu,name:account_voucher.menu_action_other_voucher_list
-msgid "Other Vouchers"
+#: view:account.voucher:0
+msgid "Payment Method"
 msgstr ""
 
 #. module: account_voucher
@@ -475,72 +709,77 @@ msgid "Description"
 msgstr "Описание"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "Canceled"
 msgstr "Отменено"
 
 #. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_cash_pay_voucher_form
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Cash Payment Voucher"
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid "Please change partner and try again !"
 msgstr ""
 
 #. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_receipt_bakreceipt_voucher_list
-msgid "Bank Receipt"
-msgstr "Квитанция банка"
+#: field:account.statement.from.invoice,journal_ids:0
+#: view:account.voucher:0
+#: field:account.voucher,journal_id:0
+msgid "Journal"
+msgstr "Журнал"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: report:voucher.cash_receipt.drcr:0
 msgid "-"
 msgstr "-"
 
 #. module: account_voucher
-#: selection:account.move,voucher_type:0
+#: view:account.voucher:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,line_cr_ids:0
+msgid "Credits"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
+msgid "State:"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.bank.statement.line,voucher_id:0
+#: view:account.invoice:0
+#: view:account.voucher:0
+#: field:account.voucher,pay_now:0
 #: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_jour_pur_voucher_form
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_pur_voucher_form
-msgid "Journal Purchase Voucher"
+msgid "Payment"
 msgstr ""
 
 #. module: account_voucher
-#: view:account.account:0
-msgid "Closing Balance"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher.line,ref:0
-msgid "Ref."
-msgstr "Ссылка"
-
-#. module: account_voucher
+#: view:account.voucher:0
 #: selection:account.voucher,state:0
-#: selection:account.voucher.open,init,state:0
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "Posted"
 msgstr "Проведено"
 
 #. module: account_voucher
-#: field:account.voucher,name:0
-msgid "Name"
-msgstr "Название"
-
-#. module: account_voucher
-#: field:account.voucher,move_ids:0
-msgid "Real Entry"
+#: view:account.voucher:0
+msgid "Customer"
 msgstr ""
 
 #. module: account_voucher
-#: model:ir.actions.wizard,name:account_voucher.wizard_account_voucher_open
-msgid "Open a Voucher Entry"
+#: field:account.voucher,type:0
+msgid "Default Type"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_statement_from_invoice
+#: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
+msgid "Entries by Statement from Invoices"
 msgstr ""
 
 #. module: account_voucher
@@ -548,53 +787,115 @@ msgstr ""
 msgid "Account Entry"
 msgstr "Проводка по счету"
 
+#. module: account_voucher
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid "Invalid Error !"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,date:0
+msgid "Effective date for accounting entries"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher.unreconcile:0
+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 ""
+
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Entry Lines"
-msgstr "Строки проводок"
-
-#. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_rec_voucher_form
-msgid "New Bank Receipt"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_payments_cashpay_voucher_list
-msgid "Cash Payments"
+#: field:account.voucher.line,untax_amount:0
+msgid "Untax Amount"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_cash_rec_voucher_form
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Cash Receipt Voucher"
+#: view:account.voucher:0
+#: field:account.voucher.line,amount_unreconciled:0
+msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_bank_pay_voucher_form
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Bank Payment Voucher"
+#: view:account.voucher:0
+#: field:account.voucher,amount:0
+msgid "Total"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_bank_rec_voucher_form
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Bank Receipt Voucher"
+#: field:account.voucher,name:0
+msgid "Memo"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.account,journal_id:0
-#: field:account.voucher,journal_id:0
-msgid "Journal"
-msgstr "Журнал"
+#~ msgid "Account Entry Line"
+#~ msgstr "Проводка по счету"
+
+#~ msgid "Optional Information"
+#~ msgstr "Доп. информация"
+
+#~ msgid "General Information"
+#~ msgstr "Общая информация"
+
+#~ msgid "Journal Voucher"
+#~ msgstr "Журнальный ваучер"
+
+#~ msgid ","
+#~ msgstr ","
+
+#~ msgid "State :"
+#~ msgstr "Статус:"
+
+#~ msgid "Total Credit"
+#~ msgstr "Всего кредит"
+
+#~ msgid "Total Debit"
+#~ msgstr "Всего дебет"
+
+#~ msgid "Level"
+#~ msgstr "Уровень"
+
+#~ msgid "Create"
+#~ msgstr "Создать"
+
+#~ msgid "None"
+#~ msgstr "Отсутствует"
+
+#~ msgid "Type"
+#~ msgstr "Тип"
+
+#~ msgid "Opening Balance"
+#~ msgstr "Начальное сальдо"
+
+#~ msgid ":"
+#~ msgstr ":"
+
+#~ msgid "Periods"
+#~ msgstr "Периоды"
+
+#~ msgid "Other Info"
+#~ msgstr "Прочая информация"
+
+#~ msgid "Reference Type"
+#~ msgstr "Тип ссылки"
+
+#~ msgid "Bank Receipt"
+#~ msgstr "Квитанция банка"
+
+#~ msgid "Ref."
+#~ msgstr "Ссылка"
+
+#~ msgid "Entry Lines"
+#~ msgstr "Строки проводок"
+
+#~ msgid "Name"
+#~ msgstr "Название"
diff --git a/addons/analytic/i18n/el.po b/addons/analytic/i18n/el.po
index 10994be807c..d61f7912c6d 100644
--- a/addons/analytic/i18n/el.po
+++ b/addons/analytic/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-22 22:21+0000\n"
-"Last-Translator: kotrotsios <Unknown>\n"
+"PO-Revision-Date: 2010-10-23 07:01+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Greek <el@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-10-23 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-24 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
diff --git a/addons/claim_from_delivery/i18n/es.po b/addons/claim_from_delivery/i18n/es.po
new file mode 100644
index 00000000000..e9e7faa12b2
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/es.po
@@ -0,0 +1,46 @@
+# Spanish 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: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-24 21:49+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: Spanish <es@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-10-25 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: claim_from_delivery
+#: model:ir.model,name:claim_from_delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: claim_from_delivery
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: claim_from_delivery
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nombre de modelo no válido en la definición de la acción"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,description:claim_from_delivery.module_meta_information
+msgid "Create Claim from delivery order:\n"
+msgstr "Crear reclamación a partir de la orden de entrega\n"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
+msgid "Claim from delivery"
+msgstr "Reclamación desde la entrega"
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index 9179efe10ca..e76dc7a8f6c 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-21 11:24+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-24 09:03+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <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-10-22 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -72,41 +72,41 @@ msgstr "Weergeven als"
 #: field:crm.meeting,day:0
 #: selection:crm.meeting,select1:0
 msgid "Date of month"
-msgstr ""
+msgstr "Dag van de maand"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Today"
-msgstr ""
+msgstr "Vandaag"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr ""
+msgstr "Selecteer verkoopkansen"
 
 #. module: crm
 #: view:crm.phonecall2phonecall:0
 #: view:crm.send.mail:0
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Vertraging tot sluiting"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Previous Stage"
-msgstr ""
+msgstr "Vorige status"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:0
 #, python-format
 msgid "Can not add note!"
-msgstr ""
+msgstr "Kan geen notitie toevoegen!"
 
 #. module: crm
 #: field:crm.case.stage,name:0
@@ -124,7 +124,7 @@ msgstr "Dossiers"
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dag"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -139,17 +139,17 @@ msgstr ""
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The lead '%s' has been closed."
-msgstr ""
+msgstr "De lead '%s' is gesloten."
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "No Repeat"
-msgstr ""
+msgstr "Geen herhaling"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
 msgid "Resource's Calendar"
-msgstr ""
+msgstr "Resource's agenda"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:0
@@ -163,7 +163,7 @@ msgstr "Waarschuwing!"
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Yearly"
-msgstr ""
+msgstr "Jaarlijks"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -183,7 +183,7 @@ msgstr "Campagne"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 msgid "Do not create a partner"
-msgstr ""
+msgstr "Geen relatie aanmaken"
 
 #. module: crm
 #: view:crm.lead:0
@@ -196,6 +196,8 @@ msgstr "Zoek kansen"
 msgid ""
 "Opportunity must have Partner assigned before merging with other Opportunity."
 msgstr ""
+"Verkoopkans moet toegewezen relatie hebben alvorens samen te voegen met "
+"andere verkoopkans."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
@@ -207,7 +209,7 @@ msgstr "Waarschuwing!"
 #: code:addons/crm/wizard/crm_send_email.py:0
 #, python-format
 msgid "Can not send mail!"
-msgstr ""
+msgstr "Kan geen email versturen!"
 
 #. module: crm
 #: field:crm.lead,partner_id:0
@@ -234,14 +236,14 @@ msgstr "Relatie"
 #: field:crm.meeting,organizer:0
 #: field:crm.meeting,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "Organisator"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: view:crm.phonecall2phonecall:0
 #: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
 msgid "Schedule Other Call"
-msgstr ""
+msgstr "Plan ander telefoongesprek"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:0
@@ -256,13 +258,13 @@ msgstr "Telefoongesprek"
 #. module: crm
 #: field:crm.lead,optout:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "Uitschrijven"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:0
 #, python-format
 msgid "The opportunity '%s' has been marked as lost."
-msgstr ""
+msgstr "Verkoopkans '%s' is als verloren gemarkeerd."
 
 #. module: crm
 #: view:crm.lead:0
@@ -278,7 +280,7 @@ msgstr "Criteria"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #, python-format
 msgid "is converted to Opportunity."
-msgstr ""
+msgstr "is omgezet naar verkoopkans."
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -293,14 +295,14 @@ msgstr "Secties"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
-msgstr ""
+msgstr "Sa_menvoegen"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_lead
 #: model:ir.ui.menu,name:crm.menu_report_crm_leads_tree
 msgid "Leads Analysis"
-msgstr ""
+msgstr "Leads analyse"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
@@ -309,17 +311,20 @@ msgid ""
 "communication history) will be merged with existing Opportunity of Selected "
 "partner."
 msgstr ""
+"Als u samenvoegen met bestaande verkoopkans selecteert, worden de lead "
+"details (met de communicatie geschiedenis) samengevoegd met de bestaande "
+"verkoopkans van de geselecteerde relatie."
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public"
-msgstr ""
+msgstr "Openbaar"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_resource_type_act
 msgid "Campaigns"
-msgstr ""
+msgstr "Campagnes"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
@@ -339,6 +344,8 @@ msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
 msgstr ""
+"Als uitschrijven is aangevinkt, heeft deze contactpersoon geweigerd emails "
+"te ontvangen of uitgeschreven voor een campagne."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
@@ -367,7 +374,7 @@ msgstr "Contactpersoon"
 #. module: crm
 #: field:crm.case.stage,on_change:0
 msgid "Change Probability Automatically"
-msgstr ""
+msgstr "Wijzig waarschijnlijkheid automatisch"
 
 #. module: crm
 #: field:base.action.rule,regex_history:0
@@ -378,7 +385,7 @@ msgstr "Reguliere expresse op dossier historie"
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The lead '%s' has been opened."
-msgstr ""
+msgstr "Lead '%s' is geopend."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -389,7 +396,7 @@ msgstr "Verkoopkansbespreking"
 #: help:crm.lead.report,delay_close:0
 #: help:crm.phonecall.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Aantal dagen om dossier af te sluiten"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
@@ -399,7 +406,7 @@ msgstr "Wanneer een echt project/verkoopkans is ontdekt"
 #. module: crm
 #: field:crm.installer,crm_fundraising:0
 msgid "Fundraising"
-msgstr ""
+msgstr "Fondsenwerving"
 
 #. module: crm
 #: view:res.partner:0
@@ -690,7 +697,7 @@ msgstr ""
 #. module: crm
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Huidige activiteit"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
@@ -1199,7 +1206,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "Herhaling ID"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1518,7 +1525,7 @@ msgstr ""
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 msgid "Current"
-msgstr ""
+msgstr "Actueel"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
@@ -3336,7 +3343,7 @@ msgstr "Contactpersoon relatie"
 #. module: crm
 #: field:crm.meeting,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "Herhaling ID datum"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index efb185982ed..185113bcff3 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.po
@@ -6,82 +6,107 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-10-08 07:38+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-24 13:14+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-10-09 12:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
-#: field:crm.email.add.cc,name:0
-msgid "Send to"
-msgstr "Wyślij do"
+#: view:crm.lead.report:0
+msgid "# Leads"
+msgstr "# Sygnałów"
 
 #. module: crm
-#: help:crm.meeting,exdate:0
-msgid ""
-"This property defines the list                 of date/time exceptions for "
-"arecurring calendar component."
-msgstr ""
+#: view:crm.lead:0
+#: selection:crm.lead,type:0
+#: selection:crm.lead.report,type:0
+msgid "Lead"
+msgstr "Sygnał"
 
 #. module: crm
-#: help:crm.case.rule,act_mail_to_user:0
-msgid ""
-"Check this if you want the rule to send an email to the responsible person."
-msgstr ""
-"Zaznacz, jeśli chcesz aby reguła wysłała wiadomość do osoby odpowiedzialnej."
+#: model:crm.case.categ,name:crm.categ_oppor3
+msgid "Need Services"
+msgstr "Wymagają obsługi"
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Monthly"
+msgstr "Co miesiąc"
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0
+msgid "Schedule a PhoneCall"
+msgstr "Zaplanuj telefon"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_case_stage
+msgid "Stage of case"
+msgstr "Etap sprawy"
 
 #. module: crm
 #: view:crm.meeting:0
+msgid "Visibility"
+msgstr "Widoczność"
+
+#. module: crm
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
+#. module: crm
+#: field:crm.lead,title:0
 msgid "Title"
 msgstr "Tytuł"
 
 #. module: crm
-#: model:ir.model,name:crm.model_report_crm_case_section_categ2
-msgid "Cases by section and category2"
-msgstr "Sprawy wg sekcji i kategorii2"
+#: field:crm.meeting,show_as:0
+msgid "Show as"
+msgstr "Pokaż jako"
 
 #. module: crm
-#: wizard_field:crm.lead.partner_create,init,close:0
-msgid "Close Lead"
-msgstr "Zamknij sygnał"
+#: field:crm.meeting,day:0
+#: selection:crm.meeting,select1:0
+msgid "Date of month"
+msgstr "Dzień miesiąca"
 
 #. module: crm
-#: view:crm.job:0
 #: view:crm.lead:0
-#: view:crm.opportunity:0
 #: view:crm.phonecall:0
-msgid "    7 Days    "
-msgstr "    7 Dni    "
+msgid "Today"
+msgstr "Dzisiaj"
 
 #. module: crm
-#: help:crm.menu.config_wizard,helpdesk:0
-msgid "Manages an Helpdesk service."
-msgstr "Zarządza usługą Helpdesku."
+#: view:crm.merge.opportunity:0
+msgid "Select Opportunities"
+msgstr "Wybierz Szansę"
 
 #. module: crm
-#: view:crm.job:0
-msgid "Pending Jobs"
-msgstr "Wstrzymane prace"
+#: view:crm.phonecall2phonecall:0
+#: view:crm.send.mail:0
+msgid " "
+msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Naciśnięcie przycisku"
+#: view:crm.lead.report:0
+#: field:crm.phonecall.report,delay_close:0
+msgid "Delay to close"
+msgstr "Opóźnienie do zamknięcia"
 
 #. module: crm
-#: view:crm.case:0
-msgid "Planned costs"
-msgstr "Planowane koszty"
+#: view:crm.lead:0
+msgid "Previous Stage"
+msgstr "Poprzedni etap"
 
 #. module: crm
-#: wizard_field:crm.job.partner_create,init,close:0
-msgid "Close job request"
-msgstr "Zamknij zgłoszenie pracy"
+#: code:addons/crm/wizard/crm_add_note.py:0
+#, python-format
+msgid "Can not add note!"
+msgstr "Nie można dodac notatki!"
 
 #. module: crm
 #: field:crm.case.stage,name:0
@@ -89,15 +114,18 @@ msgid "Stage Name"
 msgstr "Nazwa etapu"
 
 #. module: crm
-#: 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
+#: view:crm.phonecall.report:0
 msgid "Cases"
 msgstr "Sprawy"
 
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.lead.report,day:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,day:0
+msgid "Day"
+msgstr "Dzień"
+
 #. module: crm
 #: help:crm.segmentation,categ_id:0
 msgid ""
@@ -108,250 +136,214 @@ msgstr ""
 "kryteria segmentacji po obliczeniach."
 
 #. module: crm
-#: model:ir.ui.menu,name:crm.menu_hr
-msgid "Human Resources"
-msgstr "Kadry"
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The lead '%s' has been closed."
+msgstr "Sygnał '%s' został zamknięty."
 
 #. module: crm
-#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
-msgid "Cases by Opportunities, Category and Type"
-msgstr "Sprawy wg szans, kategorii i typów"
+#: selection:crm.meeting,freq:0
+msgid "No Repeat"
+msgstr "Bez powtarzania"
 
 #. module: crm
-#: help:crm.menu.config_wizard,claims:0
-msgid ""
-"Manages the supplier and customers claims, including your corrective or "
-"preventive actions."
-msgstr ""
-"Zarządza reklamacjami dostawców i klientów, oraz twoimi działaniami "
-"naprawczymi i prewencyjnymi."
+#: field:crm.case.section,resource_calendar_id:0
+msgid "Resource's Calendar"
+msgstr "Kalendarz zasobów"
 
 #. module: crm
-#: view:crm.fundraising:0
-msgid "Amount"
-msgstr "Kwota"
-
-#. module: crm
-#: model:process.transition,note:crm.process_transition_opportunitymeeting0
-msgid "Normal or phone meeting for opportunity"
-msgstr "Spotkanie albo rozmowa telefoniczna w sprawie szansy"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_claim2
-#: model:crm.case.stage,name:crm.stage_meet1
-msgid "Fixed"
-msgstr "Naprawione"
-
-#. module: crm
-#: 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
+#: code:addons/crm/crm_opportunity.py:0
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#: code:addons/crm/wizard/crm_lead_to_partner.py:0
+#: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
 #, python-format
 msgid "Warning !"
 msgstr "Ostrzeżenie !"
 
 #. module: crm
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#, python-format
-msgid "Please specify user's email address !"
-msgstr "Proszę podać adres email użytkownika!"
+#: selection:crm.meeting,rrule_type:0
+msgid "Yearly"
+msgstr "Cor rok"
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_oppor5
+#: field:crm.segmentation.line,name:0
+msgid "Rule Name"
+msgstr "Nazwa reguły"
+
+#. module: crm
+#: view:crm.case.resource.type:0
+#: view:crm.lead:0
+#: field:crm.lead,type_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,type_id:0
+#: model:ir.model,name:crm.model_crm_case_resource_type
 msgid "Campaign"
 msgstr "Kampania"
 
 #. module: crm
-#: view:crm.opportunity:0
+#: selection:crm.lead2opportunity.partner,action:0
+msgid "Do not create a partner"
+msgstr "Nie twórz partnera"
+
+#. module: crm
+#: view:crm.lead:0
 msgid "Search Opportunities"
 msgstr "Szukaj szans"
 
 #. module: crm
-#: model:ir.ui.menu,name:crm.menu_crm_case_section_stage_tree
-#: view:report.crm.case.section.stage:0
-msgid "Cases by Section and Stage"
-msgstr "Sprawy wg sekcji i etapów"
-
-#. module: crm
-#: wizard_field:crm.job.meeting_set,init,duration:0
-#: wizard_field:crm.phonecall.meeting_set,init,duration:0
-msgid "Duration (Hours)"
-msgstr "Długość trwania (godziny)"
-
-#. module: crm
-#: selection:crm.meeting,transparent:0
-msgid "TRANSPARENT"
-msgstr ""
-
-#. module: crm
-#: help:crm.case.rule,server_action_id:0
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
 msgid ""
-"Describes the action name.eg:on which object which ation to be taken on "
-"basis of which condition"
+"Opportunity must have Partner assigned before merging with other Opportunity."
 msgstr ""
-"Opisuje nazwę działania, np. na których obiektach jakie będzie działanie na "
-"podstawie jakich warunków."
+"Szansa musi mieć przypisanego partnera przed połaczeniem z inną szansą."
 
 #. module: crm
-#: help:crm.case,section_id:0
-msgid ""
-"Section to which Case belongs to. Define Responsible user and Email account "
-"for mail gateway."
-msgstr ""
-"Sekcja do której należy Sprawa. Zdefiniuj odpowiedzialnego użytkownika oraz "
-"konto Email dla bramy pocztowej."
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid "Warning!"
+msgstr "Uwaga!"
 
 #. module: crm
-#: 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.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
+#: code:addons/crm/wizard/crm_send_email.py:0
+#, python-format
+msgid "Can not send mail!"
+msgstr "Nie można wysłać maila!"
+
+#. module: crm
+#: field:crm.lead,partner_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,partner_id:0
+#: field:crm.lead2opportunity,partner_id:0
+#: field:crm.lead2opportunity.partner,partner_id:0
+#: field:crm.lead2partner,partner_id:0
+#: view:crm.meeting:0
+#: field:crm.meeting,partner_id:0
+#: field:crm.partner2opportunity,partner_id: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
+#: field:crm.phonecall,partner_id:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,partner_id:0
+#: field:crm.phonecall2opportunity,partner_id:0
+#: field:crm.phonecall2partner,partner_id:0
+#: model:ir.model,name:crm.model_res_partner
 #: model:process.node,name:crm.process_node_partner0
 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.stage,section_id:0
-#: model:ir.model,name:crm.model_crm_case_section
-msgid "Case Section"
-msgstr "Sekcja sprawy"
+#: field:crm.meeting,organizer:0
+#: field:crm.meeting,organizer_id:0
+msgid "Organizer"
+msgstr "Organizator"
 
 #. module: crm
-#: view:crm.job:0
-msgid "Proposed Salary"
-msgstr "Proponowane wynagrodzenie"
+#: view:crm.phonecall:0
+#: view:crm.phonecall2phonecall:0
+#: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
+msgid "Schedule Other Call"
+msgstr "Zaplanuj inny telefon"
 
 #. module: crm
-#: help:crm.case.section,sequence:0
-msgid "Gives the sequence order when displaying a list of case sections."
-msgstr "Ustala kolejność wyświetlania listy sekcji spraw."
-
-#. module: crm
-#: code:addons/crm/wizard/crm_job_wizard.py:0
-#: code:addons/crm/wizard/crm_opportunity_wizard.py:0
+#: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:0
+#: code:addons/crm/wizard/crm_phonecall_to_phonecall.py:0
 #: model:crm.case.categ,name:crm.categ_meet3
+#: view:crm.phonecall:0
+#: model:ir.ui.menu,name:crm.menu_crm_config_phonecall
 #, python-format
 msgid "Phone Call"
 msgstr "Rozmowa telefoniczna"
 
 #. module: crm
-#: model:ir.model,name:crm.model_report_crm_case_section_stage
-msgid "Cases by section and stage"
-msgstr "Sprawy wg sekcji i etapów"
+#: field:crm.lead,optout:0
+msgid "Opt-Out"
+msgstr "Rezygnacja"
 
 #. module: crm
-#: field:crm.case.rule,act_mail_to_email:0
-msgid "Mail to these emails"
-msgstr "Wyślij wiadomości do tych adresów email."
+#: code:addons/crm/crm_opportunity.py:0
+#, python-format
+msgid "The opportunity '%s' has been marked as lost."
+msgstr "Szansa '%s' została oznaczona jako utracona."
 
 #. module: crm
-#: selection:crm.case.rule,trg_date_type:0
-msgid "None"
-msgstr "Brak"
-
-#. module: crm
-#: view:crm.case.rule:0
-msgid "Special Keywords to Be Used in The Body"
-msgstr "Specjalne słowa kluczowe do zastosowania w treści"
-
-#. 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
 msgid "Send New Email"
 msgstr "Wyślij nową wiadomość"
 
-#. module: crm
-#: view:crm.case.history:0
-msgid "My Histories"
-msgstr "Moje historie"
-
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
 msgstr "Kryterium"
 
 #. module: crm
-#: model:ir.actions.act_window,name:crm.crm_case_section_act
-#: model:ir.ui.menu,name:crm.menu_crm_case_section_act
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "is converted to Opportunity."
+msgstr "jest skonwertowany w Szansę."
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Excluded Answers :"
+msgstr "Wyłączając odpowiedzi :"
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
 msgid "Sections"
 msgstr "Sekcje"
 
 #. module: crm
-#: help:crm.menu.config_wizard,opportunity:0
-msgid "Tracks identified business opportunities for your sales pipeline."
+#: view:crm.merge.opportunity:0
+msgid "_Merge"
+msgstr "_Połącz"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: model:ir.actions.act_window,name:crm.action_report_crm_lead
+#: model:ir.ui.menu,name:crm.menu_report_crm_leads_tree
+msgid "Leads Analysis"
+msgstr "Analiza sygnałów"
+
+#. module: crm
+#: view:crm.lead2opportunity.action:0
+msgid ""
+"If you select Merge with existing Opportunity, the lead details(with the "
+"communication history) will be merged with existing Opportunity of Selected "
+"partner."
 msgstr ""
-"Śledzi zidentyfikowane szanse biznesowe dla twoich kanałów sprzedaży."
+"Jeśli wybierzesz połączenie z istniejącą szansą, to szczegóły Sygnału (z "
+"historią komunikacji) zostaną włączone do szansy wybranego partnera."
 
 #. module: crm
-#: view:crm.meeting:0
-msgid "Exception Dates"
-msgstr "Daty wyjątków"
+#: selection:crm.meeting,class:0
+msgid "Public"
+msgstr "Publiczne"
 
 #. module: crm
-#: selection:crm.case.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Data ostatniej akcji"
+#: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
+#: model:ir.ui.menu,name:crm.menu_crm_case_resource_type_act
+msgid "Campaigns"
+msgstr "Kampanie"
 
 #. module: crm
-#: view:crm.job:0
-msgid "Appreciation"
-msgstr "Ocena"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_job3
-msgid "Second Interview"
-msgstr "Druga rozmowa kwalifikacyjna"
-
-#. module: crm
-#: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe
-msgid "Subscribe to a Remote calendar"
-msgstr "Zapisz się do zdalnego kalendarza"
-
-#. module: crm
-#: model:ir.actions.act_window,name:crm.crm_case_categ-act
-#: model:ir.ui.menu,name:crm.menu_crm_case_categ-act
+#: model:ir.actions.act_window,name:crm.crm_lead_categ_action
+#: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
+#: model:ir.ui.menu,name:crm.menu_crm_lead_categ
 msgid "Categories"
 msgstr "Kategorie"
 
 #. module: crm
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#, python-format
-msgid "Warning!"
-msgstr "Uwaga!"
-
-#. 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
 msgid "Dates"
 msgstr "Daty"
 
 #. module: crm
-#: view:crm.segmentation:0
-msgid "Segmentation Test"
-msgstr "Test segmentacji"
+#: help:crm.lead,optout:0
+msgid ""
+"If opt-out is checked, this contact has refused to receive emails or "
+"unsubscribed to a campaign."
+msgstr ""
+"Jeśli zaznaczono Odmowa to znaczy, że kontakt odmówił przyjmowania maili lub "
+"wypisał się z kampanii."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
@@ -359,51 +351,39 @@ msgid "Prospect Partner"
 msgstr "Potencjalny partner"
 
 #. module: crm
-#: view:crm.fundraising:0
-#: view:crm.opportunity:0
-msgid "Description Information"
-msgstr "Informacja opisowa"
-
-#. module: crm
-#: view:crm.lead:0
+#: field:crm.lead,contact_name:0
 msgid "Contact Name"
 msgstr "Nazwa kontaktu"
 
 #. module: crm
-#: selection:crm.lead.opportunity_set,create_partner,action:0
-#: selection:crm.phonecall.opportunity_set,create_partner,action:0
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2partner,action:0
+#: selection:crm.phonecall2partner,action:0
 msgid "Link to an existing partner"
 msgstr "Połączenie do utworzonego partnera"
 
 #. module: crm
-#: field:crm.case.rule,trg_date_range_type:0
-msgid "Delay type"
-msgstr "Typ opóźnienia"
-
-#. 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.meeting:0
+#: field:crm.phonecall,partner_contact:0
 msgid "Contact"
 msgstr "Kontakt"
 
 #. module: crm
-#: view:crm.job:0
-msgid "Next Interview"
-msgstr "Następna rozmowa kwalifikacyjna"
+#: field:crm.case.stage,on_change:0
+msgid "Change Probability Automatically"
+msgstr "Zmieniaj automatycznie prawdopodobieństwo"
 
 #. module: crm
-#: field:crm.case.rule,regex_history:0
+#: field:base.action.rule,regex_history:0
 msgid "Regular Expression on Case History"
 msgstr "Wyrażenie regularne dla historii sprawy"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_email_add_cc
-msgid "Email Add CC"
-msgstr "DW w email"
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The lead '%s' has been opened."
+msgstr "Sygnał '%s' został otwarty."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -411,279 +391,244 @@ msgid "Opportunity Meeting"
 msgstr "Spotkanie szansy"
 
 #. module: crm
-#: help:crm.case,canal_id:0
-msgid ""
-"The channels represent the different communication modes available with the "
-"customer. With each commercial opportunity, you can indicate the canall "
-"which is this opportunity source."
-msgstr ""
-"Kanały są różnymi, dostępnymi trybami komunikacji z klientem. Do każdej "
-"szansy możesz dowiązać kanał, który jest jej źródłem."
+#: help:crm.lead.report,delay_close:0
+#: help:crm.phonecall.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "Liczba dni do zamknięcia sprawy"
 
 #. module: crm
-#: view:crm.meeting:0
-msgid "Exception Rules"
-msgstr "Reguły wyjątku"
+#: model:process.node,note:crm.process_node_opportunities0
+msgid "When a real project/opportunity is detected"
+msgstr "Kiedy rzeczywisty projekt/szansa została wykryta"
 
 #. module: crm
-#: field:crm.menu.config_wizard,opportunity:0
-#: model:ir.actions.report.xml,name:crm.crm_business_opportunities_report
-msgid "Business Opportunities"
-msgstr "Szanse biznesowe"
+#: field:crm.installer,crm_fundraising:0
+msgid "Fundraising"
+msgstr "Zwiększenie funduszy"
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_claim1
-msgid "Accepted as Claim"
-msgstr "Zaakceptowano jako reklamację"
+#: view:res.partner:0
+#: field:res.partner,opportunity_ids:0
+msgid "Leads and Opportunities"
+msgstr "Sygnały i szanse"
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid ""
-"The rule use a AND operator. The case must match all non empty fields so "
-"that the rule execute the action described in the 'Actions' tab."
-msgstr ""
-"Reguła stosuje operator I. Sprawa musi pasować do wszystkich niepustych pól, "
-"aby została wykonana akcja zapisana w zakładce 'Akcje'."
+#: view:crm.send.mail:0
+msgid "_Send"
+msgstr "_Wyślij"
 
 #. module: crm
-#: field:crm.case,history_line:0
+#: view:crm.lead:0
 msgid "Communication"
 msgstr "Komunikacja"
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "%(email_from)s = Partner email"
-msgstr "%(email_from)s = Email partnera"
+#: field:crm.case.section,change_responsible:0
+msgid "Change Responsible"
+msgstr "Zmień odpowiedzialnego"
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_lead6
-msgid "Dead"
-msgstr "Martwe"
+#: field:crm.merge.opportunity,state:0
+msgid "Set State To"
+msgstr "Ustaw stan na"
 
 #. module: crm
-#: view:crm.meeting:0
-msgid "Confirm Meeting"
-msgstr "Potwierdź spotkanie"
+#: model:ir.model,name:crm.model_crm_lead2opportunity_action
+msgid "Convert/Merge Opportunity"
+msgstr "Konweruj/Połącz szansę"
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_lead1
-#: model:crm.case.categ,name:crm.categ_oppor1
-msgid "Existing Customer"
-msgstr "Istniejący klient"
+#: field:crm.lead,write_date:0
+msgid "Update Date"
+msgstr "Zaktualizuj datę"
 
 #. module: crm
-#: model:crm.case.category2,name:crm.category_meet2
-msgid "Home"
-msgstr "Dom"
+#: help:crm.meeting,count:0
+msgid "Repeat max that times"
+msgstr ""
 
 #. module: crm
-#: 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
-#: field:report.crm.case.section.categ.categ2,categ_id:0
-#: field:report.crm.case.section.categ.stage,categ_id:0
-#: field:report.crm.case.section.stage,categ_id:0
+#: view:crm.lead2opportunity.action:0
+#: field:crm.lead2opportunity.action,name:0
+msgid "Select Action"
+msgstr ""
+
+#. module: crm
+#: field:base.action.rule,trg_categ_id:0
+#: view:crm.lead:0
+#: field:crm.lead,categ_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,categ_id:0
+#: field:crm.opportunity2phonecall,categ_id:0
+#: field:crm.phonecall,categ_id:0
+#: field:crm.phonecall.report,categ_id:0
+#: field:crm.phonecall2phonecall,categ_id:0
 msgid "Category"
 msgstr "Kategoria"
 
 #. module: crm
-#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ_stage
-#: 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 "Sprawy wg sekcji, kategorii i etapów"
-
-#. module: crm
-#: help:crm.case.rule,act_mail_to_watchers:0
-msgid ""
-"Check this if you want the rule to mark CC(mail to any other person defined "
-"in actions)."
+#: view:crm.lead.report:0
+msgid "#Opportunities"
 msgstr ""
-"Zaznacz to, jeśli chcesz, aby reguła wysyłała wiadomość DW (mail do dowolnej "
-"osoby zdefiniowanej w akcji)."
 
 #. module: crm
-#: field:crm.meeting,class:0
+#: model:crm.case.resource.type,name:crm.type_oppor2
+msgid "Campaign 1"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_oppor1
+msgid "Campaign 2"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
 msgid "Privacy"
 msgstr "Prywatność"
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "%(partner)s = Partner name"
-msgstr "%(partner)s = Nazwa partnera"
-
-#. 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
-msgid "Action Information"
-msgstr "Informacja o akcji"
-
-#. module: crm
-#: view:crm.case.rule:0
-msgid "%(case_user_phone)s = Responsible phone"
-msgstr "%(case_user_phone)s = Telefon odpowiedzialnego"
-
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:crm.lead.report:0
+msgid "Opportunity Analysis"
 msgstr ""
-"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-"specjalnych !"
 
 #. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+#: help:crm.meeting,location:0
+msgid "Location of Event"
+msgstr ""
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "Conditions"
-msgstr "Warunki"
+#: field:crm.meeting,rrule:0
+msgid "Recurrent Rule"
+msgstr "Reguła rekurencyjna"
 
 #. module: crm
-#: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
-msgid "Open Cases"
-msgstr "Otwarte sprawy"
+#: help:crm.installer,fetchmail:0
+msgid "Allows you to receive E-Mails from POP/IMAP server."
+msgstr ""
 
 #. module: crm
-#: field:crm.case.log,name:0
-#: view:crm.claim:0
-#: view:crm.job:0
-msgid "Status"
-msgstr "Stan"
+#: model:process.transition,note:crm.process_transition_opportunitymeeting0
+msgid "Normal or phone meeting for opportunity"
+msgstr "Spotkanie albo rozmowa telefoniczna w sprawie szansy"
 
 #. module: crm
-#: wizard_view:crm.case.opportunity.partner_opportunity,init:0
-#: wizard_button:crm.case.opportunity.partner_opportunity,init,confirm:0
-#: wizard_button:crm.lead.opportunity_set,opportunity,confirm:0
-#: wizard_button:crm.phonecall.opportunity_set,opportunity,confirm:0
-#: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity
-#: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity1
+#: model:process.node,note:crm.process_node_leads0
+msgid "Very first contact with new prospect"
+msgstr "Pierwszy kontakt z tą okazją"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#: view:crm.lead2opportunity:0
+#: view:crm.partner2opportunity:0
+#: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
+#: model:ir.actions.act_window,name:crm.action_view_crm_partner2opportunity
+#: model:ir.actions.act_window,name:crm.crm_partner2opportunity
+#, python-format
 msgid "Create Opportunity"
 msgstr "Utwórz szansę"
 
 #. module: crm
-#: selection:report.crm.case.section.categ.categ2,month:0
-#: selection:report.crm.case.section.categ.stage,month:0
-#: selection:report.crm.case.section.categ2,month:0
-#: selection:report.crm.case.section.stage,month:0
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
 msgid "August"
 msgstr "Sierpień"
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Meetings Tree"
-msgstr "Drzewo spotkań"
-
 #. module: crm
 #: 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
+#: view:res.partner:0
 #, python-format
 msgid "Escalate"
 msgstr "Przekaż"
 
-#. module: crm
-#: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
-msgid "All Meetings"
-msgstr "Wszystkie spotkania"
-
 #. module: crm
 #: model:ir.module.module,shortdesc:crm.module_meta_information
 msgid "Customer & Supplier Relationship Management"
 msgstr "Zarządzanie relacjami z klientami i dostawcami"
 
 #. module: crm
-#: view:crm.email.add.cc:0
-#: model:ir.actions.act_window,name:crm.action_view_crm_email_add_cc_wizard
-msgid "Add CC"
-msgstr "Dodaj DW"
-
-#. module: crm
-#: selection:report.crm.case.section.categ.categ2,month:0
-#: selection:report.crm.case.section.categ.stage,month:0
-#: selection:report.crm.case.section.categ2,month:0
-#: selection:report.crm.case.section.stage,month:0
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
 msgid "June"
 msgstr "Czerwiec"
 
 #. module: crm
-#: field:crm.segmentation,som_interval_default:0
-msgid "Default (0=None)"
-msgstr "Domyślne (0=Nic)"
+#: selection:crm.segmentation,state:0
+msgid "Not Running"
+msgstr "Nie uruchomiony"
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_job7
-msgid "Refused by Company"
-msgstr "Odrzucone przez firmę"
+#: view:crm.send.mail:0
+#: model:ir.actions.act_window,name:crm.action_crm_reply_mail
+msgid "Reply to last Mail"
+msgstr ""
 
 #. module: crm
-#: field:crm.case,planned_revenue:0
-msgid "Planned Revenue"
-msgstr "Planowany dochód"
+#: field:crm.lead,email:0
+msgid "E-Mail"
+msgstr ""
 
 #. module: crm
-#: field:crm.case.section,allow_unlink:0
-msgid "Allow Delete"
-msgstr "Pozwól usuwać"
+#: field:crm.installer,wiki_sale_faq:0
+msgid "Sale FAQ"
+msgstr ""
 
 #. module: crm
-#: selection:report.crm.case.section.categ.categ2,month:0
-#: selection:report.crm.case.section.categ.stage,month:0
-#: selection:report.crm.case.section.categ2,month:0
-#: selection:report.crm.case.section.stage,month:0
+#: model:ir.model,name:crm.model_crm_send_mail_attachment
+msgid "crm.send.mail.attachment"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,count:0
+msgid "Count"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
 msgid "October"
 msgstr "Październik"
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_oppor3
-msgid "Value Proposition"
-msgstr "Propozycja wartości"
+#: view:crm.segmentation:0
+msgid "Included Answers :"
+msgstr ""
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "%(case_id)s = Case ID"
-msgstr "%(case_id)s = ID sprawy"
-
-#. module: crm
-#: model:crm.case.category2,name:crm.category_oppor2
-msgid "New Business"
-msgstr "Nowy biznes"
-
-#. module: crm
-#: help:crm.case,email_from:0
+#: help:crm.meeting,email_from:0
+#: help:crm.phonecall,email_from:0
 msgid "These people will receive email."
 msgstr "Ci ludzie otrzymają wiadomość"
 
 #. module: crm
-#: help:crm.case.section,calendar:0
-msgid "Allows to show calendar"
-msgstr "Pozwala pokazać kalendarz"
+#: view:crm.meeting:0
+#: field:crm.meeting,name:0
+msgid "Summary"
+msgstr ""
 
 #. module: crm
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
-msgid "   Today   "
-msgstr "   Dzisiaj   "
+#: view:crm.segmentation:0
+msgid "State of Mind Computation"
+msgstr "Obliczanie stanu emocji"
 
 #. module: crm
-#: wizard_view:crm.job.reschedule_phone_call,init:0
-#: wizard_view:crm.opportunity.reschedule_phone_call,init:0
-msgid "Phone Call Description"
-msgstr "Opis rozmowy telefonicznej"
+#: help:crm.case.section,change_responsible:0
+msgid ""
+"Thick this box if you want that on escalation, the responsible of this sale "
+"team automatically becomes responsible of the lead/opportunity escaladed"
+msgstr ""
+
+#. module: crm
+#: help:crm.installer,outlook:0
+#: help:crm.installer,thunderbird:0
+msgid ""
+"Allows you to link your e-mail to OpenERP's documents. You can attach it to "
+"any existing one in OpenERP or create a new one."
+msgstr ""
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -701,97 +646,63 @@ msgstr ""
 "było jeszcze żadnych zdarzeń."
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_claim3
-msgid "Policy Claims"
-msgstr "Reklamacja postępowania"
-
-#. module: crm
-#: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
-#, python-format
-msgid ""
-"You must define a responsible user for this case in order to use this action!"
+#: view:crm.segmentation:0
+msgid "Profiling Options"
 msgstr ""
-"Musisz zdefiniować użytkownika odpowiedzialnego za sprawę, aby zastosować tę "
-"akcję!"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "Assigned to"
-msgstr "Przypisano do"
+#: view:crm.phonecall.report:0
+msgid "#Phone calls"
+msgstr ""
 
 #. module: crm
-#: view:res.partner.events:0
-msgid "Partner Events"
-msgstr "Zdarzenia partnera"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_job4
-msgid "Contract Proposed"
-msgstr "Zaproponowano umowę"
-
-#. module: crm
-#: model:ir.ui.menu,name:crm.menu_crm_case_job_req_main
-msgid "Jobs - Hiring Process"
-msgstr "Praca - proces zatrudnienia"
-
-#. module: crm
-#: view:crm.case:0
-#: view:crm.claim:0
 #: view:crm.lead:0
-#: view:crm.opportunity:0
-msgid "Related Cases"
-msgstr "Sprawy powiązane"
-
-#. module: crm
-#: selection:report.crm.case.section.categ.categ2,month:0
-#: selection:report.crm.case.section.categ.stage,month:0
-#: selection:report.crm.case.section.categ2,month:0
-#: selection:report.crm.case.section.stage,month:0
-msgid "September"
-msgstr "Wrzesień"
-
-#. 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
 msgid "Communication history"
 msgstr "Historia komunikacji"
 
 #. module: crm
-#: view:crm.claim:0
-msgid "New Claims"
-msgstr "Nowe reklamacje"
+#: help:crm.phonecall,canal_id:0
+msgid ""
+"The channels represent the different communication                         "
+"modes available with the customer. With each commercial opportunity, you can "
+"indicate                         the canall which is this opportunity source."
+msgstr ""
 
 #. module: crm
-#: view:crm.meeting:0
-msgid "Meetings Form"
-msgstr "Formularz spotkań"
+#: code:addons/crm/crm_meeting.py:0
+#, python-format
+msgid "The meeting '%s' has been confirmed."
+msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_oppor5
-msgid "Negotiation/Review"
-msgstr "Negocjacje/Przegląd"
+#: field:crm.case.section,user_id:0
+msgid "Responsible User"
+msgstr "Użytkownik odpowiedzialny"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
+#: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
 #, python-format
 msgid "A partner is already defined on this phonecall."
 msgstr "Partner jest już zdefiniowany dla tej rozmowy."
 
 #. module: crm
-#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_stage
-msgid "Cases by Opportunities and Stage"
-msgstr "Sprawy wg szans i etapów"
+#: help:crm.case.section,reply_to:0
+msgid ""
+"The email address put in the 'Reply-To' of all emails sent by OpenERP about "
+"cases in this sales team"
+msgstr ""
 
 #. module: crm
-#: view:crm.claim:0
-msgid "Date of Claim"
-msgstr "Data reklamacji"
+#: view:res.users:0
+msgid "Current Activity"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -799,9 +710,36 @@ msgid "Partner Segmentation Lines"
 msgstr "Pozycje segmentacji partnera"
 
 #. module: crm
-#: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
-msgid "All Leads"
-msgstr "Wszystkie sygnały"
+#: help:crm.meeting,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the event "
+"alarm information without removing it."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+msgid "Details"
+msgstr ""
+
+#. module: crm
+#: help:crm.installer,crm_caldav:0
+msgid ""
+"Helps you to synchronize the meetings with other calendar clients and "
+"mobiles."
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Years"
+msgstr ""
+
+#. module: crm
+#: help:crm.installer,crm_claim:0
+msgid ""
+"Manages the suppliers and customers claims, including your corrective or "
+"preventive actions."
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -815,186 +753,9 @@ msgid "Partner Segmentation"
 msgstr "Segmentacja partnerów"
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_job5
-msgid "Contract Signed"
-msgstr "Umowę podpisano"
-
-#. module: crm
-#: wizard_view:caldav.crm.subscribe,init:0
-msgid "Subscribe to Remote ICS"
-msgstr "Powiąż ze zdalnym ICS"
-
-#. module: crm
-#: model:crm.case.category2,name:crm.category_oppor1
-msgid "Existing Business"
-msgstr "Istniejący biznes"
-
-#. module: crm
-#: field:crm.case,probability:0
-#: field:crm.case.categ,probability:0
-msgid "Probability (%)"
-msgstr "Prawdopodobieństwo (%)"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_lead
-msgid "Leads Cases"
-msgstr "Sprawy - sygnały"
-
-#. module: crm
-#: help:crm.case.section,reply_to:0
-msgid ""
-"The email address put in the 'Reply-To' of all emails sent by Open ERP about "
-"cases in this section"
+#: field:crm.lead.report,probable_revenue:0
+msgid "Probable Revenue"
 msgstr ""
-"Adres umieszczony w 'Reply-To' ('Odpowiedz na adres') dla wszystkich "
-"wiadomości wysłanych przez OpenERP w sprawach z tej sekcji"
-
-#. module: crm
-#: view:crm.case.rule:0
-#: model:ir.model,name:crm.model_crm_case_rule
-msgid "Case Rule"
-msgstr "Reguła sprawy"
-
-#. 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
-#: view:crm.phonecall:0
-#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor
-#, python-format
-msgid "Opportunity"
-msgstr "Szansa"
-
-#. 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
-msgid "Emails"
-msgstr "Wiadomości e-mail"
-
-#. module: crm
-#: model:crm.case.category2,name:crm.category_lead7
-msgid "Television"
-msgstr "Telewizja"
-
-#. module: crm
-#: view:crm.segmentation:0
-msgid "Stop Process"
-msgstr "Zatrzymaj proces"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_claim1
-msgid "Factual Claims"
-msgstr "Reklamacja rzeczowa"
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Search Phonecalls"
-msgstr "Przeszukaj rozmowy"
-
-#. module: crm
-#: wizard_button:crm.lead.opportunity_set,create_partner,create:0
-#: wizard_button:crm.phonecall.opportunity_set,create_partner,create:0
-msgid "Continue"
-msgstr "Dalej"
-
-#. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
-msgstr "Dni w okresie"
-
-#. module: crm
-#: field:crm.segmentation.line,expr_value:0
-msgid "Value"
-msgstr "Wartość"
-
-#. module: crm
-#: help:caldav.crm.export,init,name:0
-msgid "Save in .ics format"
-msgstr "Zapisz w formacie .ics"
-
-#. module: crm
-#: wizard_field:crm.new.send.mail,init,text:0
-#: wizard_field:crm.send.mail,init,text:0
-msgid "Message"
-msgstr "Wiadomość"
-
-#. module: crm
-#: help:crm.segmentation,exclusif:0
-msgid ""
-"Check if the category is limited to partners that match the segmentation "
-"criterions. If checked, remove the category from partners that doesn't match "
-"segmentation criterions"
-msgstr ""
-"Zaznacz to, jeśli kategoria ma być ograniczona do partnerów odpowiadających "
-"kryteriom segmentacji. Jeśli zaznaczone, to usuń kategorię z partnerów, "
-"którzy nie odpowiadają kryteriom segmentacji."
-
-#. module: crm
-#: field:crm.segmentation,exclusif:0
-msgid "Exclusive"
-msgstr "Wyłączny"
-
-#. module: crm
-#: help:crm.case,categ_id:0
-msgid ""
-"Category related to the section.Subdivide the CRM cases independently or "
-"section-wise."
-msgstr "Kategoria związana z sekcją. Ustala podział spraw wewnątrz w sekcji."
-
-#. module: crm
-#: field:crm.case.rule,act_state:0
-msgid "Set state to"
-msgstr "Ustaw stan na"
-
-#. module: crm
-#: code:addons/crm/crm.py:0
-#, python-format
-msgid "Email!"
-msgstr "Email!"
-
-#. module: crm
-#: model:crm.case.category2,name:crm.category_lead6
-msgid "Radio"
-msgstr "Radio"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_opportunity_assign_wizard
-msgid "crm.opportunity.assign_wizard"
-msgstr ""
-
-#. module: crm
-#: view:crm.case.rule:0
-msgid "Conditions on States"
-msgstr "Warunki dla stanów"
-
-#. module: crm
-#: field:crm.case.rule,trg_date_type:0
-msgid "Trigger Date"
-msgstr "Data wyzwolenia"
-
-#. module: crm
-#: view:crm.case.history:0
-msgid "Search Histories"
-msgstr "Przeszukuj historie"
-
-#. module: crm
-#: help:crm.case.stage,sequence:0
-msgid "Gives the sequence order when displaying a list of case stages."
-msgstr "Ustala kolejność wyświetlania listy spraw wg etapów."
-
-#. module: crm
-#: 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 "Szanse"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -1002,15 +763,221 @@ msgid "The name of the segmentation."
 msgstr "Nazwa segmentacji"
 
 #. module: crm
-#: field:crm.case.rule,trg_partner_categ_id:0
+#: field:crm.case.stage,probability:0
+#: field:crm.lead,probability:0
+msgid "Probability (%)"
+msgstr "Prawdopodobieństwo (%)"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Leads Generation"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+#: model:ir.ui.menu,name:crm.menu_board_statistics_dash
+msgid "Statistics Dashboard"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#: code:addons/crm/wizard/crm_partner_to_opportunity.py:0
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#: view:crm.lead:0
+#: selection:crm.lead,type:0
+#: selection:crm.lead.report,type:0
+#: field:crm.lead2opportunity,name:0
+#: field:crm.meeting,opportunity_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,opportunity_id:0
+#, python-format
+msgid "Opportunity"
+msgstr "Szansa"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead7
+msgid "Television"
+msgstr "Telewizja"
+
+#. module: crm
+#: field:crm.installer,crm_caldav:0
+msgid "Calendar Synchronizing"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Stop Process"
+msgstr "Zatrzymaj proces"
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Search Phonecalls"
+msgstr "Przeszukaj rozmowy"
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr "Dalej"
+
+#. module: crm
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr "Nazwa szansy"
+
+#. module: crm
+#: field:crm.meeting,byday:0
+msgid "By day"
+msgstr ""
+
+#. module: crm
+#: field:base.action.rule,act_section_id:0
+msgid "Set Team to"
+msgstr ""
+
+#. module: crm
+#: view:calendar.attendee:0
+#: field:calendar.attendee,categ_id:0
+msgid "Event Type"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_installer
+msgid "crm.installer"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,exclusif:0
+msgid "Exclusive"
+msgstr "Wyłączny"
+
+#. module: crm
+#: code:addons/crm/crm_opportunity.py:0
+#, python-format
+msgid "The opportunity '%s' has been won."
+msgstr ""
+
+#. module: crm
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
+
+#. module: crm
+#: model:ir.module.module,description:crm.module_meta_information
+msgid ""
+"The generic OpenERP Customer Relationship Management\n"
+"system enables a group of people to intelligently and efficiently manage\n"
+"leads, opportunities, meeting, phonecall etc.\n"
+"It manages key tasks such as communication, identification, prioritization,\n"
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and\n"
+"suppliers. It can automatically send reminders, escalate the request, "
+"trigger\n"
+"specific methods and lots of other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do "
+"anything\n"
+"special. They can just send email to the request tracker. OpenERP will take\n"
+"care of thanking them for their message, automatically routing it to the\n"
+"appropriate staff, and make sure all future correspondence gets to the "
+"right\n"
+"place.\n"
+"\n"
+"The CRM module has a email gateway for the synchronisation interface\n"
+"between mails and OpenERP. \n"
+"Create dashboard for CRM that includes:\n"
+"    * My Leads (list)\n"
+"    * Leads by Stage (graph)\n"
+"    * My Meetings (list)\n"
+"    * Sales Pipeline by Stage (graph)\n"
+"    * My Cases (list)\n"
+"    * Jobs Tracking (graph)\n"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,create_date:0
+#: field:crm.phonecall.report,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,ref2:0
+msgid "Reference 2"
+msgstr "Odnośnik 2"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Sales Purchase"
+msgstr "Sprzedaż-Zakupy"
+
+#. module: crm
+#: view:crm.case.stage:0
+#: field:crm.case.stage,requirements:0
+msgid "Requirements"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall2opportunity:0
+msgid "Convert To Opportunity "
+msgstr ""
+
+#. module: crm
+#: help:crm.case.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of case stages."
+msgstr "Ustala kolejność wyświetlania listy spraw wg etapów."
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.merge.opportunity,opportunity_ids:0
+#: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
+#: model:ir.ui.menu,name:crm.menu_crm_case_opp
+#: model:process.node,name:crm.process_node_opportunities0
+msgid "Opportunities"
+msgstr "Szanse"
+
+#. module: crm
 #: field:crm.segmentation,categ_id:0
 msgid "Partner Category"
 msgstr "Kategoria partnera"
 
 #. module: crm
-#: field:crm.segmentation,sales_purchase_active:0
-msgid "Use The Sales Purchase Rules"
-msgstr "Zastosuj reguły sprzedaży/zakupu"
+#: view:crm.add.note:0
+#: model:ir.actions.act_window,name:crm.action_crm_add_note
+msgid "Add Note"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,is_supplier_add:0
+msgid "Supplier"
+msgstr ""
+
+#. module: crm
+#: help:crm.send.mail,reply_to:0
+msgid "Reply-to of the Sales team defined on this case"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mark Won"
+msgstr ""
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1018,62 +985,37 @@ msgid "Purchase Amount"
 msgstr "Kwota zakupów"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "Direction"
-msgstr "Kierunek"
-
-#. module: crm
-#: 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"
+#: view:crm.lead:0
+msgid "Mark Lost"
 msgstr ""
-"Te osoby otrzymają kopie korespondencji pomiędzy partnerem i użytkownikiem."
 
 #. module: crm
-#: selection:report.crm.case.section.categ.categ2,month:0
-#: selection:report.crm.case.section.categ.stage,month:0
-#: selection:report.crm.case.section.categ2,month:0
-#: selection:report.crm.case.section.stage,month:0
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
 msgid "March"
 msgstr "Marzec"
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "Server Action to be Triggered"
-msgstr "Akcja serwera do wykonania"
-
-#. module: crm
-#: model:ir.actions.act_window,name:crm.crm_case_rule-act
-#: model:ir.ui.menu,name:crm.menu_crm_case_rule-act
-msgid "Rules"
-msgstr "Reguły"
-
-#. module: crm
-#: wizard_view:crm.job.meeting_set,init:0
-#: wizard_view:crm.phonecall.meeting_set,init:0
-msgid "Plan Meeting"
-msgstr "Zaplanuj spotkanie"
-
-#. module: crm
-#: wizard_field:crm.new.send.mail,init,state:0
-msgid "Set State to"
-msgstr "Ustaw stan na"
-
-#. module: crm
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
+#: code:addons/crm/crm_lead.py:0
 #, python-format
-msgid "There is no mail to reply!"
-msgstr "Nie ma wiadomości do odpowiedzi"
+msgid "The opportunity '%s' has been closed."
+msgstr ""
 
 #. module: crm
-#: wizard_button:crm.job.partner_create,init,confirm:0
-#: wizard_button:crm.lead.partner_create,init,confirm:0
-#: wizard_button:crm.phonecall.partner_create,init,confirm:0
-#: model:ir.actions.wizard,name:crm.wizard_crm_job_partner_create
-#: model:ir.actions.wizard,name:crm.wizard_crm_lead_partner_create
-#: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_partner_create
+#: field:crm.lead,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Show time as"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#: view:crm.phonecall2partner:0
+#, python-format
 msgid "Create Partner"
 msgstr "Utwórz partnera"
 
@@ -1083,376 +1025,267 @@ msgid "<"
 msgstr "<"
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "%(case_description)s = Case description"
-msgstr "%(case_description)s = Opis sprawy"
-
-#. module: crm
-#: view:crm.fundraising:0
-msgid "My Funds"
-msgstr "Moje fundusze"
-
-#. module: crm
-#: field:crm.case,partner_mobile:0
+#: field:crm.lead,mobile:0
+#: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Tel. komórkowy"
 
 #. module: crm
-#: field:crm.case.rule,name:0
-#: field:crm.segmentation.line,name:0
-msgid "Rule Name"
-msgstr "Nazwa reguły"
+#: view:crm.lead:0
+msgid "Next Stage"
+msgstr ""
 
 #. module: crm
-#: field:crm.case,planned_cost:0
-msgid "Planned Costs"
-msgstr "Planowane koszty"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_case_history
-msgid "Case history"
-msgstr "Historia sprawy"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_job2
-msgid "Junior Developer"
-msgstr "Młodszy inżynier"
-
-#. module: crm
-#: view:crm.meeting:0
+#: view:board.board:0
 msgid "My Meetings"
 msgstr "Moje spotkania"
 
 #. module: crm
-#: field:crm.case.categ,name:0
-msgid "Case Category Name"
-msgstr "Nazwa kategorii sprawy"
+#: field:crm.lead,ref:0
+msgid "Reference"
+msgstr "Numer"
 
 #. module: crm
-#: model:crm.case.category2,name:crm.category_claim2
-msgid "Preventive"
-msgstr "Działania prewencyjne"
+#: field:crm.lead,optin:0
+msgid "Opt-In"
+msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,act_email_cc:0
-msgid "Add watchers (Cc)"
-msgstr "Dodaj obserwatorów (DW)"
-
-#. module: crm
-#: wizard_view:caldav.crm.export,init:0
-msgid "Export ICS"
-msgstr "Eksportuj ICS"
-
-#. 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_phonecall.py:0
-#, python-format
-msgid "You can not assign Closed Case."
-msgstr "Nie możesz przypisać do zamkniętej sprawy"
-
-#. module: crm
-#: help:crm.case.rule,act_remind_partner:0
-msgid ""
-"Check this if you want the rule to send a reminder by email to the partner."
-msgstr ""
-"Zaznacz, jeśli chcesz, aby reguła wysyłała przypomnienie mailem do partnera."
-
-#. module: crm
-#: 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
+#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:0
 #: view:crm.meeting:0
+#: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_meeting_new
+#: model:ir.actions.act_window,name:crm.crm_case_categ_meet
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
+#: model:ir.ui.menu,name:crm.menu_meeting_sale
+#: view:res.partner:0
+#: field:res.partner,meeting_ids:0
 #, python-format
 msgid "Meetings"
 msgstr "Spotkania"
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Warunki dla pól sprawy"
-
-#. module: crm
-#: field:crm.case,date_action_next:0
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
 msgid "Next Action"
 msgstr "Następna akcja"
 
 #. module: crm
-#: view:crm.case:0
-#: field:crm.case,date_deadline:0
-#: selection:crm.case.rule,trg_date_type:0
-#: view:crm.opportunity:0
+#: field:crm.meeting,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Extended Options..."
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,date_deadline:0
 msgid "Deadline"
 msgstr "Termin"
 
 #. module: crm
-#: wizard_button:caldav.crm.export,init,end:0
-#: wizard_button:caldav.crm.import,init,end:0
-#: wizard_button:caldav.crm.subscribe,init,end:0
+#: view:crm.add.note:0
+#: view:crm.merge.opportunity:0
+#: view:crm.opportunity2phonecall:0
+#: view:crm.partner2opportunity:0
+#: view:crm.phonecall2opportunity:0
+#: view:crm.phonecall2phonecall:0
+#: view:crm.send.mail:0
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#. module: crm
-#: field:crm.case,category2_id:0
-msgid "Category Name"
-msgstr "Nazwa kategorii"
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
 msgstr "Segmentacja partnera"
 
 #. module: crm
-#: view:crm.meeting:0
-msgid "Recurrency Rule"
-msgstr "Reguła rekurencyjna"
+#: view:res.partner:0
+msgid "Previous"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_case_categ
-msgid "Category of case"
-msgstr "Kategoria sprawy"
+#: view:crm.lead:0
+msgid "Statistics"
+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
-#: wizard_field:crm.send.mail,init,subject:0
-msgid "Subject"
-msgstr "Temat"
-
-#. module: crm
-#: field:crm.meeting,attendees:0
+#: field:crm.meeting,attendee_ids:0
 msgid "Attendees"
 msgstr "Uczestnicy"
 
 #. module: crm
-#: model:ir.module.module,description:crm.module_meta_information
-msgid ""
-"The generic Open ERP Customer Relationship Management\n"
-"system enables a group of people to intelligently and efficiently manage\n"
-"leads, opportunities, tasks, issues, requests, bugs, campaign, claims, etc.\n"
-"It manages key tasks such as communication, identification, prioritization,\n"
-"assignment, resolution and notification.\n"
-"\n"
-"Open ERP ensures that all cases are successfully tracked by users, customers "
-"and\n"
-"suppliers. It can automatically send reminders, escalate the request, "
-"trigger\n"
-"specific methods and lots of others actions based on your enterprise own "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do "
-"anything\n"
-"special. They can just send email to the request tracker. Open ERP will "
-"take\n"
-"care of thanking them for their message, automatically routing it to the\n"
-"appropriate staff, and making sure all future correspondence gets to the "
-"right\n"
-"place.\n"
-"\n"
-"The CRM module has a email gateway for the synchronisation interface\n"
-"between mails and Open ERP."
+#: view:crm.lead2opportunity.action:0
+#: view:res.partner:0
+msgid "Next"
 msgstr ""
-"Podstawowy moduł Zarządzania Relacjami z Klientami (CRM) Open ERP\n"
-"pozwala grupie ludzi inteligentnie i efektywnie zarządzać sygnałami, "
-"szansami,\n"
-"zadaniami, problemami, zgłoszeniami, błędami, reklamacjami, kampaniami itp.\n"
-"Moduł zarządza kluczowymi dziedzinami jak komunikacja, identyfikacja, \n"
-"priorytezacja, powiązania i powiadamianie.\n"
-"\n"
-"OpenERP zapewnia, że sprawy są skutecznie obsługiwane przez \n"
-"użytkowników, klientów i dostawców. System automatycznie wysyła \n"
-"przypomnienia, przekazuje odpowiedzialność, wysyła zgłoszenia, wyzwala\n"
-"specjalne metody i wykonuje inne akcje na podstawie twoich własnych reguł.\n"
-"\n"
-"Najważniejszą cechą systemu jest, że klient nie musi wykonywać żadnych \n"
-"specjalnych czynności. Wystarczy, że wyśle wiadomość do centrum zgłoszeń.\n"
-"OpenERP podziękuje za wiadomość, przekieruje ją do odpowiednich osób i \n"
-"zapewni, że cała przyszła korespondencja trafi w odpowiednie miejsce.\n"
-"\n"
-"Moduł CRM zawiera bramę korespondencyjną do łączenia OpenERP z \n"
-"systemem pocztowym."
 
 #. module: crm
-#: model:process.transition,note:crm.process_transition_leadpartner0
-msgid "Prospect is converting to business partner"
-msgstr "Partner potencjalny jest konwertowany do partnera biznesowego."
+#: view:crm.lead:0
+msgid "Stage:"
+msgstr ""
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "Regex on Case Name"
-msgstr "Wyrażenie regularne dla nazwy sprawy"
+#: model:crm.case.stage,name:crm.stage_lead5
+#: view:crm.lead:0
+msgid "Won"
+msgstr ""
 
 #. module: crm
-#: view:crm.claim:0
-msgid "Pending Claims"
-msgstr "Oczekujące reklamacje"
+#: field:crm.lead.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr ""
 
 #. module: crm
-#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_stage
-msgid "Cases by Opportunities, Category and Stage"
-msgstr "Sprawy wg szans, kategorii i etapów"
+#: model:crm.case.section,name:crm.section_sales_department
+msgid "Sales Department"
+msgstr ""
 
 #. module: crm
-#: model:crm.case.category2,name:crm.category_lead4
-msgid "Print"
-msgstr "Drukuj"
+#: field:crm.send.mail,html:0
+msgid "HTML formatting?"
+msgstr ""
 
 #. module: crm
-#: field:crm.case,som:0
-#: field:crm.case.log,som:0
-#: selection:crm.segmentation.line,expr_name:0
-msgid "State of Mind"
-msgstr "Stan emocji"
-
-#. module: crm
-#: view:crm.claim:0
+#: field:crm.lead,type:0
+#: field:crm.lead.report,type:0
 #: view:crm.meeting:0
-#: field:report.crm.case.section.categ.categ2,category2_id:0
-#: field:report.crm.case.section.categ2,category2_id:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
 msgid "Type"
 msgstr "Typ"
 
-#. module: crm
-#: view:crm.job:0
-msgid "Candidate Refused"
-msgstr "Kandydat odrzucony"
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Compute Segmentation"
 msgstr "Oblicz segmentację"
 
+#. module: crm
+#: selection:crm.lead,priority:0
+#: selection:crm.lead.report,priority:0
+#: selection:crm.phonecall,priority:0
+#: selection:crm.phonecall.report,priority:0
+msgid "Lowest"
+msgstr "Najniższy"
+
+#. module: crm
+#: view:crm.add.note:0
+#: view:crm.send.mail:0
+#: field:crm.send.mail.attachment,binary:0
+msgid "Attachment"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
-msgid "Lead Email"
-msgstr "Email sygnału"
-
-#. module: crm
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-#: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
-#: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
-#: model:ir.ui.menu,name:crm.next_id_53
-msgid "Segmentations"
-msgstr "Segmentacje"
-
-#. module: crm
-#: selection:crm.case.rule,trg_date_type:0
+#: field:crm.lead,create_date:0
+#: field:crm.lead.report,creation_date:0
+#: field:crm.meeting,create_date:0
+#: field:crm.phonecall,create_date:0
+#: field:crm.phonecall.report,creation_date:0
 msgid "Creation Date"
 msgstr "Data utworzenia"
 
 #. module: crm
-#: view:crm.meeting:0
-#: view:crm.phonecall:0
-#: model:process.node,name:crm.process_node_meeting0
-msgid "Meeting"
-msgstr "Spotkanie"
+#: help:crm.meeting,interval:0
+msgid "Repeat every x"
+msgstr ""
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "%(partner_email)s = Partner email"
-msgstr "%(partner_email)s = Email partnera"
+#: model:crm.case.categ,name:crm.categ_oppor5
+msgid "Need a Website Design"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,recurrent_uid:0
+msgid "Recurrent ID"
+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
-msgid "Reset to Draft"
-msgstr "Przywróć do projektu"
+#: view:crm.meeting:0
+#: field:crm.send.mail,subject:0
+#: view:res.partner:0
+msgid "Subject"
+msgstr "Temat"
 
 #. module: crm
-#: model:ir.model,name:crm.model_report_crm_case_section_categ_categ2
-msgid "Cases by section, Category and Category2"
-msgstr "Sprawy wg sekcji, kategorii i kategorii2"
+#: field:crm.meeting,tu:0
+msgid "Tue"
+msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_oppor6
-msgid "Closed Won"
-msgstr "Zamknięte z sukcesem"
-
-#. module: crm
-#: model:ir.actions.act_window,name:crm.act_crm_case_categ_crm_case_opened
-#: model:ir.actions.act_window,name:crm.act_crm_case_section_crm_case_opened
-#: model:ir.actions.act_window,name:crm.act_res_partner_2_crm_case_opened
-#: model:ir.actions.act_window,name:crm.act_res_partner_canal_2_crm_case_opened
-#: model:ir.actions.act_window,name:crm.act_res_users_2_crm_case_opened
-msgid "Open cases"
-msgstr "Otwarte sprawy"
-
-#. module: crm
-#: 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
-#: field:report.crm.case.section.stage,stage_id:0
+#: view:crm.lead:0
+#: field:crm.lead,stage_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,stage_id:0
 msgid "Stage"
 msgstr "Etap"
 
+#. module: crm
+#: view:crm.lead:0
+msgid "History Information"
+msgstr ""
+
 #. module: crm
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 
 #. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the case "
-"section without removing it."
+#: field:base.action.rule,act_mail_to_partner:0
+msgid "Mail to Partner"
 msgstr ""
-"Jeśli pole aktywne jest ustawione na true (prawda), to będziesz mógł ukryć "
-"sekcję sprawy bez jej usuwania."
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_fund2
-msgid "Learning And Education"
-msgstr "Nauka i edukacja"
-
-#. module: crm
-#: wizard_view:crm.phonecall.opportunity_set,create_partner:0
-#: wizard_view:crm.phonecall.partner_create,init:0
-msgid "Are you sure you want to create a partner based on this phonecall ?"
+#: view:crm.lead:0
+msgid "Mailings"
 msgstr ""
-"Jesteś pewien, że chcesz utworzyć partnera na podstawie tej rozmowy ?"
 
 #. module: crm
+#: field:crm.meeting,class:0
+msgid "Mark as"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: crm
+#: view:base.action.rule:0
+msgid "Condition Case Fields"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
+#: field:crm.case.section,stage_ids:0
 #: view:crm.case.stage:0
 #: model:ir.actions.act_window,name:crm.crm_case_stage_act
-#: model:ir.ui.menu,name:crm.menu_crm_case_stage_act
+#: model:ir.actions.act_window,name:crm.crm_lead_stage_act
+#: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
 msgid "Stages"
 msgstr "Etapy"
 
 #. module: crm
-#: wizard_field:crm.case.opportunity.partner_opportunity,init,planned_revenue:0
-#: wizard_field:crm.lead.opportunity_set,opportunity,planned_revenue:0
-#: wizard_field:crm.phonecall.opportunity_set,opportunity,planned_revenue:0
+#: field:crm.lead,planned_revenue:0
+#: field:crm.lead2opportunity,planned_revenue:0
+#: field:crm.partner2opportunity,planned_revenue:0
+#: field:crm.phonecall2opportunity,planned_revenue:0
 msgid "Expected Revenue"
 msgstr "Spodziewany dochód"
 
 #. module: crm
-#: view:crm.meeting:0
-msgid "Meeting Date"
-msgstr "Data spotkania"
-
-#. module: crm
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.phonecall:0
-msgid "Convert to Partner"
-msgstr "Konwertuj do partnera"
-
-#. module: crm
-#: model:ir.actions.act_window,name:crm.crm_case_category_act_meetall3
-msgid "Next Meetings"
-msgstr "Następne spotkania"
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "September"
+msgstr "Wrzesień"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1460,55 +1293,61 @@ msgid "Max Partner ID processed"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0
-#, python-format
-msgid "You can not delete this case. You should better cancel it."
-msgstr "Nie możesz usunąć tej sprawy. Powinieneś ją raczej anulować."
-
-#. module: crm
-#: wizard_button:caldav.crm.subscribe,init,open:0
-msgid "_Subscribe"
-msgstr "_Subskrybuj"
-
-#. module: crm
-#: field:crm.case.rule,trg_priority_from:0
-msgid "Minimum Priority"
-msgstr "Minimalny priorytet"
-
-#. module: crm
-#: model:ir.actions.act_window,name:crm.crm_meeting_generic_wizard_act
-msgid "Meeting Generic Wizard"
-msgstr "Podstawowy kreator spotkań"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_claim2
-msgid "Value Claims"
-msgstr "Reklamacje wartości"
-
-#. module: crm
-#: wizard_view:caldav.crm.subscribe,display:0
-msgid "Message..."
-msgstr "Wiadomość..."
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall_assign_wizard
-msgid "crm.phonecall.assign_wizard"
+#: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
+#: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
+msgid "Phone Calls Analysis"
 msgstr ""
 
 #. module: crm
-#: view:report.crm.case.section.categ2:0
-msgid "Cases by Section and Category2"
-msgstr "Sprawy wg sekcji i kategorii2"
+#: field:crm.lead.report,opening_date:0
+#: field:crm.phonecall.report,opening_date:0
+msgid "Opening Date"
+msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr ""
+
+#. module: crm
+#: help:crm.installer,crm_helpdesk:0
+msgid "Manages a Helpdesk service."
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "Dni w okresie"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #, python-format
-msgid "done"
-msgstr "gotowe"
+msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Edit All"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,write_date:0
+msgid "Write Date"
+msgstr ""
 
 #. module: crm
 #: view:crm.meeting:0
-#: view:crm.phonecall:0
 msgid "Reminder"
 msgstr "Przypomnienie"
 
@@ -1522,97 +1361,81 @@ msgstr ""
 "Jeśli nie zaznaczone, to kryteria poniżej zostaną zignorowane."
 
 #. module: crm
-#: code:addons/crm/crm.py:0
-#, python-format
-msgid "open"
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall2partner:0
+#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
+#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
+msgid "Create a Partner"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.rule,act_remind_attach:0
-msgid "Remind with attachment"
-msgstr "Przypomnij z załącznikiem"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_lead6
-#: model:crm.case.categ,name:crm.categ_oppor6
-msgid "Website"
-msgstr "Strona WWW"
-
-#. module: crm
-#: field:crm.case.rule,act_remind_user:0
-msgid "Remind responsible"
-msgstr "Przypomnij odpowiedzialnym"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
 msgstr "Stan wykonania"
 
 #. module: crm
-#: help:crm.menu.config_wizard,jobs:0
-msgid ""
-"Helps you to organise the jobs hiring process: evaluation, meetings, email "
-"integration..."
+#: selection:crm.meeting,week_list:0
+msgid "Monday"
 msgstr ""
-"Pomaga organizować proces zatrudniania: ocena, spotkania, integracja "
-"wiadomości..."
 
 #. module: crm
-#: view:crm.fundraising:0
-msgid "Funds"
-msgstr "Fundusze"
+#: field:crm.lead,day_close:0
+msgid "Days to Close"
+msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0
-#, python-format
-msgid "draft"
-msgstr "wersja robocza"
+#: field:crm.add.note,attachment_ids:0
+#: field:crm.case.section,complete_name:0
+#: field:crm.send.mail,attachment_ids:0
+msgid "unknown"
+msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_claim5
-#: model:crm.case.stage,name:crm.stage_meet4
-msgid "Awaiting Response"
-msgstr "Oczekuje na odpowiedź"
+#: field:crm.lead,id:0
+#: field:crm.meeting,id:0
+#: field:crm.phonecall,id:0
+msgid "ID"
+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
+#: model:ir.model,name:crm.model_crm_partner2opportunity
+msgid "Partner To Opportunity"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.meeting,date:0
+#: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
+#: field:crm.phonecall,date:0
+#: field:crm.phonecall2phonecall,date:0
+#: view:res.partner:0
 msgid "Date"
 msgstr "Data"
 
 #. module: crm
-#: view:crm.job:0
-msgid "Candidate Name"
-msgstr "Nazwisko kandydata"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_lead2
-#: model:crm.case.categ,name:crm.categ_oppor2
-msgid "Self Generated"
-msgstr "Samogenerowane"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_claim3
-msgid "Won't fix"
-msgstr "Nie do naprawienia"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead4
-msgid "Converted"
-msgstr "Skonwertowano"
-
-#. 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
-msgid "Reply to Last Email"
-msgstr "Odpowiedz na ostatnią wiadomość"
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Search"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,interval:0
+msgid "Interval"
+msgstr ""
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1620,135 +1443,85 @@ msgid "Segmentation Description"
 msgstr "Opis segmentacji"
 
 #. module: crm
-#: help:crm.meeting,location:0
-msgid "Gives Location of Meeting"
-msgstr "Ustala miejsce spotkania"
-
-#. 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:res.partner:0
 msgid "History"
 msgstr "Historia"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_job
-msgid "Job Cases"
-msgstr "Sprawy rekrutacji"
+#: field:crm.case.section,code:0
+msgid "Code"
+msgstr ""
 
 #. module: crm
-#: view:crm.job:0
-msgid "Jobs - Recruitment Tree"
-msgstr "Praca - Drzewo rekrutacji"
+#: field:crm.case.section,child_ids:0
+msgid "Child Teams"
+msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,regex_name:0
-msgid "Regular Expression on Case Name"
-msgstr "Wyrażenie regularne dla nazwy sprawy"
-
-#. module: crm
-#: 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
+#: view:crm.lead:0
+#: field:crm.lead,state:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,state:0
+#: view:crm.meeting:0
+#: field:crm.meeting,state:0
+#: field:crm.phonecall,state:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,state:0
 msgid "State"
 msgstr "Stan"
 
 #. module: crm
-#: view:crm.case:0
-msgid "Send Reminder"
-msgstr "Wyślij przypomnienie"
+#: model:crm.case.resource.type,name:crm.type_lead1
+msgid "Telesales"
+msgstr "Telesprzedaż"
+
+#. module: crm
+#: field:crm.meeting,freq:0
+msgid "Frequency"
+msgstr ""
 
 #. module: crm
-#: view:crm.case:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
 #: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "References"
 msgstr "Odnośniki"
 
 #. module: crm
 #: 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.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.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
-#: view:crm.opportunity.assign_wizard:0
-#: wizard_button:crm.opportunity.reschedule_phone_call,init,end:0
+#: view:crm.lead2opportunity:0
+#: view:crm.lead2opportunity.action:0
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.meeting: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
-#: wizard_button:crm.phonecall.partner_create,init,end:0
-#: wizard_button:crm.send.mail,init,end:0
+#: view:crm.phonecall2partner:0
+#: view:res.partner:0
 #, python-format
 msgid "Cancel"
 msgstr "Anuluj"
 
 #. module: crm
-#: code:addons/crm/crm.py:0
-#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Brak ID email dla adresu twojej firmy !"
+#: model:ir.model,name:crm.model_res_users
+msgid "res.users"
+msgstr ""
 
 #. module: crm
-#: view:crm.fundraising:0
-msgid "Search Funds"
-msgstr "Przeszukaj fundusze"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge two Opportunities"
+msgstr ""
 
 #. module: crm
-#: view:crm.claim:0
-msgid "Type of claim"
-msgstr "Typ reklamacji"
-
-#. module: crm
-#: view:crm.case:0
-msgid "Helpdesk Support Tree"
-msgstr "Drzewo wsparcia helpdesku"
-
-#. module: crm
-#: view:res.partner.events:0
-msgid "General Description"
-msgstr "Ogólny opis"
+#: selection:crm.meeting,rrule_type:0
+msgid "Custom"
+msgstr ""
 
 #. module: crm
+#: view:crm.lead:0
 #: view:crm.meeting:0
-msgid "Other Info"
-msgstr "Inne informacje"
-
-#. module: crm
-#: view:crm.claim:0
-msgid "Claim Cost"
-msgstr "Koszt reklamacji"
-
-#. module: crm
-#: view:crm.job:0
-#: view:crm.opportunity:0
-msgid "Schedule a Phone Call"
-msgstr "Zaplanuj rozmowę"
-
-#. module: crm
-#: field:crm.case,ref:0
-msgid "Reference"
-msgstr "Numer"
+#: view:crm.phonecall:0
+msgid "Current"
+msgstr ""
 
 #. module: crm
 #: field:crm.meeting,exrule:0
@@ -1756,39 +1529,34 @@ msgid "Exception Rule"
 msgstr "Reguła wyjątku"
 
 #. module: crm
-#: help:crm.case.rule,act_mail_to_partner:0
+#: help:base.action.rule,act_mail_to_partner:0
 msgid "Check this if you want the rule to send an email to the partner."
 msgstr "Zaznacz to, jeśli chcesz aby reguła wysyłała wiadomość do partnera."
 
 #. module: crm
-#: model:crm.case.category2,name:crm.category_lead2
-msgid "Mail"
+#: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
+msgid "Phonecall Categories"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,act_priority:0
-msgid "Set priority to"
-msgstr "Ustaw priorytet na"
+#: view:crm.meeting:0
+msgid "Invite People"
+msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_oppor2
-msgid "Needs Analysis"
-msgstr "Wymaga analizy"
+#: view:board.board:0
+msgid "Opportunities By Categories"
+msgstr ""
 
 #. module: crm
-#: view:crm.claim:0
-msgid "Search Claims"
-msgstr "Przeszukaj reklamacje"
+#: constraint:crm.case.section:0
+msgid "Error ! You cannot create recursive Sales team."
+msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,act_mail_body:0
-msgid "Mail body"
-msgstr "Treść wiadomości"
-
-#. module: crm
-#: help:crm.menu.config_wizard,meeting:0
-msgid "Manages the calendar of meetings of the users."
-msgstr "Zarządza kalendarzem spotkań użytkownika"
+#: view:crm.meeting:0
+msgid "Search Meetings"
+msgstr "Przeszukuj spotkania"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1796,14 +1564,10 @@ msgid "Sale Amount"
 msgstr "Kwota sprzedaży"
 
 #. 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
-msgid "Add a CC"
-msgstr "Dodaj DW"
+#: code:addons/crm/wizard/crm_send_email.py:0
+#, python-format
+msgid "Unable to send mail. Please check SMTP is configured properly."
+msgstr ""
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1811,75 +1575,74 @@ msgid "="
 msgstr ""
 
 #. module: crm
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: field:crm.menu.config_wizard,name:0
+#: selection:crm.meeting,state:0
+msgid "Unconfirmed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.categ,name:0
+#: field:crm.installer,name:0
+#: field:crm.lead,name:0
 #: field:crm.segmentation,name:0
+#: field:crm.send.mail.attachment,name:0
 msgid "Name"
 msgstr "Nazwa"
 
-#. module: crm
-#: view:crm.opportunity:0
-msgid "Sales Stage"
-msgstr "Etap sprzedaży"
-
 #. module: crm
 #: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
 msgstr "Przypomnienie"
 
 #. module: crm
-#: field:crm.case.rule,act_mail_to_watchers:0
-msgid "Mail to watchers (CC)"
-msgstr "Wiadomość dla obserwatorów (DW)"
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
+msgstr "Zaplanuj zwykłe spotkanie albo telefoniczne"
 
 #. module: crm
-#: view:crm.fundraising:0
-#: view:crm.meeting:0
-msgid "Next Meeting"
-msgstr "Następne spotkanie"
-
-#. module: crm
-#: code:addons/crm/crm.py:0
-#, python-format
-msgid ""
-"No E-Mail ID Found for your Company address or missing reply address in "
-"section!"
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "My Case(s)"
 msgstr ""
-"Nie znaleziono ID email dla adresu twojej firmy lub brak adresu zwrotnego w "
-"sekcji!"
 
 #. module: crm
-#: help:crm.case.section,allow_unlink:0
-msgid "Allows to delete non draft cases"
-msgstr "Pozwala usuwać sprawy inne niż w stanie projekt"
+#: field:crm.lead,birthdate:0
+msgid "Birthdate"
+msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_oppor7
-msgid "Closed Lost"
-msgstr "Zamknięte z porażką"
+#: view:crm.meeting:0
+msgid "The"
+msgstr ""
 
 #. module: crm
-#: field:crm.menu.config_wizard,bugs:0
-msgid "Bug Tracking"
-msgstr "Obsługa błędów"
+#: field:crm.send.mail.attachment,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: crm
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,section_id:0
+msgid ""
+"Sales team to which this case belongs to. Defines responsible user and e-"
+"mail address for the mail gateway."
+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.opportunity:0
-msgid "Actions"
-msgstr "Akcje"
+#: view:crm.phonecall:0
+msgid "Creation"
+msgstr ""
 
 #. module: crm
-#: 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
+#: selection:crm.lead,priority:0
+#: selection:crm.lead.report,priority:0
+#: selection:crm.phonecall,priority:0
+#: selection:crm.phonecall.report,priority:0
 msgid "High"
 msgstr "Wysoki"
 
@@ -1889,161 +1652,181 @@ msgid "Convert to prospect to business partner"
 msgstr "Konwertuj potencjalnego do partnera biznesowego"
 
 #. module: crm
-#: view:crm.claim:0
-msgid "In Progress Claims"
-msgstr "Reklamacje w toku"
-
-#. module: crm
-#: model:ir.actions.wizard,name:crm.wizard_crm_set_rrule
-msgid "Set RRULE"
+#: view:crm.phonecall2opportunity:0
+msgid "_Convert"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_oppor4
-msgid "Proposal/Price Quote"
-msgstr "Propozycja/Oferta ceny"
+#: selection:crm.meeting,week_list:0
+msgid "Saturday"
+msgstr ""
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "Delay After Trigger Date:"
-msgstr "Opóźnienie po dacie wyzwolenia"
+#: selection:crm.meeting,byday:0
+msgid "Fifth"
+msgstr ""
 
 #. module: crm
-#: model:crm.case.category2,name:crm.category_lead5
-msgid "Web"
-msgstr "WWW"
+#: view:crm.phonecall2phonecall:0
+msgid "_Schedule"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,delay_close:0
+msgid "Delay to Close"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,we:0
+msgid "Wed"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor6
+msgid "Potential Reseller"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Planowany dochód"
 
 #. module: crm
 #: view:crm.lead:0
-msgid "Campaign Type"
-msgstr "Typ kampanii"
-
-#. module: crm
-#: view:crm.segmentation:0
-msgid "State of Mind Computation"
-msgstr "Obliczanie stanu emocji"
-
-#. module: crm
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
-#, python-format
-msgid "Error"
-msgstr "Błąd"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_meeting_generic_wizard
-msgid "crm.meeting.generic_wizard"
+#: view:crm.lead.report:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.act_window,name:crm.crm_case_history-act
-msgid "Histories"
-msgstr "Historie"
-
-#. module: crm
-#: model:crm.case.category2,name:crm.category_job1
-msgid "Graduate"
-msgstr "Wykształcenie"
-
-#. module: crm
-#: wizard_view:crm.job.meeting_set,init:0
-#: wizard_view:crm.phonecall.meeting_set,init:0
-msgid ""
-"Note that you can also use the calendar view to graphically schedule your "
-"next meeting."
+#: help:crm.lead,partner_id:0
+msgid "Optional linked partner, usually after conversion of the lead"
 msgstr ""
-"Zauważ, że możesz stosować kalendarz do graficznego planowania spotkań."
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Leads Tree"
-msgstr "Drzewo sygnałów"
-
-#. module: crm
-#: field:crm.meeting,caldav_url:0
-msgid "Caldav URL"
-msgstr "Caldav URL"
 
 #. module: crm
 #: view:crm.meeting:0
-msgid "Attendee"
-msgstr "Uczestnik"
+msgid "Invitation details"
+msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0
+#: field:crm.case.section,parent_id:0
+msgid "Parent Team"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Uruchomione"
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Hours"
+msgstr "Godziny"
+
+#. module: crm
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
 #, python-format
-msgid "Email Fail!"
-msgstr "Błąd wiadomości"
+msgid "The case '%s' has been opened."
+msgstr ""
+
+#. module: crm
+#: view:crm.installer:0
+msgid "title"
+msgstr ""
 
 #. module: crm
 #: 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"
 msgstr "Przychodzące"
 
 #. module: crm
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive sections."
-msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych sekcji."
-
-#. module: crm
-#: model:ir.ui.menu,name:crm.menu_crm
-msgid "CRM & SRM"
-msgstr ""
-
-#. module: crm
-#: help:crm.menu.config_wizard,document_ics:0
+#: help:crm.case.stage,probability:0
 msgid ""
-" Will allow you to synchronise your Open ERP calendars with your phone, "
-"outlook, Sunbird, ical, ..."
+"This percentage depicts the default/average probability of the Case for this "
+"stage to be a success"
 msgstr ""
-" Pozwoli ci synchronizować kalendarze OpenERP z twoim telefonem, outlook, "
-"Sunbird, ical, ..."
 
 #. 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
-msgid "This Year"
-msgstr "Ten rok"
+#: view:crm.phonecall.report:0
+#: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
+msgid "Phone calls"
+msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,act_remind_partner:0
-msgid "Remind Partner"
-msgstr "Przypomnij partnerowi"
+#: selection:crm.meeting,show_as:0
+msgid "Free"
+msgstr ""
 
 #. module: crm
-#: 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
+#: view:crm.installer:0
+msgid "Synchronization"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,allow_unlink:0
+msgid "Allow Delete"
+msgstr "Pozwól usuwać"
+
+#. module: crm
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead,priority:0
+#: selection:crm.lead.report,priority:0
+#: selection:crm.phonecall,priority:0
+#: selection:crm.phonecall.report,priority:0
 msgid "Highest"
 msgstr "Najwyższy"
 
 #. module: crm
-#: view:crm.job:0
-msgid "Contract Data"
-msgstr "Data umowy"
+#: view:crm.case.section:0
+#: view:crm.lead:0
+#: field:crm.lead,description:0
+msgid "Notes"
+msgstr ""
 
 #. module: crm
-#: selection:crm.case.rule,trg_date_range_type:0
+#: selection:crm.meeting,freq:0
 msgid "Days"
 msgstr "Dni"
 
 #. module: crm
-#: help:crm.menu.config_wizard,bugs:0
-msgid "Used by companies to track bugs and support requests on software"
-msgstr ""
-"Stosowane przez firmy do śledzenia błędów i zgłoszeń do wsparcia dla "
-"oprogramowania"
+#: field:crm.segmentation.line,expr_value:0
+msgid "Value"
+msgstr "Wartość"
 
 #. module: crm
-#: field:crm.menu.config_wizard,document_ics:0
-msgid "Shared Calendar"
-msgstr "Współdzielony kalendarz"
+#: view:crm.lead:0
+#: view:crm.lead.report:0
+msgid "Opportunity by Categories"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,partner_name:0
+msgid "Customer Name"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2opportunity
+msgid "Phonecall To Opportunity"
+msgstr ""
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
@@ -2051,110 +1834,110 @@ msgid "Reply-To"
 msgstr "Odpowiedz do"
 
 #. module: crm
-#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ
-msgid "Cases by Leads and Type"
-msgstr "Sprawy wg sygnałów i typów"
-
-#. module: crm
-#: selection:crm.case.rule,trg_date_range_type:0
+#: selection:crm.meeting,freq:0
 msgid "Minutes"
 msgstr "Minuty"
 
 #. module: crm
-#: field:report.crm.case.section.categ2,amount_revenue:0
-#: field:report.crm.case.section.stage,amount_revenue:0
-msgid "Est.Revenue"
-msgstr "Szac. dochód"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_job1
-msgid "Initial Jobs Demand"
-msgstr "Potrzeba stanowiska"
-
-#. module: crm
-#: field:crm.case.rule,trg_priority_to:0
-msgid "Maximim Priority"
-msgstr "Maksymalny priorytet"
-
-#. module: crm
-#: selection:crm.meeting,transparent:0
-msgid "OPAQUE"
+#: view:crm.case.section:0
+msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: view:crm.claim:0
-msgid "Claims Info"
-msgstr "Informacja o reklamacji"
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
 
 #. module: crm
-#: field:crm.case.category2,name:0
-msgid "Case Category2 Name"
-msgstr "Nazwa kategorii2 sprawy"
+#: model:process.transition,note:crm.process_transition_leadpartner0
+msgid "Prospect is converting to business partner"
+msgstr "Partner potencjalny jest konwertowany do partnera biznesowego."
 
 #. module: crm
-#: wizard_view:crm.lead.opportunity_set,opportunity:0
-#: wizard_view:crm.phonecall.opportunity_set,opportunity:0
-#: model:ir.actions.wizard,name:crm.wizard_crm_lead_opportunity_set
-#: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_opportunity_set
+#: view:crm.lead2opportunity:0
+#: view:crm.partner2opportunity:0
+#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert To Opportunity"
 msgstr "Konwertuj do szansy"
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_phone2
 #: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+#: view:res.partner:0
 msgid "Held"
 msgstr "Odebrane"
 
 #. module: crm
-#: view:crm.case:0
-msgid "Helpdesk Supports"
-msgstr "Wsparcie helpdesk"
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+msgid "Reset to Draft"
+msgstr "Przywróć do projektu"
 
 #. module: crm
-#: model:crm.case.section,name:crm.section_support4
-#: model:ir.ui.menu,name:crm.menu_crm_case_fund_raise
-msgid "Fund Raising"
-msgstr "Zwiększenie funduszu"
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "Dodatkowe informacje"
 
 #. module: crm
-#: selection:crm.new.send.mail,init,state:0
-msgid "Unchanged"
-msgstr "Niezmienione"
+#: view:crm.merge.opportunity:0
+#: model:ir.actions.act_window,name:crm.action_merge_opportunities
+#: model:ir.actions.act_window,name:crm.merge_opportunity_act
+msgid "Merge Opportunities"
+msgstr ""
 
 #. module: crm
-#: wizard_view:crm.job.partner_create,init:0
-#: wizard_view:crm.lead.opportunity_set,create_partner:0
-#: wizard_view:crm.lead.partner_create,init:0
-#: wizard_view:crm.phonecall.opportunity_set,create_partner:0
-#: wizard_view:crm.phonecall.partner_create,init:0
-msgid "Convert To Partner"
-msgstr "Konwertuj do partnera"
+#: model:crm.case.resource.type,name:crm.type_lead5
+msgid "Google Adwords"
+msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,trg_state_from:0
-msgid "Case State"
-msgstr "Stan sprawy"
+#: model:ir.model,name:crm.model_crm_phonecall
+msgid "crm.phonecall"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead3
+msgid "Mail Campaign 2"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead2
+msgid "Mail Campaign 1"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Create"
+msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Send"
 msgstr "Wyślij"
 
 #. module: crm
-#: field:crm.case,priority:0
-#: view:crm.fundraising:0
 #: view:crm.lead:0
-#: view:crm.opportunity:0
+#: field:crm.lead,priority:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,priority:0
+#: field:crm.phonecall,priority:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,priority:0
 msgid "Priority"
 msgstr "Priorytet"
 
 #. module: crm
-#: view:crm.opportunity:0
-msgid "Source"
-msgstr "Źródło"
+#: field:crm.segmentation,sales_purchase_active:0
+msgid "Use The Sales Purchase Rules"
+msgstr "Zastosuj reguły sprzedaży/zakupu"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity_partner
+msgid "Lead To Opportunity Partner"
+msgstr ""
 
 #. module: crm
 #: field:crm.meeting,location:0
@@ -2162,72 +1945,31 @@ msgid "Location"
 msgstr "Lokalizacja"
 
 #. module: crm
-#: view:crm.fundraising:0
-msgid "Payment Mode"
-msgstr "Sposób zapłaty"
-
-#. module: crm
-#: help:crm.case.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date, specifies you can put a negative number if you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Opóźnienie po czasie wyzwolenia. Możesz wstawić wartości ujemne, jeśli "
-"chcesz przypomnienie np. 15 min przed spotkaniem."
-
-#. module: crm
-#: view:crm.claim:0
-#: view:crm.job:0
 #: view:crm.lead:0
-msgid "Stage: "
-msgstr "Etap: "
+msgid "Reply"
+msgstr ""
 
 #. module: crm
-#: view:crm.case.section:0
-msgid "Case section"
-msgstr "Sekcja sprawy"
+#: selection:crm.meeting,freq:0
+msgid "Weeks"
+msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
-msgstr "Zaplanuj zwykłe spotkanie albo telefoniczne"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead "
+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
 #, python-format
 msgid "Error !"
 msgstr "Błąd!"
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "Fields to Change"
-msgstr "Pola do zmiany"
-
-#. module: crm
-#: model:crm.case.category2,name:crm.category_lead1
-msgid "Telesales"
-msgstr "Telesprzedaż"
-
-#. module: crm
-#: model:ir.ui.menu,name:crm.menu_crm_case_history-act_main
-msgid "Cases Histories"
-msgstr "Historie spraw"
-
-#. module: crm
-#: field:crm.case,create_date:0
-msgid "Created"
-msgstr "Utworzono"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Lead Information"
-msgstr "Informacja sygnału"
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -2235,178 +1977,135 @@ msgid "Segmentation line"
 msgstr "Pozycja segmentacji"
 
 #. module: crm
-#: wizard_field:crm.job.reschedule_phone_call,init,deadline:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,deadline:0
-#: view:crm.phonecall:0
+#: view:crm.opportunity2phonecall:0
+#: view:crm.phonecall2phonecall:0
 msgid "Planned Date"
 msgstr "Planowana data"
 
 #. module: crm
-#: selection:crm.case.rule,trg_date_range_type:0
-msgid "Hours"
-msgstr "Godziny"
+#: field:crm.meeting,base_calendar_url:0
+msgid "Caldav URL"
+msgstr "Caldav URL"
 
 #. module: crm
-#: help:crm.menu.config_wizard,phonecall:0
-msgid ""
-"Helps you to encode the result of a phone call or to plan a list of phone "
-"calls to process."
-msgstr ""
-"Pomaga wprowadzić rezultat rozmowy lub zaplanować rozmowy do wykonania."
-
-#. module: crm
-#: model:ir.actions.wizard,name:crm.wizard_crm_cal_import
-msgid "Import ICS File"
-msgstr "Importuj plik ICS"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Attendee Detail"
-msgstr "Szczegóły uczestnika"
-
-#. module: crm
-#: model:crm.case.category2,name:crm.category_job3
-msgid " > Bac +5"
+#: view:crm.lead:0
+msgid "Expected Revenues"
 msgstr ""
 
 #. module: crm
-#: selection:report.crm.case.section.categ.categ2,month:0
-#: selection:report.crm.case.section.categ.stage,month:0
-#: selection:report.crm.case.section.categ2,month:0
-#: selection:report.crm.case.section.stage,month:0
+#: model:crm.case.resource.type,name:crm.type_lead6
+msgid "Google Adwords 2"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,type:0
+#: help:crm.lead.report,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall2partner:0
+msgid "Are you sure you want to create a partner based on this Phonecall ?"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
 msgid "July"
 msgstr "Lipiec"
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_oppor1
-msgid "Prospecting"
-msgstr "Ocenianie"
+#: model:ir.actions.act_window,name:crm.crm_case_section_act
+#: model:ir.model,name:crm.model_crm_case_section
+#: model:ir.ui.menu,name:crm.menu_crm_case_section_act
+msgid "Sales Teams"
+msgstr ""
 
 #. module: crm
-#: field:crm.case,partner_name2:0
-msgid "Employee Email"
-msgstr "Email pracownika"
+#: model:ir.model,name:crm.model_crm_lead2partner
+msgid "Lead to Partner"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_meeting
-msgid "Meeting Cases"
-msgstr "Sprawy spotkań"
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentacja"
 
 #. module: crm
-#: view:crm.job:0
-msgid "Job Info"
-msgstr "Informacja o stanowisku"
+#: view:crm.lead:0
+msgid "Team"
+msgstr ""
 
 #. module: crm
-#: view:crm.meeting:0
-msgid "Cancel Meeting"
-msgstr "Anuluj spotkanie"
+#: field:crm.installer,outlook:0
+msgid "MS-Outlook"
+msgstr ""
 
 #. module: crm
-#: model:crm.case.section,name:crm.section_support0
-msgid "Jobs"
-msgstr "Stanowiska"
-
-#. module: crm
-#: view:crm.case.rule:0
-msgid "%(case_date)s = Creation date"
-msgstr "%(case_date)s = Data utworzenia"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_phone3
 #: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+#: view:res.partner:0
 msgid "Not Held"
 msgstr "Nie odebrane"
 
 #. module: crm
-#: field:crm.case.rule,act_mail_to_user:0
-msgid "Mail to responsible"
-msgstr "Mail do odpowiedzialnych"
+#: field:crm.lead.report,probability:0
+msgid "Probability"
+msgstr ""
 
 #. module: crm
-#: view:crm.job:0
-msgid "Jobs - Recruitment Form"
-msgstr "Praca - Formularz rekrutacji"
-
-#. module: crm
-#: model:crm.case.category2,name:crm.category_claim1
-msgid "Corrective"
-msgstr "Działania naprawcze"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_opportunity
-msgid "Opportunity Cases"
-msgstr "Sprawy szans"
-
-#. module: crm
-#: view:crm.case:0
-msgid "Support Query"
-msgstr "Zapytanie o wsparcie"
-
-#. module: crm
-#: view:crm.case.rule:0
-msgid "Template of Email to Send"
-msgstr "Szablon emaila do wysłania"
-
-#. module: crm
-#: field:report.crm.case.section.categ.categ2,month:0
-#: field:report.crm.case.section.categ.stage,month:0
-#: field:report.crm.case.section.categ2,month:0
-#: field:report.crm.case.section.stage,month:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,month:0
+#: field:crm.meeting,month_list:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,month:0
 msgid "Month"
 msgstr "Miesiąc"
 
 #. module: crm
-#: 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.actions.act_window,name:crm.crm_case_category_act_leads_all
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
 msgstr "Sygnały"
 
 #. module: crm
-#: wizard_button:crm.new.send.mail,init,send:0
-#: wizard_button:crm.send.mail,init,send:0
-msgid "Send Email"
-msgstr "Wyślij e-mail"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2partner,action:0
+#: selection:crm.phonecall2partner,action:0
+msgid "Create a new partner"
+msgstr "Utwórz nowego partnera"
 
 #. module: crm
-#: wizard_view:crm.new.send.mail,init:0
-msgid "Set case state to"
-msgstr "Ustaw stan sprawy na"
-
-#. module: crm
-#: model:crm.case.category2,name:crm.categ2_fund3
-msgid "Credit Card"
-msgstr "Karta kredytowa"
-
-#. module: crm
-#: code:addons/crm/crm.py:0
-#, python-format
-msgid ""
-"No E-Mail ID Found for the Responsible Partner or missing reply address in "
-"section!"
+#: view:crm.meeting:0
+#: view:res.partner:0
+msgid "Start Date"
 msgstr ""
-"Nie znaleziono ID E-Mail dla partnera odpowiedzialnego lub brak adresu "
-"zwrotnego w sekcji!"
 
 #. module: crm
-#: view:crm.job:0
-msgid "Search Jobs"
-msgstr "Przeszukuj stanowiska"
+#: selection:crm.phonecall,state:0
+#: view:crm.phonecall.report:0
+msgid "Todo"
+msgstr ""
 
 #. module: crm
-#: field:crm.case.history,log_id:0
-msgid "Log"
-msgstr "Log"
+#: view:crm.meeting:0
+msgid "Delegate"
+msgstr ""
 
 #. module: crm
-#: help:crm.menu.config_wizard,fund:0
-msgid ""
-"This may help associations in their fund raising process and tracking."
-msgstr "To może pomóc stowarzyszeniom w poszukiwaniu funduszy."
+#: view:crm.meeting:0
+msgid "Decline"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,optin:0
+msgid "If opt-in is checked, this contact has accepted to receive emails."
+msgstr ""
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2414,58 +2113,37 @@ msgid "Reset to Unconfirmed"
 msgstr "Przywróć do niepotwierdzonych"
 
 #. module: crm
-#: view:crm.case:0
-msgid "Helpdesk Support"
-msgstr "Wsparcie helpdesku"
-
-#. module: crm
-#: field:crm.case,email_cc:0
-msgid "Watchers Emails"
-msgstr "Adresy obserwatorów"
-
-#. module: crm
-#: view:crm.case.rule:0
+#: code:addons/crm/wizard/crm_add_note.py:0
+#: view:crm.add.note:0
+#, python-format
 msgid "Note"
 msgstr "Uwaga"
 
 #. module: crm
-#: field:report.crm.case.section.categ.categ2,delay_close:0
-#: field:report.crm.case.section.categ.stage,delay_close:0
-#: field:report.crm.case.section.categ2,delay_close:0
-#: field:report.crm.case.section.stage,delay_close:0
-msgid "Delay Close"
-msgstr "Zamknij opóźnienie"
-
-#. module: crm
-#: 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
+#: selection:crm.lead,priority:0
+#: selection:crm.lead.report,priority:0
+#: selection:crm.phonecall,priority:0
+#: selection:crm.phonecall.report,priority:0
 msgid "Low"
 msgstr "Niski"
 
 #. module: crm
-#: 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
-#: 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
-#: selection:report.crm.case.section.stage,state:0
+#: selection:crm.add.note,state:0
+#: field:crm.lead,date_closed:0
+#: selection:crm.lead,state:0
+#: view:crm.lead.report:0
+#: selection:crm.lead.report,state:0
+#: field:crm.meeting,date_closed:0
+#: selection:crm.merge.opportunity,state:0
+#: field:crm.phonecall,date_closed:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
 msgid "Closed"
 msgstr "Zamknięty"
 
 #. module: crm
-#: view:crm.job:0
-msgid "Candidate Name2"
-msgstr "Nazwa 2 kandydata"
-
-#. module: crm
-#: code:addons/crm/crm.py:0
-#, python-format
-msgid "cancel"
+#: view:crm.installer:0
+msgid "Plug-In"
 msgstr ""
 
 #. module: crm
@@ -2474,38 +2152,19 @@ msgid "Internal Meeting"
 msgstr "Spotkanie wewnętrzne"
 
 #. module: crm
-#: view:crm.case:0
-#: field:crm.case,child_ids:0
-#: view:crm.claim:0
+#: code:addons/crm/crm.py:0
+#: selection:crm.add.note,state:0
 #: view:crm.lead:0
-#: view:crm.opportunity:0
-msgid "Events"
-msgstr "Wydarzenia"
-
-#. module: crm
-#: help:crm.menu.config_wizard,lead:0
-msgid ""
-"Allows you to track and manage leads which are pre-sales requests or "
-"contacts, the very first contact with a customer request."
-msgstr ""
-"Pozwala śledzić i zarządzać sygnałami, które są pytaniami sondażowymi lub "
-"przypadkowymi kontaktami."
-
-#. module: crm
-#: help:crm.case,som:0
-msgid ""
-"The minds states allow to define a value scale which representsthe partner "
-"mentality in relation to our services.The scale hasto be created with a "
-"factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."
-msgstr ""
-"Stany emocji pozwalają określać poziomy zadowolenia partnera w stosunku do "
-"naszej obsługi. Skala powinna być utworzona jako liczby od 0 (bardzie "
-"niezadowolony) do 10 (bardzo zadowolony)."
-
-#. module: crm
-#: field:crm.meeting,freebusy:0
-msgid "FreeBusy"
-msgstr ""
+#: selection:crm.lead,state:0
+#: view:crm.lead.report:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.merge.opportunity,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+#, python-format
+msgid "Pending"
+msgstr "Oczekiwanie"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
@@ -2513,81 +2172,40 @@ msgid "Customer Meeting"
 msgstr "Spotkanie z klientem"
 
 #. module: crm
-#: wizard_field:crm.new.send.mail,init,doc2:0
-msgid "Attachment2"
-msgstr "Załącznik2"
+#: view:crm.lead:0
+#: field:crm.lead,email_cc:0
+msgid "Global CC"
+msgstr ""
 
 #. module: crm
-#: wizard_field:crm.new.send.mail,init,doc3:0
-msgid "Attachment3"
-msgstr "Załącznik3"
-
-#. module: crm
-#: view:crm.job:0
-msgid "Degree"
-msgstr "Stopień"
-
-#. module: crm
-#: wizard_field:crm.new.send.mail,init,doc1:0
-msgid "Attachment1"
-msgstr "Załącznik1"
-
-#. 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
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
-#, python-format
+#: view:res.partner:0
 msgid "Phone Calls"
 msgstr "Rozmowy telefoniczne"
 
 #. module: crm
-#: help:crm.case,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the case "
-"without removing it."
-msgstr ""
-"Jeśli aktywne pole jest ustawione na true (prawda), to będziesz mógł ukryć "
-"sprawę bez jej usuwania."
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_menu_config_wizard
-msgid "crm.menu.config_wizard"
+#: help:crm.lead.report,delay_open:0
+#: help:crm.phonecall.report,delay_open:0
+msgid "Number of Days to open the case"
 msgstr ""
 
 #. module: crm
-#: view:crm.case.history:0
-msgid "Case History"
-msgstr "Historia sprawy"
-
-#. module: crm
-#: field:crm.case,partner_phone:0
+#: field:crm.lead,phone:0
+#: field:crm.phonecall,partner_phone:0
 msgid "Phone"
 msgstr "Telefon"
 
 #. module: crm
-#: model:crm.case.category2,name:crm.categ2_fund2
-msgid "Cheque"
-msgstr "Czek"
-
-#. module: crm
-#: field:crm.case,active:0
-#: field:crm.case.rule,active:0
 #: field:crm.case.section,active:0
+#: field:crm.lead,active:0
+#: view:crm.lead.report:0
+#: field:crm.meeting,active:0
+#: field:crm.phonecall,active:0
 msgid "Active"
 msgstr "Aktywne"
 
-#. module: crm
-#: help:crm.case.rule,act_remind_attach:0
-msgid ""
-"Check this if you want that all documents attached to the case be attached "
-"to the reminder email sent."
-msgstr ""
-"Zaznacz to, jeśli chcesz aby wszystkie dokumenty załączone do sprawy zostały "
-"dołączone do przypomnień."
-
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2599,64 +2217,47 @@ msgid ">"
 msgstr ">"
 
 #. module: crm
-#: view:crm.job:0
-msgid "Candidate Phone"
-msgstr "Telefon kandydata"
+#: view:crm.meeting:0
+msgid "Uncertain"
+msgstr ""
 
 #. module: crm
-#: model:ir.actions.wizard,name:crm.wizard_crm_send_mail
+#: field:crm.send.mail,email_cc:0
+msgid "CC"
+msgstr "DW"
+
+#. module: crm
+#: view:crm.send.mail:0
+#: model:ir.actions.act_window,name:crm.action_crm_send_mail
 msgid "Send Mail"
 msgstr "Wyślij wiadomość"
 
 #. module: crm
-#: selection:crm.case.rule,trg_date_range_type:0
+#: selection:crm.meeting,freq:0
 msgid "Months"
 msgstr "Miesiące"
 
 #. 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
-#: 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
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall_assign_wizard
-msgid "To Assign"
-msgstr "Do przypisania"
-
-#. module: crm
-#: code:addons/crm/wizard/wizard_cal_subscribe.py:0
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "Podaj poprawny URL !"
-
-#. module: crm
-#: model:process.node,note:crm.process_node_opportunities0
-msgid "When a real project/opportunity is detected"
-msgstr "Kiedy rzeczywisty projekt/szansa została wykryta"
-
-#. module: crm
-#: wizard_view:crm.job.partner_create,init:0
-msgid "Are you sure you want to create a partner based on this job request ?"
+#: help:crm.installer,wiki_sale_faq:0
+msgid ""
+"Helps you manage wiki pages for Frequently Asked Questions on Sales "
+"Application."
 msgstr ""
-"Jesteś pewien, że chcesz utworzyć partnera na podstawie tego zgłoszenia do "
-"pracy ?"
 
 #. module: crm
-#: wizard_field:crm.lead.opportunity_set,create_partner,action:0
-#: wizard_field:crm.phonecall.opportunity_set,create_partner,action:0
+#: help:crm.installer,crm_fundraising:0
+msgid "This may help associations in their fundraising process and tracking."
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2partner,action:0
+#: field:crm.phonecall2partner,action:0
 msgid "Action"
 msgstr "Akcja"
 
 #. 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:ir.ui.menu,name:crm.menu_crm_case_claims
-#, python-format
+#: field:crm.installer,crm_claim:0
 msgid "Claims"
 msgstr "Reklamacje"
 
@@ -2666,60 +2267,39 @@ msgid "Decrease (0>1)"
 msgstr "Zmniejsz (0>1)"
 
 #. module: crm
-#: model:ir.actions.wizard,name:crm.wizard_case_history_event
-msgid "History of Events"
-msgstr "Historia wydarzeń"
+#: view:crm.add.note:0
+#: view:crm.lead:0
+#: view:crm.send.mail:0
+msgid "Attachments"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_case_category2
-msgid "Category2 of case"
-msgstr "Kategoria2 sprawy"
+#: selection:crm.meeting,rrule_type:0
+msgid "Weekly"
+msgstr ""
 
 #. module: crm
-#: wizard_field:crm.new.send.mail,init,to:0
-#: wizard_field:crm.send.mail,init,to:0
-msgid "To"
-msgstr "Do"
+#: view:crm.lead.report:0
+#: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
+#: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
+msgid "Opportunities Analysis"
+msgstr ""
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "%(case_user_email)s = Responsible email"
-msgstr "%(case_user_email)s = Email odpowiedzialnego"
+#: view:crm.lead:0
+msgid "Misc"
+msgstr ""
 
 #. module: crm
-#: model:ir.ui.menu,name:crm.menu_presale
-msgid "Sales"
-msgstr "Sprzedaż"
-
-#. module: crm
-#: view:crm.case:0
-#: view:crm.phonecall:0
-msgid "General"
-msgstr "Ogólne"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead2
-msgid "Assigned"
-msgstr "Przydzielony"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Recycled"
-msgstr "Usunięty"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_lead8
 #: model:crm.case.categ,name:crm.categ_oppor8
+#: view:crm.meeting:0
 msgid "Other"
 msgstr "Inne"
 
 #. 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.meeting:0
+#: selection:crm.meeting,state:0
+#: selection:crm.phonecall,state:0
 msgid "Done"
 msgstr "Wykonano"
 
@@ -2729,169 +2309,129 @@ msgid "Max Interval"
 msgstr "Maks. interwał"
 
 #. module: crm
-#: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
-msgid "All Opportunities"
-msgstr "Wszystkie sprawy"
+#: view:crm.opportunity2phonecall:0
+msgid "_Schedule Call"
+msgstr ""
 
 #. module: crm
 #: 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
+#: selection:crm.add.note,state:0
 #: view:crm.lead:0
-#: view:crm.opportunity:0
+#: selection:crm.lead,state:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.merge.opportunity,state: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
-#: selection:report.crm.case.section.stage,state:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+#: view:res.partner:0
 #, python-format
 msgid "Open"
 msgstr "Otwarte"
 
 #. module: crm
-#: selection:crm.meeting,class:0
-msgid "PUBLIC"
-msgstr "PUBLICZNY"
+#: selection:crm.meeting,week_list:0
+msgid "Tuesday"
+msgstr ""
 
 #. module: crm
-#: 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 "A partner is already existing with the same name."
-msgstr "Istnieje już partner z tą samą nazwą"
+#: field:crm.lead,city:0
+msgid "City"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall
-msgid "Phonecall Cases"
-msgstr "Sprawy telefoniczne"
+#: selection:crm.meeting,show_as:0
+msgid "Busy"
+msgstr ""
 
 #. module: crm
-#: help:crm.case.rule,sequence:0
-msgid "Gives the sequence order when displaying a list of case rules."
-msgstr "Ustala kolejność wyświetlania listy reguł spraw"
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
+"specjalnych !"
 
 #. module: crm
-#: field:crm.menu.config_wizard,helpdesk:0
+#: field:crm.installer,crm_helpdesk:0
 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.phonecall.assign_wizard,user_id:0
+#: field:crm.meeting,user_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,user_id:0
+#: view:res.partner:0
 msgid "Responsible"
 msgstr "Odpowiedzialny"
 
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_claim4
-#: model:crm.case.stage,name:crm.stage_meet3
-msgid "Invalid"
-msgstr "Niepoprawny"
-
-#. module: crm
-#: wizard_button:crm.job.meeting_set,init,order:0
-#: wizard_button:crm.phonecall.meeting_set,init,order:0
-msgid "Set Meeting"
-msgstr "Ustal spotkanie"
-
-#. module: crm
-#: field:crm.menu.config_wizard,meeting:0
-msgid "Calendar of Meetings"
-msgstr "Kalendarz spotkań"
-
-#. module: crm
-#: view:crm.case:0
-msgid "Cases By Stage and Estimates"
-msgstr "Sprawy wg etapów i szacunków"
-
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
-msgid ""
-"You can not escalate this case.\n"
-"You are already at the top level."
+msgid "The case '%s' has been cancelled."
 msgstr ""
-"Nie możesz przekazać tej sprawy.\n"
-"Jesteś na najwyższym poziomie."
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Lead Name"
-msgstr "Nazwa sygnału"
+#: field:crm.installer,sale_crm:0
+msgid "Opportunity to Quotation"
+msgstr ""
 
 #. module: crm
-#: view:crm.claim:0
-msgid "Claim/Action Description"
-msgstr "Reklamacja/Opis akcji"
+#: model:ir.model,name:crm.model_crm_send_mail
+msgid "Send new email"
+msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,trg_max_history:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:crm.act_my_oppor
+msgid "My Open Opportunities"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.open_board_statistical_dash
+msgid "CRM - Statistics Dashboard"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,job_id:0
+msgid "Main Job"
+msgstr ""
+
+#. module: crm
+#: field:base.action.rule,trg_max_history:0
 msgid "Maximum Communication History"
 msgstr "Maksimum historii komunikacji"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Meeting For Leads Generation"
-msgstr "Spotkanie do generacji sygnałów"
-
-#. module: crm
-#: wizard_view:crm.lead.opportunity_set,create_partner:0
-#: wizard_view:crm.lead.partner_create,init:0
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
 msgid "Are you sure you want to create a partner based on this lead ?"
 msgstr ""
 "Jesteś pewien, że chcesz utworzyć partnera na podstawie tego sygnału ?"
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_job6
-msgid "Refused by Employee"
-msgstr "Odmowa pracownika"
+#: view:crm.meeting:0
+#: field:crm.meeting,categ_id:0
+msgid "Meeting Type"
+msgstr ""
 
 #. module: crm
-#: field:crm.case,partner_name:0
-msgid "Employee's Name"
-msgstr "Nazwisko pracownika"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Merge with Existing Opportunity"
+msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_job2
-msgid "First Interview"
-msgstr "Pierwsza rozmowa"
-
-#. 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
-msgid "This Month"
-msgstr "Bieżący miesiąc"
-
-#. module: crm
-#: view:crm.job:0
-msgid "Availability (weeks)"
-msgstr "Dostępność (tygodnie)"
-
-#. module: crm
-#: view:crm.opportunity:0
-msgid "Opportunities Tree"
-msgstr "Drzewo szans"
-
-#. module: crm
-#: help:crm.case,state:0
+#: help:crm.lead,state:0
+#: help:crm.phonecall,state:0
 msgid ""
 "The state is set to 'Draft', when a case is created.                         "
 "         \n"
@@ -2910,14 +2450,15 @@ msgstr ""
 "Jeśli sprawa wymaga interwencji, to stan jest 'Oczekiwanie'."
 
 #. module: crm
-#: view:crm.job:0
-msgid "Open Jobs"
-msgstr "Otwarte stanowiska"
+#: view:crm.meeting:0
+#: view:res.partner:0
+msgid "End Date"
+msgstr ""
 
 #. module: crm
-#: selection:crm.email.add.cc,name:0
-msgid "Email Address"
-msgstr "Adres email"
+#: selection:crm.meeting,byday:0
+msgid "Third"
+msgstr ""
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2929,218 +2470,26 @@ msgstr ""
 "trakcie tego interwału, w ostatnich X okresach."
 
 #. module: crm
-#: field:crm.case,case_id:0
-msgid "Related Case"
-msgstr "Sprawa związana"
-
-#. module: crm
-#: field:crm.case.rule,server_action_id:0
-msgid "Server Action"
-msgstr "Akcja serwera"
-
-#. module: crm
-#: model:ir.actions.act_window,name:crm.crm_case_categ_claim0
-msgid "All Claims"
-msgstr "Wszystkie reklamacje"
-
-#. module: crm
-#: field:crm.case.log,user_id:0
-msgid "User Responsible"
-msgstr "Użytkownik odpowiedzialny"
-
-#. module: crm
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#, python-format
-msgid "Email not sent !"
-msgstr "Wiadomość nie wysłana !"
-
-#. module: crm
-#: wizard_field:crm.phonecall.partner_create,init,close:0
-msgid "Close Phonecall"
-msgstr "Zamknij rozmowę"
-
-#. module: crm
-#: field:crm.case,email_last:0
-msgid "Latest E-Mail"
-msgstr "Ostatni email"
-
-#. module: crm
-#: view:crm.case.rule:0
-msgid "Regex on Communication History"
-msgstr "Wyrażenia reg. dla historii komunikacji"
-
-#. module: crm
-#: model:crm.case.category2,name:crm.categ2_fund4
-msgid "Demand Draft"
-msgstr "Wymagaj projektu"
-
-#. module: crm
-#: field:crm.case,id:0
-msgid "ID"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
-#. module: crm
-#: field:crm.case,log_ids:0
-msgid "Logs History"
-msgstr "Zapisuje historię"
-
-#. module: crm
-#: wizard_field:crm.lead.opportunity_set,opportunity,name:0
-#: wizard_field:crm.phonecall.opportunity_set,opportunity,name:0
-msgid "Opportunity Summary"
-msgstr "Podsumowanie szans"
-
-#. module: crm
-#: view:crm.case:0
-msgid "Search Case"
-msgstr "Przeszukaj sprawę"
-
-#. module: crm
-#: view:crm.segmentation:0
-msgid "Continue Process"
-msgstr "Kontynuuj proces"
-
-#. module: crm
-#: view:crm.case.history:0
-msgid "Case Description"
-msgstr "Opis sprawy"
-
-#. module: crm
-#: wizard_field:crm.job.reschedule_phone_call,init,user_id:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,user_id:0
-msgid "Assign To"
-msgstr "Przypisz do"
-
-#. module: crm
-#: field:crm.case,date_action_last:0
-msgid "Last Action"
-msgstr "Ostatnia akcja"
-
-#. module: crm
-#: field:crm.case,duration:0
-msgid "Duration"
-msgstr "Czas trwania"
-
-#. module: crm
-#: model:ir.model,name:crm.model_report_crm_case_section_categ_stage
-msgid "Cases by section, Category and stage"
-msgstr "Sprawy wg sekcji, kategorii i etapu"
-
-#. module: crm
-#: view:crm.job:0
-msgid "Candidate Hired"
-msgstr "Kandydat zatrudniony"
-
-#. module: crm
-#: field:crm.menu.config_wizard,jobs:0
-msgid "Jobs Hiring Process"
-msgstr "Proces zatrudniania"
-
-#. module: crm
-#: model:ir.ui.menu,name:crm.next_id_52
-msgid "All Cases"
-msgstr "Wszystkie sprawy"
-
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_wizard.py:0
-#, python-format
-msgid "A partner is already defined on this lead."
-msgstr "Na podstawie tego sygnału juz został utworzony partner."
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Lead Source"
-msgstr "Źródło sygnału"
-
-#. module: crm
-#: field:report.crm.case.section.categ.categ2,nbr:0
-#: field:report.crm.case.section.categ.stage,nbr:0
-#: field:report.crm.case.section.categ2,nbr:0
-#: field:report.crm.case.section.stage,nbr:0
-msgid "# of Cases"
-msgstr "# spraw"
-
-#. module: crm
-#: selection:crm.meeting,class:0
-msgid "PRIVATE"
-msgstr "PRYWATNY"
-
-#. module: crm
-#: wizard_view:caldav.crm.subscribe,init:0
-msgid "Provide path for Remote Calendar"
-msgstr "Wprowadź ścieżkę dla zdalnego kalendarza"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-msgid "Segmentation"
-msgstr "Segmentacja"
-
-#. module: crm
-#: view:crm.fundraising:0
-msgid "Funds Form"
-msgstr "Formularz funduszy"
-
 #. module: crm
 #: view:crm.meeting:0
-msgid "Search Meetings"
-msgstr "Przeszukuj spotkania"
+msgid "Custom Recurrency Rule"
+msgstr ""
 
 #. module: crm
-#: selection:crm.lead.opportunity_set,create_partner,action:0
-#: selection:crm.phonecall.opportunity_set,create_partner,action:0
-msgid "Create a new partner"
-msgstr "Utwórz nowego partnera"
+#: field:crm.installer,thunderbird:0
+msgid "Thunderbird"
+msgstr ""
 
 #. module: crm
-#: field:crm.case,company_id:0
-msgid "Company"
-msgstr "Firma"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead3
-msgid "In Process"
-msgstr "W toku"
-
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Uruchomione"
-
-#. module: crm
-#: view:crm.case.rule:0
-msgid "%(case_user)s = Responsible name"
-msgstr "%(case_user)s = Nazwa odpowiedzialnego"
-
-#. module: crm
-#: wizard_field:crm.job.reschedule_phone_call,init,note:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,note:0
-msgid "Goals"
-msgstr "Cele"
-
-#. module: crm
-#: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_tree
-#: view:report.crm.case.section.categ2:0
-msgid "Cases by Section and Type"
-msgstr "Sprawy wg sekcji i typu"
-
-#. module: crm
-#: model:ir.ui.menu,name:crm.menu_aftersale
-msgid "After-Sale Services"
-msgstr "Obsługa posprzedażna"
-
-#. 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
-msgid "Ok"
-msgstr "Ok"
-
-#. module: crm
-#: wizard_field:caldav.crm.export,init,name:0
-msgid "File name"
-msgstr "Nazwa pliku"
+#: view:crm.lead.report:0
+msgid "# of Emails"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -3148,78 +2497,298 @@ msgid "Search Leads"
 msgstr "Przeszukuj sygnały"
 
 #. module: crm
-#: help:crm.case.rule,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the case rule "
-"without removing it."
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,delay_open:0
+msgid "Delay to open"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead
+msgid "crm.lead"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Referrer"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity
+msgid "Lead To Opportunity"
+msgstr ""
+
+#. module: crm
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
+msgstr "Podsumowanie szans"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Segmentation Test"
+msgstr "Test segmentacji"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Continue Process"
+msgstr "Kontynuuj proces"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2partner
+msgid "Phonecall to Partner"
+msgstr ""
+
+#. module: crm
+#: field:crm.opportunity2phonecall,user_id:0
+#: field:crm.phonecall2phonecall,user_id:0
+msgid "Assign To"
+msgstr "Przypisz do"
+
+#. module: crm
+#: field:crm.add.note,state:0
+#: field:crm.send.mail,state:0
+msgid "Set New State To"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,date_action_last:0
+#: field:crm.meeting,date_action_last:0
+#: field:crm.phonecall,date_action_last:0
+msgid "Last Action"
+msgstr "Ostatnia akcja"
+
+#. module: crm
+#: field:crm.meeting,duration:0
+#: field:crm.phonecall,duration:0
+#: field:crm.phonecall.report,duration:0
+msgid "Duration"
+msgstr "Czas trwania"
+
+#. module: crm
+#: field:crm.opportunity2phonecall,name:0
+#: field:crm.phonecall2phonecall,name:0
+msgid "Call summary"
+msgstr ""
+
+#. module: crm
+#: field:crm.send.mail,reply_to:0
+msgid "Reply To"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+#: model:ir.actions.act_window,name:crm.open_board_crm
+#: model:ir.ui.menu,name:crm.menu_board_crm
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_partner.py:0
+#, python-format
+msgid "A partner is already defined on this lead."
+msgstr "Na podstawie tego sygnału juz został utworzony partner."
+
+#. module: crm
+#: field:crm.lead.report,nbr:0
+#: field:crm.phonecall.report,nbr:0
+msgid "# of Cases"
+msgstr "# spraw"
+
+#. module: crm
+#: help:crm.meeting,section_id:0
+#: help:crm.phonecall,section_id:0
+msgid "Sales team to which Case belongs to."
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Sunday"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Fourth"
+msgstr ""
+
+#. module: crm
+#: selection:crm.add.note,state:0
+#: selection:crm.merge.opportunity,state:0
+#: selection:crm.send.mail,state:0
+msgid "Unchanged"
+msgstr "Niezmienione"
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
+#: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
+msgid "Partners Segmentation"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,fax:0
+msgid "Fax"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Assignment"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,company_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,company_id:0
+#: field:crm.phonecall,company_id:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Friday"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,allday:0
+msgid "All Day"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.action_view_attendee_form
+#: model:ir.ui.menu,name:crm.menu_attendee_invitations
+msgid "Meeting Invitations"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.categ,object_id:0
+#: field:crm.case.stage,object_id:0
+msgid "Object Name"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "E-mail address of the contact"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,referred:0
+msgid "Referred By"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: model:ir.model,name:crm.model_crm_add_note
+msgid "Add Internal Note"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Last"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.stage,on_change:0
+msgid "Change Probability on next and previous stages."
 msgstr ""
-"Jeśli aktywne pole jest ustawione na true (prawda), to będziesz mógł ukryć "
-"regułę sprawy bez jej usuwania."
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_cal_subscribe.py:0
+#: code:addons/crm/crm_action_rule.py:0
+#: code:addons/crm/wizard/crm_send_email.py:0
 #, python-format
 msgid "Error!"
 msgstr "Błąd!"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_claim_assign_wizard
-msgid "crm.claim.assign_wizard"
+#: view:crm.meeting:0
+msgid "Exclude range"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.act_window,name:crm.crm_case_categ0_act_job
-#: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_job
-msgid "All Jobs Requests"
-msgstr "Wszystkie zgłoszenia na stanowisko"
-
-#. module: crm
-#: 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
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
+#: selection:crm.add.note,state:0
+#: selection:crm.lead,state:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.meeting,state:0
+#: selection:crm.merge.opportunity,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
 msgid "Cancelled"
 msgstr "Anulowano"
 
 #. module: crm
-#: view:crm.job:0
-msgid "Applied Job"
-msgstr "Zgłoszenia na stanowisko"
-
-#. module: crm
-#: help:crm.meeting,exrule:0
-msgid ""
-"defines a rule or repeating pattern                                 for "
-"anexception to a recurrence set"
+#: field:crm.add.note,body:0
+msgid "Note Body"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "Relevant"
-msgstr "Priorytet"
+#: view:board.board:0
+msgid "My Planned Revenues by Stage"
+msgstr ""
 
 #. module: crm
-#: wizard_field:crm.case.opportunity.partner_opportunity,init,name:0
-msgid "Opportunity Name"
-msgstr "Nazwa szansy"
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
 
 #. module: crm
-#: field:crm.meeting,rrule:0
-msgid "Recurrent Rule"
-msgstr "Reguła rekurencyjna"
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "   Month   "
+msgstr ""
 
 #. module: crm
-#: wizard_view:caldav.crm.import,init:0
-msgid "Import ICS"
-msgstr "Importuj ICS"
+#: view:crm.lead:0
+msgid "Links"
+msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
+#: help:crm.segmentation,som_interval_decrease:0
+msgid ""
+"If the partner has not purchased (or bought) during a period, decrease the "
+"state of mind by this factor. It's a multiplication"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
+msgid "Mailgateway"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,user_id:0
+msgid "By Default Salesman is Administrator when create New User"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "# Mails"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: crm
+#: field:crm.phonecall,name:0
+#: view:res.partner:0
 msgid "Call Summary"
 msgstr "Podsumowanie rozmowy"
 
@@ -3229,53 +2798,74 @@ msgid "Operator"
 msgstr "Operator"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_case_log
-msgid "Case Communication History"
-msgstr "Historia komunikacji sprawy"
+#: view:crm.lead:0
+msgid "Schedule/Log Call"
+msgstr ""
 
 #. module: crm
-#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ
-msgid "Cases by Opportunities and Type"
-msgstr "Sprawy wg szans i typów"
+#: field:crm.installer,fetchmail:0
+msgid "Fetch Emails"
+msgstr ""
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "%(case_subject)s = Case subject"
-msgstr "%(case_subject)s = Temat sprawy"
+#: selection:crm.meeting,state:0
+msgid "Confirmed"
+msgstr "Potwierdzone"
 
 #. module: crm
-#: 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
-#: wizard_field:crm.job.reschedule_phone_call,init,section_id:0
-#: field:crm.meeting.generic_wizard,section_id:0
-#: field:crm.opportunity.assign_wizard,section_id:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,section_id:0
-#: field:crm.phonecall.assign_wizard,section_id:0
-#: field:report.crm.case.section.categ.categ2,section_id:0
-#: field:report.crm.case.section.categ.stage,section_id:0
-#: field:report.crm.case.section.categ2,section_id:0
-#: field:report.crm.case.section.stage,section_id:0
+#: help:crm.send.mail,email_cc:0
+msgid ""
+"These addresses will receive a copy of this email. To modify the permanent "
+"CC list, edit the global CC field of this case"
+msgstr ""
+
+#. module: crm
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Confirm"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,su:0
+msgid "Sun"
+msgstr ""
+
+#. module: crm
+#: field:crm.phonecall.report,section_id:0
 msgid "Section"
 msgstr "Sekcja"
 
+#. module: crm
+#: view:crm.lead:0
+msgid "Total of Planned Revenue"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:0
+#, python-format
+msgid ""
+"You can not escalate, You are already at the top level regarding your sales-"
+"team category."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Optional Expression"
 msgstr "Opcjonalne wyrażenie"
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_fund1
-msgid "Social Rehabilitation And Rural Upliftment"
+#: selection:crm.meeting,select1:0
+msgid "Day of month"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_job_wizard.py:0
-#, python-format
-msgid "A partner is already defined on this job request."
-msgstr "Dla tego zgłoszenia do pracy partner jest juz zdefiniowany."
+#: field:crm.lead2opportunity,probability:0
+msgid "Success Rate (%)"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
@@ -3283,43 +2873,45 @@ msgid "New"
 msgstr "Nowe"
 
 #. module: crm
-#: field:crm.case,description:0
-msgid "Your action"
-msgstr "Twoja akcja"
+#: view:crm.meeting:0
+msgid "Mail TO"
+msgstr ""
 
 #. module: crm
-#: model:crm.case.category2,name:crm.category_lead3
-#: field:crm.case.history,email:0
-#: field:crm.email.add.cc,email:0
-#: view:crm.job:0
+#: view:crm.lead:0
+#: field:crm.lead,email_from:0
+#: field:crm.meeting,email_from:0
+#: field:crm.phonecall,email_from:0
 msgid "Email"
 msgstr "E-mail"
 
 #. module: crm
-#: field:crm.case,canal_id:0
-#: field:crm.case.log,canal_id:0
+#: view:crm.lead:0
+#: field:crm.lead,channel_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,channel_id:0
+#: field:crm.phonecall,canal_id:0
 msgid "Channel"
 msgstr "Kanał"
 
 #. module: crm
-#: help:crm.case.rule,act_mail_to_email:0
-msgid "Email-id of the persons whom mail is to be sent"
-msgstr "Email osoby, do której ma być wysłana wiadomość"
+#: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
+msgid "Schedule Call"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_claim
-msgid "Claim Cases"
-msgstr "Sprawy reklamacji"
+#: view:crm.segmentation:0
+msgid "Profiling"
+msgstr "Profilowanie"
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "E-Mail Reminders (includes the content of the case)"
-msgstr "Przypomnienie email (zawiera sprawę)"
-
-#. module: crm
-#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_stage
-msgid "Cases by Leads and Stage"
-msgstr "Sprawy wg sygnałów i etapów"
+#: help:crm.segmentation,exclusif:0
+msgid ""
+"Check if the category is limited to partners that match the segmentation "
+"criterions.                        \n"
+"If checked, remove the category from partners that doesn't match "
+"segmentation criterions"
+msgstr ""
 
 #. module: crm
 #: field:crm.meeting,exdate:0
@@ -3327,9 +2919,21 @@ msgid "Exception Date/Times"
 msgstr "Daty/Czasy wyjątków"
 
 #. module: crm
-#: view:crm.meeting.generic_wizard:0
-msgid "Generic Wizard"
-msgstr "Podstawowy kreator"
+#: selection:crm.meeting,class:0
+msgid "Confidential"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,date_deadline:0
+msgid ""
+"Deadline Date is automatically                         computed from Start "
+"Date + Duration"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,state_id:0
+msgid "Fed. State"
+msgstr ""
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
@@ -3337,30 +2941,14 @@ msgid "Creating business opportunities from Leads"
 msgstr "Tworzenie szansy z sygnału"
 
 #. module: crm
-#: model:ir.ui.menu,name:crm.next_id_64
-msgid "Reporting"
-msgstr "Raportowanie"
+#: help:crm.send.mail,html:0
+msgid "Select this if you want to send email with HTML formatting."
+msgstr ""
 
 #. module: crm
-#: 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: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
-#: selection:report.crm.case.section.stage,state:0
-#, python-format
-msgid "Pending"
-msgstr "Oczekiwanie"
+#: model:crm.case.categ,name:crm.categ_oppor4
+msgid "Need Information"
+msgstr ""
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
@@ -3368,333 +2956,337 @@ msgid "Prospect Opportunity"
 msgstr "Potencjalna szansa"
 
 #. module: crm
-#: view:crm.job:0
-msgid "Expected Salary"
-msgstr "Oczekiwane wynagrodzenie"
+#: model:ir.actions.act_window,name:crm.action_crm_installer
+msgid "CRM Application Configuration"
+msgstr ""
 
 #. module: crm
-#: model:ir.ui.menu,name:crm.menu_crm_configuration
+#: field:base.action.rule,act_categ_id:0
+msgid "Set Category to"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
 msgid "Configuration"
 msgstr "Konfiguracja"
 
 #. module: crm
-#: model:ir.actions.wizard,name:crm.wizard_crm_new_send_mail
-msgid "Send New Mail"
-msgstr "Wyślij nową wiadomość"
+#: field:crm.meeting,th:0
+msgid "Thu"
+msgstr ""
 
 #. module: crm
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr "Niepoprawne argumenty"
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "    Month-1    "
+msgstr ""
 
 #. module: crm
-#: field:crm.meeting,transparent:0
-msgid "Trensparent"
-msgstr "Przezroczysty"
+#: help:crm.installer,sale_crm:0
+msgid "This module relates sale from opportunity cases in the CRM."
+msgstr ""
 
 #. module: crm
-#: view:crm.case:0
-msgid "My Cases"
-msgstr "Moje sprawy"
+#: view:crm.meeting:0
+msgid "of"
+msgstr ""
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_lead7
-#: model:crm.case.categ,name:crm.categ_oppor7
-msgid "Word of mouth"
-msgstr "Ustna wiadomość"
+#: selection:crm.meeting,rrule_type:0
+msgid "Daily"
+msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Lead Subject"
-msgstr "Temat sygnału"
+#: model:res.request.link,name:crm.request_link_meeting
+msgid "Case Meeting"
+msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-#: view:crm.phonecall:0
-msgid "Convert to Opportunity"
-msgstr "Konwertuj do szansy"
+#: model:crm.case.stage,name:crm.stage_lead2
+msgid "Qualification"
+msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_phone1
-msgid "Planned"
-msgstr "Planowane"
+#: view:crm.case.stage:0
+msgid "Stage Definition"
+msgstr ""
 
 #. module: crm
-#: model:crm.case.category2,name:crm.category_meet3
-msgid "Customer Office"
-msgstr "Biuro klienta"
+#: selection:crm.meeting,byday:0
+msgid "First"
+msgstr ""
 
 #. module: crm
-#: view:crm.job:0
-msgid "Candidate Email"
-msgstr "Email kandydata"
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "December"
+msgstr "Grudzień"
 
 #. module: crm
-#: view:crm.opportunity:0
-msgid "Sales Stage: "
-msgstr "Etap sprzedaży: "
+#: field:crm.installer,config_logo:0
+msgid "Image"
+msgstr ""
 
 #. module: crm
-#: view:crm.claim:0
-msgid "Type of Action"
-msgstr "Typ akcji"
-
-#. module: crm
-#: field:crm.case.rule,act_user_id:0
-msgid "Set responsible to"
-msgstr "Ustaw odpowiedzialnego na"
-
-#. module: crm
-#: view:crm.job:0
-msgid "Meeting With Candidates"
-msgstr "Spotkanie z kandydatami"
+#: view:base.action.rule:0
+msgid "Condition on Communication History"
+msgstr "Warunki dla historii komunikacji"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
 msgid ""
 "A period is the average number of days between two cycle of sale or purchase "
-"for this segmentation. It's mainly used to detect if a partner has not "
-"purchased or buy for a too long time, so we suppose that his state of mind "
-"has decreased because he probably bought goods to another supplier. Use this "
-"functionality for recurring businesses."
+"for this segmentation.                 \n"
+"It's mainly used to detect if a partner has not purchased or buy for a too "
+"long time,                  \n"
+"so we suppose that his state of mind has decreased because he probably "
+"bought goods to another supplier.                  \n"
+"Use this functionality for recurring businesses."
 msgstr ""
-"Okres jest średnią (w dniach) pomiędzy dwiema sprzedażami lub dwoma zakupami "
-"dla tej segmentacji. To jest stosowane głównie do wykrycia, czy partner nie "
-"kupował u nas zbyt długo, co może oznaczać, że jego stan emocji obniżył się, "
-"ponieważ prawdopodobnie dokonał zakupów u innego dostawcy. Stosuj te "
-"funkcjonalność do biznesów powtarzalnych."
 
 #. module: crm
-#: selection:report.crm.case.section.categ.categ2,month:0
-#: selection:report.crm.case.section.categ.stage,month:0
-#: selection:report.crm.case.section.categ2,month:0
-#: selection:report.crm.case.section.stage,month:0
-msgid "December"
-msgstr "Grudzień"
+#: view:crm.send.mail:0
+msgid "_Send Reply"
+msgstr ""
 
 #. module: crm
-#: view:report.crm.case.section.categ.categ2:0
-msgid "Search Cases by User"
-msgstr "Przeszukuj sprawy wg użytkownika"
+#: field:crm.meeting,vtimezone:0
+msgid "Timezone"
+msgstr ""
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "Condition on Communication History"
-msgstr "Warunki dla historii komunikacji"
+#: field:crm.lead2opportunity.partner,msg:0
+#: field:crm.lead2partner,msg:0
+#: view:crm.send.mail:0
+msgid "Message"
+msgstr "Wiadomość"
 
 #. module: crm
-#: field:crm.case.rule,act_mail_to_partner:0
-msgid "Mail to partner"
-msgstr "Mail do partnera"
+#: field:crm.meeting,sa:0
+msgid "Sat"
+msgstr ""
 
 #. module: crm
-#: view:crm.fundraising:0
-msgid "Funds Tree"
-msgstr "Drzewo funduszy"
-
-#. module: crm
-#: field:crm.case.rule,act_method:0
-msgid "Call Object Method"
-msgstr "Metoda wywołania obiektu"
-
-#. module: crm
-#: model:ir.actions.act_window,name:crm.crm_case_category_act_fund_all1
-msgid "All Funds"
-msgstr "Wszystkie fundusze"
-
-#. module: crm
-#: 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 "Kalendarz"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_job1
+#: view:crm.lead:0
+#: field:crm.lead,user_id:0
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
 msgid "Salesman"
 msgstr "Sprzedawca"
 
 #. module: crm
-#: model:crm.case.section,name:crm.section_support_help
-msgid "HelpDesk"
+#: field:crm.lead,date_deadline:0
+msgid "Expected Closing"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,ref2:0
-msgid "Reference 2"
-msgstr "Odnośnik 2"
+#: model:ir.model,name:crm.model_crm_opportunity2phonecall
+msgid "Opportunity to Phonecall"
+msgstr ""
 
 #. module: crm
-#: view:crm.segmentation:0
-msgid "Sales Purchase"
-msgstr "Sprzedaż-Zakupy"
+#: help:crm.case.section,allow_unlink:0
+msgid "Allows to delete non draft cases"
+msgstr "Pozwala usuwać sprawy inne niż w stanie projekt"
 
 #. module: crm
-#: 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
+#: view:crm.lead:0
 msgid "Schedule Meeting"
 msgstr "Zaplanuj spotkanie"
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_fund4
-msgid "Arts And Culture"
-msgstr "Kultura i sztuka"
+#: view:crm.lead:0
+msgid "Partner Name"
+msgstr ""
 
 #. module: crm
 #: 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"
 msgstr "Ruch wychodzący"
 
 #. module: crm
-#: code:addons/crm/crm.py:0
-#, python-format
-msgid "Historize"
-msgstr "Zapisz do historii"
+#: field:crm.lead,date_open:0
+#: field:crm.phonecall,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
+#: field:crm.case.section,member_ids:0
+msgid "Team Members"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,job_ids:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+msgid "Contacts"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor1
+msgid "Interest in Computer"
+msgstr ""
 
 #. module: crm
 #: view:crm.meeting:0
-msgid "Confirmed"
-msgstr "Potwierdzone"
+msgid "Invitation Detail"
+msgstr ""
 
 #. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Not Running"
-msgstr "Nie uruchomiony"
+#: field:crm.segmentation,som_interval_default:0
+msgid "Default (0=None)"
+msgstr "Domyślne (0=Nic)"
 
 #. module: crm
-#: wizard_field:crm.case.opportunity.partner_opportunity,init,probability:0
-#: wizard_field:crm.lead.opportunity_set,opportunity,probability:0
-#: wizard_field:crm.phonecall.opportunity_set,opportunity,probability:0
+#: help:crm.lead,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm
+#: field:crm.partner2opportunity,probability:0
+#: field:crm.phonecall2opportunity,probability:0
 msgid "Success Probability"
 msgstr "Prawdopodobieństwo sukcesu"
 
 #. module: crm
 #: 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: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
-#: selection:report.crm.case.section.stage,state:0
+#: selection:crm.add.note,state:0
+#: selection:crm.lead,state:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.merge.opportunity,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
 #, python-format
 msgid "Draft"
 msgstr "Projekt"
 
 #. module: crm
-#: field:crm.case.rule,trg_date_range:0
-msgid "Delay after trigger date"
-msgstr "Opóźnienie po dacie wyzwolenia"
+#: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
+msgid "Cases by Sales Team"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.send.mail,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_meeting.py:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+#: model:ir.model,name:crm.model_crm_meeting
+#: model:process.node,name:crm.process_node_meeting0
+#, python-format
+msgid "Meeting"
+msgstr "Spotkanie"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_case_categ
+msgid "Category of Case"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-msgid "Lead Details"
-msgstr "Szczegóły sygnału"
+#: view:crm.phonecall:0
+msgid "7 Days"
+msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,act_section_id:0
-msgid "Set section to"
-msgstr "Ustaw sekcję na"
+#: view:board.board:0
+msgid "Planned Revenue by Stage and User"
+msgstr ""
 
 #. module: crm
-#: 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
+#: model:ir.model,name:crm.model_crm_lead_report
+msgid "CRM Lead Report"
+msgstr ""
+
+#. module: crm
+#: field:crm.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead,priority:0
+#: selection:crm.lead.report,priority:0
+#: selection:crm.phonecall,priority:0
+#: selection:crm.phonecall.report,priority:0
 msgid "Normal"
 msgstr "Normalny"
 
 #. module: crm
-#: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
-#, python-format
-msgid "You must put a Partner eMail to use this action!"
-msgstr "Musisz podac email pertnera, aby zastosować tę akcję!"
+#: field:crm.lead,street2:0
+msgid "Street2"
+msgstr ""
 
 #. module: crm
-#: wizard_view:crm.job.partner_create,init:0
-#: wizard_view:crm.lead.opportunity_set,create_partner:0
-#: wizard_view:crm.lead.partner_create,init:0
-#: wizard_view:crm.phonecall.opportunity_set,create_partner:0
-#: wizard_view:crm.phonecall.partner_create,init:0
+#: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
+#: model:ir.ui.menu,name:crm.menu_crm_case_meeting-act
+msgid "Meeting Categories"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
 msgid "You may have to verify that this partner does not exist already."
 msgstr "Powinieneś sprawdzić, czy ten partner już istnieje."
 
 #. module: crm
-#: view:crm.job:0
-msgid "Qualication"
-msgstr "Kwalifikacje"
+#: field:crm.lead.report,delay_open:0
+msgid "Delay to Open"
+msgstr ""
 
 #. module: crm
-#: view:crm.meeting:0
-msgid "Change RRule"
-msgstr "Zmień regułę"
+#: code:addons/crm/crm_opportunity.py:0
+#, python-format
+msgid "There is no stage for won opportunities defined for this Sale Team."
+msgstr ""
 
 #. module: crm
-#: 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
-#: field:report.crm.case.section.stage,user_id:0
+#: field:crm.lead.report,user_id:0
+#: field:crm.phonecall.report,user_id:0
 msgid "User"
 msgstr "Użytkownik"
 
 #. module: crm
-#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ_categ2
-#: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_categ2_tree
-#: view:report.crm.case.section.categ.categ2:0
-msgid "Cases by Section, Category and Type"
-msgstr "Sprawy wg sekcji, kategorii i typu"
-
-#. module: crm
-#: selection:report.crm.case.section.categ.categ2,month:0
-#: selection:report.crm.case.section.categ.stage,month:0
-#: selection:report.crm.case.section.categ2,month:0
-#: selection:report.crm.case.section.stage,month:0
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
 msgid "November"
 msgstr "Listopad"
 
 #. module: crm
-#: model:crm.case.category2,name:crm.category_job2
-msgid "Licenced"
-msgstr "Licencjonowane"
+#: code:addons/crm/crm_action_rule.py:0
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr "Brak ID email dla adresu twojej firmy !"
 
 #. module: crm
-#: field:crm.case.section,parent_id:0
-msgid "Parent Section"
-msgstr "Sekcja nadrzędna"
+#: view:board.board:0
+#: view:crm.lead.report:0
+msgid "Opportunities By Stage"
+msgstr ""
 
 #. module: crm
-#: wizard_view:crm.job.reschedule_phone_call,init:0
-#: wizard_button:crm.job.reschedule_phone_call,init,order:0
-#: wizard_view:crm.opportunity.reschedule_phone_call,init:0
-#: wizard_button:crm.opportunity.reschedule_phone_call,init,order:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
-#: model:ir.actions.wizard,name:crm.wizard_crm_job_reschedule_phone_call
-#: model:ir.actions.wizard,name:crm.wizard_crm_opportunity_reschedule_phone_call
 msgid "Schedule Phone Call"
 msgstr "Zaplanuj rozmowę telefoniczną"
 
 #. module: crm
-#: code:addons/crm/crm.py:0
-#, python-format
-msgid ""
-"Can not send mail with empty body,you should have description in the body"
-msgstr "Nie można wysłać wiadomości z pustą treścią."
-
-#. module: crm
-#: selection:report.crm.case.section.categ.categ2,month:0
-#: selection:report.crm.case.section.categ.stage,month:0
-#: selection:report.crm.case.section.categ2,month:0
-#: selection:report.crm.case.section.stage,month:0
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
 msgid "January"
 msgstr "Styczeń"
 
@@ -3704,170 +3296,164 @@ msgid "Contract"
 msgstr "Umowa"
 
 #. module: crm
-#: field:crm.case.section,child_ids:0
-msgid "Child Sections"
-msgstr "Sekcje podrzędne"
+#: model:crm.case.resource.type,name:crm.type_lead4
+msgid "Twitter Ads"
+msgstr ""
 
 #. module: crm
-#: view:crm.case:0
-msgid "Planned revenue"
-msgstr "Planowany dochód"
+#: code:addons/crm/wizard/crm_add_note.py:0
+#: code:addons/crm/wizard/crm_send_email.py:0
+#, python-format
+msgid "Error"
+msgstr "Błąd"
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_fund3
-msgid "Healthcare"
-msgstr "Służba zdrowia"
+#: view:crm.lead.report:0
+msgid "Planned Revenues"
+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.phonecall.assign_wizard:0
-msgid "Assign"
-msgstr "Przydziel"
+#: model:crm.case.categ,name:crm.categ_oppor7
+msgid "Need Consulting"
+msgstr ""
 
 #. module: crm
-#: field:crm.case,partner_address_id:0
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The case '%s' has been closed."
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,partner_address_id:0
+#: field:crm.meeting,partner_address_id:0
+#: field:crm.phonecall,partner_address_id:0
 msgid "Partner Contact"
 msgstr "Kontakt do partnera"
 
 #. module: crm
-#: model:crm.case.category2,name:crm.category_meet1
-msgid "Office"
-msgstr "Biuro"
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_fundraising
-msgid "Fund Raising Cases"
-msgstr "Sprawy podwyższania funduszy"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_case_stage
-msgid "Stage of case"
-msgstr "Etap sprawy"
-
-#. module: crm
-#: view:crm.case:0
-#: view:crm.fundraising:0
-#: view:crm.opportunity:0
-msgid "Estimates"
-msgstr "Szacunki"
-
-#. module: crm
-#: field:crm.case.section,user_id:0
-msgid "Responsible User"
-msgstr "Użytkownik odpowiedzialny"
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid "Merged into Opportunity: %s"
+msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: view:crm.case:0
+#: view:crm.lead:0
+#: view:res.partner:0
 #, python-format
 msgid "Close"
 msgstr "Zamknij"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_helpdesk_assign_wizard
-msgid "crm.helpdesk.assign_wizard"
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+msgid "Categorization"
 msgstr ""
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "Conditions on Case Partner"
-msgstr "Warunki dla partnera sprawy"
+#: model:ir.model,name:crm.model_base_action_rule
+msgid "Action Rules"
+msgstr ""
 
 #. module: crm
-#: field:crm.case.section,code:0
-msgid "Section Code"
-msgstr "Kod sekcji"
+#: view:crm.meeting:0
+#: field:crm.meeting,rrule_type:0
+msgid "Recurrency"
+msgstr ""
 
 #. module: crm
-#: wizard_field:crm.job.meeting_set,init,date:0
-#: wizard_field:crm.phonecall.meeting_set,init,date:0
-msgid "Meeting date"
-msgstr "Data spotkania"
+#: field:crm.meeting,phonecall_id:0
+msgid "Phonecall"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Thursday"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.send.mail,email_to:0
+msgid "To"
+msgstr "Do"
 
 #. module: crm
 #: selection:crm.meeting,class:0
-msgid "CONFIDENTIAL"
-msgstr "POUFNE"
+msgid "Private"
+msgstr ""
 
 #. module: crm
-#: help:crm.case.rule,act_mail_body:0
-msgid "Content of mail"
-msgstr "Treść wiaodmości"
+#: field:crm.lead,function:0
+msgid "Function"
+msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_meet2
-msgid "Not fixed"
-msgstr "Nie ustalone"
+#: view:crm.add.note:0
+msgid "_Add"
+msgstr ""
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_lead3
-#: model:crm.case.categ,name:crm.categ_oppor3
-msgid "Employee"
-msgstr "Pracownik"
+#: selection:crm.segmentation.line,expr_name:0
+msgid "State of Mind"
+msgstr "Stan emocji"
 
 #. module: crm
-#: field:crm.case,email_from:0
-msgid "Partner Email"
-msgstr "Email partnera"
-
-#. module: crm
-#: view:crm.case.rule:0
-msgid "% = The '%' Character"
-msgstr "% = Znak '%'"
-
-#. 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
+#: field:crm.case.section,note:0
 #: view:crm.meeting:0
-#: view:crm.opportunity:0
+#: field:crm.meeting,description:0
 #: view:crm.phonecall:0
+#: field:crm.phonecall,description:0
 #: field:crm.segmentation,description:0
 msgid "Description"
 msgstr "Opis"
 
 #. module: crm
-#: selection:report.crm.case.section.categ.categ2,month:0
-#: selection:report.crm.case.section.categ.stage,month:0
-#: selection:report.crm.case.section.categ2,month:0
-#: selection:report.crm.case.section.stage,month:0
+#: field:base.action.rule,trg_section_id:0
+#: field:crm.case.categ,section_id:0
+#: field:crm.case.resource.type,section_id:0
+#: view:crm.case.section:0
+#: field:crm.case.section,name:0
+#: field:crm.lead,section_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,section_id:0
+#: field:crm.meeting,section_id:0
+#: field:crm.opportunity2phonecall,section_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,section_id:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall2phonecall,section_id:0
+#: field:res.partner,section_id:0
+#: field:res.users,context_section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
 msgid "May"
 msgstr "Maj"
 
 #. module: crm
-#: view:crm.job:0
-msgid "Internal Notes"
-msgstr "Wiadomości wewnętrzne"
-
-#. module: crm
-#: help:crm.case.rule,act_remind_user:0
-msgid ""
-"Check this if you want the rule to send a reminder by email to the user."
+#: model:crm.case.categ,name:crm.categ_oppor2
+msgid "Interest in Accessories"
 msgstr ""
-"Zaznacz to, jeśli chcesz aby reguła wysłała przypomnienie mailem do "
-"użytkownika."
 
 #. 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
-msgid "CC"
-msgstr "DW"
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The opportunity '%s' has been opened."
+msgstr ""
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
@@ -3875,158 +3461,123 @@ msgid "Mandatory / Optional"
 msgstr "Obowiązkowe / Opcjonalne"
 
 #. module: crm
-#: wizard_button:caldav.crm.import,init,open:0
-msgid "_Import"
-msgstr "_Importuj"
+#: field:crm.lead,street:0
+msgid "Street"
+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
-#: field:crm.opportunity,inherit_case_id:0
-#: field:crm.phonecall,inherit_case_id:0
-#: model:ir.model,name:crm.model_crm_case
-#: model:res.request.link,name:crm.req_link_case
-#, python-format
-msgid "Case"
-msgstr "Sprawa"
+#: view:crm.lead.report:0
+msgid "Opportunities by User and Team"
+msgstr ""
 
 #. module: crm
-#: 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"
-msgstr "Najniższy"
+#: field:crm.case.section,working_hours:0
+msgid "Working Hours"
+msgstr ""
 
 #. module: crm
-#: selection:report.crm.case.section.categ.categ2,month:0
-#: selection:report.crm.case.section.categ.stage,month:0
-#: selection:report.crm.case.section.categ2,month:0
-#: selection:report.crm.case.section.stage,month:0
+#: view:crm.lead:0
+#: field:crm.lead,is_customer_add:0
+msgid "Customer"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
 msgid "February"
 msgstr "Luty"
 
 #. module: crm
 #: view:crm.phonecall:0
-#: model:ir.actions.act_window,name:crm.crm_case_categ_meet_case
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 msgid "Schedule a Meeting"
 msgstr "Zaplanuj spotkanie"
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "Conditions on Priority Range"
-msgstr "Warunki dla zakres priorytetu"
-
-#. module: crm
-#: help:crm.segmentation,som_interval_decrease:0
-msgid ""
-"If the partner has not purchased (or buied) during a period, decrease the "
-"state of mind by this factor. It's a multiplication"
+#: model:crm.case.stage,name:crm.stage_lead6
+#: view:crm.lead:0
+msgid "Lost"
 msgstr ""
-"Jeśli partner nie zakupił nic przez ten okres, to zmniejsz jego stan emocji "
-"o ten współczynnik. To jest dzielenie."
 
 #. module: crm
-#: wizard_view:crm.new.send.mail,init:0
-#: wizard_view:crm.send.mail,init:0
-msgid "Mass Mailing"
-msgstr "Poczta masowa"
+#: field:crm.lead,country_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,country_id:0
+msgid "Country"
+msgstr ""
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "E-Mail Actions"
-msgstr "Akcje email"
+#: view:crm.lead:0
+#: selection:crm.lead2opportunity.action,name:0
+#: view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr "Konwertuj do szansy"
 
 #. module: crm
-#: field:report.crm.case.section.categ.categ2,name:0
-#: field:report.crm.case.section.categ.stage,name:0
-#: field:report.crm.case.section.categ2,name:0
-#: field:report.crm.case.section.stage,name:0
-msgid "Year"
-msgstr "Rok"
+#: selection:crm.meeting,week_list:0
+msgid "Wednesday"
+msgstr ""
 
 #. module: crm
-#: model:crm.case.category2,name:crm.categ2_fund1
-msgid "Cash"
-msgstr "Gotówka"
-
-#. module: crm
-#: view:crm.fundraising:0
-msgid "Funds by Categories"
-msgstr "Fundusze wg kategorii"
-
-#. module: crm
-#: model:process.node,note:crm.process_node_leads0
-msgid "Very first contact with new prospect"
-msgstr "Pierwszy kontakt z tą okazją"
-
-#. module: crm
-#: selection:report.crm.case.section.categ.categ2,month:0
-#: selection:report.crm.case.section.categ.stage,month:0
-#: selection:report.crm.case.section.categ2,month:0
-#: selection:report.crm.case.section.stage,month:0
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
 msgid "April"
 msgstr "Kwiecień"
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_meet5
-msgid "Future"
-msgstr "Przyszłe"
+#: field:crm.case.resource.type,name:0
+msgid "Campaign Name"
+msgstr ""
 
 #. module: crm
-#: wizard_field:caldav.crm.export,init,file_path:0
-msgid "Save ICS file"
-msgstr "Zapisz plik ICS"
+#: model:ir.model,name:crm.model_crm_phonecall_report
+msgid "Phone calls by user and section"
+msgstr ""
 
 #. module: crm
-#: wizard_field:caldav.crm.subscribe,init,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Wprowadź ścieżkę dla zdalnego kalendarza"
+#: selection:crm.lead2opportunity.action,name:0
+msgid "Merge with existing Opportunity"
+msgstr ""
 
 #. module: crm
-#: view:crm.case.log:0
-msgid "Case logs"
-msgstr "Log sprawy"
+#: field:crm.meeting,select1:0
+msgid "Option"
+msgstr ""
 
 #. module: crm
-#: view:crm.case.rule:0
-msgid "Conditions on Timing"
-msgstr "Warunki dla czasu"
+#: model:crm.case.stage,name:crm.stage_lead4
+msgid "Negotiation"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_helpdesk
-msgid "Helpdesk Cases"
-msgstr "Sprawy helpdesku"
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
+msgstr ""
 
 #. module: crm
-#: model:ir.actions.wizard,name:crm.wizard_crm_cal_export
-msgid "Export ICS File"
-msgstr "Eksportuj plik ICS"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,sequence:0
-#: field:crm.case.section,sequence:0
 #: field:crm.case.stage,sequence:0
+#: field:crm.meeting,sequence:0
 msgid "Sequence"
 msgstr "Numeracja"
 
 #. module: crm
-#: wizard_view:caldav.crm.import,init:0
-#: wizard_field:caldav.crm.import,init,file_path:0
-msgid "Select ICS file"
-msgstr "Wybierz plik ICS"
+#: field:crm.send.mail,body:0
+msgid "Message Body"
+msgstr ""
 
 #. module: crm
-#: wizard_view:caldav.crm.import,display:0
-msgid "Import Message"
-msgstr "Importuj wiadomość"
+#: view:crm.meeting:0
+msgid "Accept"
+msgstr ""
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -4034,34 +3585,41 @@ msgid "Control Variable"
 msgstr "Zmienna kontrolna"
 
 #. module: crm
-#: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
-#: model:ir.ui.menu,name:crm.menu_crm_case_section_act_tree
-msgid "Cases by section"
-msgstr "Sprawy wg sekcji"
+#: selection:crm.meeting,byday:0
+msgid "Second"
+msgstr ""
 
 #. module: crm
-#: view:crm.job:0
-msgid "New Jobs"
-msgstr "Nowe stanowiska"
+#: model:crm.case.stage,name:crm.stage_lead3
+msgid "Proposition"
+msgstr ""
 
 #. module: crm
-#: field:crm.menu.config_wizard,fund:0
-msgid "Fund Raising Operations"
-msgstr "Operacje zwiększania funduszy"
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr ""
 
 #. module: crm
-#: model:crm.case.category2,name:crm.category_lead8
+#: view:crm.lead.report:0
+#: field:crm.lead.report,name:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,name:0
+msgid "Year"
+msgstr "Rok"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
 msgstr "Biuletyn"
 
 #~ msgid "My "
 #~ msgstr "Moje "
 
-#~ msgid "Extra Info"
-#~ msgstr "Dodatkowe informacje"
+#~ msgid "Estimates"
+#~ msgstr "Szacunki"
 
-#~ msgid "Profiling"
-#~ msgstr "Profilowanie"
+#~ msgid "Rules"
+#~ msgstr "Reguły"
 
 #~ msgid "Base Information"
 #~ msgstr "Informacja podstawowa"
@@ -4072,9 +3630,36 @@ msgstr "Biuletyn"
 #~ msgid "All Open "
 #~ msgstr "Wszystkie otwarte "
 
+#~ msgid "Remind Partner"
+#~ msgstr "Przypomnij partnerowi"
+
+#~ msgid "Planned costs"
+#~ msgstr "Planowane koszty"
+
+#~ msgid "Template of Email to Send"
+#~ msgstr "Szablon emaila do wysłania"
+
+#~ msgid "Set state to"
+#~ msgstr "Ustaw stan na"
+
 #~ msgid "Create menu Entries"
 #~ msgstr "Utwórz pozycje menu"
 
+#~ msgid "Planned Costs"
+#~ msgstr "Planowane koszty"
+
+#~ msgid "Watchers Emails"
+#~ msgstr "Adresy obserwatorów"
+
+#~ msgid "None"
+#~ msgstr "Brak"
+
+#~ msgid "Maximim Priority"
+#~ msgstr "Maksymalny priorytet"
+
+#~ msgid "Partner Events"
+#~ msgstr "Zdarzenia partnera"
+
 #~ msgid "New "
 #~ msgstr "Nowe "
 
@@ -4084,39 +3669,96 @@ msgstr "Biuletyn"
 #~ msgid "Select Views (empty for default)"
 #~ msgstr "Wybierz widoki (domyślnie puste)"
 
+#~ msgid "Special Keywords to Be Used in The Body"
+#~ msgstr "Specjalne słowa kluczowe do zastosowania w treści"
+
+#~ msgid "Your action"
+#~ msgstr "Twoja akcja"
+
+#~ msgid "My Histories"
+#~ msgstr "Moje historie"
+
 #~ msgid "All Draft "
 #~ msgstr "Wszystkie projekty "
 
+#~ msgid "Fields to Change"
+#~ msgstr "Pola do zmiany"
+
 #~ msgid "My Draft "
 #~ msgstr "Moje projekty "
 
+#~ msgid "Add watchers (Cc)"
+#~ msgstr "Dodaj obserwatorów (DW)"
+
 #~ msgid "All Unclosed and Unassigned "
 #~ msgstr "Wszystkie nie zamknięte i nie przypisane "
 
 #~ msgid "My cases"
 #~ msgstr "Moje przypadki"
 
+#~ msgid "Last Action Date"
+#~ msgstr "Data ostatniej akcji"
+
 #~ msgid "My Open Cases"
 #~ msgstr "Moje otwarte przypadki"
 
+#~ msgid "Created"
+#~ msgstr "Utworzono"
+
+#~ msgid "Set responsible to"
+#~ msgstr "Ustaw odpowiedzialnego na"
+
+#~ msgid "Calendar"
+#~ msgstr "Kalendarz"
+
+#~ msgid "Status"
+#~ msgstr "Stan"
+
+#~ msgid "Conditions"
+#~ msgstr "Warunki"
+
+#~ msgid "Set section to"
+#~ msgstr "Ustaw sekcję na"
+
+#~ msgid "Parent Section"
+#~ msgstr "Sekcja nadrzędna"
+
 #~ msgid "Parent Menu"
 #~ msgstr "Menu nadrzędne"
 
 #~ msgid "Created Menus"
 #~ msgstr "Utworzone menu"
 
+#~ msgid "Child Sections"
+#~ msgstr "Sekcje podrzędne"
+
 #~ msgid "Don't Create"
 #~ msgstr "Nie twórz"
 
+#~ msgid "Send Reminder"
+#~ msgstr "Wyślij przypomnienie"
+
+#~ msgid "General"
+#~ msgstr "Ogólne"
+
 #~ msgid "Tree View"
 #~ msgstr "Widok drzewa"
 
 #~ msgid "Create Menus For Cases"
 #~ msgstr "Utwórz menu dla przypadków"
 
+#~ msgid "General Description"
+#~ msgstr "Ogólny opis"
+
+#~ msgid "Set priority to"
+#~ msgstr "Ustaw priorytet na"
+
 #~ msgid "All Canceled "
 #~ msgstr "Wszystkie anulowane "
 
+#~ msgid "Segmentations"
+#~ msgstr "Segmentacje"
+
 #~ msgid "List"
 #~ msgstr "Lista"
 
@@ -4126,6 +3768,18 @@ msgstr "Biuletyn"
 #~ msgid "Form View"
 #~ msgstr "Widok formularza"
 
+#~ msgid "Planned revenue"
+#~ msgstr "Planowany dochód"
+
+#~ msgid "Actions"
+#~ msgstr "Akcje"
+
+#~ msgid "Trigger Date"
+#~ msgstr "Data wyzwolenia"
+
+#~ msgid "Log"
+#~ msgstr "Log"
+
 #~ msgid "All Unassigned "
 #~ msgstr "Wszystkie nieprzypisane "
 
@@ -4134,3 +3788,1299 @@ msgstr "Biuletyn"
 
 #~ msgid "All "
 #~ msgstr "Wszystko "
+
+#~ msgid "    7 Days    "
+#~ msgstr "    7 Dni    "
+
+#~ msgid "Manages an Helpdesk service."
+#~ msgstr "Zarządza usługą Helpdesku."
+
+#~ msgid "Send to"
+#~ msgstr "Wyślij do"
+
+#, python-format
+#~ msgid "Please specify user's email address !"
+#~ msgstr "Proszę podać adres email użytkownika!"
+
+#~ msgid ""
+#~ "Describes the action name.eg:on which object which ation to be taken on "
+#~ "basis of which condition"
+#~ msgstr ""
+#~ "Opisuje nazwę działania, np. na których obiektach jakie będzie działanie na "
+#~ "podstawie jakich warunków."
+
+#~ msgid "Duration (Hours)"
+#~ msgstr "Długość trwania (godziny)"
+
+#~ msgid "Proposed Salary"
+#~ msgstr "Proponowane wynagrodzenie"
+
+#~ msgid "Second Interview"
+#~ msgstr "Druga rozmowa kwalifikacyjna"
+
+#~ msgid "Subscribe to a Remote calendar"
+#~ msgstr "Zapisz się do zdalnego kalendarza"
+
+#~ msgid "Mail to these emails"
+#~ msgstr "Wyślij wiadomości do tych adresów email."
+
+#~ msgid "Exception Dates"
+#~ msgstr "Daty wyjątków"
+
+#~ msgid "Next Interview"
+#~ msgstr "Następna rozmowa kwalifikacyjna"
+
+#~ msgid "Description Information"
+#~ msgstr "Informacja opisowa"
+
+#~ msgid "Action Information"
+#~ msgstr "Informacja o akcji"
+
+#~ msgid "Dead"
+#~ msgstr "Martwe"
+
+#~ msgid "Confirm Meeting"
+#~ msgstr "Potwierdź spotkanie"
+
+#~ msgid "Existing Customer"
+#~ msgstr "Istniejący klient"
+
+#~ msgid "Meetings Tree"
+#~ msgstr "Drzewo spotkań"
+
+#~ msgid "All Meetings"
+#~ msgstr "Wszystkie spotkania"
+
+#~ msgid "   Today   "
+#~ msgstr "   Dzisiaj   "
+
+#~ msgid "Allows to show calendar"
+#~ msgstr "Pozwala pokazać kalendarz"
+
+#~ msgid "Phone Call Description"
+#~ msgstr "Opis rozmowy telefonicznej"
+
+#~ msgid "Meetings Form"
+#~ msgstr "Formularz spotkań"
+
+#~ msgid "Assigned to"
+#~ msgstr "Przypisano do"
+
+#~ msgid "Jobs - Hiring Process"
+#~ msgstr "Praca - proces zatrudnienia"
+
+#~ msgid "Contract Signed"
+#~ msgstr "Umowę podpisano"
+
+#~ msgid "Close Lead"
+#~ msgstr "Zamknij sygnał"
+
+#~ msgid "Amount"
+#~ msgstr "Kwota"
+
+#~ msgid "Lead Email"
+#~ msgstr "Email sygnału"
+
+#~ msgid "Leads Tree"
+#~ msgstr "Drzewo sygnałów"
+
+#~ msgid "All Leads"
+#~ msgstr "Wszystkie sygnały"
+
+#~ msgid "Lead Information"
+#~ msgstr "Informacja sygnału"
+
+#~ msgid "Lead Name"
+#~ msgstr "Nazwa sygnału"
+
+#~ msgid "Lead Subject"
+#~ msgstr "Temat sygnału"
+
+#~ msgid ""
+#~ "Allows you to track and manage leads which are pre-sales requests or "
+#~ "contacts, the very first contact with a customer request."
+#~ msgstr ""
+#~ "Pozwala śledzić i zarządzać sygnałami, które są pytaniami sondażowymi lub "
+#~ "przypadkowymi kontaktami."
+
+#~ msgid "Lead Source"
+#~ msgstr "Źródło sygnału"
+
+#~ msgid "Meeting For Leads Generation"
+#~ msgstr "Spotkanie do generacji sygnałów"
+
+#~ msgid "Lead Details"
+#~ msgstr "Szczegóły sygnału"
+
+#~ msgid "Contract Proposed"
+#~ msgstr "Zaproponowano umowę"
+
+#~ msgid "New Claims"
+#~ msgstr "Nowe reklamacje"
+
+#~ msgid "Date of Claim"
+#~ msgstr "Data reklamacji"
+
+#~ msgid ""
+#~ "Manages the supplier and customers claims, including your corrective or "
+#~ "preventive actions."
+#~ msgstr ""
+#~ "Zarządza reklamacjami dostawców i klientów, oraz twoimi działaniami "
+#~ "naprawczymi i prewencyjnymi."
+
+#~ msgid "Pending Claims"
+#~ msgstr "Oczekujące reklamacje"
+
+#~ msgid "Type of claim"
+#~ msgstr "Typ reklamacji"
+
+#~ msgid "All Claims"
+#~ msgstr "Wszystkie reklamacje"
+
+#~ msgid "Claim Cost"
+#~ msgstr "Koszt reklamacji"
+
+#~ msgid "Claim/Action Description"
+#~ msgstr "Reklamacja/Opis akcji"
+
+#~ msgid "Claims Info"
+#~ msgstr "Informacja o reklamacji"
+
+#~ msgid "In Progress Claims"
+#~ msgstr "Reklamacje w toku"
+
+#~ msgid "Factual Claims"
+#~ msgstr "Reklamacja rzeczowa"
+
+#~ msgid "Policy Claims"
+#~ msgstr "Reklamacja postępowania"
+
+#~ msgid "Value Claims"
+#~ msgstr "Reklamacje wartości"
+
+#~ msgid "Pending Jobs"
+#~ msgstr "Wstrzymane prace"
+
+#~ msgid ""
+#~ "Check this if you want the rule to send an email to the responsible person."
+#~ msgstr ""
+#~ "Zaznacz, jeśli chcesz aby reguła wysłała wiadomość do osoby odpowiedzialnej."
+
+#~ msgid "Close job request"
+#~ msgstr "Zamknij zgłoszenie pracy"
+
+#~ msgid "Fixed"
+#~ msgstr "Naprawione"
+
+#~ msgid "Appreciation"
+#~ msgstr "Ocena"
+
+#~ msgid "Tracks identified business opportunities for your sales pipeline."
+#~ msgstr ""
+#~ "Śledzi zidentyfikowane szanse biznesowe dla twoich kanałów sprzedaży."
+
+#~ msgid "Delay type"
+#~ msgstr "Typ opóźnienia"
+
+#~ msgid "Exception Rules"
+#~ msgstr "Reguły wyjątku"
+
+#~ msgid "Accepted as Claim"
+#~ msgstr "Zaakceptowano jako reklamację"
+
+#~ msgid ""
+#~ "The channels represent the different communication modes available with the "
+#~ "customer. With each commercial opportunity, you can indicate the canall "
+#~ "which is this opportunity source."
+#~ msgstr ""
+#~ "Kanały są różnymi, dostępnymi trybami komunikacji z klientem. Do każdej "
+#~ "szansy możesz dowiązać kanał, który jest jej źródłem."
+
+#~ msgid "Business Opportunities"
+#~ msgstr "Szanse biznesowe"
+
+#~ msgid "Value Proposition"
+#~ msgstr "Propozycja wartości"
+
+#~ msgid "Refused by Company"
+#~ msgstr "Odrzucone przez firmę"
+
+#~ msgid "Add CC"
+#~ msgstr "Dodaj DW"
+
+#~ msgid "New Business"
+#~ msgstr "Nowy biznes"
+
+#~ msgid "Negotiation/Review"
+#~ msgstr "Negocjacje/Przegląd"
+
+#~ msgid "Existing Business"
+#~ msgstr "Istniejący biznes"
+
+#~ msgid "Emails"
+#~ msgstr "Wiadomości e-mail"
+
+#~ msgid "Save in .ics format"
+#~ msgstr "Zapisz w formacie .ics"
+
+#~ msgid ""
+#~ "Check if the category is limited to partners that match the segmentation "
+#~ "criterions. If checked, remove the category from partners that doesn't match "
+#~ "segmentation criterions"
+#~ msgstr ""
+#~ "Zaznacz to, jeśli kategoria ma być ograniczona do partnerów odpowiadających "
+#~ "kryteriom segmentacji. Jeśli zaznaczone, to usuń kategorię z partnerów, "
+#~ "którzy nie odpowiadają kryteriom segmentacji."
+
+#~ msgid "Search Histories"
+#~ msgstr "Przeszukuj historie"
+
+#~ msgid "Set State to"
+#~ msgstr "Ustaw stan na"
+
+#~ msgid "Plan Meeting"
+#~ msgstr "Zaplanuj spotkanie"
+
+#, python-format
+#~ msgid "There is no mail to reply!"
+#~ msgstr "Nie ma wiadomości do odpowiedzi"
+
+#~ msgid "Direction"
+#~ msgstr "Kierunek"
+
+#~ msgid "Server Action to be Triggered"
+#~ msgstr "Akcja serwera do wykonania"
+
+#~ msgid "My Funds"
+#~ msgstr "Moje fundusze"
+
+#~ msgid "Junior Developer"
+#~ msgstr "Młodszy inżynier"
+
+#~ msgid "Export ICS"
+#~ msgstr "Eksportuj ICS"
+
+#~ msgid "Category Name"
+#~ msgstr "Nazwa kategorii"
+
+#~ msgid "Recurrency Rule"
+#~ msgstr "Reguła rekurencyjna"
+
+#~ msgid "Candidate Refused"
+#~ msgstr "Kandydat odrzucony"
+
+#~ msgid "Print"
+#~ msgstr "Drukuj"
+
+#~ msgid "Closed Won"
+#~ msgstr "Zamknięte z sukcesem"
+
+#~ msgid "Are you sure you want to create a partner based on this phonecall ?"
+#~ msgstr ""
+#~ "Jesteś pewien, że chcesz utworzyć partnera na podstawie tej rozmowy ?"
+
+#~ msgid "Learning And Education"
+#~ msgstr "Nauka i edukacja"
+
+#~ msgid "Minimum Priority"
+#~ msgstr "Minimalny priorytet"
+
+#~ msgid "Meeting Date"
+#~ msgstr "Data spotkania"
+
+#~ msgid "Convert to Partner"
+#~ msgstr "Konwertuj do partnera"
+
+#~ msgid "Next Meetings"
+#~ msgstr "Następne spotkania"
+
+#~ msgid "_Subscribe"
+#~ msgstr "_Subskrybuj"
+
+#~ msgid "Meeting Generic Wizard"
+#~ msgstr "Podstawowy kreator spotkań"
+
+#~ msgid "Website"
+#~ msgstr "Strona WWW"
+
+#~ msgid "Message..."
+#~ msgstr "Wiadomość..."
+
+#~ msgid "Self Generated"
+#~ msgstr "Samogenerowane"
+
+#~ msgid "Candidate Name"
+#~ msgstr "Nazwisko kandydata"
+
+#~ msgid ""
+#~ "Helps you to organise the jobs hiring process: evaluation, meetings, email "
+#~ "integration..."
+#~ msgstr ""
+#~ "Pomaga organizować proces zatrudniania: ocena, spotkania, integracja "
+#~ "wiadomości..."
+
+#~ msgid "Awaiting Response"
+#~ msgstr "Oczekuje na odpowiedź"
+
+#~ msgid "Funds"
+#~ msgstr "Fundusze"
+
+#~ msgid "Won't fix"
+#~ msgstr "Nie do naprawienia"
+
+#~ msgid "Gives Location of Meeting"
+#~ msgstr "Ustala miejsce spotkania"
+
+#~ msgid "Jobs - Recruitment Tree"
+#~ msgstr "Praca - Drzewo rekrutacji"
+
+#~ msgid "Reply to Last Email"
+#~ msgstr "Odpowiedz na ostatnią wiadomość"
+
+#~ msgid "Converted"
+#~ msgstr "Skonwertowano"
+
+#~ msgid "Helpdesk Support Tree"
+#~ msgstr "Drzewo wsparcia helpdesku"
+
+#~ msgid "Other Info"
+#~ msgstr "Inne informacje"
+
+#~ msgid "Schedule a Phone Call"
+#~ msgstr "Zaplanuj rozmowę"
+
+#~ msgid "Search Funds"
+#~ msgstr "Przeszukaj fundusze"
+
+#~ msgid "Search Claims"
+#~ msgstr "Przeszukaj reklamacje"
+
+#~ msgid "Manages the calendar of meetings of the users."
+#~ msgstr "Zarządza kalendarzem spotkań użytkownika"
+
+#~ msgid "Needs Analysis"
+#~ msgstr "Wymaga analizy"
+
+#~ msgid "Mail body"
+#~ msgstr "Treść wiadomości"
+
+#, python-format
+#~ msgid ""
+#~ "No E-Mail ID Found for your Company address or missing reply address in "
+#~ "section!"
+#~ msgstr ""
+#~ "Nie znaleziono ID email dla adresu twojej firmy lub brak adresu zwrotnego w "
+#~ "sekcji!"
+
+#~ msgid "Mail to watchers (CC)"
+#~ msgstr "Wiadomość dla obserwatorów (DW)"
+
+#~ msgid "Sales Stage"
+#~ msgstr "Etap sprzedaży"
+
+#~ msgid "Add a CC"
+#~ msgstr "Dodaj DW"
+
+#~ msgid "Closed Lost"
+#~ msgstr "Zamknięte z porażką"
+
+#~ msgid "Next Meeting"
+#~ msgstr "Następne spotkanie"
+
+#~ msgid "Email Address"
+#~ msgstr "Adres email"
+
+#~ msgid "Open Jobs"
+#~ msgstr "Otwarte stanowiska"
+
+#~ msgid "Availability (weeks)"
+#~ msgstr "Dostępność (tygodnie)"
+
+#~ msgid "Opportunities Tree"
+#~ msgstr "Drzewo szans"
+
+#~ msgid "First Interview"
+#~ msgstr "Pierwsza rozmowa"
+
+#~ msgid "This Month"
+#~ msgstr "Bieżący miesiąc"
+
+#~ msgid "Refused by Employee"
+#~ msgstr "Odmowa pracownika"
+
+#~ msgid "Employee's Name"
+#~ msgstr "Nazwisko pracownika"
+
+#~ msgid "Campaign Type"
+#~ msgstr "Typ kampanii"
+
+#~ msgid "Proposal/Price Quote"
+#~ msgstr "Propozycja/Oferta ceny"
+
+#~ msgid "Web"
+#~ msgstr "WWW"
+
+#~ msgid "Bug Tracking"
+#~ msgstr "Obsługa błędów"
+
+#~ msgid "Delay After Trigger Date:"
+#~ msgstr "Opóźnienie po dacie wyzwolenia"
+
+#~ msgid "User Responsible"
+#~ msgstr "Użytkownik odpowiedzialny"
+
+#~ msgid "Server Action"
+#~ msgstr "Akcja serwera"
+
+#~ msgid "Demand Draft"
+#~ msgstr "Wymagaj projektu"
+
+#~ msgid "Regex on Communication History"
+#~ msgstr "Wyrażenia reg. dla historii komunikacji"
+
+#, python-format
+#~ msgid "Email not sent !"
+#~ msgstr "Wiadomość nie wysłana !"
+
+#~ msgid "Close Phonecall"
+#~ msgstr "Zamknij rozmowę"
+
+#~ msgid "Latest E-Mail"
+#~ msgstr "Ostatni email"
+
+#~ msgid "Graduate"
+#~ msgstr "Wykształcenie"
+
+#~ msgid ""
+#~ "Note that you can also use the calendar view to graphically schedule your "
+#~ "next meeting."
+#~ msgstr ""
+#~ "Zauważ, że możesz stosować kalendarz do graficznego planowania spotkań."
+
+#~ msgid "Histories"
+#~ msgstr "Historie"
+
+#~ msgid "Attendee"
+#~ msgstr "Uczestnik"
+
+#, python-format
+#~ msgid "Email Fail!"
+#~ msgstr "Błąd wiadomości"
+
+#~ msgid "Logs History"
+#~ msgstr "Zapisuje historię"
+
+#~ msgid "Error ! You cannot create recursive sections."
+#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych sekcji."
+
+#~ msgid "This Year"
+#~ msgstr "Ten rok"
+
+#~ msgid ""
+#~ " Will allow you to synchronise your Open ERP calendars with your phone, "
+#~ "outlook, Sunbird, ical, ..."
+#~ msgstr ""
+#~ " Pozwoli ci synchronizować kalendarze OpenERP z twoim telefonem, outlook, "
+#~ "Sunbird, ical, ..."
+
+#~ msgid "Used by companies to track bugs and support requests on software"
+#~ msgstr ""
+#~ "Stosowane przez firmy do śledzenia błędów i zgłoszeń do wsparcia dla "
+#~ "oprogramowania"
+
+#~ msgid "Contract Data"
+#~ msgstr "Data umowy"
+
+#~ msgid "Jobs Hiring Process"
+#~ msgstr "Proces zatrudniania"
+
+#~ msgid "Funds Form"
+#~ msgstr "Formularz funduszy"
+
+#~ msgid "Provide path for Remote Calendar"
+#~ msgstr "Wprowadź ścieżkę dla zdalnego kalendarza"
+
+#~ msgid "Candidate Hired"
+#~ msgstr "Kandydat zatrudniony"
+
+#~ msgid "Est.Revenue"
+#~ msgstr "Szac. dochód"
+
+#~ msgid "Initial Jobs Demand"
+#~ msgstr "Potrzeba stanowiska"
+
+#~ msgid "Shared Calendar"
+#~ msgstr "Współdzielony kalendarz"
+
+#~ msgid "Goals"
+#~ msgstr "Cele"
+
+#~ msgid "In Process"
+#~ msgstr "W toku"
+
+#~ msgid "After-Sale Services"
+#~ msgstr "Obsługa posprzedażna"
+
+#~ msgid "%(case_user)s = Responsible name"
+#~ msgstr "%(case_user)s = Nazwa odpowiedzialnego"
+
+#~ msgid "Fund Raising"
+#~ msgstr "Zwiększenie funduszu"
+
+#~ msgid "Helpdesk Supports"
+#~ msgstr "Wsparcie helpdesk"
+
+#~ msgid "Source"
+#~ msgstr "Źródło"
+
+#~ msgid "Convert To Partner"
+#~ msgstr "Konwertuj do partnera"
+
+#~ msgid "File name"
+#~ msgstr "Nazwa pliku"
+
+#~ msgid "All Jobs Requests"
+#~ msgstr "Wszystkie zgłoszenia na stanowisko"
+
+#~ msgid "Stage: "
+#~ msgstr "Etap: "
+
+#~ msgid "Payment Mode"
+#~ msgstr "Sposób zapłaty"
+
+#~ msgid "Import ICS"
+#~ msgstr "Importuj ICS"
+
+#~ msgid "Attendee Detail"
+#~ msgstr "Szczegóły uczestnika"
+
+#~ msgid ""
+#~ "Helps you to encode the result of a phone call or to plan a list of phone "
+#~ "calls to process."
+#~ msgstr ""
+#~ "Pomaga wprowadzić rezultat rozmowy lub zaplanować rozmowy do wykonania."
+
+#~ msgid "Import ICS File"
+#~ msgstr "Importuj plik ICS"
+
+#, python-format
+#~ msgid "A partner is already defined on this job request."
+#~ msgstr "Dla tego zgłoszenia do pracy partner jest juz zdefiniowany."
+
+#~ msgid "Prospecting"
+#~ msgstr "Ocenianie"
+
+#~ msgid "Jobs"
+#~ msgstr "Stanowiska"
+
+#~ msgid "Cancel Meeting"
+#~ msgstr "Anuluj spotkanie"
+
+#~ msgid "Employee Email"
+#~ msgstr "Email pracownika"
+
+#~ msgid "Mail to responsible"
+#~ msgstr "Mail do odpowiedzialnych"
+
+#~ msgid "%(case_date)s = Creation date"
+#~ msgstr "%(case_date)s = Data utworzenia"
+
+#~ msgid "Jobs - Recruitment Form"
+#~ msgstr "Praca - Formularz rekrutacji"
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Niepoprawne argumenty"
+
+#~ msgid "Generic Wizard"
+#~ msgstr "Podstawowy kreator"
+
+#~ msgid "Reporting"
+#~ msgstr "Raportowanie"
+
+#~ msgid "Expected Salary"
+#~ msgstr "Oczekiwane wynagrodzenie"
+
+#~ msgid "Send New Mail"
+#~ msgstr "Wyślij nową wiadomość"
+
+#~ msgid "Credit Card"
+#~ msgstr "Karta kredytowa"
+
+#~ msgid "Send Email"
+#~ msgstr "Wyślij e-mail"
+
+#~ msgid "Support Query"
+#~ msgstr "Zapytanie o wsparcie"
+
+#~ msgid "Sales Stage: "
+#~ msgstr "Etap sprzedaży: "
+
+#~ msgid "Type of Action"
+#~ msgstr "Typ akcji"
+
+#~ msgid "Candidate Email"
+#~ msgstr "Email kandydata"
+
+#~ msgid "Planned"
+#~ msgstr "Planowane"
+
+#~ msgid "Customer Office"
+#~ msgstr "Biuro klienta"
+
+#~ msgid "Trensparent"
+#~ msgstr "Przezroczysty"
+
+#~ msgid "Word of mouth"
+#~ msgstr "Ustna wiadomość"
+
+#~ msgid "Helpdesk Support"
+#~ msgstr "Wsparcie helpdesku"
+
+#~ msgid "Delay Close"
+#~ msgstr "Zamknij opóźnienie"
+
+#~ msgid "Search Jobs"
+#~ msgstr "Przeszukuj stanowiska"
+
+#~ msgid ""
+#~ "This may help associations in their fund raising process and tracking."
+#~ msgstr "To może pomóc stowarzyszeniom w poszukiwaniu funduszy."
+
+#~ msgid "Mail to partner"
+#~ msgstr "Mail do partnera"
+
+#~ msgid "Funds Tree"
+#~ msgstr "Drzewo funduszy"
+
+#~ msgid ""
+#~ "A period is the average number of days between two cycle of sale or purchase "
+#~ "for this segmentation. It's mainly used to detect if a partner has not "
+#~ "purchased or buy for a too long time, so we suppose that his state of mind "
+#~ "has decreased because he probably bought goods to another supplier. Use this "
+#~ "functionality for recurring businesses."
+#~ msgstr ""
+#~ "Okres jest średnią (w dniach) pomiędzy dwiema sprzedażami lub dwoma zakupami "
+#~ "dla tej segmentacji. To jest stosowane głównie do wykrycia, czy partner nie "
+#~ "kupował u nas zbyt długo, co może oznaczać, że jego stan emocji obniżył się, "
+#~ "ponieważ prawdopodobnie dokonał zakupów u innego dostawcy. Stosuj te "
+#~ "funkcjonalność do biznesów powtarzalnych."
+
+#~ msgid "Meeting With Candidates"
+#~ msgstr "Spotkanie z kandydatami"
+
+#~ msgid "All Funds"
+#~ msgstr "Wszystkie fundusze"
+
+#~ msgid "Candidate Name2"
+#~ msgstr "Nazwa 2 kandydata"
+
+#~ msgid "Events"
+#~ msgstr "Wydarzenia"
+
+#~ msgid "Attachment3"
+#~ msgstr "Załącznik3"
+
+#~ msgid "Attachment2"
+#~ msgstr "Załącznik2"
+
+#~ msgid ""
+#~ "Check this if you want that all documents attached to the case be attached "
+#~ "to the reminder email sent."
+#~ msgstr ""
+#~ "Zaznacz to, jeśli chcesz aby wszystkie dokumenty załączone do sprawy zostały "
+#~ "dołączone do przypomnień."
+
+#~ msgid "Cheque"
+#~ msgstr "Czek"
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the case "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Jeśli aktywne pole jest ustawione na true (prawda), to będziesz mógł ukryć "
+#~ "sprawę bez jej usuwania."
+
+#~ msgid "Case History"
+#~ msgstr "Historia sprawy"
+
+#~ msgid "Attachment1"
+#~ msgstr "Załącznik1"
+
+#~ msgid "Degree"
+#~ msgstr "Stopień"
+
+#, python-format
+#~ msgid "Historize"
+#~ msgstr "Zapisz do historii"
+
+#~ msgid "Arts And Culture"
+#~ msgstr "Kultura i sztuka"
+
+#~ msgid "Delay after trigger date"
+#~ msgstr "Opóźnienie po dacie wyzwolenia"
+
+#~ msgid "Qualication"
+#~ msgstr "Kwalifikacje"
+
+#, python-format
+#~ msgid "You must put a Partner eMail to use this action!"
+#~ msgstr "Musisz podac email pertnera, aby zastosować tę akcję!"
+
+#, python-format
+#~ msgid "Please provide Proper URL !"
+#~ msgstr "Podaj poprawny URL !"
+
+#~ msgid "To Assign"
+#~ msgstr "Do przypisania"
+
+#~ msgid "Candidate Phone"
+#~ msgstr "Telefon kandydata"
+
+#~ msgid "Are you sure you want to create a partner based on this job request ?"
+#~ msgstr ""
+#~ "Jesteś pewien, że chcesz utworzyć partnera na podstawie tego zgłoszenia do "
+#~ "pracy ?"
+
+#~ msgid "Change RRule"
+#~ msgstr "Zmień regułę"
+
+#~ msgid "Cases by Section, Category and Type"
+#~ msgstr "Sprawy wg sekcji, kategorii i typu"
+
+#, python-format
+#~ msgid ""
+#~ "Can not send mail with empty body,you should have description in the body"
+#~ msgstr "Nie można wysłać wiadomości z pustą treścią."
+
+#~ msgid "Recycled"
+#~ msgstr "Usunięty"
+
+#~ msgid "Category2 of case"
+#~ msgstr "Kategoria2 sprawy"
+
+#~ msgid "Sales"
+#~ msgstr "Sprzedaż"
+
+#~ msgid "Assigned"
+#~ msgstr "Przydzielony"
+
+#~ msgid "History of Events"
+#~ msgstr "Historia wydarzeń"
+
+#~ msgid "Fund Raising Cases"
+#~ msgstr "Sprawy podwyższania funduszy"
+
+#~ msgid "Office"
+#~ msgstr "Biuro"
+
+#~ msgid "Assign"
+#~ msgstr "Przydziel"
+
+#~ msgid "Healthcare"
+#~ msgstr "Służba zdrowia"
+
+#~ msgid "Gives the sequence order when displaying a list of case rules."
+#~ msgstr "Ustala kolejność wyświetlania listy reguł spraw"
+
+#~ msgid "Phonecall Cases"
+#~ msgstr "Sprawy telefoniczne"
+
+#, python-format
+#~ msgid "A partner is already existing with the same name."
+#~ msgstr "Istnieje już partner z tą samą nazwą"
+
+#~ msgid "All Opportunities"
+#~ msgstr "Wszystkie sprawy"
+
+#~ msgid "Employee"
+#~ msgstr "Pracownik"
+
+#~ msgid "Partner Email"
+#~ msgstr "Email partnera"
+
+#~ msgid "Section Code"
+#~ msgstr "Kod sekcji"
+
+#~ msgid "CONFIDENTIAL"
+#~ msgstr "POUFNE"
+
+#~ msgid "Meeting date"
+#~ msgstr "Data spotkania"
+
+#~ msgid "Not fixed"
+#~ msgstr "Nie ustalone"
+
+#~ msgid "Content of mail"
+#~ msgstr "Treść wiaodmości"
+
+#~ msgid "Invalid"
+#~ msgstr "Niepoprawny"
+
+#~ msgid "Calendar of Meetings"
+#~ msgstr "Kalendarz spotkań"
+
+#, python-format
+#~ msgid ""
+#~ "You can not escalate this case.\n"
+#~ "You are already at the top level."
+#~ msgstr ""
+#~ "Nie możesz przekazać tej sprawy.\n"
+#~ "Jesteś na najwyższym poziomie."
+
+#~ msgid "Set Meeting"
+#~ msgstr "Ustal spotkanie"
+
+#~ msgid "Case Section"
+#~ msgstr "Sekcja sprawy"
+
+#~ msgid ""
+#~ "The rule use a AND operator. The case must match all non empty fields so "
+#~ "that the rule execute the action described in the 'Actions' tab."
+#~ msgstr ""
+#~ "Reguła stosuje operator I. Sprawa musi pasować do wszystkich niepustych pól, "
+#~ "aby została wykonana akcja zapisana w zakładce 'Akcje'."
+
+#~ msgid "Cases by Opportunities, Category and Type"
+#~ msgstr "Sprawy wg szans, kategorii i typów"
+
+#~ msgid "Gives the sequence order when displaying a list of case sections."
+#~ msgstr "Ustala kolejność wyświetlania listy sekcji spraw."
+
+#~ msgid "Cases by section and stage"
+#~ msgstr "Sprawy wg sekcji i etapów"
+
+#~ msgid ""
+#~ "Section to which Case belongs to. Define Responsible user and Email account "
+#~ "for mail gateway."
+#~ msgstr ""
+#~ "Sekcja do której należy Sprawa. Zdefiniuj odpowiedzialnego użytkownika oraz "
+#~ "konto Email dla bramy pocztowej."
+
+#~ msgid "Cases by Section and Stage"
+#~ msgstr "Sprawy wg sekcji i etapów"
+
+#~ msgid ""
+#~ "Check this if you want the rule to send a reminder by email to the user."
+#~ msgstr ""
+#~ "Zaznacz to, jeśli chcesz aby reguła wysłała przypomnienie mailem do "
+#~ "użytkownika."
+
+#, python-format
+#~ msgid "Case"
+#~ msgstr "Sprawa"
+
+#~ msgid "Internal Notes"
+#~ msgstr "Wiadomości wewnętrzne"
+
+#~ msgid "% = The '%' Character"
+#~ msgstr "% = Znak '%'"
+
+#~ msgid "_Import"
+#~ msgstr "_Importuj"
+
+#~ msgid "%(case_user_phone)s = Responsible phone"
+#~ msgstr "%(case_user_phone)s = Telefon odpowiedzialnego"
+
+#~ msgid "Open Cases"
+#~ msgstr "Otwarte sprawy"
+
+#~ msgid ""
+#~ "The email address put in the 'Reply-To' of all emails sent by Open ERP about "
+#~ "cases in this section"
+#~ msgstr ""
+#~ "Adres umieszczony w 'Reply-To' ('Odpowiedz na adres') dla wszystkich "
+#~ "wiadomości wysłanych przez OpenERP w sprawach z tej sekcji"
+
+#~ msgid "Related Cases"
+#~ msgstr "Sprawy powiązane"
+
+#~ msgid "%(case_id)s = Case ID"
+#~ msgstr "%(case_id)s = ID sprawy"
+
+#~ msgid "Cases by Section, Category and Stage"
+#~ msgstr "Sprawy wg sekcji, kategorii i etapów"
+
+#~ msgid "Cases by Opportunities and Stage"
+#~ msgstr "Sprawy wg szans i etapów"
+
+#~ msgid "Leads Cases"
+#~ msgstr "Sprawy - sygnały"
+
+#, python-format
+#~ msgid ""
+#~ "You must define a responsible user for this case in order to use this action!"
+#~ msgstr ""
+#~ "Musisz zdefiniować użytkownika odpowiedzialnego za sprawę, aby zastosować tę "
+#~ "akcję!"
+
+#~ msgid "E-Mail Actions"
+#~ msgstr "Akcje email"
+
+#~ msgid "Mass Mailing"
+#~ msgstr "Poczta masowa"
+
+#~ msgid ""
+#~ "If the partner has not purchased (or buied) during a period, decrease the "
+#~ "state of mind by this factor. It's a multiplication"
+#~ msgstr ""
+#~ "Jeśli partner nie zakupił nic przez ten okres, to zmniejsz jego stan emocji "
+#~ "o ten współczynnik. To jest dzielenie."
+
+#~ msgid "Funds by Categories"
+#~ msgstr "Fundusze wg kategorii"
+
+#~ msgid "Cash"
+#~ msgstr "Gotówka"
+
+#~ msgid "Case history"
+#~ msgstr "Historia sprawy"
+
+#~ msgid "Case Rule"
+#~ msgstr "Reguła sprawy"
+
+#~ msgid ""
+#~ "The generic Open ERP Customer Relationship Management\n"
+#~ "system enables a group of people to intelligently and efficiently manage\n"
+#~ "leads, opportunities, tasks, issues, requests, bugs, campaign, claims, etc.\n"
+#~ "It manages key tasks such as communication, identification, prioritization,\n"
+#~ "assignment, resolution and notification.\n"
+#~ "\n"
+#~ "Open ERP ensures that all cases are successfully tracked by users, customers "
+#~ "and\n"
+#~ "suppliers. It can automatically send reminders, escalate the request, "
+#~ "trigger\n"
+#~ "specific methods and lots of others actions based on your enterprise own "
+#~ "rules.\n"
+#~ "\n"
+#~ "The greatest thing about this system is that users don't need to do "
+#~ "anything\n"
+#~ "special. They can just send email to the request tracker. Open ERP will "
+#~ "take\n"
+#~ "care of thanking them for their message, automatically routing it to the\n"
+#~ "appropriate staff, and making sure all future correspondence gets to the "
+#~ "right\n"
+#~ "place.\n"
+#~ "\n"
+#~ "The CRM module has a email gateway for the synchronisation interface\n"
+#~ "between mails and Open ERP."
+#~ msgstr ""
+#~ "Podstawowy moduł Zarządzania Relacjami z Klientami (CRM) Open ERP\n"
+#~ "pozwala grupie ludzi inteligentnie i efektywnie zarządzać sygnałami, "
+#~ "szansami,\n"
+#~ "zadaniami, problemami, zgłoszeniami, błędami, reklamacjami, kampaniami itp.\n"
+#~ "Moduł zarządza kluczowymi dziedzinami jak komunikacja, identyfikacja, \n"
+#~ "priorytezacja, powiązania i powiadamianie.\n"
+#~ "\n"
+#~ "OpenERP zapewnia, że sprawy są skutecznie obsługiwane przez \n"
+#~ "użytkowników, klientów i dostawców. System automatycznie wysyła \n"
+#~ "przypomnienia, przekazuje odpowiedzialność, wysyła zgłoszenia, wyzwala\n"
+#~ "specjalne metody i wykonuje inne akcje na podstawie twoich własnych reguł.\n"
+#~ "\n"
+#~ "Najważniejszą cechą systemu jest, że klient nie musi wykonywać żadnych \n"
+#~ "specjalnych czynności. Wystarczy, że wyśle wiadomość do centrum zgłoszeń.\n"
+#~ "OpenERP podziękuje za wiadomość, przekieruje ją do odpowiednich osób i \n"
+#~ "zapewni, że cała przyszła korespondencja trafi w odpowiednie miejsce.\n"
+#~ "\n"
+#~ "Moduł CRM zawiera bramę korespondencyjną do łączenia OpenERP z \n"
+#~ "systemem pocztowym."
+
+#, python-format
+#~ msgid "You can not assign Closed Case."
+#~ msgstr "Nie możesz przypisać do zamkniętej sprawy"
+
+#~ msgid "Case Category Name"
+#~ msgstr "Nazwa kategorii sprawy"
+
+#~ msgid "Category of case"
+#~ msgstr "Kategoria sprawy"
+
+#~ msgid "%(case_description)s = Case description"
+#~ msgstr "%(case_description)s = Opis sprawy"
+
+#~ msgid "Save ICS file"
+#~ msgstr "Zapisz plik ICS"
+
+#~ msgid "Future"
+#~ msgstr "Przyszłe"
+
+#~ msgid "Helpdesk Cases"
+#~ msgstr "Sprawy helpdesku"
+
+#~ msgid "Provide path for remote calendar"
+#~ msgstr "Wprowadź ścieżkę dla zdalnego kalendarza"
+
+#~ msgid "Select ICS file"
+#~ msgstr "Wybierz plik ICS"
+
+#~ msgid "Export ICS File"
+#~ msgstr "Eksportuj plik ICS"
+
+#~ msgid "Case logs"
+#~ msgstr "Log sprawy"
+
+#~ msgid "Cases by Opportunities, Category and Stage"
+#~ msgstr "Sprawy wg szans, kategorii i etapów"
+
+#~ msgid "Cases by section, Category and Category2"
+#~ msgstr "Sprawy wg sekcji, kategorii i kategorii2"
+
+#~ msgid "Open cases"
+#~ msgstr "Otwarte sprawy"
+
+#, python-format
+#~ msgid "You can not delete this case. You should better cancel it."
+#~ msgstr "Nie możesz usunąć tej sprawy. Powinieneś ją raczej anulować."
+
+#~ msgid "Cases by Section and Category2"
+#~ msgstr "Sprawy wg sekcji i kategorii2"
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the case "
+#~ "section without removing it."
+#~ msgstr ""
+#~ "Jeśli pole aktywne jest ustawione na true (prawda), to będziesz mógł ukryć "
+#~ "sekcję sprawy bez jej usuwania."
+
+#~ msgid "Regex on Case Name"
+#~ msgstr "Wyrażenie regularne dla nazwy sprawy"
+
+#~ msgid "Regular Expression on Case Name"
+#~ msgstr "Wyrażenie regularne dla nazwy sprawy"
+
+#~ msgid "Job Cases"
+#~ msgstr "Sprawy rekrutacji"
+
+#~ msgid "Import Message"
+#~ msgstr "Importuj wiadomość"
+
+#~ msgid "New Jobs"
+#~ msgstr "Nowe stanowiska"
+
+#~ msgid "Fund Raising Operations"
+#~ msgstr "Operacje zwiększania funduszy"
+
+#~ msgid "Cases by section"
+#~ msgstr "Sprawy wg sekcji"
+
+#~ msgid "Set case state to"
+#~ msgstr "Ustaw stan sprawy na"
+
+#~ msgid "Meeting Cases"
+#~ msgstr "Sprawy spotkań"
+
+#~ msgid "Case Category2 Name"
+#~ msgstr "Nazwa kategorii2 sprawy"
+
+#~ msgid "Cases Histories"
+#~ msgstr "Historie spraw"
+
+#~ msgid "Case State"
+#~ msgstr "Stan sprawy"
+
+#~ msgid "Opportunity Cases"
+#~ msgstr "Sprawy szans"
+
+#~ msgid "Cases by Leads and Type"
+#~ msgstr "Sprawy wg sygnałów i typów"
+
+#~ msgid "Case section"
+#~ msgstr "Sekcja sprawy"
+
+#~ msgid "Related Case"
+#~ msgstr "Sprawa związana"
+
+#~ msgid "Cases By Stage and Estimates"
+#~ msgstr "Sprawy wg etapów i szacunków"
+
+#~ msgid "All Cases"
+#~ msgstr "Wszystkie sprawy"
+
+#~ msgid "Case Communication History"
+#~ msgstr "Historia komunikacji sprawy"
+
+#~ msgid "Search Case"
+#~ msgstr "Przeszukaj sprawę"
+
+#~ msgid "Cases by Section and Type"
+#~ msgstr "Sprawy wg sekcji i typu"
+
+#~ msgid "Cases by Opportunities and Type"
+#~ msgstr "Sprawy wg szans i typów"
+
+#~ msgid "Cases by section, Category and stage"
+#~ msgstr "Sprawy wg sekcji, kategorii i etapu"
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the case rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Jeśli aktywne pole jest ustawione na true (prawda), to będziesz mógł ukryć "
+#~ "regułę sprawy bez jej usuwania."
+
+#~ msgid "Case Description"
+#~ msgstr "Opis sprawy"
+
+#~ msgid "Claim Cases"
+#~ msgstr "Sprawy reklamacji"
+
+#~ msgid "%(case_subject)s = Case subject"
+#~ msgstr "%(case_subject)s = Temat sprawy"
+
+#~ msgid "Search Cases by User"
+#~ msgstr "Przeszukuj sprawy wg użytkownika"
+
+#~ msgid "Cases by Leads and Stage"
+#~ msgstr "Sprawy wg sygnałów i etapów"
+
+#~ msgid "My Cases"
+#~ msgstr "Moje sprawy"
+
+#~ msgid "E-Mail Reminders (includes the content of the case)"
+#~ msgstr "Przypomnienie email (zawiera sprawę)"
+
+#~ msgid "Button Pressed"
+#~ msgstr "Naciśnięcie przycisku"
+
+#~ msgid "Cases by section and category2"
+#~ msgstr "Sprawy wg sekcji i kategorii2"
+
+#~ msgid "Human Resources"
+#~ msgstr "Kadry"
+
+#~ msgid "Email Add CC"
+#~ msgstr "DW w email"
+
+#~ msgid "%(partner)s = Partner name"
+#~ msgstr "%(partner)s = Nazwa partnera"
+
+#~ msgid "Home"
+#~ msgstr "Dom"
+
+#~ msgid ""
+#~ "Check this if you want the rule to mark CC(mail to any other person defined "
+#~ "in actions)."
+#~ msgstr ""
+#~ "Zaznacz to, jeśli chcesz, aby reguła wysyłała wiadomość DW (mail do dowolnej "
+#~ "osoby zdefiniowanej w akcji)."
+
+#~ msgid "Subscribe to Remote ICS"
+#~ msgstr "Powiąż ze zdalnym ICS"
+
+#~ msgid ""
+#~ "Category related to the section.Subdivide the CRM cases independently or "
+#~ "section-wise."
+#~ msgstr "Kategoria związana z sekcją. Ustala podział spraw wewnątrz w sekcji."
+
+#~ msgid ""
+#~ "Delay After Trigger Date, specifies you can put a negative number if you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Opóźnienie po czasie wyzwolenia. Możesz wstawić wartości ujemne, jeśli "
+#~ "chcesz przypomnienie np. 15 min przed spotkaniem."
+
+#~ msgid "Conditions on States"
+#~ msgstr "Warunki dla stanów"
+
+#~ msgid ""
+#~ "These people will receive a copy of the future communication between partner "
+#~ "and users by email"
+#~ msgstr ""
+#~ "Te osoby otrzymają kopie korespondencji pomiędzy partnerem i użytkownikiem."
+
+#~ msgid "Job Info"
+#~ msgstr "Informacja o stanowisku"
+
+#, python-format
+#~ msgid ""
+#~ "No E-Mail ID Found for the Responsible Partner or missing reply address in "
+#~ "section!"
+#~ msgstr ""
+#~ "Nie znaleziono ID E-Mail dla partnera odpowiedzialnego lub brak adresu "
+#~ "zwrotnego w sekcji!"
+
+#~ msgid "Corrective"
+#~ msgstr "Działania naprawcze"
+
+#~ msgid "Preventive"
+#~ msgstr "Działania prewencyjne"
+
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Warunki dla pól sprawy"
+
+#~ msgid ""
+#~ "Check this if you want the rule to send a reminder by email to the partner."
+#~ msgstr ""
+#~ "Zaznacz, jeśli chcesz, aby reguła wysyłała przypomnienie mailem do partnera."
+
+#~ msgid ""
+#~ "The minds states allow to define a value scale which representsthe partner "
+#~ "mentality in relation to our services.The scale hasto be created with a "
+#~ "factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."
+#~ msgstr ""
+#~ "Stany emocji pozwalają określać poziomy zadowolenia partnera w stosunku do "
+#~ "naszej obsługi. Skala powinna być utworzona jako liczby od 0 (bardzie "
+#~ "niezadowolony) do 10 (bardzo zadowolony)."
+
+#~ msgid "%(partner_email)s = Partner email"
+#~ msgstr "%(partner_email)s = Email partnera"
+
+#~ msgid "%(case_user_email)s = Responsible email"
+#~ msgstr "%(case_user_email)s = Email odpowiedzialnego"
+
+#~ msgid "%(email_from)s = Partner email"
+#~ msgstr "%(email_from)s = Email partnera"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#~ msgid "Email-id of the persons whom mail is to be sent"
+#~ msgstr "Email osoby, do której ma być wysłana wiadomość"
+
+#~ msgid "Applied Job"
+#~ msgstr "Zgłoszenia na stanowisko"
+
+#~ msgid "Call Object Method"
+#~ msgstr "Metoda wywołania obiektu"
+
+#~ msgid "Licenced"
+#~ msgstr "Licencjonowane"
+
+#~ msgid "Conditions on Priority Range"
+#~ msgstr "Warunki dla zakres priorytetu"
+
+#~ msgid "Conditions on Timing"
+#~ msgstr "Warunki dla czasu"
+
+#~ msgid "Conditions on Case Partner"
+#~ msgstr "Warunki dla partnera sprawy"
+
+#~ msgid "Relevant"
+#~ msgstr "Priorytet"
+
+#, python-format
+#~ msgid "done"
+#~ msgstr "gotowe"
+
+#, python-format
+#~ msgid "Email!"
+#~ msgstr "Email!"
+
+#, python-format
+#~ msgid "draft"
+#~ msgstr "wersja robocza"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "PRIVATE"
+#~ msgstr "PRYWATNY"
+
+#~ msgid "PUBLIC"
+#~ msgstr "PUBLICZNY"
+
+#~ msgid "Remind with attachment"
+#~ msgstr "Przypomnij z załącznikiem"
+
+#~ msgid "Remind responsible"
+#~ msgstr "Przypomnij odpowiedzialnym"
diff --git a/addons/google_map/i18n/sk.po b/addons/google_map/i18n/sk.po
index bd0a339b2d7..ebd0ee64fbf 100644
--- a/addons/google_map/i18n/sk.po
+++ b/addons/google_map/i18n/sk.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-22 10:11+0000\n"
+"PO-Revision-Date: 2010-10-23 07:01+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@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-10-23 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-10-24 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
index 16e8947e276..a32dfaf942c 100644
--- a/addons/hr/i18n/pl.po
+++ b/addons/hr/i18n/pl.po
@@ -6,33 +6,37 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-12 05:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-24 12:13+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-09-29 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
-#: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Openerp user"
 msgstr "Użytkownik OpenERP"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.edit_workgroup
-#: model:ir.ui.menu,name:hr.menu_edit_workgroup
-msgid "Working Time Categories"
-msgstr "Kategorie czasu pracy"
+#: view:hr.job:0
+#: field:hr.job,requirements:0
+msgid "Requirements"
+msgstr "Wymagania"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
 msgstr "Błąd! Nie możesz tworzyć rekurencyjnych działów"
 
+#. module: hr
+#: model:process.transition,name:hr.process_transition_contactofemployee0
+msgid "Link the employee to information"
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
@@ -40,19 +44,24 @@ msgstr "NIP"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
+#: model:ir.ui.menu,name:hr.menu_hr_deshboard
+#: model:ir.ui.menu,name:hr.menu_hr_main
+#: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
 msgstr "Kadry"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Sunday"
-msgstr "Niedziela"
+#: view:hr.department:0
+#: view:hr.employee:0
+#: view:hr.job:0
+msgid "Group By..."
+msgstr "Grupuj wg..."
 
 #. module: hr
-#: view:res.users:0
-msgid "Parents"
-msgstr "Nadrzędne"
+#: field:hr.employee,work_email:0
+msgid "Work E-mail"
+msgstr ""
 
 #. module: hr
 #: constraint:ir.actions.act_window:0
@@ -60,52 +69,111 @@ msgid "Invalid model name in the action definition."
 msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: hr
-#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,department_id:0
+#: view:hr.job:0
+#: field:hr.job,department_id:0
+#: view:res.users:0
 msgid "Department"
 msgstr "Dział"
 
 #. module: hr
-#: model:process.transition,name:hr.process_transition_contactofemployee0
-msgid "Contact  of employee"
-msgstr "Kontakt do pracownika"
+#: help:hr.installer,hr_attendance:0
+msgid "Simplifies the management of employee's attendances."
+msgstr "Upraszcza kontrolę obecności pracowników"
 
 #. module: hr
-#: field:hr.employee,work_email:0
-msgid "Work Email"
-msgstr "Służbowy e-mail"
+#: view:hr.job:0
+msgid "Mark as Old"
+msgstr "Zaznacz jako nieaktualne"
 
 #. module: hr
-#: field:hr.timesheet.group,name:0
-msgid "Group name"
-msgstr "Nazwa grupy"
+#: view:hr.job:0
+msgid "Jobs"
+msgstr "Stanowiska"
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Recruitment"
+msgstr "W trakcie rekrutacji"
+
+#. module: hr
+#: view:hr.installer:0
+msgid "title"
+msgstr "tytuł"
 
 #. module: hr
 #: field:hr.department,company_id:0
-#: field:hr.employee,company_id:0
+#: view:hr.employee:0
+#: view:hr.job:0
+#: field:hr.job,company_id:0
 msgid "Company"
 msgstr "Firma"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Friday"
-msgstr "Piątek"
+#: field:hr.job,no_of_recruitment:0
+msgid "Expected in Recruitment"
+msgstr ""
 
 #. module: hr
-#: field:hr.department,parent_id:0
-msgid "Parent Department"
-msgstr "Dział nadrzędny"
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
+msgid "Holidays"
+msgstr "Urlopy"
+
+#. module: hr
+#: help:hr.installer,hr_holidays:0
+msgid "Tracks employee leaves, allocation requests and planning."
+msgstr "Rejestruje obecności pracownika, jego wymagania i plany."
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_employee_marital_status
+msgid "Employee Marital Status"
+msgstr "Stan cywilny pracownika"
+
+#. module: hr
+#: help:hr.employee,partner_id:0
+msgid ""
+"Partner that is related to the current employee. Accounting transaction will "
+"be written on this partner belongs to employee."
+msgstr ""
+"Partner związany z tym pracownikiem. Operacje księgowe dla tego pracownika "
+"będą przypisane do podanego partnera."
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_employeeuser0
+msgid "Link a user to an employee"
+msgstr "Powiąż użytkownika z pracownikiem."
+
+#. module: hr
+#: field:hr.installer,hr_contract:0
+msgid "Employee's Contracts"
+msgstr "Umowy pracownika"
+
+#. module: hr
+#: help:hr.installer,hr_payroll:0
+msgid "Generic Payroll system."
+msgstr "Podstawowy system płacowy."
 
 #. module: hr
-#: view:hr.department:0
 #: view:hr.employee:0
-#: field:hr.employee,notes:0
-msgid "Notes"
-msgstr "Uwagi"
+msgid "My Departments Employee"
+msgstr "Pracownicy mojego działu"
 
 #. module: hr
-#: field:hr.timesheet,hour_from:0
-msgid "Work from"
-msgstr "Pracuje od"
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr "Błąd ! Nie możesz wybrać działu, którego pracownik jest przełożonym."
+
+#. module: hr
+#: help:hr.employee,passport_id:0
+msgid "Employee Passport Information"
+msgstr "Inofrmacje o paszporcie pracownika"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Position"
+msgstr "Stanowisko"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
@@ -113,14 +181,29 @@ msgid "Employee Hierarchy"
 msgstr "Hierarchia pracowników"
 
 #. module: hr
-#: model:ir.ui.menu,name:hr.menu_hr_configuration
-msgid "Configuration"
-msgstr "Konfiguracja"
+#: model:process.transition,note:hr.process_transition_employeeuser0
+msgid ""
+"The Related user field on the Employee form allows to link the OpenERP user "
+"(and her rights) to the employee."
+msgstr ""
+"Pole związany użytkownik na formularzu Pracownicy pozwala związać "
+"użytkownika systemu OpenERP (i jego prawa) z pracownikiem."
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Unmaried"
-msgstr "Wolny(a)"
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Recruitement"
+msgstr "W trakcie rekrutacji"
+
+#. module: hr
+#: field:hr.employee,identification_id:0
+msgid "Identification No"
+msgstr "Numer identyfikacyjny"
+
+#. module: hr
+#: field:hr.job,no_of_employee:0
+msgid "No of Employee"
+msgstr "Liczba pracowników"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -128,13 +211,23 @@ msgid "Female"
 msgstr "Kobieta"
 
 #. module: hr
-#: view:hr.timesheet.group:0
-msgid "Working Time Category"
-msgstr "Kategoria czasu pracy"
+#: help:hr.installer,hr_timesheet_sheet:0
+msgid ""
+"Tracks and helps employees encode and validate timesheets and attendances."
+msgstr "Rejestruje i wspomaga prowadzenie kart czasu pracy i obecności."
+
+#. module: hr
+#: field:hr.installer,hr_evaluation:0
+msgid "Periodic Evaluations"
+msgstr "Ocena okresowa"
+
+#. module: hr
+#: field:hr.installer,hr_timesheet_sheet:0
+msgid "Timesheets"
+msgstr "Karty czasu pracy"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
-#: model:ir.ui.menu,name:hr.menu_open_view_employee_tree
 msgid "Employees Structure"
 msgstr "Struktura pracowników"
 
@@ -143,6 +236,11 @@ msgstr "Struktura pracowników"
 msgid "Social IDs"
 msgstr "ID"
 
+#. module: hr
+#: help:hr.job,no_of_employee:0
+msgid "Number of employee with that job."
+msgstr "Liczba pracowników na tym stanowisku."
+
 #. module: hr
 #: field:hr.employee,work_phone:0
 msgid "Work Phone"
@@ -153,28 +251,50 @@ msgstr "Telefon do pracy"
 msgid "Child Categories"
 msgstr "Kategorie podrzędne"
 
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,description:0
+#: model:ir.model,name:hr.model_hr_job
+msgid "Job Description"
+msgstr "Opis stanowiska"
+
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
 msgstr "Położenia biura"
 
+#. module: hr
+#: field:hr.employee,passport_id:0
+msgid "Passport"
+msgstr "Paszport"
+
 #. module: hr
 #: view:hr.employee:0
-#: field:hr.employee,name:0
+#: view:hr.job:0
 #: model:ir.model,name:hr.model_hr_employee
 #: model:process.node,name:hr.process_node_employee0
 msgid "Employee"
 msgstr "Pracownik"
 
 #. module: hr
-#: field:hr.timesheet.group,manager:0
-msgid "Workgroup manager"
-msgstr "Kierownik grupy"
+#: model:process.node,note:hr.process_node_employeecontact0
+msgid "Other information"
+msgstr "Inne informacje"
 
 #. module: hr
-#: field:hr.employee,child_ids:0
-msgid "Subordinates"
-msgstr "Podlegli"
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Adres do pracy"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_installer
+msgid "Human Resources Application Configuration"
+msgstr "Konfiguracja kadr"
+
+#. module: hr
+#: field:hr.employee,birthday:0
+msgid "Date of Birth"
+msgstr "Data urodzenia"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
@@ -182,19 +302,42 @@ msgid "Reporting"
 msgstr "Raportowanie"
 
 #. module: hr
+#: model:ir.model,name:hr.model_ir_actions_act_window
+msgid "ir.actions.act_window"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr
+msgid "Human Resources Dashboard"
+msgstr "Konsola kadr"
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,job_id:0
+#: view:hr.job:0
+msgid "Job"
+msgstr "Stanowisko"
+
+#. module: hr
+#: view:hr.department:0
 #: field:hr.department,member_ids:0
 msgid "Members"
 msgstr "Członkowie"
 
 #. module: hr
-#: field:hr.employee,ssnid:0
-msgid "SSN No"
-msgstr "PESEL"
+#: model:ir.ui.menu,name:hr.menu_hr_configuration
+msgid "Configuration"
+msgstr "Konfiguracja"
 
 #. module: hr
-#: model:process.transition,note:hr.process_transition_contactofemployee0
-msgid "Fill up contact information"
-msgstr "Wypełnij informacje o kontakcie"
+#: view:hr.employee:0
+msgid "Categories"
+msgstr "Kategorie"
+
+#. module: hr
+#: field:hr.job,expected_employees:0
+msgid "Expected Employees"
+msgstr "Spodziewana liczba pracowników"
 
 #. module: hr
 #: constraint:ir.ui.view:0
@@ -202,9 +345,9 @@ msgid "Invalid XML for View Architecture!"
 msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Divorced"
-msgstr "Rozwiedziony"
+#: help:hr.employee,sinid:0
+msgid "Social Insurance Number"
+msgstr "Numer ubezpieczenia (PESEL)"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
@@ -212,10 +355,16 @@ msgid "Parent Category"
 msgstr "Kategoria nadrzędna"
 
 #. module: hr
+#: constraint:hr.employee.category:0
+msgid "Error ! You cannot create recursive Categories."
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
 #: model:ir.actions.act_window,name:hr.open_module_tree_department
-#: model:ir.actions.act_window,name:hr.open_module_tree_department_tree
-#: model:ir.ui.menu,name:hr.menu_department_def
-#: model:ir.ui.menu,name:hr.menu_department_tree
+#: model:ir.ui.menu,name:hr.menu_hr_department_tree
+#: view:res.users:0
+#: field:res.users,context_department_id:0
 msgid "Departments"
 msgstr "Działy"
 
@@ -225,14 +374,9 @@ msgid "Employee Contact"
 msgstr "Kontakt do pracownika"
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Maried"
-msgstr "Żonaty (Zamężna)"
-
-#. module: hr
-#: field:hr.timesheet,tgroup_id:0
-msgid "Employee's timesheet group"
-msgstr "Grupa kart czasu pracy pracowników"
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -240,9 +384,10 @@ msgid "Male"
 msgstr "Mężczyzna"
 
 #. module: hr
-#: model:process.transition,note:hr.process_transition_employeeuser0
-msgid "Create openerp user"
-msgstr "Utwórz użytkownika OpenERP"
+#: model:ir.actions.act_window,name:hr.open_view_categ_form
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
+msgid "Categories of Employee"
+msgstr "Kategorie pracowników"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -251,9 +396,21 @@ msgid "Employee Category"
 msgstr "Kategoria pracownika"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Tuesday"
-msgstr "Wtorek"
+#: field:hr.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: hr
+#: model:process.process,name:hr.process_process_employeecontractprocess0
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_evaluation:0
+msgid ""
+"Lets you create and manage the periodic evaluation and performance review of "
+"employees."
+msgstr ""
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
@@ -261,16 +418,26 @@ msgid "hr.department"
 msgstr ""
 
 #. module: hr
-#: field:hr.employee,user_id:0
-msgid "Related User"
-msgstr "Powiązany użytkownik"
+#: help:hr.employee,parent_id:0
+msgid "It is linked with manager of Department"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,category_id:0
+#: field:hr.installer,hr_recruitment:0
+msgid "Recruitment Process"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,category_ids:0
 #: field:hr.employee.category,name:0
 msgid "Category"
 msgstr "Kategoria"
 
+#. module: hr
+#: help:hr.employee,bank_account_id:0
+msgid "Employee bank salary account"
+msgstr ""
+
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
@@ -281,15 +448,25 @@ msgstr "Notatka"
 msgid "Contact Information"
 msgstr "Informacje kontaktowe"
 
+#. module: hr
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr_manager
+msgid "HR Manager Dashboard"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Status"
 msgstr "Stan"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Monday"
-msgstr "Poniedziałek"
+#: field:hr.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -298,17 +475,22 @@ msgid "Categories structure"
 msgstr "Struktura kategorii"
 
 #. module: hr
-#: field:hr.timesheet,dayofweek:0
-msgid "Day of week"
-msgstr "Dzień tygodnia"
+#: field:hr.employee,partner_id:0
+msgid "unknown"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,birthday:0
-msgid "Birthday"
-msgstr "Data urodzenia"
+#: field:hr.installer,hr_holidays:0
+msgid "Holidays / Leaves Management"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,active:0
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr "PESEL"
+
+#. module: hr
+#: view:hr.employee:0
 msgid "Active"
 msgstr "Aktywny"
 
@@ -317,61 +499,72 @@ msgstr "Aktywny"
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Błąd ! Nie mozesz tworzyć rekurencyjnych hierarchii pracowników"
 
-#. module: hr
-#: model:process.process,name:hr.process_process_employeecontractprocess0
-msgid "Employee Contract Process"
-msgstr "Proces umowy pracownika"
-
-#. module: hr
-#: model:process.node,note:hr.process_node_openerpuser0
-msgid "Create OpenERP User"
-msgstr "Utwórz użytkownika OpenERP"
-
-#. module: hr
-#: model:process.node,note:hr.process_node_employee0
-msgid "Employee Complete Form"
-msgstr "Formularz pracownika"
-
 #. module: hr
 #: view:hr.department:0
 msgid "Companies"
 msgstr "Firmy"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Wednesday"
-msgstr "Środa"
+#: model:process.transition,note:hr.process_transition_contactofemployee0
+msgid ""
+"In the Employee form, there are different kind of information like Contact "
+"information."
+msgstr ""
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_view_categ_form
-#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
-msgid "Categories of Employee"
-msgstr "Kategorie pracowników"
+#: help:hr.job,expected_employees:0
+msgid "Required number of Employees in total for that job."
+msgstr ""
 
 #. module: hr
-#: field:hr.timesheet,date_from:0
-msgid "Starting date"
-msgstr "Data rozpoczęcia"
+#: selection:hr.job,state:0
+msgid "Old"
+msgstr ""
 
 #. module: hr
-#: field:res.users,parent_id:0
-msgid "Parent Users"
-msgstr "Użytkownik nadrzędny"
+#: field:hr.employee.marital.status,description:0
+msgid "Status Description"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Adres do pracy"
+#: view:hr.job:0
+#: field:hr.job,state:0
+msgid "State"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,marital:0
+#: view:hr.employee.marital.status:0
+#: field:hr.employee.marital.status,name:0
+#: model:ir.actions.act_window,name:hr.action_hr_marital_status
+#: model:ir.ui.menu,name:hr.hr_menu_marital_status
 msgid "Marital Status"
 msgstr "Stan cywilny"
 
 #. module: hr
-#: model:ir.model,name:hr.model_hr_timesheet
-msgid "Timesheet Line"
-msgstr "Pozycja karty czasu pracy"
+#: help:hr.installer,hr_recruitment:0
+msgid "Helps you manage and streamline your recruitment process."
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employee0
+msgid "Employee form and structure"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,photo:0
+msgid "Photo"
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_payroll_account:0
+msgid "Payroll Accounting"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
@@ -387,26 +580,26 @@ msgstr ""
 "specjalnych !"
 
 #. module: hr
-#: view:hr.timesheet:0
-#: field:hr.timesheet.group,timesheet_id:0
-#: model:ir.model,name:hr.model_hr_timesheet_group
-msgid "Working Time"
-msgstr "Czas pracy"
+#: view:res.users:0
+msgid "Current Activity"
+msgstr ""
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Thursday"
-msgstr "Czwartek"
+#: help:hr.installer,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
 
 #. module: hr
-#: field:hr.timesheet,hour_to:0
-msgid "Work to"
-msgstr "Pracuje do"
+#: view:hr.job:0
+msgid "Current"
+msgstr ""
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Other"
-msgstr "Inny"
+#: field:hr.department,parent_id:0
+msgid "Parent Department"
+msgstr "Dział nadrzędny"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -418,6 +611,39 @@ msgstr "Kategorie pracowników"
 msgid "Home Address"
 msgstr "Adres domowy"
 
+#. module: hr
+#: field:hr.installer,hr_attendance:0
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
+msgid "Attendances"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.marital.status:0
+#: view:hr.job:0
+msgid "Description"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_contract:0
+msgid "Extends employee profiles to help manage their contracts."
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_payroll:0
+msgid "Payroll"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,name:0
+msgid "Job Name"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Position"
+msgstr ""
+
 #. module: hr
 #: view:hr.department:0
 msgid "department"
@@ -429,12 +655,30 @@ msgid "Nationality"
 msgstr "Narodowość"
 
 #. module: hr
-#: field:hr.employee,otherid:0
-msgid "Other ID"
-msgstr "Inne ID"
+#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,notes:0
+msgid "Notes"
+msgstr "Uwagi"
 
 #. module: hr
-#: field:hr.timesheet,name:0
+#: model:ir.model,name:hr.model_hr_installer
+msgid "hr.installer"
+msgstr ""
+
+#. module: hr
+#: view:board.board:0
+msgid "HR Manager Board"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,resource_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,complete_name:0
+#: field:hr.employee.category,complete_name:0
 msgid "Name"
 msgstr "Nazwa"
 
@@ -445,50 +689,185 @@ msgstr "Płeć"
 
 #. module: hr
 #: view:hr.employee:0
+#: field:hr.job,employee_ids:0
+#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree
 #: model:ir.actions.act_window,name:hr.open_view_employee_list
-#: model:ir.ui.menu,name:hr.menu_open_view_employee_list
+#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form
 msgid "Employees"
 msgstr "Pracownicy"
 
+#. module: hr
+#: field:hr.employee,bank_account_id:0
+msgid "Bank Account"
+msgstr ""
+
 #. module: hr
 #: field:hr.department,name:0
 msgid "Department Name"
 msgstr "Nazwa departamentu"
 
+#. module: hr
+#: help:hr.employee,ssnid:0
+msgid "Social Security Number"
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_openerpuser0
+msgid "Creation of a OpenERP user"
+msgstr ""
+
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Działy podrzędne"
 
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_job
+#: model:ir.ui.menu,name:hr.menu_hr_job
+msgid "Job Positions"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
-msgid "Job Information"
-msgstr "Informacja o pracy"
+#: field:hr.employee,coach_id:0
+msgid "Coach"
+msgstr ""
 
 #. module: hr
-#: model:process.node,note:hr.process_node_employeecontact0
-msgid "Fill up employee's contact information"
-msgstr "Wypełnij informacje kontaktowe pracownika"
+#: field:hr.installer,hr_expense:0
+msgid "Expenses"
+msgstr ""
 
 #. module: hr
+#: view:hr.department:0
 #: field:hr.department,manager_id:0
+#: view:hr.employee:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
 msgstr "Menedżer"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
-#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
-msgid "All Employees"
-msgstr "Wszyscy pracownicy"
+#: help:hr.installer,hr_payroll_account:0
+msgid "Generic Payroll system Integrated with Accountings."
+msgstr ""
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Saturday"
-msgstr "Sobota"
+#: field:hr.employee,child_ids:0
+msgid "Subordinates"
+msgstr "Podlegli"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_view_employee_new
-#: model:ir.ui.menu,name:hr.menu_open_view_employee_new
-msgid "New Employee"
-msgstr "Nowy pracownik"
+#~ msgid "Sunday"
+#~ msgstr "Niedziela"
+
+#~ msgid "Friday"
+#~ msgstr "Piątek"
+
+#~ msgid "Divorced"
+#~ msgstr "Rozwiedziony"
+
+#~ msgid "Working Time Categories"
+#~ msgstr "Kategorie czasu pracy"
+
+#~ msgid "Parents"
+#~ msgstr "Nadrzędne"
+
+#~ msgid "Contact  of employee"
+#~ msgstr "Kontakt do pracownika"
+
+#~ msgid "Work Email"
+#~ msgstr "Służbowy e-mail"
+
+#~ msgid "Unmaried"
+#~ msgstr "Wolny(a)"
+
+#~ msgid "Group name"
+#~ msgstr "Nazwa grupy"
+
+#~ msgid "Work from"
+#~ msgstr "Pracuje od"
+
+#~ msgid "Workgroup manager"
+#~ msgstr "Kierownik grupy"
+
+#~ msgid "Working Time Category"
+#~ msgstr "Kategoria czasu pracy"
+
+#~ msgid "Fill up contact information"
+#~ msgstr "Wypełnij informacje o kontakcie"
+
+#~ msgid "Employee's timesheet group"
+#~ msgstr "Grupa kart czasu pracy pracowników"
+
+#~ msgid "Maried"
+#~ msgstr "Żonaty (Zamężna)"
+
+#~ msgid "Tuesday"
+#~ msgstr "Wtorek"
+
+#~ msgid "Create openerp user"
+#~ msgstr "Utwórz użytkownika OpenERP"
+
+#~ msgid "Day of week"
+#~ msgstr "Dzień tygodnia"
+
+#~ msgid "Create OpenERP User"
+#~ msgstr "Utwórz użytkownika OpenERP"
+
+#~ msgid "Birthday"
+#~ msgstr "Data urodzenia"
+
+#~ msgid "Monday"
+#~ msgstr "Poniedziałek"
+
+#~ msgid "Employee Contract Process"
+#~ msgstr "Proces umowy pracownika"
+
+#~ msgid "Wednesday"
+#~ msgstr "Środa"
+
+#~ msgid "Parent Users"
+#~ msgstr "Użytkownik nadrzędny"
+
+#~ msgid "Working Time"
+#~ msgstr "Czas pracy"
+
+#~ msgid "Timesheet Line"
+#~ msgstr "Pozycja karty czasu pracy"
+
+#~ msgid "Starting date"
+#~ msgstr "Data rozpoczęcia"
+
+#~ msgid "Thursday"
+#~ msgstr "Czwartek"
+
+#~ msgid "Work to"
+#~ msgstr "Pracuje do"
+
+#~ msgid "New Employee"
+#~ msgstr "Nowy pracownik"
+
+#~ msgid "Saturday"
+#~ msgstr "Sobota"
+
+#~ msgid "Job Information"
+#~ msgstr "Informacja o pracy"
+
+#~ msgid "All Employees"
+#~ msgstr "Wszyscy pracownicy"
+
+#~ msgid "Fill up employee's contact information"
+#~ msgstr "Wypełnij informacje kontaktowe pracownika"
+
+#~ msgid "Other"
+#~ msgstr "Inny"
+
+#~ msgid "Related User"
+#~ msgstr "Powiązany użytkownik"
+
+#~ msgid "Employee Complete Form"
+#~ msgstr "Formularz pracownika"
+
+#~ msgid "Other ID"
+#~ msgstr "Inne ID"
diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po
index ed8604e33b4..f8e099d5c2f 100644
--- a/addons/hr_holidays/i18n/pl.po
+++ b/addons/hr_holidays/i18n/pl.po
@@ -6,25 +6,54 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-08 05:42+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-24 13:12+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-09-29 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
-msgid "New Holidays Request"
-msgstr "Nowy wniosek urlopowy"
+#: selection:hr.holidays.status,color_name:0
+msgid "Blue"
+msgstr "Niebieski"
 
 #. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_all_holiday
-msgid "All Holidays Requests"
-msgstr "Wszystkie wnioski urlopowe"
+#: view:hr.holidays:0
+#: field:hr.holidays,allocation_type:0
+#: field:hr.holidays,holiday_type:0
+msgid "Allocation Type"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays,state:0
+msgid "Waiting Second Approval"
+msgstr "Oczekuje na drugą aprobatę"
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: field:available.holidays.report,taken_leaves:0
+msgid "Taken Leaves"
+msgstr "Wykorzystane urlopy"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,remaining_leaves:0
+msgid "Maximum Leaves Allowed - Leaves Already Taken"
+msgstr "Liczba dni urlopu - Urlopy wykorzystane"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Leaves Management"
+msgstr "Urlopy"
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: view:hr.holidays:0
+msgid "Group By..."
+msgstr "Grupuj wg..."
 
 #. module: hr_holidays
 #: constraint:ir.actions.act_window:0
@@ -32,14 +61,34 @@ msgid "Invalid model name in the action definition."
 msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting
-msgid "Requests Awaiting for Validation"
-msgstr "Wnioski urlopowe - czekające na zatwierdzenie"
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
+msgid "Sick Leave"
+msgstr "Zwolnienie lekarskie"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Blue"
-msgstr "Jasnoniebieski"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
+msgid "Department"
+msgstr "Dział"
+
+#. module: hr_holidays
+#: selection:available.holidays.report,state:0
+#: selection:hr.holidays,state:0
+msgid "Refused"
+msgstr "Odrzucone"
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
+msgstr "Zatwierdzony wymiar urlopu"
+
+#. module: hr_holidays
+#: selection:hr.holidays,allocation_type:0
+msgid "Company Allocation"
+msgstr ""
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -47,20 +96,34 @@ msgid "Brown"
 msgstr "Brązowy"
 
 #. module: hr_holidays
-#: xsl:holidays.summary:0
-msgid "of the"
-msgstr "z"
-
-#. module: hr_holidays
-#: xsl:holidays.summary:0
-msgid "Off-Days' Summary"
-msgstr "Suma dni wolnych"
-
-#. module: hr_holidays
+#: view:available.holidays.report:0
 #: view:hr.holidays:0
-#: model:process.transition,name:hr_holidays.process_transition_employeeholidays0
-msgid "Employee Holidays"
-msgstr "Urlopy pracownika"
+msgid "Remaining Days"
+msgstr "Pozostałe dni"
+
+#. module: hr_holidays
+#: selection:available.holidays.report,month:0
+msgid "March"
+msgstr "Marzec"
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee"
+msgstr "Wg pracowników"
+
+#. module: hr_holidays
+#: help:hr.holidays,employee_id:0
+msgid ""
+"Leave Manager can let this field empty if this leave request/allocation is "
+"for every employee"
+msgstr ""
+"Przełożony może pozwolić, aby to pole było puste, jeśli wniosek dotyczy "
+"wszystkich pracowników."
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+msgid "Leave Days"
+msgstr "Dni urlopu"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -68,15 +131,16 @@ msgid "Set to Draft"
 msgstr "Ustaw na projekt"
 
 #. module: hr_holidays
-#: model:ir.model,name:hr_holidays.model_hr_holidays
-#: model:process.node,name:hr_holidays.process_node_holidays0
+#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_reporting_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
 msgid "Holidays"
 msgstr "Urlopy"
 
 #. module: hr_holidays
-#: xsl:holidays.summary:0
-msgid "to"
-msgstr "do"
+#: field:available.holidays.report,category_id:0
+msgid "Category's Name"
+msgstr "Nazwa kategorii"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -89,103 +153,103 @@ msgid "Light Green"
 msgstr "Jasnozielony"
 
 #. module: hr_holidays
-#: model:process.transition,name:hr_holidays.process_transition_employeedeclaration0
-msgid "Employee Declaration"
-msgstr "Deklaracja pracownika"
+#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
+msgid "Summary Of Leaves"
+msgstr "Podsumowanie urlopów"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
-#: model:process.transition.action,name:hr_holidays.process_transition_action_validate0
-msgid "Validate"
-msgstr "Zatwierdź"
-
-#. module: hr_holidays
-#: model:process.transition,name:hr_holidays.process_transition_refusedrequest0
-msgid "Refused Request"
-msgstr "Wniosek odrzucony"
-
-#. module: hr_holidays
-#: model:process.node,name:hr_holidays.process_node_approved0
 msgid "Approved"
 msgstr "Zaaprobowane"
 
-#. module: hr_holidays
-#: selection:hr.holidays.summary.employee,init,holiday_type:0
-msgid "Both"
-msgstr "Oba"
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Refuse"
 msgstr "Odmów"
 
 #. module: hr_holidays
-#: wizard_button:hr.holidays.summary,notify,end:0
-#: wizard_button:hr.holidays.summary.employee,notify,end:0
-msgid "Ok"
+#: view:available.holidays.report:0
+#: view:hr.holidays:0
+msgid "Leaves"
+msgstr "Nieobecności"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays
+msgid "Leave"
+msgstr "Zostaw"
+
+#. module: hr_holidays
+#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
+msgid "Remaining leaves"
+msgstr "Pozostałe nieobecności"
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
+msgid "Leaves by Department"
+msgstr "Nieobecności wg działów"
+
+#. module: hr_holidays
+#: selection:available.holidays.report,state:0
+#: selection:hr.holidays,state:0
+msgid "Cancelled"
+msgstr "Anulowano"
+
+#. module: hr_holidays
+#: help:hr.holidays,type:0
+msgid ""
+"Choose 'Leave Request' if someone wants to take an off-day. \n"
+"Choose 'Allocation Request' if you want to increase the number of leaves "
+"available for someone"
 msgstr ""
+"Wybierz 'Wniosek urlopowy' jeśli ktoś chce wziąć urlop. \n"
+"Wybierz 'Wniosek o zwiększenie urlopu' jeśli chcesz zwiększyć liczbę dni "
+"wolnych dla kogoś."
 
 #. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday
-msgid "My Holidays Requests"
-msgstr "Moje wnioski urlopowe"
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Ostrzeżenie !"
 
 #. module: hr_holidays
-#: field:hr.holidays,notes:0
-msgid "Notes"
-msgstr "Uwagi"
+#: field:hr.holidays.status,color_name:0
+msgid "Color in Report"
+msgstr "Kolor w raporcie"
 
 #. module: hr_holidays
-#: field:hr.holidays,holiday_status:0
-#: field:hr.holidays.log,holiday_status:0
-msgid "Holiday's Status"
-msgstr "Rodzaj urlopu"
-
-#. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_refusedrequest0
-msgid "Request is refused."
-msgstr "Wniosek został odrzucony"
-
-#. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
-msgid "Holidays Management"
-msgstr "Urlopy"
-
-#. module: hr_holidays
-#: xsl:holidays.summary:0
-msgid "Analyze from"
-msgstr "Analizuj od"
-
-#. module: hr_holidays
-#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
-msgid "Summary Of Holidays"
-msgstr "Podsumowanie urlopów"
-
-#. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_calendar0
-msgid "The holiday is set in the calendar"
-msgstr "Urlop został ustawiony w kalendarzu"
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
+msgid "HR Holidays Summary Report By Employee"
+msgstr "Raport podsumowania urlopów wg pracowników"
 
 #. module: hr_holidays
+#: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
-msgid "Holiday status"
-msgstr "Rodzaje urlopu"
-
-#. module: hr_holidays
+#: field:hr.holidays.status,name:0
+#: field:hr.holidays.summary.dept,holiday_type:0
+#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
-msgid "Holidays Status"
-msgstr "Rodzaje urlopu"
+#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
+msgid "Leave Type"
+msgstr "Typ urlopu"
 
 #. module: hr_holidays
-#: field:hr.holidays,date_to:0
-msgid "Vacation end day"
-msgstr "Ostatni dzień urlopu"
+#: view:available.holidays.report:0
+msgid "Validation User"
+msgstr "Użytkownik zatwierdzający"
 
 #. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_legaldeclaration0
-msgid "Legal Declaration Document to declare new employee"
-msgstr "Formalny dokument deklaracji składanej przez nowego pracownika"
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid "Warning!"
+msgstr "Uwaga!"
+
+#. module: hr_holidays
+#: selection:available.holidays.report,state:0
+#: selection:hr.holidays,state:0
+msgid "Draft"
+msgstr "Projekt"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -193,197 +257,71 @@ msgid "Magenta"
 msgstr "Purpurowy"
 
 #. module: hr_holidays
-#: model:ir.model,name:hr_holidays.model_hr_holidays_per_user
-msgid "Holidays Per User"
-msgstr "Urlopy na użytkownika"
+#: help:hr.holidays,state:0
+msgid ""
+"When the holiday request is created the state is 'Draft'.\n"
+" It is confirmed by the user and request is sent to admin, the state is "
+"'Waiting Approval'.            If the admin accepts it, the state is "
+"'Approved'. If it is refused, the state is 'Refused'."
+msgstr ""
+"Wniosek urlopowy po utworzeniu jest w stanie 'Projekt'.\n"
+" Po potwierdzeniu przez użytkownika jest przesyłany do admina w stanie "
+"'Oczekuje na aprobatę'.            Jeśli admin aprobuje, to stan zmienia się "
+"na 'Zaaprobowano'. Jeśli zostanie odrzucony, to stan zmienia się na "
+"'Odrzucony'."
 
 #. module: hr_holidays
-#: view:hr.holidays.status:0
-msgid "Define holiday status"
-msgstr "Zdefiniuj rodzaj urlopu"
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:0
+#, python-format
+msgid "You have to select at least 1 Department. And try again"
+msgstr "Musisz wybrać co najmniej 1 wydział. Spróbuj ponownie."
 
 #. module: hr_holidays
-#: selection:hr.holidays.summary,init,holiday_type:0
-#: selection:hr.holidays.summary.employee,init,holiday_type:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Confirmed"
 msgstr "Potwierdzone"
 
 #. module: hr_holidays
-#: wizard_field:hr.holidays.summary,init,date_from:0
-#: wizard_field:hr.holidays.summary.employee,init,date_from:0
+#: field:hr.holidays.summary.dept,date_from:0
+#: field:hr.holidays.summary.employee,date_from:0
 msgid "From"
 msgstr "Od"
 
+#. module: hr_holidays
+#: help:hr.holidays,allocation_type:0
+msgid ""
+"This field is only for informative purposes, to depict if the leave "
+"request/allocation comes from an employee or from the company"
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
-#: model:process.transition.action,name:hr_holidays.process_transition_action_confirm0
 msgid "Confirm"
 msgstr "Potwierdź"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_waiting
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_waiting
-msgid "My Awaiting Confirmation Holidays Requests"
-msgstr "Moje wnioski urlopowe - czekające na zatwierdzenie"
-
-#. module: hr_holidays
-#: field:hr.holidays,user_id:0
-msgid "Employee_id"
+#: model:ir.model,name:hr_holidays.model_available_holidays_report
+msgid "available.holidays.report"
 msgstr ""
 
-#. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_holidaysdefinition0
-msgid "Encoding of annual available holidays."
-msgstr "Wprowadzanie urlopów przysługujących w roku"
-
-#. module: hr_holidays
-#: field:hr.holidays,employee_id:0
-#: field:hr.holidays.log,employee_id:0
-msgid "Employee"
-msgstr "Pracownik"
-
-#. module: hr_holidays
-#: selection:hr.holidays,state:0
-msgid "Waiting Validation"
-msgstr "Oczekujące na zatwierdzenie"
-
-#. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_employeeholidays0
-msgid "Employee get holidays"
-msgstr "Pracownik dostaje urlop"
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Jasno-łososiowy"
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Wheat"
-msgstr "Pszenny"
-
-#. module: hr_holidays
-#: field:hr.holidays.log,nb_holidays:0
-msgid "Number of Holidays Requested"
-msgstr "Liczba wnioskowanych dni urlopu"
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
-msgid "My Holiday Requests"
-msgstr "Moje wnioski urlopowe"
-
-#. module: hr_holidays
-#: view:hr.holidays:0
-msgid "Number of Days"
-msgstr "Liczba dni"
-
-#. module: hr_holidays
-#: field:hr.holidays.status,name:0
-#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
-#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
-msgid "Holiday Status"
-msgstr "Rodzaj urlopu"
-
-#. module: hr_holidays
-#: wizard_view:hr.holidays.summary,init:0
-#: wizard_view:hr.holidays.summary.employee,init:0
-msgid "Report Options"
-msgstr "Opcje raportu"
-
-#. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_approved0
-msgid "His manager approves the request"
-msgstr "Jego zwierzchnik zaaprobował wniosek"
-
-#. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_holidaysdefrequest0
-msgid "If holidays available, employee can take it and fill it."
-msgstr "Jeśli urlop jest dostępny, to pracownik może o niego wnioskować"
-
-#. module: hr_holidays
-#: wizard_view:hr.holidays.summary.employee,notify:0
-msgid "You have to select at least 1 Employee. Try again."
-msgstr "Musisz wybrać co najmniej jednego pracownika. Spróbuj ponownie."
-
-#. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_validate
-msgid "My Validated Holidays Requests"
-msgstr "Moje wnioski urlopowe - zatwierdzone"
-
-#. module: hr_holidays
-#: wizard_field:hr.holidays.summary.employee,init,emp:0
-msgid "Employee(s)"
-msgstr "Pracowników"
-
-#. module: hr_holidays
-#: field:hr.holidays,number_of_days:0
-msgid "Number of Days in this Holiday Request"
-msgstr "Liczba wnioskowanych dni urlopu"
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user
-#: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user
-msgid "Holidays Per Employee"
-msgstr "Urlopy wg pracowników"
-
-#. module: hr_holidays
-#: field:hr.holidays.status,limit:0
-msgid "Allow to override Limit"
-msgstr "Pozwól przekroczyć limit"
-
-#. module: hr_holidays
-#: field:hr.holidays.log,holiday_user_id:0
-msgid "Holidays user"
-msgstr "Użytkownik urlopu"
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Lavender"
-msgstr "Lawendowy"
-
-#. module: hr_holidays
-#: model:ir.model,name:hr_holidays.model_hr_holidays_log
-msgid "hr.holidays.log"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary
-msgid "Print Summary of Employee's Holidays"
-msgstr "Drukuj podsumowanie urlopów"
-
-#. module: hr_holidays
-#: model:process.node,name:hr_holidays.process_node_calendar0
-msgid "Calendar"
-msgstr "Kalendarz"
-
-#. module: hr_holidays
-#: field:hr.holidays,date_from:0
-msgid "Vacation start day"
-msgstr "Dzień rozpoczęcia urlopu"
-
 #. module: hr_holidays
 #: model:ir.module.module,description:hr_holidays.module_meta_information
 msgid ""
-"Human Ressources: Holidays tracking and workflow\n"
-"\n"
-"    This module allows you to manage holidays and holidays requests. For "
-"each employee, you can also define a number of available holidays per "
-"holiday status.\n"
+"Human Resources: Holidays tracking and workflow\n"
 "\n"
+"    This module allows you to manage leaves and leaves' requests.\n"
+"    Implements a dashboard for human resource management that includes.\n"
+"        * My Leaves\n"
+"        * My Expenses\n"
 "    Note that:\n"
 "    - A synchronisation with an internal agenda (use of the CRM module) is "
 "possible: in order to automatically create a case when an holiday request is "
 "accepted, you have to link the holidays status to a case section. You can "
 "set up this info and your colour preferences in\n"
 "                HR / Configuration / Holidays Status\n"
-"    - An employee can make a negative holiday request (holiday request of -2 "
-"days for example), this is considered by the system as an ask for more off-"
-"days. It will increase his total of that holiday status available (if the "
+"    - An employee can make an ask for more off-days by making a new "
+"Allocation It will increase his total of that leave type available (if the "
 "request is accepted).\n"
 "    - There are two ways to print the employee's holidays:\n"
 "        * The first will allow to choose employees by department and is used "
@@ -397,143 +335,45 @@ msgid ""
 "                'Print Summary of Employee's Holidays'\n"
 "    - The wizard allows you to choose if you want to print either the "
 "Confirmed & Validated holidays or only the Validated ones. These states must "
-"be set up by a user from the group 'HR' and with the role 'holidays'. You "
-"can define these features in the security tab from the user data in\n"
+"be set up by a user from the group 'HR'. You can define these features in "
+"the security tab from the user data in\n"
 "                Administration / Users / Users\n"
-"            for example, you maybe will do it for the user 'admin'.\n"
+"            for example, you maybe will do it for the user 'admin'\n"
+"            .\n"
 msgstr ""
 
 #. module: hr_holidays
-#: wizard_view:hr.holidays.summary,notify:0
-#: wizard_view:hr.holidays.summary.employee,notify:0
-msgid "Notification"
-msgstr "Powiadomienie"
-
-#. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_holidaysrequest0
-msgid "Employee fills in a request for holidays"
-msgstr "Pracownik wypełnia wniosek o urlop"
-
-#. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_setholiday0
-msgid "Holiday is set in the calendar."
-msgstr "Urlop został ustawiony w kalendarzu"
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Coral"
-msgstr "Jasny koralowy"
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_available
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_available
-msgid "My Available Holidays"
-msgstr "Moje przysługujące urlopy"
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Black"
-msgstr "Czarny"
-
-#. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse
-msgid "My Refused Holidays Requests"
-msgstr "Moje wnioski urlopowe - odrzucone"
-
-#. module: hr_holidays
-#: model:process.transition,name:hr_holidays.process_transition_setholiday0
-msgid "Set Holiday"
-msgstr "Ustaw urlop"
-
-#. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_draft
-msgid "My Draft Holidays Requests"
-msgstr "Moje wnioski urlopowe - projekty"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,remaining_leave:0
+#: field:hr.holidays.status,remaining_leaves:0
+msgid "Remaining Leaves"
+msgstr "Pozostało dni urlopu"
 
 #. module: hr_holidays
+#: view:available.holidays.report:0
+#: field:available.holidays.report,state:0
+#: view:hr.holidays:0
 #: field:hr.holidays,state:0
-msgid "Status"
-msgstr "Stan"
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Ivory"
-msgstr "Kość słoniowa"
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday
-msgid "My Holidays Request"
-msgstr "Moje wnioski urlopowe"
-
-#. module: hr_holidays
-#: field:hr.holidays.status,color_name:0
-msgid "Color of the status"
-msgstr "Kolor dla rodzaju"
-
-#. module: hr_holidays
-#: selection:hr.holidays.summary,init,holiday_type:0
-msgid "Both Validated and Confirmed"
-msgstr "Zarówno potwierdzone jak i zatwierdzone"
-
-#. module: hr_holidays
-#: xsl:holidays.summary:0
-msgid "holidays."
-msgstr "urlopy."
-
-#. module: hr_holidays
-#: selection:hr.holidays,state:0
-msgid "draft"
+msgid "State"
 msgstr ""
 
 #. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0
-msgid "Document for employee"
-msgstr "Dokument dla pracownika"
+#: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
+msgid "Total holidays by type"
+msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays.log,date:0
-msgid "Date"
-msgstr "Data"
+#: view:available.holidays.report:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
+#: field:hr.holidays.remaining.leaves.user,name:0
+msgid "Employee"
+msgstr "Pracownik"
 
 #. module: hr_holidays
-#: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
-msgstr "Odmów"
-
-#. module: hr_holidays
-#: field:hr.holidays.status,section_id:0
-msgid "Section"
-msgstr "Sekcja"
-
-#. module: hr_holidays
-#: field:hr.holidays,manager_id:0
-msgid "Holiday manager"
-msgstr "Menedżer urlopów"
-
-#. module: hr_holidays
-#: field:hr.holidays.status,active:0
-msgid "Active"
-msgstr "Aktywny"
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft
-msgid "My Holidays Request Draft"
-msgstr "Moje projekty wniosków urlopowych"
-
-#. module: hr_holidays
-#: model:process.transition,name:hr_holidays.process_transition_approvedrequest0
-msgid "Approved Request"
-msgstr "Zaaprobowane wnioski."
-
-#. module: hr_holidays
-#: model:process.node,name:hr_holidays.process_node_holidaysrequest0
-msgid "Holidays Request"
-msgstr "Wnioski urlopowe."
-
-#. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_holiday_waiting
-msgid "Holidays Requests Awaiting for Validation"
-msgstr "Wnioski urlopowe - czekające na zatwierdzenie"
+#: selection:available.holidays.report,state:0
+msgid "Waiting Validation"
+msgstr "Oczekujące na zatwierdzenie"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -541,28 +381,410 @@ msgid "General"
 msgstr "Ogólne"
 
 #. module: hr_holidays
+#: view:available.holidays.report:0
 #: view:hr.holidays:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Red"
+msgstr "Czerwony"
+
+#. module: hr_holidays
+#: view:hr.holidays.remaining.leaves.user:0
+msgid "Leaves by Type"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Jasno-łososiowy"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Wheat"
+msgstr "Pszenny"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
+#: field:hr.holidays,number_of_days_temp:0
+msgid "Number of Days"
+msgstr "Liczba dni"
+
+#. module: hr_holidays
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
+msgstr ""
+
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Remaining Leave by Type and User"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: hr_holidays
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,double_validation:0
+msgid ""
+"If its True then its Allocation/Request have to be validated by second "
+"validator"
+msgstr ""
+
+#. module: hr_holidays
 #: selection:hr.holidays,state:0
-#: wizard_button:hr.holidays.summary,init,end:0
-#: wizard_button:hr.holidays.summary.employee,init,end:0
+msgid "Waiting Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,emp:0
+msgid "Employee(s)"
+msgstr "Pracowników"
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+msgid " Month "
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,categ_id:0
+msgid ""
+"If you link this type of leave with a category in the CRM, it will "
+"synchronize each leave asked with a case in this category, to display it in "
+"the company shared calendar for example."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id2:0
+msgid ""
+"This area is automaticly filled by the user who validate the leave with "
+"second level (If Leave type need second validation)"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:available.holidays.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:available.holidays.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_remaining_leaves_empoloyee_all
+msgid "Remaining Leaves by User"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Lavender"
+msgstr "Lawendowy"
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: field:available.holidays.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
+msgid "Leave Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,limit:0
+msgid "Allow to Override Limit"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.employee:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
+msgid "Employee's Holidays"
+msgstr ""
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: field:hr.holidays,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,max_leaves:0
+msgid ""
+"This value is given by the sum of all holidays requests with a positive "
+"value."
+msgstr ""
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+msgid "Available Holidays"
+msgstr ""
+
+#. module: hr_holidays
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
+msgid "All Employee Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid "No user related to the selected employee."
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Coral"
+msgstr "Jasny koralowy"
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
+msgid "Holidays by Department"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Black"
+msgstr "Czarny"
+
+#. module: hr_holidays
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: hr_holidays
+#: field:resource.calendar.leaves,holiday_id:0
+msgid "Holiday"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Leaves Allowed"
+msgstr "Maksymalna liczba dni urlopowych"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for %s while available leaves are less than asked "
+"leaves.' %(record.category_id.name)))\n"
+"                nb = -(record.number_of_days_temp)\n"
+"            else:\n"
+"                nb = record.number_of_days_temp\n"
+"\n"
+"            if record.holiday_type == 'employee' and record.employee_id:\n"
+"                user_id = record.employee_id.user_id and "
+"record.employee_id.user_id.id or uid\n"
+"\n"
+"            self.write(cr, uid, [record.id], {'state':'confirm', "
+"'number_of_days': nb, 'user_id': user_id })\n"
+"        return True\n"
+"\n"
+"    def holidays_refuse(self, cr, uid, ids, *args):\n"
+"        vals = {'state': 'refuse'}\n"
+"        ids2 = self.pool.get('hr.employee"
+msgstr ""
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Ivory"
+msgstr "Kość słoniowa"
+
+#. module: hr_holidays
+#: selection:available.holidays.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:available.holidays.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Both Validated and Confirmed"
+msgstr "Zarówno potwierdzone jak i zatwierdzone"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,leaves_taken:0
+msgid "Leaves Already Taken"
+msgstr "Wykorzystane nieobecności"
+
+#. module: hr_holidays
+#: field:available.holidays.report,user_id:0
+#: field:hr.holidays,user_id:0
+#: field:hr.holidays.remaining.leaves.user,user_id:0
+msgid "User"
+msgstr "Użytkownik"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,active:0
+msgid "Active"
+msgstr "Aktywny"
+
+#. module: hr_holidays
+#: field:hr.holidays,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:available.holidays.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_holidays
+#: selection:available.holidays.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:available.holidays.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays,allocation_type:0
+msgid "Employee Request"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id:0
+msgid "First Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
+msgid "Casual Leave"
+msgstr ""
+
+#. module: hr_holidays
+#: field:available.holidays.report,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Extended options..."
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for %s while available leaves are less than asked "
+"leaves.' %(record.employee_id.name)))\n"
+"                nb = -(record.number_of_days_temp)\n"
+"            elif record.holiday_type == 'category' and record.type == "
+"'remove':\n"
+"                if record.category_id and not "
+"record.holiday_status_id.limit:\n"
+"                    leaves_rest = self.pool.get('hr.holidays.status"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Blue"
+msgstr "Jasnoniebieski"
+
+#. module: hr_holidays
+#: constraint:hr.holidays:0
+msgid ""
+"Start date should not be larger than end date!\n"
+"Number of Days should be greater than 1!"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,type:0
+msgid "Request Type"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the leave "
+"type without removing it."
+msgstr ""
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: field:available.holidays.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
+msgid "Reasons"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
+msgid "Leaves Analysis"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Anuluj"
 
 #. module: hr_holidays
-#: model:process.transition,name:hr_holidays.process_transition_holidaysdefrequest0
-msgid "Holidays def Request"
+#: help:hr.holidays.status,color_name:0
+msgid ""
+"This color will be used in the leaves summary located in Reporting\\Leaves "
+"by Departement"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.summary,init,holiday_type:0
-#: selection:hr.holidays.summary.employee,init,holiday_type:0
+#: view:available.holidays.report:0
+#: selection:available.holidays.report,state:0
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Validated"
 msgstr "Zatwierdzony"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse
-msgid "My Holidays Request Refused"
-msgstr "Moje wnioski urlopowe - odrzucone"
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
+msgid "Allocation Request"
+msgstr ""
 
 #. module: hr_holidays
 #: constraint:ir.model:0
@@ -573,67 +795,132 @@ msgstr ""
 "specjalnych !"
 
 #. module: hr_holidays
-#: wizard_button:hr.holidays.summary,init,checkdept:0
-#: wizard_button:hr.holidays.summary.employee,init,checkemp:0
+#: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
+msgid "Leave Detail"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,double_validation:0
+msgid "Apply Double Validation"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_status_id:0
+msgid " Leave Type"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Drukuj"
 
 #. module: hr_holidays
-#: model:ir.actions.wizard,name:hr_holidays.holidays_summary
-#: model:ir.ui.menu,name:hr_holidays.menu_holidays_summary
-msgid "Print Summary of Holidays"
-msgstr "Drukuj podsumowanie urlopów"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
+msgstr ""
 
 #. module: hr_holidays
-#: wizard_field:hr.holidays.summary,init,depts:0
+#: view:board.board:0
+msgid "My Leaves by Type"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,depts:0
 msgid "Department(s)"
 msgstr "Dział(y)"
 
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
+msgid "Leave Request"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Opis"
 
 #. module: hr_holidays
-#: selection:hr.holidays,state:0
-#: model:process.node,name:hr_holidays.process_node_refused0
-msgid "Refused"
-msgstr "Odrzucone"
+#: selection:available.holidays.report,month:0
+msgid "May"
+msgstr ""
 
 #. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_approvedrequest0
-msgid "Request is approved."
-msgstr "Wniosek aprobowano."
+#: field:hr.holidays.status,categ_id:0
+msgid "Meeting Category"
+msgstr ""
 
 #. module: hr_holidays
-#: model:process.node,name:hr_holidays.process_node_holidaysdefinition0
-msgid "Holidays Definition"
-msgstr "Definicje urlopów"
+#: help:hr.holidays,holiday_type:0
+msgid ""
+"By Employee: Allocation/Request for individual Employee, By Employee "
+"Category: Allocation/Request for group of employees in category"
+msgstr ""
 
 #. module: hr_holidays
-#: wizard_field:hr.holidays.summary,init,holiday_type:0
-#: wizard_field:hr.holidays.summary.employee,init,holiday_type:0
+#: view:hr.holidays:0
+msgid "Search Leave"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Holiday Type"
 msgstr "Wybierz typ urlopu"
 
+#. module: hr_holidays
+#: field:available.holidays.report,employee_id:0
+msgid "Employee's Name"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
+msgid "Leaves by Month"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "This Month"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id2:0
+msgid "Second Approval"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0
 msgid "Case"
 msgstr "Sprawa"
 
 #. module: hr_holidays
-#: field:hr.holidays,holiday_user_id:0
-msgid "Holiday per user"
-msgstr "Urlopy na użytkownika"
+#: field:hr.holidays,date_to:0
+msgid "End Date"
+msgstr ""
 
 #. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_holidays0
-msgid "Encode number of available holidays"
-msgstr "Wprowadź liczbę przysługujących dni urlopu"
+#: selection:available.holidays.report,month:0
+msgid "February"
+msgstr ""
 
 #. module: hr_holidays
-#: model:process.node,name:hr_holidays.process_node_legaldeclaration0
-msgid "Secretariat Social"
+#: help:hr.holidays.status,limit:0
+msgid ""
+"If you tick this checkbox, the system will allow, for this section, the "
+"employees to take more leaves than the available ones."
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,leaves_taken:0
+msgid ""
+"This value is given by the sum of all holidays requests with a negative "
+"value."
 msgstr ""
 
 #. module: hr_holidays
@@ -642,9 +929,9 @@ msgid "Violet"
 msgstr "Fioletowy"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Red"
-msgstr "Czerwony"
+#: selection:available.holidays.report,month:0
+msgid "April"
+msgstr ""
 
 #. module: hr_holidays
 #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
@@ -652,24 +939,35 @@ msgid "Human Resources: Holidays management"
 msgstr "Kadry: Urlopy"
 
 #. module: hr_holidays
-#: model:process.process,name:hr_holidays.process_process_holidaysprocess0
-msgid "Holidays Process"
-msgstr "Proces urlopów"
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
+msgid "HR Holidays Summary Report By Department"
+msgstr ""
 
 #. module: hr_holidays
-#: wizard_view:hr.holidays.summary,notify:0
-msgid "You have to select at least 1 Department. Try again."
-msgstr "Musisz wybrac co najmniej jeden dział. Spróbuj ponownie."
+#: help:hr.holidays,manager_id:0
+msgid "This area is automaticly filled by the user who validate the leave"
+msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_validate
-msgid "My Holidays Request Validated"
-msgstr "Moje wnioski urlopowe - zatwierdzone"
+#: view:hr.holidays:0
+msgid "Approve"
+msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays.log,holiday_req_id:0
-msgid "Holiday Request ID"
-msgstr "ID wniosku urlopowego"
+#: field:hr.holidays,linked_request_ids:0
+msgid "Linked Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
+msgid "Allocation Requests"
+msgstr ""
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -682,6 +980,260 @@ msgid "Light Pink"
 msgstr "Jasnoróżowy"
 
 #. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_refused0
-msgid "His manager refuses the request"
-msgstr "Jego (Jej) zwierzchnik odrzucił wniosek"
+#: view:hr.holidays:0
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid "Wrong leave definition."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Confirm"
+msgstr ""
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: field:available.holidays.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Approve"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You Cannot Validate leaves while available leaves are less than asked leaves."
+msgstr ""
+
+#~ msgid "Off-Days' Summary"
+#~ msgstr "Suma dni wolnych"
+
+#~ msgid "of the"
+#~ msgstr "z"
+
+#~ msgid "Employee Holidays"
+#~ msgstr "Urlopy pracownika"
+
+#~ msgid "Both"
+#~ msgstr "Oba"
+
+#~ msgid "Employee Declaration"
+#~ msgstr "Deklaracja pracownika"
+
+#~ msgid "Refused Request"
+#~ msgstr "Wniosek odrzucony"
+
+#~ msgid "to"
+#~ msgstr "do"
+
+#~ msgid "Analyze from"
+#~ msgstr "Analizuj od"
+
+#~ msgid "Notes"
+#~ msgstr "Uwagi"
+
+#~ msgid "Request is refused."
+#~ msgstr "Wniosek został odrzucony"
+
+#~ msgid "Holidays Management"
+#~ msgstr "Urlopy"
+
+#~ msgid "Summary Of Holidays"
+#~ msgstr "Podsumowanie urlopów"
+
+#~ msgid "The holiday is set in the calendar"
+#~ msgstr "Urlop został ustawiony w kalendarzu"
+
+#~ msgid "Vacation end day"
+#~ msgstr "Ostatni dzień urlopu"
+
+#~ msgid "Holidays Per User"
+#~ msgstr "Urlopy na użytkownika"
+
+#~ msgid "Encoding of annual available holidays."
+#~ msgstr "Wprowadzanie urlopów przysługujących w roku"
+
+#~ msgid "Employee get holidays"
+#~ msgstr "Pracownik dostaje urlop"
+
+#~ msgid "Number of Holidays Requested"
+#~ msgstr "Liczba wnioskowanych dni urlopu"
+
+#~ msgid "Number of Days in this Holiday Request"
+#~ msgstr "Liczba wnioskowanych dni urlopu"
+
+#~ msgid "Report Options"
+#~ msgstr "Opcje raportu"
+
+#~ msgid "His manager approves the request"
+#~ msgstr "Jego zwierzchnik zaaprobował wniosek"
+
+#~ msgid "Holidays Per Employee"
+#~ msgstr "Urlopy wg pracowników"
+
+#~ msgid "Notification"
+#~ msgstr "Powiadomienie"
+
+#~ msgid "Print Summary of Employee's Holidays"
+#~ msgstr "Drukuj podsumowanie urlopów"
+
+#~ msgid "Vacation start day"
+#~ msgstr "Dzień rozpoczęcia urlopu"
+
+#~ msgid "Employee fills in a request for holidays"
+#~ msgstr "Pracownik wypełnia wniosek o urlop"
+
+#~ msgid "Calendar"
+#~ msgstr "Kalendarz"
+
+#~ msgid "Allow to override Limit"
+#~ msgstr "Pozwól przekroczyć limit"
+
+#~ msgid "My Available Holidays"
+#~ msgstr "Moje przysługujące urlopy"
+
+#~ msgid "Status"
+#~ msgstr "Stan"
+
+#~ msgid "Holiday is set in the calendar."
+#~ msgstr "Urlop został ustawiony w kalendarzu"
+
+#~ msgid "Set Holiday"
+#~ msgstr "Ustaw urlop"
+
+#~ msgid "My Holidays Request"
+#~ msgstr "Moje wnioski urlopowe"
+
+#~ msgid "holidays."
+#~ msgstr "urlopy."
+
+#~ msgid "Document for employee"
+#~ msgstr "Dokument dla pracownika"
+
+#~ msgid "Reufse"
+#~ msgstr "Odmów"
+
+#~ msgid "Section"
+#~ msgstr "Sekcja"
+
+#~ msgid "Holiday manager"
+#~ msgstr "Menedżer urlopów"
+
+#~ msgid "Holidays Request"
+#~ msgstr "Wnioski urlopowe."
+
+#~ msgid "My Holidays Request Draft"
+#~ msgstr "Moje projekty wniosków urlopowych"
+
+#~ msgid "Approved Request"
+#~ msgstr "Zaaprobowane wnioski."
+
+#~ msgid "Print Summary of Holidays"
+#~ msgstr "Drukuj podsumowanie urlopów"
+
+#~ msgid "Request is approved."
+#~ msgstr "Wniosek aprobowano."
+
+#~ msgid "Holidays Definition"
+#~ msgstr "Definicje urlopów"
+
+#~ msgid "Encode number of available holidays"
+#~ msgstr "Wprowadź liczbę przysługujących dni urlopu"
+
+#~ msgid "Holiday Request ID"
+#~ msgstr "ID wniosku urlopowego"
+
+#~ msgid "Holidays Process"
+#~ msgstr "Proces urlopów"
+
+#~ msgid "His manager refuses the request"
+#~ msgstr "Jego (Jej) zwierzchnik odrzucił wniosek"
+
+#~ msgid "You have to select at least 1 Department. Try again."
+#~ msgstr "Musisz wybrac co najmniej jeden dział. Spróbuj ponownie."
+
+#~ msgid "Validate"
+#~ msgstr "Zatwierdź"
+
+#~ msgid "You have to select at least 1 Employee. Try again."
+#~ msgstr "Musisz wybrać co najmniej jednego pracownika. Spróbuj ponownie."
+
+#~ msgid "Holiday per user"
+#~ msgstr "Urlopy na użytkownika"
+
+#~ msgid "Holiday's Status"
+#~ msgstr "Rodzaj urlopu"
+
+#~ msgid "Holidays Status"
+#~ msgstr "Rodzaje urlopu"
+
+#~ msgid "Legal Declaration Document to declare new employee"
+#~ msgstr "Formalny dokument deklaracji składanej przez nowego pracownika"
+
+#~ msgid "Define holiday status"
+#~ msgstr "Zdefiniuj rodzaj urlopu"
+
+#~ msgid "Holiday status"
+#~ msgstr "Rodzaje urlopu"
+
+#~ msgid "Holiday Status"
+#~ msgstr "Rodzaj urlopu"
+
+#~ msgid "My Validated Holidays Requests"
+#~ msgstr "Moje wnioski urlopowe - zatwierdzone"
+
+#~ msgid "If holidays available, employee can take it and fill it."
+#~ msgstr "Jeśli urlop jest dostępny, to pracownik może o niego wnioskować"
+
+#~ msgid "Holidays user"
+#~ msgstr "Użytkownik urlopu"
+
+#~ msgid "My Draft Holidays Requests"
+#~ msgstr "Moje wnioski urlopowe - projekty"
+
+#~ msgid "My Refused Holidays Requests"
+#~ msgstr "Moje wnioski urlopowe - odrzucone"
+
+#~ msgid "Color of the status"
+#~ msgstr "Kolor dla rodzaju"
+
+#~ msgid "My Holidays Request Refused"
+#~ msgstr "Moje wnioski urlopowe - odrzucone"
+
+#~ msgid "My Holidays Request Validated"
+#~ msgstr "Moje wnioski urlopowe - zatwierdzone"
+
+#~ msgid "All Holidays Requests"
+#~ msgstr "Wszystkie wnioski urlopowe"
+
+#~ msgid "Requests Awaiting for Validation"
+#~ msgstr "Wnioski urlopowe - czekające na zatwierdzenie"
+
+#~ msgid "My Holidays Requests"
+#~ msgstr "Moje wnioski urlopowe"
+
+#~ msgid "My Holiday Requests"
+#~ msgstr "Moje wnioski urlopowe"
+
+#~ msgid "My Awaiting Confirmation Holidays Requests"
+#~ msgstr "Moje wnioski urlopowe - czekające na zatwierdzenie"
+
+#~ msgid "Holidays Requests Awaiting for Validation"
+#~ msgstr "Wnioski urlopowe - czekające na zatwierdzenie"
+
+#~ msgid "New Holidays Request"
+#~ msgstr "Nowy wniosek urlopowy"
diff --git a/addons/hr_payroll/i18n/sv.po b/addons/hr_payroll/i18n/sv.po
new file mode 100644
index 00000000000..3c2e881fd93
--- /dev/null
+++ b/addons/hr_payroll/i18n/sv.po
@@ -0,0 +1,1769 @@
+# Swedish 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: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-24 21:35+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"Language-Team: Swedish <sv@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-10-25 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "E-mail Address"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Based"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,net:0
+#: field:hr.employee,net:0
+#: field:hr.payroll.register,net:0
+#: field:hr.payslip,net:0
+#: report:salary.structure:0
+msgid "Net Salary"
+msgstr "Nettolön"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Recompute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid ""
+"Variable Error : %s ' % (e)))\n"
+"\n"
+"                if sal_type in ('gross', 'net"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:salary.structure:0
+msgid "Department"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,gratuity:0
+msgid "Use for Gratuity ?"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,working_days_per_week:0
+#: field:hr.payslip,working_days:0
+#: report:payslip.pdf:0
+msgid "Working Days"
+msgstr "Arbetsdagar"
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Loan"
+msgstr "Lån"
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Salary Payment Register"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,slip_ids:0
+#: view:hr.payroll.register:0
+#: field:hr.payroll.register,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
+msgid "Year Salary Report"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Paid Salary"
+msgstr "Utbetald lön"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "("
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,company_id:0
+#: field:hr.allounce.deduction.categoty,company_id:0
+#: field:hr.contibution.register,company_id:0
+#: field:hr.holidays.status,company_id:0
+#: field:hr.payroll.advice,company_id:0
+#: field:hr.payroll.register,company_id:0
+#: field:hr.payroll.structure,company_id:0
+#: field:hr.payslip,company_id:0
+msgid "Company"
+msgstr "Företag"
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: report:payslip.pdf:0
+msgid ","
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Expire"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Half-Pay Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid ""
+"Please check configuration of %s, payroll head is missing' % "
+"(hday.holiday_status_id.name)))\n"
+"                    \n"
+"                res = {\n"
+"                    'slip_id':slip.id,\n"
+"                    'name':hday.holiday_status_id.name + '-%s' % "
+"(hday.number_of_days),\n"
+"                    'code':hday.holiday_status_id.code,\n"
+"                    'amount_type':'fix',\n"
+"                    'category_id':hday.holiday_status_id.head_id.id,\n"
+"                    'sequence':hday.holiday_status_id.head_id.sequence\n"
+"                }\n"
+"                days = hday.number_of_days\n"
+"                if hday.number_of_days < 0:\n"
+"                    days = hday.number_of_days * -1\n"
+"                total_leave += days\n"
+"                if hday.holiday_status_id.type == 'paid':\n"
+"                    paid_leave += days\n"
+"                    continue\n"
+"#                    res['name'] = hday.holiday_status_id.name + '-%s' % "
+"(days)\n"
+"#                    res['amount'] = perday * days\n"
+"#                    res['type'] = 'allowance'\n"
+"#                    leave += days\n"
+"#                    total += perday * days\n"
+"                \n"
+"                elif hday.holiday_status_id.type == 'halfpaid':\n"
+"                    paid_leave += (days / 2)\n"
+"                    res['name'] = hday.holiday_status_id.name + '-%s/2' % "
+"(days)\n"
+"                    res['amount'] = perday * (days/2)\n"
+"                    total += perday * (days/2)\n"
+"                    leave += days / 2\n"
+"                    res['type'] = 'deduction'\n"
+"                else:\n"
+"                    res['name'] = hday.holiday_status_id.name + '-%s' % "
+"(days)\n"
+"                    res['amount'] = perday * days\n"
+"                    res['type'] = 'deduction'\n"
+"                    leave += days\n"
+"                    total += perday * days\n"
+"\n"
+"                slip_line_pool.create(cr, uid, res, context=context)\n"
+"            basic = basic - total\n"
+"            leaves = total\n"
+"            update.update({\n"
+"                'basic':basic,\n"
+"                'basic_before_leaves': round(basic_before_leaves),\n"
+"                'leaves':total,\n"
+"                'holiday_days':leave,\n"
+"                'worked_days':working_day - leave,\n"
+"                'working_days':working_day,\n"
+"            })\n"
+"            self.write(cr, uid, [slip.id], update, context=context)\n"
+"        return True\n"
+"hr_payslip()\n"
+"\n"
+"class hr_payslip_line(osv.osv):\n"
+"    '''\n"
+"    Payslip Line\n"
+"    '''\n"
+"    \n"
+"    _name = 'hr.payslip.line'\n"
+"    _description = 'Payslip Line'\n"
+"\n"
+"    def onchange_category(self, cr, uid, ids, category_id):\n"
+"        seq = 0\n"
+"        res = {\n"
+"        }\n"
+"        if category_id:\n"
+"            category = self.pool.get('hr.allounce.deduction.categoty"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: field:hr.payslip,other_pay:0
+msgid "Others"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,slip_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip
+#: report:payslip.pdf:0
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Contract Detail:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,igross:0
+#: field:hr.payslip,inet:0
+msgid "Calculaton Field"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+#: help:hr.payroll.register,bank_id:0
+msgid "Select the Bank Address from whcih the salary is going to be paid"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+msgid "Bank Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Reject"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,register_id:0
+#: view:hr.payslip:0
+#: field:hr.payslip,register_id:0
+#: report:payslip.pdf:0
+msgid "Register"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Total Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution.line,value:0
+#: field:hr.payslip.line.line,value:0
+msgid "Value"
+msgstr "Värde"
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Register Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Salary Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,amount:0
+#: report:payroll.advice:0
+#: report:salary.structure:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:company.contribution,amount_type:0
+msgid "Percentage"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+msgid "Other Information"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,country_id:0
+msgid "Country of Issue"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,emp_deduction:0
+msgid "Employee Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Other Deduction"
+msgstr "Övriga avdrag"
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Paid Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: view:hr.passport:0
+#: view:hr.payslip:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,date_expire:0
+msgid "Passport Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Un-Paid Holiday"
+msgstr "Obetald ledighet"
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Valid From"
+msgstr "Giltigt från"
+
+#. module: hr_payroll
+#: help:hr.payslip,igross:0
+#: help:hr.payslip,inet:0
+msgid ""
+"Calculation field used for internal calculation, do not place this on form"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Amount (in words) :"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,type:0
+msgid "Payment"
+msgstr "Betalning"
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: field:hr.payslip,line_ids:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,base:0
+msgid "Based on"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
+msgid "Human Resource Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Total:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Posted"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.module.module,description:hr_payroll.module_meta_information
+msgid ""
+"Generic Payroll system\n"
+"    * Employee Details\n"
+"    * Employee Contracts\n"
+"    * Passport based Contract\n"
+"    * Allowances / Deductions\n"
+"    * Allow to configure Basic / Grows / Net Salary\n"
+"    * Employee Payslip\n"
+"    * Monthly Payroll Register\n"
+"    * Integrated with Holiday Management\n"
+"    "
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_holidays_status
+msgid "Leave Type"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Date :"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,total:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Payments -"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution.line,from_val:0
+#: report:employees.salary:0
+#: field:hr.payslip.line.line,from_val:0
+#: report:year.salary:0
+msgid "From"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+#: report:payroll.advice:0
+msgid "By Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.employees.detail,date_to:0
+#: field:hr.payroll.year.salary,date_to:0
+#: report:salary.structure:0
+msgid "End Date"
+msgstr "Slutdatum"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+msgid "Employee PaySlip"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid ""
+"Variable Error : %s ' % (e)))\n"
+"                amount = 0.0\n"
+"                if line.amount_type == 'per':\n"
+"                    amount = amt * line.amount\n"
+"                elif line.amount_type == 'func':\n"
+"                    amount = slip_line_pool.execute_function(cr, uid, "
+"line.id, amt, context)\n"
+"                elif line.amount_type == 'fix':\n"
+"                    amount = line.amount\n"
+"                \n"
+"                if line.type == 'allowance':\n"
+"                    allowance += amount\n"
+"                elif line.type == 'deduction':\n"
+"                    deduction += amount\n"
+"            \n"
+"            vals[employee.id] = {\n"
+"                'basic':basic, \n"
+"                'advantages_gross':allowance, \n"
+"                'gross':basic + allowance, \n"
+"                'advantages_net':deduction,\n"
+"                'net':basic + allowance - deduction\n"
+"            }\n"
+"        return vals\n"
+"    \n"
+"    _columns = {\n"
+"        'passport_id':fields.many2one('hr.passport', 'Passport', "
+"required=False, domain=\"[('employee_id','=',active_id), "
+"('address_id','=',address_home_id)]\", help=\"Employee Passport Information"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,leaves:0
+msgid "Leave Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
+msgid "Authorised Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,amount_type:0
+msgid "Function Value"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Notes:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,state:0
+#: field:hr.payroll.register,state:0
+#: field:hr.payslip,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Paymeny Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Other Lines"
+msgstr "Övriga linjer"
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+msgid "Function Arguments"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
+msgid "Company Contributions"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,employee_id:0
+#: field:hr.passport,employee_id:0
+#: field:hr.payroll.advice.line,employee_id:0
+#: field:hr.payslip,employee_id:0
+#: field:hr.payslip.line,employee_id:0
+#: model:ir.model,name:hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr "Anställd"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,base:0
+msgid "Formula"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,type:0
+#: field:hr.payslip.line,type:0
+#: report:salary.structure:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Error !"
+msgstr "Fel!"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Verify Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.contract,working_days_per_week:0
+msgid "No of Working days / week for an employee"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "New Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,basic:0
+msgid "Net Basic"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,gross:0
+#: field:hr.employee,gross:0
+#: field:hr.payroll.register,grows:0
+#: field:hr.payslip,grows:0
+#: report:salary.structure:0
+msgid "Gross Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Total Earnings"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
+msgid "Employee Salary Statement"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Other Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,advantages_net:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+msgid "Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+msgid "Chaque Nos"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register,monthly_total_by_emp:0
+msgid "Total By Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: selection:company.contribution,amount_type:0
+#: selection:company.contribution.line,amount_type:0
+#: selection:hr.payslip.line,amount_type:0
+#: selection:hr.payslip.line.line,amount_type:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid ""
+"Variable Error : %s ' % (e)))\n"
+"                elif line.amount_type in ('fix', 'func"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution.line,to_val:0
+#: report:employees.salary:0
+#: field:hr.payslip.line.line,to_val:0
+#: report:year.salary:0
+msgid "To"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Variable Error !"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
+msgid "hr.payroll.employees.detail"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Pay Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid ""
+"Please define bank account for the %s employee' % (slip.employee_id.name)))\n"
+"                pline = {\n"
+"                    'advice_id':pid,\n"
+"                    'name':slip.employee_id.bank_account_id.acc_number,\n"
+"                    'employee_id':slip.employee_id.id,\n"
+"                    'amount':slip.other_pay + slip.net,\n"
+"                    'bysal':slip.net\n"
+"                }\n"
+"                id = advice_line_pool.create(cr, uid, pline, "
+"context=context)\n"
+"\n"
+"        self.write(cr, uid, ids, {'state':'confirm'}, context=context)\n"
+"        return True\n"
+"\n"
+"    def process_sheet(self, cr, uid, ids, context=None):\n"
+"        slip_pool = self.pool.get('hr.payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account A/C"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "For the month of"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+#: selection:hr.allounce.deduction.categoty,type:0
+#: field:hr.payroll.register,deduction:0
+#: report:hr.payroll.register.sheet:0
+#: field:hr.payslip,deduction:0
+#: selection:hr.payslip.line,type:0
+msgid "Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+msgid "Contibution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Loan Installment"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Complete HR Checking"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Net Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Salary Structure:"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
+msgid "Employees Salary Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
+msgid "Function Line"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Others:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: selection:company.contribution,amount_type:0
+msgid "Function Calculation"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,worked_days:0
+#: report:payslip.pdf:0
+msgid "Worked Day"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register,monthly_total_by_comp:0
+msgid "Total By Company"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,flag:0
+msgid "D/C"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Country & Address"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Basic Salary – Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,amount_type:0
+#: field:company.contribution.line,amount_type:0
+#: field:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line.line,amount_type:0
+#: report:salary.structure:0
+msgid "Amount Type"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: field:hr.payslip.line,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.payslip.line,company_contrib:0
+#: model:ir.model,name:hr_payroll.model_company_contribution
+msgid "Company Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,category_id:0
+msgid "Heads"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
+msgid "Print Statement"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Earnings"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: report:salary.structure:0
+msgid "Basic"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
+msgid "All Passports"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
+msgid "Salary Register"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:hr.payroll.register.sheet:0
+msgid "Employee Name"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_passport
+msgid "Passport Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,amount_type:0
+msgid "Percentage (%)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,register_id:0
+#: view:hr.payroll.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
+#: model:ir.model,name:hr_payroll.model_hr_payroll_register
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
+msgid "For"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+#: field:hr.passport,contracts_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+msgid "Employee Function"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Paid"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Approve Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,paid:0
+msgid "Paid ? "
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Title"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+msgid "Search Company Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Compute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,active:0
+#: field:hr.payroll.register,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.allounce.deduction.categoty,condition:0
+msgid "Applied this head for calculation if condition is true"
+msgstr ""
+
+#. module: hr_payroll
+#: report:year.salary:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for HR Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Compute"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: field:hr.payslip,deg_id:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+msgid "Designation"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "HR Manager"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,basic:0
+#: field:hr.employee,basic:0
+#: field:hr.payslip,basic_before_leaves:0
+#: report:payslip.pdf:0
+msgid "Basic Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,code:0
+msgid "Categoty Code"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Salary Information"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_company_contribution_line
+msgid "Allowance Deduction Categoty"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Companies"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,contract_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.year.salary,salary_on:0
+msgid "Next Month Date"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,date:0
+#: field:hr.payroll.advice,date:0
+#: field:hr.payroll.register,date:0
+#: field:hr.payslip,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Search Passport"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:salary.structure:0
+msgid "Phone No."
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,contribute_per:0
+#: field:company.contribution.line,contribution_id:0
+#: view:hr.allounce.deduction.categoty:0
+#: view:hr.contibution.register:0
+#: view:hr.contibution.register.line:0
+msgid "Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,state:0
+msgid "Label"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid ""
+"Variable Error : %s ' % (e)))\n"
+"\n"
+"                if not calculate:\n"
+"                    continue\n"
+"\n"
+"                percent = 0.0\n"
+"                value = 0.0\n"
+"                base = False\n"
+"                company_contrib = 0.0\n"
+"                base = line.category_id.base\n"
+"\n"
+"                try:\n"
+"                    #Please have a look at the configuration guide.\n"
+"                    amt = eval(base, obj)\n"
+"                except Exception, e:\n"
+"                    raise osv.except_osv(_('Variable Error !"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+msgid "Company contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:salary.structure:0
+msgid "Other No."
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,code:0
+#: field:hr.contibution.register.line,code:0
+#: field:hr.holidays.status,code:0
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip.line,code:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+msgid "Code"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
+msgid "Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Number :"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.allounce.deduction.categoty,base:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all heads code field in small letter as a variable name i.e. "
+"hra, ma, lta, etc...., also you can use, static varible basic"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Computation Overview"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.year.salary,salary_on:0
+msgid "Salary On"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,number:0
+#: field:hr.payroll.register,number:0
+#: field:hr.payslip,number:0
+msgid "Number"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,struct_id:0
+#: field:hr.employee,line_ids:0
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
+#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
+#: model:ir.model,name:hr_payroll.model_hr_payroll_structure
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
+msgid "Salary Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register,register_line_ids:0
+msgid "Register Line"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Close"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount:0
+msgid "Amount / Percentage"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,advantages_gross:0
+#: report:hr.payroll.register.sheet:0
+#: report:salary.structure:0
+msgid "Allowances"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.year.salary,salary_on:0
+msgid "Current Month Date"
+msgstr ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,name:0
+msgid "Passport No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,passport_id:0
+#: view:hr.passport:0
+msgid "Passport"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Total Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "for period"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,head_id:0
+msgid "Payroll Head"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contibution_register
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "E-mail"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
+msgid "Salary Heads"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Print Report"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,line_ids:0
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,line_ids:0
+msgid "Calculations"
+msgstr ""
+
+#. module: hr_payroll
+#: help:company.contribution,contribute_per:0
+msgid ""
+"Define Company contribution ratio 1.00=100% contribution, If Employee "
+"Contribute 5% then company will and here 0.50 defined then company will "
+"contribute 50% on employee 5% contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Issue"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Dynamic Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Basic Salary without Leave:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,function_id:0
+msgid "Function"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "States"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
+msgid "Allowance Deduction Heads"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Gross Sal."
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: field:company.contribution,note:0
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,note:0
+#: view:hr.contibution.register:0
+#: field:hr.contibution.register,note:0
+#: view:hr.passport:0
+#: field:hr.passport,note:0
+#: field:hr.payroll.advice,note:0
+#: field:hr.payroll.register,note:0
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,note:0
+#: view:hr.payslip:0
+#: field:hr.payslip,note:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,note:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.employees.detail,date_from:0
+#: field:hr.payroll.year.salary,date_from:0
+#: report:salary.structure:0
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Deduction -"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid ")"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Registers"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
+#: model:ir.ui.menu,name:hr_payroll.payroll_configure
+msgid "Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
+msgid "Wage Type"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Net Sal."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Year Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,name:0
+msgid "Categoty Name"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
+msgid "hr.payroll.year.salary"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: field:hr.passport,address_id:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+msgid "Address"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line.line,slipline_id:0
+msgid "Slip Line"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Number of Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: field:hr.payroll.advice,bank_id:0
+#: field:hr.payroll.register,bank_id:0
+#: report:salary.structure:0
+msgid "Bank"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Advance"
+msgstr ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Special Allowances and Deductions For Employee:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,name:0
+#: field:company.contribution.line,name:0
+#: field:hr.contibution.register,name:0
+#: field:hr.contibution.register.line,name:0
+#: field:hr.payroll.advice,name:0
+#: field:hr.payroll.register,name:0
+#: field:hr.payroll.structure,name:0
+#: field:hr.payslip,name:0
+#: field:hr.payslip.line,name:0
+#: field:hr.payslip.line.line,name:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+#: report:year.salary:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Leaved Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Country"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+#: view:hr.payroll.employees.detail:0
+#: field:hr.payroll.employees.detail,employee_ids:0
+#: view:hr.payroll.year.salary:0
+#: field:hr.payroll.year.salary,employee_ids:0
+#: view:hr.payslip:0
+msgid "Employees"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: hr_payroll
+#: help:company.contribution,register_id:0
+msgid "Contribution register based on company"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.allounce.deduction.categoty,sequence:0
+msgid "Use to arrange calculation sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,total_pay:0
+msgid "Total Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Leave Deductions Line:"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Account Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,comp_deduction:0
+msgid "Company Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "Payroll Configurtion"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,date_issue:0
+msgid "Passport Issue Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+#: selection:hr.allounce.deduction.categoty,type:0
+#: field:hr.payroll.register,allounce:0
+#: field:hr.payslip,allounce:0
+#: selection:hr.payslip.line,type:0
+msgid "Allowance"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,holiday_days:0
+msgid "No of Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,otherid:0
+msgid "Other Id"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Slip ID"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution.line,sequence:0
+#: field:hr.allounce.deduction.categoty,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.line.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Content"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Allowance / Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
+msgid "Bank Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Search Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: field:hr.contibution.register.line,total:0
+#: report:year.salary:0
+msgid "Total"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,contribute_ids:0
+msgid "Contributions"
+msgstr ""
diff --git a/addons/hr_timesheet/i18n/it.po b/addons/hr_timesheet/i18n/it.po
index 96fd6420221..0b2fe5c37c7 100644
--- a/addons/hr_timesheet/i18n/it.po
+++ b/addons/hr_timesheet/i18n/it.po
@@ -6,29 +6,324 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 09:58+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-24 23:10+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <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-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
-#: wizard_view:hr.analytical.timesheet,init:0
-#: wizard_view:hr.analytical.timesheet.my,init:0
-msgid "Choose your month"
-msgstr "Definisci Mese"
+#: model:product.template,name:hr_timesheet.product_consultant_product_template
+msgid "Service on Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "Wed"
+msgstr "Mercoledi"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "(Keep empty for current_time)"
+msgstr "(lasciare vuoto per ora corrente)"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr "Nessun dipendente definito per il tuo utente!"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Group By..."
+msgstr "Ragguppato per..."
+
+#. module: hr_timesheet
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nome del modello non valido nella definizione dell'azione."
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Today"
+msgstr "Oggi"
+
+#. module: hr_timesheet
+#: field:hr.employee,journal_id:0
+msgid "Analytic Journal"
+msgstr "Registro Analitico"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Stop Working"
+msgstr "Fine Lavoro"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_employee
+msgid "Employee Timesheet"
+msgstr "Foglio ore Impiegato"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Work done stats"
+msgstr "Statistiche Lavoro Svolto"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_reporting_timesheet
+msgid "Timesheet"
+msgstr "Orario di Lavoro"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "janvier"
+msgstr "gennaio"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "Mon"
+msgstr "Lun"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in"
+msgstr "Entrata"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "avril"
+msgstr "aprile"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,analytic_amount:0
+msgid "Minimum Analytic Amount"
+msgstr "Contabilità Analitica Minima"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Monthly Employee Timesheet"
+msgstr "Timesheet mensile impiegato"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in / Sign out"
+msgstr "Entrate/Uscite"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Work done in the last period"
+msgstr "Lavoro Svolto nell'ultimo periodo"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,state:0
+#: field:hr.sign.out.project,state:0
+msgid "Current state"
+msgstr "Stato Attuale"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,name:0
+#: field:hr.sign.out.project,name:0
+msgid "Employees name"
+msgstr "Nome Impiegato"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
+msgid "Print Employees Timesheet"
+msgstr "Stampa i timesheet degli impiegati"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Attenzione !"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
+#, python-format
+msgid "UserError"
+msgstr "Errore utente"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
+#, python-format
+msgid "No cost unit defined for this employee !"
+msgstr "Nessuna unità di costo definito per questo dipendente!"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "Tue"
+msgstr "Mar"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,account_id:0
+msgid "Analytic Account"
+msgstr "Contabilità Analitica"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:0
+#, python-format
+msgid "Warning"
 msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
+
+#. module: hr_timesheet
+#: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
+msgid "Human Resources (Timesheet encoding)"
+msgstr "Risorse Umane (codifica foglio ore"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Sign In/Out By Project"
+msgstr "Ingresso/Uscita per Progetto"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "Sat"
+msgstr "Sab"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "Sun"
+msgstr "Dom"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+msgid "Print"
+msgstr "Stampa"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
+msgid "Sign Out By Project"
+msgstr "Uscita per Progetto"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Timesheet Lines"
+msgstr "Righe Orari di Lavoro"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "juillet"
+msgstr "luglio"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Monthly Employees Timesheet"
+msgstr "Timesheet mensili impiegati"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "July"
+msgstr "Luglio"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,date:0
+#: field:hr.sign.out.project,date_start:0
+msgid "Starting Date"
+msgstr "Data di inizio"
+
+#. module: hr_timesheet
+#: view:hr.employee:0
+msgid "Categories"
+msgstr "Categorie"
+
+#. module: hr_timesheet
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valido per Visualizzazione Architettura!"
+
+#. module: hr_timesheet
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+"Errore: L'Unità di Vendita deve essere in una categoria diversa da quella "
+"dell'Unità di misura"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "novembre"
+msgstr "novembre"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "March"
+msgstr "Marzo"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total cost"
+msgstr "Costo Totale"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "décembre"
+msgstr "dicembre"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "September"
+msgstr "Settembre"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "December"
+msgstr "Dicembre"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.users,employee_ids:0
+msgid "employees"
+msgstr "Impiegati"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Stats by month"
+msgstr "Statistiche per Mese"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+#: field:hr.analytical.timesheet.employee,month:0
+#: field:hr.analytical.timesheet.users,month:0
+msgid "Month"
+msgstr "Mese"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,info:0
+msgid "Work Description"
+msgstr "Descrizione Lavoro"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "To be invoiced"
+msgstr "Da Fatturare"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
@@ -36,20 +331,18 @@ msgid "Employee timesheet"
 msgstr "Orari di Lavoro Dipendente"
 
 #. module: hr_timesheet
-#: model:ir.actions.wizard,name:hr_timesheet.si_so
-#: model:ir.ui.menu,name:hr_timesheet.menu_si_so
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_sign_in
 msgid "Sign in / Sign out by project"
 msgstr "Entrate/Uscite per Progetto"
 
 #. module: hr_timesheet
-#: wizard_button:hr_timesheet.si_so,sign_in,so_result_end:0
-msgid "Stop Working"
-msgstr "Fine Lavoro"
-
-#. module: hr_timesheet
-#: wizard_view:hr_timesheet.si_so,sign_in:0
-msgid "(Keep empty for current_time)"
-msgstr "(lasciare vuoto per ora corrente)"
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "Fri"
+msgstr "Ven"
 
 #. module: hr_timesheet
 #: constraint:product.template:0
@@ -60,214 +353,97 @@ msgstr ""
 "trovarsi nella stessa categoria"
 
 #. module: hr_timesheet
-#: wizard_view:hr_timesheet.si_so,sign_in:0
-msgid "Sign in status"
-msgstr "Stato Entrata"
-
-#. module: hr_timesheet
-#: wizard_view:hr_timesheet.si_so,sign_out:0
+#: view:hr.sign.in.project:0
 msgid "(Keep empty for current time)"
 msgstr "(lasciare vuoto per orario attuale)"
 
 #. module: hr_timesheet
-#: wizard_field:hr_timesheet.si_so,sign_out,server_date:0
-msgid "Current Date"
-msgstr "Data corrente"
+#: view:hr.employee:0
+msgid "Timesheets"
+msgstr "Orari di Lavoro"
 
 #. module: hr_timesheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modello non valido nella definizione dell'azione."
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Errore ! Non puoi creare un menù ricorsivo"
 
 #. module: hr_timesheet
-#: wizard_button:hr.analytical.timesheet,init,report:0
-#: wizard_button:hr.analytical.timesheet.my,init,report:0
-#: wizard_button:hr.analytical.timesheet_users,init,report:0
-msgid "Print"
-msgstr "Stampa"
+#: help:hr.employee,product_id:0
+msgid "Specifies employee's designation as a product with type 'service'."
+msgstr ""
 
 #. module: hr_timesheet
-#: wizard_field:hr_timesheet.si_so,sign_in,analytic_amount:0
-msgid "Minimum Analytic Amount"
-msgstr "Contabilità Analitica Minima"
-
-#. module: hr_timesheet
-#: wizard_field:hr_timesheet.si_so,sign_in,server_date:0
-msgid "Current Server Date"
-msgstr "Data corrente lato Server"
-
-#. module: hr_timesheet
-#: wizard_field:hr_timesheet.si_so,sign_in,date_start:0
-#: wizard_field:hr_timesheet.si_so,sign_out,date:0
-msgid "Starting Date"
-msgstr "Data di inizio"
-
-#. module: hr_timesheet
-#: field:hr.employee,product_id:0
-msgid "Product"
-msgstr "Prodotto"
-
-#. module: hr_timesheet
-#: selection:hr.analytical.timesheet,init,month:0
-#: selection:hr.analytical.timesheet.my,init,month:0
-#: selection:hr.analytical.timesheet_users,init,month:0
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
 msgid "août"
 msgstr "agosto"
 
 #. module: hr_timesheet
-#: field:hr.employee,journal_id:0
-msgid "Analytic Journal"
-msgstr "Registro Analitico"
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "August"
+msgstr "Agosto"
 
 #. module: hr_timesheet
-#: model:product.uom,name:hr_timesheet.uom_hour
-msgid "Hour"
-msgstr "Ora"
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "June"
+msgstr "Giugno"
 
 #. module: hr_timesheet
-#: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet
-#: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet
-msgid "Employee Timesheet"
-msgstr "Foglio ore Impiegato"
-
-#. module: hr_timesheet
-#: view:account.analytic.account:0
-msgid "Work done stats"
-msgstr "Statistiche Lavoro Svolto"
-
-#. module: hr_timesheet
-#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
-#: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_all_form
-#: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_today_form
-msgid "Working Hours"
-msgstr "Ore lavorative"
-
-#. module: hr_timesheet
-#: view:hr.analytic.timesheet:0
-msgid "Timesheet Lines"
-msgstr "Righe Orari di Lavoro"
-
-#. module: hr_timesheet
-#: view:hr.analytic.timesheet:0
-msgid "Total time"
-msgstr "Tempo totale"
-
-#. module: hr_timesheet
-#: selection:hr.analytical.timesheet,init,month:0
-#: selection:hr.analytical.timesheet.my,init,month:0
-#: selection:hr.analytical.timesheet_users,init,month:0
-msgid "juillet"
-msgstr "luglio"
-
-#. module: hr_timesheet
-#: xsl:hr.analytical.timesheet:0
-#: xsl:hr.analytical.timesheet_users:0
-#: model:ir.ui.menu,name:hr_timesheet.next_id_48
-msgid "Timesheet"
-msgstr "Orario di Lavoro"
-
-#. module: hr_timesheet
-#: selection:hr.analytical.timesheet,init,month:0
-#: selection:hr.analytical.timesheet.my,init,month:0
-#: selection:hr.analytical.timesheet_users,init,month:0
-msgid "janvier"
-msgstr "gennaio"
-
-#. module: hr_timesheet
-#: selection:hr.analytical.timesheet,init,month:0
-#: selection:hr.analytical.timesheet.my,init,month:0
-#: selection:hr.analytical.timesheet_users,init,month:0
-msgid "juin"
-msgstr "giugno"
-
-#. module: hr_timesheet
-#: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_my
-#: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet_my
+#: view:hr.analytical.timesheet.employee:0
 msgid "Print My Timesheet"
 msgstr "Stampa il mio foglio ore"
 
 #. module: hr_timesheet
-#: wizard_field:hr.analytical.timesheet,init,user_id:0
-#: wizard_field:hr.analytical.timesheet.my,init,user_id:0
-msgid "User"
-msgstr "Utente"
-
-#. module: hr_timesheet
-#: wizard_view:hr_timesheet.si_so,sign_out:0
-msgid "Sign in"
-msgstr "Entrata"
-
-#. module: hr_timesheet
-#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form
-#: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form
-msgid "Working Hours of The Day"
-msgstr "Ore Lavorative del Giorno"
-
-#. module: hr_timesheet
-#: wizard_view:hr_timesheet.si_so,sign_out:0
-msgid "(local time on the server side)"
-msgstr "(ora locale sul lato server)"
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "mars"
+msgstr "marzo"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
-msgid "Total cost"
-msgstr "Costo Totale"
+msgid "Date"
+msgstr "Data"
 
 #. module: hr_timesheet
-#: model:product.uom,name:hr_timesheet.uom_day
-msgid "Day"
-msgstr "Giorno"
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "November"
+msgstr "Novembre"
 
 #. module: hr_timesheet
-#: wizard_field:hr_timesheet.si_so,sign_in,date:0
+#: field:hr.sign.out.project,date:0
 msgid "Closing Date"
 msgstr "Data di fine"
 
 #. module: hr_timesheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "October"
+msgstr "Ottobre"
 
 #. module: hr_timesheet
-#: selection:hr.analytical.timesheet,init,month:0
-#: selection:hr.analytical.timesheet.my,init,month:0
-#: selection:hr.analytical.timesheet_users,init,month:0
-msgid "avril"
-msgstr "aprile"
-
-#. module: hr_timesheet
-#: field:hr.analytic.timesheet,line_id:0
-msgid "Analytic line"
-msgstr "Riga Analitica"
-
-#. module: hr_timesheet
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
+#: code:addons/hr_timesheet/hr_timesheet.py:0
+#, python-format
+msgid ""
+"No analytic account defined on the project.\n"
+"Please set one or we can not automatically fill the timesheet."
 msgstr ""
-"Errore: L'Unità di Vendita deve essere in una categoria diversa da quella "
-"dell'Unità di misura"
+"Nessun conto analitico definito sul progetto.\n"
+"Per favore selezionane uno o non sarà possibile riempire in automatico il "
+"timesheet"
 
 #. module: hr_timesheet
-#: wizard_view:hr.analytical.timesheet_users,init:0
-msgid "Choose Users"
-msgstr "Definisci Utente"
-
-#. module: hr_timesheet
-#: selection:hr.analytical.timesheet,init,month:0
-#: selection:hr.analytical.timesheet.my,init,month:0
-#: selection:hr.analytical.timesheet_users,init,month:0
-msgid "novembre"
-msgstr "novembre"
-
-#. module: hr_timesheet
-#: wizard_view:hr_timesheet.si_so,sign_out:0
-msgid "Sign in / Sign out"
-msgstr "Entrate/Uscite"
-
-#. module: hr_timesheet
-#: wizard_view:hr_timesheet.si_so,sign_in:0
-msgid "Work done in the last period"
-msgstr "Lavoro Svolto nell'ultimo periodo"
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "January"
+msgstr "Gennaio"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -275,17 +451,11 @@ msgid "Key dates"
 msgstr "Fate Chiave"
 
 #. module: hr_timesheet
-#: wizard_field:hr_timesheet.si_so,sign_in,state:0
-#: wizard_field:hr_timesheet.si_so,sign_out,state:0
-msgid "Current state"
-msgstr "Stato Attuale"
-
-#. module: hr_timesheet
-#: selection:hr.analytical.timesheet,init,month:0
-#: selection:hr.analytical.timesheet.my,init,month:0
-#: selection:hr.analytical.timesheet_users,init,month:0
-msgid "octobre"
-msgstr "ottobre"
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "Thu"
+msgstr "Gio"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -293,119 +463,198 @@ msgid "Analysis stats"
 msgstr "Statistiche Analisi"
 
 #. module: hr_timesheet
-#: selection:hr.analytical.timesheet,init,month:0
-#: selection:hr.analytical.timesheet.my,init,month:0
-#: selection:hr.analytical.timesheet_users,init,month:0
-msgid "décembre"
-msgstr "dicembre"
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
+msgid "Print Employee Timesheet & Print My Timesheet"
+msgstr "Stampa timesheet impiegato e il mio personale"
 
 #. module: hr_timesheet
-#: wizard_field:hr_timesheet.si_so,sign_in,info:0
-msgid "Work Description"
-msgstr "Descrizione Lavoro"
+#: field:hr.sign.in.project,emp_id:0
+#: field:hr.sign.out.project,emp_id:0
+msgid "Employee ID"
+msgstr "ID impiegato"
 
 #. module: hr_timesheet
-#: wizard_field:hr_timesheet.si_so,sign_in,name:0
-#: wizard_field:hr_timesheet.si_so,sign_out,name:0
-msgid "Employee's name"
-msgstr "Nome Dipendente"
-
-#. module: hr_timesheet
-#: model:product.template,name:hr_timesheet.product_consultant_product_template
-msgid "Consultancy - Senior Developer"
-msgstr "Consulenza - Sviluppatore Senjor"
-
-#. module: hr_timesheet
-#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_me_all_form
-#: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_me_all_form
-msgid "My Working Hours"
-msgstr "Le Mie Ore Lavorative"
-
-#. module: hr_timesheet
-#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
-msgid "Timesheet line"
-msgstr "Riga Orari di Lavoro"
-
-#. module: hr_timesheet
-#: xsl:hr.analytical.timesheet:0
-msgid "Sum"
-msgstr "Totale"
-
-#. module: hr_timesheet
-#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form_my
-#: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form_my
-msgid "My Working Hours of The Day"
-msgstr "Le Mie Ore di Lavoro del Giorno"
-
-#. module: hr_timesheet
-#: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
-msgid "Human Resources (Timesheet encoding)"
-msgstr "Risorse Umane (codifica foglio ore"
-
-#. module: hr_timesheet
-#: selection:hr.analytical.timesheet,init,month:0
-#: selection:hr.analytical.timesheet.my,init,month:0
-#: selection:hr.analytical.timesheet_users,init,month:0
-msgid "mars"
-msgstr "marzo"
-
-#. module: hr_timesheet
-#: xsl:hr.analytical.timesheet:0
-#: xsl:hr.analytical.timesheet_users:0
-msgid "Total"
-msgstr "Totale"
-
-#. module: hr_timesheet
-#: selection:hr.analytical.timesheet,init,month:0
-#: selection:hr.analytical.timesheet.my,init,month:0
-#: selection:hr.analytical.timesheet_users,init,month:0
-msgid "mai"
-msgstr "maggio"
-
-#. module: hr_timesheet
-#: wizard_button:hr_timesheet.si_so,sign_out,si_result:0
-msgid "Start Working"
-msgstr "Inizio Lavoro"
-
-#. module: hr_timesheet
-#: wizard_button:hr_timesheet.si_so,sign_in,so_result:0
-msgid "Change Work"
-msgstr "Cambia Lavoro"
-
-#. module: hr_timesheet
-#: selection:hr.analytical.timesheet,init,month:0
-#: selection:hr.analytical.timesheet.my,init,month:0
-#: selection:hr.analytical.timesheet_users,init,month:0
-msgid "février"
-msgstr "febbraio"
-
-#. module: hr_timesheet
-#: view:account.analytic.account:0
-msgid "Stats by month"
-msgstr "Statistiche per Mese"
-
-#. module: hr_timesheet
-#: view:account.analytic.account:0
-#: wizard_field:hr.analytical.timesheet,init,month:0
-#: wizard_field:hr.analytical.timesheet.my,init,month:0
-#: wizard_field:hr.analytical.timesheet_users,init,month:0
-msgid "Month"
-msgstr "Mese"
-
-#. module: hr_timesheet
-#: wizard_field:hr_timesheet.si_so,sign_in,account_id:0
-msgid "Analytic Account"
-msgstr "Contabilità Analitica"
-
-#. module: hr_timesheet
-#: wizard_view:hr_timesheet.si_so,sign_in:0
+#: view:hr.sign.out.project:0
 msgid "General Information"
 msgstr "Informazioni Generali"
 
 #. module: hr_timesheet
-#: model:process.process,name:hr_timesheet.process_process_timesheetprocess0
-msgid "Timesheet Process"
-msgstr "Processo di modulo orario"
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
+msgid "My Timesheet"
+msgstr "Il mio Timesheet"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Analysis summary"
+msgstr "Riepilogo Analisi"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Cancel"
+msgstr "Annulla"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_users
+#: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet
+#: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users
+msgid "Employees Timesheet"
+msgstr "Foglio ore Impiegati"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "février"
+msgstr "febbraio"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Information"
+msgstr ""
+
+#. module: hr_timesheet
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+"speciali!"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,employee_id:0
+#: model:ir.model,name:hr_timesheet.model_hr_employee
+msgid "Employee"
+msgstr "Impiegato"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,server_date:0
+#: field:hr.sign.out.project,server_date:0
+msgid "Current Date"
+msgstr "Data corrente"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Anlytic account"
+msgstr "Conto analitico"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Riga Orari di Lavoro"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "This wizard will print monthly timesheet"
+msgstr "Il wizard stamperà il timesheet mensile"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: field:hr.employee,product_id:0
+msgid "Product"
+msgstr "Prodotto"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Invoicing"
+msgstr "Fatturazione"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "May"
+msgstr "Maggio"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total time"
+msgstr "Tempo totale"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "juin"
+msgstr "giugno"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "(local time on the server side)"
+msgstr "(ora locale sul lato server)"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
+#: model:ir.ui.menu,name:hr_timesheet.menu_project_working_hours
+msgid "Working Hours"
+msgstr "Ore lavorative"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
+msgid "Sign In By Project"
+msgstr "Entrata per progetto"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "February"
+msgstr "Febbraio"
+
+#. module: hr_timesheet
+#: field:hr.analytic.timesheet,line_id:0
+msgid "Analytic line"
+msgstr "Riga Analitica"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "This Wizard will make Sign In/Out By Project"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Employees"
+msgstr "Dipendenti"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:0
+#, python-format
+msgid ""
+"Analytic journal is not defined for employee %s \n"
+"Define an employee for the selected user and assign an analytic journal!"
+msgstr ""
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "octobre"
+msgstr "ottobre"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "April"
+msgstr "Aprile"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "mai"
+msgstr "maggio"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+#: view:hr.analytic.timesheet:0
+msgid "Users"
+msgstr "Utenti"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Start Working"
+msgstr "Inizio Lavoro"
 
 #. module: hr_timesheet
 #: constraint:product.product:0
@@ -418,62 +667,85 @@ msgid "Stats by user"
 msgstr "Statistiche per Utente"
 
 #. module: hr_timesheet
-#: view:hr.analytic.timesheet:0
-msgid "Timesheet Line"
-msgstr "Riga Orari di Lavoro"
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:0
+#, python-format
+msgid "No employee defined for this user"
+msgstr "Non è stato definito l'impiegato per questo utente"
 
 #. module: hr_timesheet
-#: view:account.analytic.account:0
-msgid "Analysis summary"
-msgstr "Riepilogo Analisi"
-
-#. module: hr_timesheet
-#: wizard_field:hr.analytical.timesheet,init,year:0
-#: wizard_field:hr.analytical.timesheet.my,init,year:0
-#: wizard_field:hr.analytical.timesheet_users,init,year:0
+#: field:hr.analytical.timesheet.employee,year:0
+#: field:hr.analytical.timesheet.users,year:0
 msgid "Year"
 msgstr "Anno"
 
 #. module: hr_timesheet
-#: wizard_button:hr.analytical.timesheet,init,end:0
-#: wizard_button:hr.analytical.timesheet.my,init,end:0
-#: wizard_button:hr.analytical.timesheet_users,init,end:0
-#: wizard_button:hr_timesheet.si_so,sign_in,end:0
-#: wizard_button:hr_timesheet.si_so,sign_out,end:0
-msgid "Cancel"
-msgstr "Annulla"
+#: view:hr.analytic.timesheet:0
+msgid "Accounting"
+msgstr ""
 
 #. module: hr_timesheet
-#: view:account.analytic.account:0
-#: wizard_field:hr.analytical.timesheet_users,init,user_ids:0
-msgid "Users"
-msgstr "Utenti"
+#: field:hr.analytic.timesheet,partner_id:0
+msgid "Partner Id"
+msgstr "ID Partner"
 
 #. module: hr_timesheet
-#: model:product.uom.categ,name:hr_timesheet.uom_categ_wtime
-msgid "Working Time"
-msgstr "Orario di Lavoro"
+#: view:hr.sign.out.project:0
+msgid "Change Work"
+msgstr "Cambia Lavoro"
 
 #. module: hr_timesheet
-#: view:account.analytic.account:0
-msgid "To be invoiced"
-msgstr "Da Fatturare"
-
-#. module: hr_timesheet
-#: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet
-#: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
-#: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet_users
-msgid "Employees Timesheet"
-msgstr "Foglio ore Impiegati"
-
-#. module: hr_timesheet
-#: selection:hr.analytical.timesheet,init,month:0
-#: selection:hr.analytical.timesheet.my,init,month:0
-#: selection:hr.analytical.timesheet_users,init,month:0
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
 msgid "septembre"
 msgstr "settembre"
 
-#. module: hr_timesheet
-#: view:hr.employee:0
-msgid "Timesheets"
-msgstr "Orari di Lavoro"
+#~ msgid "Day"
+#~ msgstr "Giorno"
+
+#~ msgid "My Working Hours"
+#~ msgstr "Le Mie Ore Lavorative"
+
+#~ msgid "Timesheet Process"
+#~ msgstr "Processo di modulo orario"
+
+#~ msgid "Sum"
+#~ msgstr "Totale"
+
+#~ msgid "Hour"
+#~ msgstr "Ora"
+
+#~ msgid "Choose Users"
+#~ msgstr "Definisci Utente"
+
+#~ msgid "Timesheet line"
+#~ msgstr "Riga Orari di Lavoro"
+
+#~ msgid "My Working Hours of The Day"
+#~ msgstr "Le Mie Ore di Lavoro del Giorno"
+
+#~ msgid "Sign in status"
+#~ msgstr "Stato Entrata"
+
+#~ msgid "User"
+#~ msgstr "Utente"
+
+#~ msgid "Employee's name"
+#~ msgstr "Nome Dipendente"
+
+#~ msgid "Choose your month"
+#~ msgstr "Definisci Mese"
+
+#~ msgid "Working Time"
+#~ msgstr "Orario di Lavoro"
+
+#~ msgid "Current Server Date"
+#~ msgstr "Data corrente lato Server"
+
+#~ msgid "Working Hours of The Day"
+#~ msgstr "Ore Lavorative del Giorno"
+
+#~ msgid "Total"
+#~ msgstr "Totale"
+
+#~ msgid "Consultancy - Senior Developer"
+#~ msgstr "Consulenza - Sviluppatore Senjor"
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 37985293f94..ebea0fb6217 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -6,36 +6,51 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 08:24+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-24 13:13+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-09-29 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-msgid "Moves Created"
-msgstr "Utworzone przesunięcia"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 msgid "No. Of Cycles"
 msgstr "Liczba cykli"
 
 #. module: mrp
-#: help:mrp.procurement.compute.all,init,automatic:0
-msgid ""
-"Triggers an automatic procurement for all products that have a virtual stock "
-"under 0. You should probably not use this option, we suggest using a MTO "
-"configuration on products."
-msgstr ""
-"Wyzwala automatyczne zapotrzebowanie dla wszystkich produktów o zapasie "
-"poniżej 0. Prawdopodobnie nie powinieneś stosować tej opcji. Sugerujemy "
-"ustawienie konfiguracji produktów 'Na zamówienie'."
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of operations this workcenter can do."
+msgstr "Liczba operacji, którą to centrum może wykonać."
+
+#. module: mrp
+#: help:mrp.production,location_src_id:0
+msgid "Location where the system will look for components."
+msgstr "Strefa, w której system będzie oczekiwał komponentów."
+
+#. module: mrp
+#: field:mrp.production,workcenter_lines:0
+msgid "Work Centers Utilisation"
+msgstr "Wykorzystanie centrum roboczego"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Work Centers load"
+msgstr "Obłożenie centrum roboczego"
+
+#. module: mrp
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Utworzone przesunięcia"
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
@@ -48,31 +63,56 @@ msgid "Invalid model name in the action definition."
 msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Wersja"
+#: field:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of Cycles"
+msgstr "Liczba cykli"
 
 #. module: mrp
-#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2
-#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc2
-msgid "Compute Stock Minimum Rules Only"
-msgstr "Oblicz tylko reguły minimalnych zapasów"
+#: model:process.transition,note:mrp.process_transition_minimumstockprocure0
+msgid ""
+"The 'Minimum stock rule' allows the system to create procurement orders "
+"automatically as soon as the minimum stock is reached."
+msgstr ""
+"'Reguła minimalnego zapasu' pozwala systemowi tworzyć automatycznie "
+"zapotrzebowanie, jak tylko zapas spadnie do określonego minimum."
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_procurement_action5
-#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action5
-msgid "Exceptions Procurements"
-msgstr "Wyjątki zapotrzebowania"
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+"Jeśli pole Aktywne jest wyłączone, to pozwala ci na ukrycie zestawienia "
+"materiałowego bez jego usuwania."
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Workcenters"
-msgstr "Centra robocze marszruty"
+#: field:mrp.production,picking_id:0
+#: field:mrp.production.order,picking_id:0
+msgid "Picking list"
+msgstr "Pobranie"
 
 #. module: mrp
-#: help:mrp.property,composition:0
-msgid "Not used in computations, for information purpose only."
-msgstr "Nie używane w obliczeniach, tylko do informacji"
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Hourly Cost"
+msgstr "Koszt godzinowy"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Cost Price per Uom"
+msgstr "Koszt na JM"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Scrap Products"
+msgstr "Produkty uszkodzone"
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:mrp.production.order,day:0
+msgid "Day"
+msgstr "Dzień"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
@@ -81,28 +121,24 @@ msgid "Routings"
 msgstr "Marszruty"
 
 #. module: mrp
-#: field:mrp.production,picking_id:0
-msgid "Packing list"
-msgstr "Lista przesunięć"
+#: view:mrp.bom:0
+msgid "Search Bill Of Material"
+msgstr "Przeszukuj zaestawienie materiałowe"
 
 #. module: mrp
-#: model:process.node,name:mrp.process_node_stock0
-msgid "Stockable Stock"
-msgstr "Zapas rejestrowany"
+#: model:process.node,note:mrp.process_node_stockproduct1
+msgid "For stockable products and consumables"
+msgstr "Dla produktów rejestrowanych i materiałów pomocniczych"
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
-msgid "Origin"
-msgstr "Pochodzenie"
-
-#. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Konfiguracja"
+#: model:process.transition,name:mrp.process_transition_stockproduction0
+msgid "To Produce"
+msgstr "Do wyprodukowania"
 
 #. module: mrp
+#: view:mrp.bom:0
+#: field:mrp.bom,code:0
+#: view:mrp.production:0
 #: field:mrp.production,name:0
 msgid "Reference"
 msgstr "Numer"
@@ -113,10 +149,40 @@ msgid "Finished Products"
 msgstr "Produkty gotowe"
 
 #. module: mrp
-#: wizard_field:mrp.procurement.compute.all,init,automatic:0
-#: wizard_field:mrp.procurement.orderpoint.compute,init,automatic:0
-msgid "Automatic orderpoint"
-msgstr "Punkt automatycznego zamawiania"
+#: selection:mrp.production.order,month:0
+msgid "May"
+msgstr "Maj"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_servicerfq0
+#: model:process.transition,name:mrp.process_transition_stockrfq0
+msgid "To Buy"
+msgstr "Do zakupu"
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Raw Material Location"
+msgstr "Strefa materiałów do produkcji"
+
+#. module: mrp
+#: help:mrp.installer,mrp_operations:0
+msgid ""
+"Enhances production orders with readiness states as well as the start date "
+"and end date of execution of the order."
+msgstr ""
+"Rozszerza zamówienia produkcji o stany gotowości oraz datę rozpoczęcia "
+"wykonywania zamówienia."
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_purchaseprocure0
+msgid "The system launches automatically a RFQ to the preferred supplier."
+msgstr ""
+"System utworzy automatycznie Zapytanie ofertowe do preferowanego dostawcy."
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Products to Finish"
+msgstr "Produkty do wyprodukowania"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -129,12 +195,17 @@ msgid "Invalid XML for View Architecture!"
 msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 
 #. module: mrp
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"To są dni dodane do twojej obietnicy klientowi na wszelki wypadek (wysyłka "
-"nastąpi o tyle dni wcześniej)."
+#: field:mrp.installer,mrp_subproduct:0
+msgid "MRP Subproducts"
+msgstr "Produkty uboczne"
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,state:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,state:0
+msgid "State"
+msgstr "Stan"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
@@ -142,100 +213,92 @@ msgid "Cost per hour"
 msgstr "Koszt na godzinę"
 
 #. module: mrp
-#: selection:stock.warehouse.orderpoint,logic:0
-msgid "Best price (not yet active!)"
-msgstr "Najlepsza cena (jeszcze nie aktywne!)"
-
-#. module: mrp
-#: view:mrp.procurement:0
-msgid "Product & Location"
-msgstr "Produkt i strefa"
-
-#. module: mrp
-#: view:res.company:0
-msgid "MRP & Logistic Scheduler"
-msgstr "MRP i planowanie logistyczne"
-
-#. module: mrp
-#: help:mrp.workcenter,capacity_per_cycle:0
+#: model:process.transition,note:mrp.process_transition_stockproduction0
 msgid ""
-"Number of operation this workcenter can do in parallel. If this workcenter "
-"represent a team of 5 workers, the capacity per cycle is 5."
+"In case the Supply method of the product is Produce, the system creates a "
+"production order."
 msgstr ""
-"Liczba operacji, którą to centrum robocze jest w stanie wykonać równolegle. "
-"Jeśli centrum składa się z 5 pracowników, to ilość na cykl wynosi 5."
+"Jeśli metoda zaopatrzenia jest Produkcja, to system utworzy zamówienie "
+"produkcji."
 
 #. module: mrp
-#: wizard_button:product.product.procurement,init,create:0
-msgid "Ask New Products"
-msgstr "Pytaj o nowe produkty"
+#: view:mrp.production:0
+msgid "UOM"
+msgstr "JM"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_reordering
-msgid "Automatic Procurements"
-msgstr "Automatyczne zapotrzebowania"
-
-#. module: mrp
-#: wizard_field:change_production_qty,confirm,product_qty:0
+#: field:change.production.qty,product_qty:0
 #: field:mrp.bom,product_qty:0
 #: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "Ilość produktu"
 
 #. module: mrp
-#: field:mrp.production,move_lines:0
-msgid "Products Consummed"
-msgstr "Zużyte produkty"
+#: model:process.node,note:mrp.process_node_purchaseprocure0
+msgid "For purchased material"
+msgstr "Dla kupowanych materiałów"
+
+#. module: mrp
+#: field:mrp.bom.revision,indice:0
+msgid "Revision"
+msgstr "Wersja"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Raportowanie"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
 msgid "Cycle Account"
 msgstr "Konto cykli"
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost"
+msgstr "Koszt pracy"
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "["
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
+msgid "Procurement of services"
+msgstr "Zapotrzebowanie na usługi"
+
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Capacity Information"
 msgstr "Informacje o wydajności"
 
 #. module: mrp
-#: selection:mrp.production,state:0
-msgid "Packing Exception"
-msgstr "Wyjątek przesunięcia"
-
-#. module: mrp
-#: model:process.node,note:mrp.process_node_orderrfq0
-msgid "A purchase order is created for a sub-contracting demand."
-msgstr "Zamówienie zakupu zostało utworzone dla podwykonawcy."
-
-#. module: mrp
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 msgid "Destination Location"
 msgstr "Strefa docelowa"
 
 #. module: mrp
-#: view:mrp.workcenter:0
-msgid "Analytic Accounting"
-msgstr "Księgowość analityczna"
+#: view:mrp.installer:0
+msgid "title"
+msgstr ""
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_servicemts0
-msgid "Do nothing"
-msgstr "Nic nie rób"
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom
+msgid "Master Data"
+msgstr "Dane główne"
 
 #. module: mrp
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 msgid "Partner Ref"
 msgstr "Odn. partnera"
 
 #. module: mrp
-#: help:mrp.procurement.orderpoint.compute,init,automatic:0
-msgid "If the stock of a product is under 0, it will act like an orderpoint"
-msgstr ""
-"Jeśli zapas produktu jest poniżej 0, to to zadziała jak punkt zamawiania."
-
-#. module: mrp
-#: selection:mrp.workcenter.load,init,measure_unit:0
+#: selection:mrp.workcenter.load,measure_unit:0
 msgid "Amount in hours"
 msgstr "Wartość w godzinach"
 
@@ -245,9 +308,18 @@ msgid "Scheduled goods"
 msgstr "Zaplanowane materiały"
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_producttostockrules0
-msgid "you can see the minimum stock rules from product"
-msgstr "możesz sprawdzić reguły minimalnego zapasu w produkcie"
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid ""
+"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
+"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
+"\n"
+"    def copy(self, cr, uid, id, default=None, context=None):\n"
+"        if default is None:\n"
+"            default = {}\n"
+"        default.update({\n"
+"            'name': self.pool.get('ir.sequence"
+msgstr ""
 
 #. module: mrp
 #: selection:mrp.bom,type:0
@@ -255,26 +327,10 @@ msgid "Sets / Phantom"
 msgstr "Zestaw / Fantom"
 
 #. module: mrp
-#: wizard_view:mrp.procurement.compute,init:0
-msgid "This wizard will schedule procurements."
-msgstr "Ten kreator zaplanuje zapotrzebowania."
-
-#. module: mrp
-#: field:mrp.bom,position:0
-msgid "Internal Ref."
-msgstr "Wewn. odnośnik"
-
-#. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
-#: field:mrp.production,state:0
-msgid "Status"
-msgstr "Stan"
-
-#. module: mrp
-#: model:process.transition,name:mrp.process_transition_stockproduction0
-msgid "Stockable Production Order"
-msgstr "Zamówienie produkcji na zapas"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "Nie pilne"
 
 #. module: mrp
 #: help:mrp.bom,position:0
@@ -282,55 +338,54 @@ msgid "Reference to a position in an external plan."
 msgstr "Odnośnik do pozycji w planie zewnętrznym"
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_stockrfq0
-msgid "Stockable Request"
+#: selection:mrp.production.order,month:0
+msgid "August"
 msgstr ""
 
 #. module: mrp
-#: model:process.node,name:mrp.process_node_serviceonorder0
-msgid "Service on Order"
-msgstr "Usługa na zamówienie"
-
-#. module: mrp
-#: help:stock.warehouse.orderpoint,product_max_qty:0
-#: help:stock.warehouse.orderpoint,product_min_qty:0
-msgid ""
-"When the virtual stock goes belong the Min Quantity, Open ERP generates a "
-"procurement to bring the virtual stock to the Max Quantity."
-msgstr ""
-"Kiedy zapas wirtualny będzie poniżej ilości minimalnej, to Open ERP "
-"wygeneruje zapotrzebowanie, aby zapas wzrósł do wartości maksymalnej."
-
-#. module: mrp
-#: model:process.transition,name:mrp.process_transition_stockmts0
-msgid "Stockable Make to Stock"
+#: model:ir.model,name:mrp.model_mrp_production_order
+msgid "Production Order Report"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
-msgid "Production Orders"
-msgstr "Zamówienia produkcji"
+#: selection:mrp.production.order,month:0
+msgid "June"
+msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
-#: rml:mrp.production.order:0
-#: wizard_field:product.product.procurement,init,qty:0
+#: model:ir.model,name:mrp.model_mrp_product_produce
+msgid "Product Produce"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "October"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
+msgid "Procurement of stockable Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Default UOM"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#: report:bom.structure:0
+#: field:mrp.product.produce,product_qty:0
+#: field:mrp.product_price,number:0
+#: report:mrp.production.order:0
+#, python-format
 msgid "Quantity"
 msgstr "Ilość"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
-msgid "Not urgent"
-msgstr "Nie pilne"
-
-#. module: mrp
-#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
-msgid "Procure Service Product"
-msgstr "Zapotrzebowanie na usługę"
+#: field:mrp.production.workcenter.line,hour:0
+msgid "Nbr of hours"
+msgstr ""
 
 #. module: mrp
 #: view:mrp.production:0
@@ -338,52 +393,50 @@ msgid "Confirm Production"
 msgstr "Potwierdź produkcję"
 
 #. module: mrp
-#: model:process.node,name:mrp.process_node_purchaseprocure0
-#: field:stock.move,procurements:0
-msgid "Procurements"
-msgstr "Zapotrzebowania"
+#: model:process.transition,note:mrp.process_transition_stockproduct0
+msgid ""
+"The system creates an order (production or purchased) depending on the sold "
+"quantity and the products parameters."
+msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_production_product_line
-msgid "Production scheduled products"
-msgstr "Produkty zaplanowane do produkcji"
+#: model:process.transition,note:mrp.process_transition_servicemts0
+msgid ""
+"This is used in case of a service without any impact in the system, a "
+"training session for instance."
+msgstr ""
 
 #. module: mrp
-#: field:mrp.workcenter,timesheet_id:0
-msgid "Working Time"
-msgstr "Czas pracy"
+#: field:mrp.installer,mrp_repair:0
+msgid "Repairs"
+msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-msgid "Details"
-msgstr "Szczegóły"
+#: field:mrp.installer,stock_location:0
+msgid "Advanced Routes"
+msgstr ""
 
 #. module: mrp
-#: model:process.process,name:mrp.process_process_procurementprocess0
-msgid "Procurement Process"
-msgstr "Proces zapotrzebowania"
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+msgid "Weekly Stock Value Variation"
+msgstr "Tygodniowe odchylenie wartości zapasów"
+
+#. module: mrp
+#: help:mrp.installer,mrp_repair:0
+msgid ""
+"Enables warranty and repair management (and their impact on stocks and "
+"invoicing)."
+msgstr ""
 
 #. module: mrp
 #: field:mrp.production,date_planned_date:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,date_planned:0
 msgid "Scheduled Date"
 msgstr "Zaplanowana data"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
-msgid "Urgent"
-msgstr "Pilne"
-
-#. module: mrp
-#: help:mrp.bom,product_rounding:0
-msgid ""
-"Rounding applied on the product quantity. For integer only values, put 1.0"
-msgstr ""
-"Zaokrąglenie stosowane do ilości produktu. Aby wykluczyć liczby ułamkowe "
-"ustaw 1,0."
-
-#. module: mrp
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 msgid "Bill Of Material"
 msgstr "Zestawienie materiałowe"
 
@@ -399,9 +452,9 @@ msgstr ""
 "partnera, jeśli wykonujesz operacje produkcyjne jako podwykonawca."
 
 #. module: mrp
-#: field:mrp.procurement,move_id:0
-msgid "Reservation"
-msgstr "Rezerwacja"
+#: view:board.board:0
+msgid "Stock Value Variation"
+msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
@@ -409,29 +462,25 @@ msgid "Bill of Materials Structure"
 msgstr "Struktura zestawień materiałowych"
 
 #. module: mrp
-#: wizard_field:product.product.procurement,init,product_id:0
-msgid "product"
-msgstr "produkt"
+#: model:process.node,note:mrp.process_node_serviceproduct0
+msgid "Product type is service"
+msgstr ""
 
 #. module: mrp
-#: selection:mrp.property,composition:0
-msgid "max"
-msgstr "max"
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "of "
+msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_producttostockrules0
-msgid "Product to stock rules"
-msgstr "Produkt do reguł zapasu"
+#: model:process.transition,name:mrp.process_transition_bom0
+msgid "Manufacturing decomposition"
+msgstr ""
 
 #. module: mrp
-#: wizard_button:product_price,init,price:0
-msgid "Print product price"
-msgstr "Drukuj cenę produktu"
-
-#. module: mrp
-#: wizard_view:product.product.procurement,done:0
-msgid "Make Procurement"
-msgstr "Wykonaj zapotrzebowanie"
+#: model:process.node,note:mrp.process_node_serviceproduct1
+msgid "For Services."
+msgstr ""
 
 #. module: mrp
 #: field:mrp.bom.revision,date:0
@@ -449,18 +498,36 @@ msgstr ""
 "zamówień produkcji."
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_stockproduction0
-msgid "If Procure method is Make to order and supply method is produce"
+#: field:mrp.production.workcenter.line,cycle:0
+msgid "Nbr of cycles"
 msgstr ""
-"Jeśli metoda nabycia jest 'Na zamówienie' i metoda zaopatrzenia jest "
-"'Produkcja'"
 
 #. module: mrp
-#: field:res.company,po_lead:0
-msgid "Purchase Lead Time"
-msgstr "Czas na zakup"
+#: model:process.node,note:mrp.process_node_orderrfq0
+#: model:process.node,note:mrp.process_node_rfq0
+msgid "Request for Quotation."
+msgstr ""
 
 #. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component suppliers"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
+msgid ""
+"The Bill of Material is linked to a routing, i.e. the succession of work "
+"centers."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_hour:0
+msgid "Specify Cost of Workcenter per hour."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
 #: field:mrp.routing,location_id:0
 msgid "Production Location"
 msgstr "Strefa dla produkcji"
@@ -481,35 +548,73 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_stockproduct0
-msgid "Stockable Product Stock"
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Wycena zapasów"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_product_bom_structure
+msgid "Product BoM Structure"
+msgstr "Struktura Zest. Mat. produktu"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Search Production"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
-msgid "Product UOS"
-msgstr "JS produktu"
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Supplier Price per Uom"
+msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
-msgid "Production Procure Products"
-msgstr "Zapotrzebowanie produktów z produkcji"
+#: selection:mrp.production.order,month:0
+msgid "March"
+msgstr ""
 
 #. module: mrp
-#: model:process.process,name:mrp.process_process_serviceproductprocess0
-msgid "Service Product Process"
-msgstr "Proces usługi"
+#: model:ir.model,name:mrp.model_mrp_workcenter_load
+msgid "Workcenter Load"
+msgstr "Obciążenie centrum roboczego"
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_purchaseprocure0
-msgid "Procurement convert into the draft purchase order."
-msgstr "Zapotrzebowanie zmienia się w projekt zamówienia zakupu."
+#: help:mrp.workcenter,costs_cycle:0
+msgid "Specify Cost of Workcenter per cycle."
+msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,message:0
-msgid "Latest error"
-msgstr "Ostatni błąd"
+#: field:mrp.bom,child_complete_ids:0
+msgid "BoM Hierarchy"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
+#: view:mrp.product.produce:0
+#: view:mrp.production:0
+msgid "Produce"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,picking_id:0
+msgid ""
+"This is the internal picking list that brings the finished product to the "
+"production plan"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.product_price,number:0
+msgid ""
+"Specify quantity of products to produce or buy. Report of Cost structure "
+"will be displayed base on this qunatity."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+msgid "Picking Exception"
+msgstr ""
 
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
@@ -522,12 +627,15 @@ msgid "Time before prod."
 msgstr "Czas przed prod."
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing_workcenter
-msgid "Routing workcenter usage"
-msgstr "Wykorzystanie centrum roboczego w marszrucie"
+#: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
+msgid "Material Routing"
+msgstr ""
 
 #. module: mrp
 #: view:mrp.production:0
+#: field:mrp.production,move_lines2:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,consumed_products:0
 msgid "Consumed Products"
 msgstr "Zużyte produkty"
 
@@ -537,121 +645,115 @@ msgid "Error ! You can not create recursive BoM."
 msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych Zestawień materiałowych."
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_stockmts0
-#: model:process.transition,note:mrp.process_transition_stockrfq0
-msgid "If Product type is Stockable and procure method is make to stock"
+#: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Work Center Load"
 msgstr ""
-"Jeśli typ produktu jest 'Produkt rejestrowany' i metoda nabycia jest 'Na "
-"zapas'"
 
 #. module: mrp
-#: field:res.company,manufacturing_lead:0
-msgid "Manufacturity Lead Time"
-msgstr "Czas produkcji"
+#: code:addons/mrp/procurement.py:0
+#, python-format
+msgid "No BoM defined for this product !"
+msgstr "Nie zdefiniowano Zestawienia materiałowego dla tego produktu !"
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_procurement_action4
-#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action4
-msgid "Exceptions Procurements to Fix"
-msgstr "Wyjątki zapotrzebowania do poprawienia"
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
+msgid "Bill of Material Components"
+msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-msgid "Ready"
-msgstr "Gotowe"
+#: field:mrp.production.order,nbr:0
+msgid "# of Lines"
+msgstr ""
 
 #. module: mrp
-#: view:mrp.routing:0
-msgid "Workcenter Operations"
-msgstr "Operacje centrum roboczego"
+#: model:ir.ui.menu,name:mrp.menu_mrp_planning
+msgid "Planning"
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_action2_gantt
-#: model:ir.ui.menu,name:mrp.menu_production_orders_start_gantt
-msgid "Production Orders Planning"
-msgstr "Planowanie zamówień produkcyjnych"
-
-#. module: mrp
-#: help:mrp.workcenter,time_efficiency:0
-msgid "Factor that multiplies all times expressed in the workcenter."
-msgstr "Współczynnik mnożący wszystkie czasy podane w centrum roboczym."
+#: view:mrp.workcenter:0
+msgid "Costing Information"
+msgstr ""
 
 #. module: mrp
+#: help:mrp.routing.workcenter,hour_nbr:0
 #: help:mrp.workcenter,time_cycle:0
 msgid "Time in hours for doing one cycle."
 msgstr "Czas wykonania jednego cyklu w godzinach"
 
 #. module: mrp
-#: field:mrp.production,date_finished:0
-msgid "End Date"
-msgstr "Data końcowa"
-
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list take bring the raw materials to the "
-"production plan."
+#: report:bom.structure:0
+msgid "BOM Ref"
 msgstr ""
-"To jest wenętrzna lista przesunięć (pobrań), która dostarcza metriały do "
-"produkcji wg planu."
 
 #. module: mrp
 #: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
 msgid "In Production"
 msgstr "W trakcie produkcji"
 
 #. module: mrp
-#: field:stock.warehouse.orderpoint,qty_multiple:0
-msgid "Qty Multiple"
-msgstr "Wielokrotność"
+#: model:ir.ui.menu,name:mrp.menu_mrp_property
+msgid "Master Bill of Materials"
+msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-msgid "Waiting"
-msgstr "Oczekiwanie"
+#: help:mrp.bom,product_uos:0
+msgid ""
+"Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
+"promotion of stock."
+msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
-#: model:process.node,name:mrp.process_node_routing0
-msgid "Routing"
-msgstr "Marszruta"
-
-#. module: mrp
-#: wizard_button:mrp.workcenter.load,init,report:0
+#: view:mrp.product_price:0
+#: view:mrp.workcenter.load:0
 msgid "Print"
 msgstr "Drukuj"
 
 #. module: mrp
-#: field:mrp.workcenter,type:0
+#: view:mrp.bom:0
+#: view:mrp.workcenter:0
 msgid "Type"
 msgstr "Typ"
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_stockproduct0
-#: model:process.node,note:mrp.process_node_stockproduct1
-msgid "For stockable and consumable"
-msgstr "Dla rejestrowanych i pomocniczych"
+#: model:process.node,note:mrp.process_node_minimumstockrule0
+msgid "Linked to the 'Minimum stock rule' supplying method."
+msgstr ""
 
 #. module: mrp
-#: selection:mrp.workcenter.load,init,time_unit:0
+#: selection:mrp.workcenter.load,time_unit:0
 msgid "Per month"
 msgstr "Na miesiąc"
 
 #. module: mrp
-#: field:mrp.procurement,product_uos_qty:0
-msgid "UoS Quantity"
-msgstr "Ilość JS"
+#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/wizard/change_production_qty.py:0
+#, python-format
+msgid "Couldn't find bill of material for product"
+msgstr "Nie można znaleźć zestawienia materiałowego dla produktu"
 
 #. module: mrp
-#: rml:bom.structure:0
+#: report:bom.structure:0
 msgid "Product Name"
 msgstr "Nazwa produktu"
 
 #. module: mrp
-#: rml:mrp.production.order:0
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Niedozwolona akcja !"
+
+#. module: mrp
+#: help:mrp.bom,product_efficiency:0
+msgid "A factor of 0.9 means a loss of 10% within the production process."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
 msgid "Printing date"
 msgstr "Data druku"
 
@@ -662,56 +764,53 @@ msgid "RFQ"
 msgstr "Zap. Ofert."
 
 #. module: mrp
-#: field:mrp.bom,revision_type:0
-msgid "indice type"
+#: model:process.transition,name:mrp.process_transition_producttostockrules0
+msgid "Procurement rule"
 msgstr ""
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_production0
-msgid "Production orders are created for the product manufacturing."
-msgstr "Zamówienia produkcji są tworzone do wytworzenia produktu."
+#: view:mrp.production:0
+msgid "Partial"
+msgstr ""
 
 #. module: mrp
-#: rml:mrp.production.order:0
+#: selection:mrp.production.order,month:0
+msgid "September"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
 msgid "WorkCenter"
 msgstr ""
 
 #. module: mrp
-#: field:stock.warehouse.orderpoint,product_min_qty:0
-msgid "Min Quantity"
-msgstr "Ilość min."
+#: model:process.transition,note:mrp.process_transition_procureserviceproduct0
+msgid ""
+"Depending on the chosen method to 'supply' the service, the procurement "
+"order creates a RFQ for a subcontracting purchase order or waits until the "
+"service is done (= the delivery of the products)."
+msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-msgid "Production orders"
-msgstr "Zamówienia produkcji"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Urgent"
+msgstr "Pilne"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
-msgid "BoM Hyerarchy"
-msgstr "Hierarchia Zest. Mat."
+#: model:ir.model,name:mrp.model_mrp_routing_workcenter
+msgid "Workcenter Usage"
+msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-msgid "Procurement Lines"
-msgstr "Pozycje zapotrzebowania"
+#: model:ir.model,name:mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_servicemts0
-msgid "If Product type is service and procure method is Make to stock"
-msgstr "Jeśli typ produktu jest Usługa i metoda nabycia jest 'Na zapas'"
-
-#. module: mrp
-#: model:process.node,note:mrp.process_node_serviceproduct0
-#: model:process.node,note:mrp.process_node_serviceproduct1
-msgid "If Product type is service"
-msgstr "Jeśli typem produktu jest usługa"
-
-#. module: mrp
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Dni na wszelki wypadek"
+#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
+msgid "Procurement of raw material"
+msgstr ""
 
 #. module: mrp
 #: view:mrp.production:0
@@ -721,6 +820,8 @@ msgstr "Suma cykli"
 
 #. module: mrp
 #: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
 msgid "Ready to Produce"
 msgstr "Gotowe do produkcji"
 
@@ -729,104 +830,144 @@ msgstr "Gotowe do produkcji"
 msgid "Modification name"
 msgstr "Nazwa modyfikacji"
 
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.production:0
+#: field:mrp.production.order,date:0
+msgid "Date"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,type:0
 msgid "BoM Type"
 msgstr "Typ Zest. Mat."
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-msgid "Exception"
-msgstr "Wyjątek"
-
-#. module: mrp
-#: wizard_view:product.product.procurement,init:0
-msgid ""
-"This wizard will planify the procurement for this product. This procurement "
-"may generate task, production orders or purchase orders."
+#: view:mrp.production.order:0
+msgid "Extended Filters..."
 msgstr ""
-"Ten kreator zaplanuje zapotrzebowanie dla tego produktu. Zapotrzebowanie "
-"może wygenerować zadania, zamówienia produkcji lub zamówienia zakupu."
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_mts0
-msgid "The system waits for requested products in stock."
-msgstr "System czeka na wymagane produkty."
+#: code:addons/mrp/procurement.py:0
+#, python-format
+msgid ""
+"Procurement '%s' has an exception: 'No BoM defined for this product !'"
+msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_servicemto0
-msgid "Serivce Stockable Order"
-msgstr "Zamówienie usług Rejestrowanych"
+#: view:mrp.production.order:0
+#: view:mrp.property:0
+msgid "Search"
+msgstr ""
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_minimumstockprocure0
-msgid "From minimum stock rules, it goes for procure product."
-msgstr "Z reguł minimalnych zapasów jest tworzone zapotrzebowanie produktu."
+#: field:report.workcenter.load,cycle:0
+msgid "Nbr of cycle"
+msgstr "Liczba cykli"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_minimumstockrule0
+#: model:process.node,name:mrp.process_node_productminimumstockrule0
+msgid "Minimum Stock"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menus_dash_mrp
+msgid "Dashboard"
+msgstr ""
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
+#: model:process.process,name:mrp.process_process_stockableproductprocess0
 msgid "Stockable Product"
 msgstr "Produkt rejestrowany"
 
 #. module: mrp
-#: view:mrp.production:0
-msgid "Production done"
-msgstr "Produkcja wykonana"
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Center name"
+msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
 #: field:mrp.routing,code:0
-#: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Kod"
 
 #. module: mrp
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 msgid "No. Of Hours"
 msgstr "Liczba godzin"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.installer,mrp_jit:0
+msgid "Just In Time Scheduling"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property:0
+#: view:mrp.property.group:0
 msgid "Property Group"
 msgstr "Grupa właściwości"
 
 #. module: mrp
-#: field:mrp.bom,bom_id:0
-msgid "Parent BoM"
-msgstr "Nadrzędne Zest. Mat."
-
-#. module: mrp
-#: view:mrp.procurement:0
-msgid "References"
-msgstr "Odnośniki"
-
-#. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
-#: selection:mrp.procurement,state:0
-#: wizard_button:mrp.procurement.compute,init,end:0
-#: wizard_button:mrp.procurement.compute.all,init,end:0
-#: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
 #: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
-#: wizard_button:product.product.procurement,init,end:0
-#: wizard_button:product_price,init,end:0
+msgid "Qty"
+msgstr "Il."
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_production0
+msgid "Manufacturing Plan."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Inactive"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.installer,mrp_subproduct:0
+msgid ""
+"Enables multiple product output from a single production order: without "
+"this, a production order can have only one output product."
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+#: view:mrp.product.produce:0
+#: view:mrp.product_price:0
+#: view:mrp.production:0
+#: view:mrp.workcenter.load:0
 msgid "Cancel"
 msgstr "Anuluj"
 
+#. module: mrp
+#: view:mrp.production:0
+msgid "Split in production lots"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicerfq0
+msgid ""
+"If the service has a 'Buy' supply method, this creates a RFQ, a "
+"subcontracting demand for instance."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
 msgid "Move product"
 msgstr "Przesuń produkt"
 
 #. module: mrp
-#: selection:mrp.workcenter,type:0
-msgid "Machine"
-msgstr "Maszyna"
+#: view:mrp.production:0
+msgid "Late"
+msgstr ""
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
@@ -834,9 +975,14 @@ msgid "Make to stock"
 msgstr "Na zapas"
 
 #. module: mrp
-#: field:mrp.workcenter,name:0
-msgid "Workcenter Name"
-msgstr "Nazwa centrym roboczego"
+#: view:board.board:0
+msgid "Work Center Future load"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Name"
+msgstr ""
 
 #. module: mrp
 #: view:mrp.production:0
@@ -844,132 +990,127 @@ msgid "Start Production"
 msgstr "Rozpocznij produkcję"
 
 #. module: mrp
-#: selection:mrp.property,composition:0
-msgid "min"
-msgstr "min"
-
-#. module: mrp
-#: help:mrp.workcenter,note:0
-msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
-msgstr "Opis centrum roboczego. Opisz co jest cyklem dla tego centrum."
-
-#. module: mrp
-#: rml:bom.structure:0
-msgid "-"
+#: model:ir.actions.act_window,name:mrp.open_board_manufacturing
+#: model:ir.ui.menu,name:mrp.menu_board_manufacturing
+msgid "Production Dashboard"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.workcenter,type:0
-msgid "Human Resource"
-msgstr "Zasoby ludzkie"
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component"
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
-#: field:mrp.routing,workcenter_lines:0
-msgid "Workcenters"
-msgstr "Centra robocze"
+#: view:mrp.production:0
+msgid "Source Loc."
+msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-msgid "UOM"
-msgstr "JM"
+#: field:mrp.bom,position:0
+msgid "Internal Reference"
+msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,procure_method:0
-msgid "on order"
-msgstr "na zamówienie"
+#: help:mrp.installer,stock_location:0
+msgid ""
+"Manages product routes and paths within and between locations (e.g. "
+"warehouses)."
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc0
-#: model:ir.ui.menu,name:mrp.mrp_Sched_all
-msgid "Compute All Schedulers"
-msgstr "Oblicz wszystkie planowania"
-
-#. module: mrp
-#: field:mrp.production.workcenter.line,cycle:0
-msgid "Nbr of cycle"
-msgstr "Liczba cykli"
+#: model:process.node,note:mrp.process_node_billofmaterial0
+msgid "Product's structure"
+msgstr ""
 
 #. module: mrp
 #: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 #: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
 #: field:mrp.routing,name:0
 #: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "Nazwa"
 
 #. module: mrp
-#: field:mrp.routing.workcenter,cycle_nbr:0
-msgid "Number of Cycle"
-msgstr "Liczba cykli"
-
-#. module: mrp
-#: wizard_field:mrp.workcenter.load,init,measure_unit:0
-msgid "Amount measuring unit"
-msgstr "Jednostka miary wielkości"
-
-#. module: mrp
-#: view:mrp.procurement:0
-msgid "Run procurement"
-msgstr "Uruchom zapotrzebowanie"
-
-#. module: mrp
-#: help:res.company,schedule_range:0
+#: help:mrp.installer,mrp_jit:0
 msgid ""
-"This is the time frame analysed by the scheduler when computing "
-"procurements. All procurement that are not between today and today+range are "
-"skipped for futur computation."
+"Enables Just In Time computation of procurement orders.\n"
+"\n"
+"While it's more resource intensive than the default setup, the JIT computer "
+"avoids having to wait for the procurement scheduler to run or having to run "
+"the procurement scheduler manually."
 msgstr ""
-"To jest rama czasowa do obliczeń planisty. Wszystkie zapotrzebowania, "
-"których daty są poza zakresem od (dzisiaj) do (dzisiaj + zakres planowania) "
-"są pomijane w obliczeniach."
 
 #. module: mrp
-#: field:mrp.workcenter,time_efficiency:0
-msgid "Time Efficiency"
-msgstr "Efektywność czasu"
+#: field:mrp.product.produce,mode:0
+msgid "Mode"
+msgstr ""
 
 #. module: mrp
-#: help:res.company,manufacturing_lead:0
-msgid "Security days for each manufacturing operation."
-msgstr "Dni na wszelki wypadek dla każdej operacji produkcyjnej."
+#: report:bom.structure:0
+msgid "]"
+msgstr ""
 
 #. module: mrp
-#: wizard_view:mrp.procurement.compute.all,init:0
-msgid "Scheduler Parameters"
-msgstr "Parametry planisty"
+#: help:mrp.routing.workcenter,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of routing workcenters."
+msgstr ""
 
 #. module: mrp
-#: help:mrp.routing.workcenter,cycle_nbr:0
-msgid "A cycle is defined in the workcenter definition."
-msgstr "Cykle są w definicji centrum roboczego"
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
 
 #. module: mrp
-#: selection:mrp.workcenter.load,init,measure_unit:0
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action3
+msgid "Manufacturing Orders in Progress"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action4
+msgid "Manufacturing Orders Waiting Products"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.production:0
+#: view:mrp.production.order:0
+#: view:mrp.property:0
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Cycles Cost"
+msgstr "Koszt cykli"
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
 msgid "Amount in cycles"
 msgstr "Wartość w cyklach"
 
 #. module: mrp
 #: field:mrp.production,location_dest_id:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,location_dest_id:0
 msgid "Finished Products Location"
 msgstr "Strefa dla gotowych produktów"
 
 #. module: mrp
-#: wizard_field:product.product.procurement,init,uom_id:0
-msgid "Unit of Measure"
-msgstr "Jednostka miary"
-
-#. module: mrp
-#: field:mrp.procurement,procure_method:0
-msgid "Procurement Method"
-msgstr "Metoda zpotrzebowania"
+#: model:ir.ui.menu,name:mrp.menu_pm_resources_config
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
+msgid "Resources"
+msgstr ""
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -977,39 +1118,36 @@ msgid "Analytic Journal"
 msgstr "Dziennik analityczny"
 
 #. module: mrp
-#: selection:mrp.workcenter.load,init,time_unit:0
+#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: field:mrp.routing,workcenter_lines:0
+msgid "Work Centers"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
 msgid "Per week"
 msgstr "Na tydzień"
 
 #. module: mrp
-#: wizard_button:mrp.procurement.compute,init,compute:0
-#: wizard_button:mrp.procurement.compute.all,init,compute:0
-#: wizard_button:mrp.procurement.orderpoint.compute,init,compute:0
-msgid "Compute Procurements"
-msgstr "Oblicz zapotrzebowania"
+#: model:process.transition,note:mrp.process_transition_stockmts0
+msgid ""
+"The system waits for the products to be available in the stock. These "
+"products are typically procured manually or through a minimum stock rule."
+msgstr ""
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_stock0
-msgid "Wait for available products for reservation"
-msgstr "Czeka na zarezerwowanie dostępnych produktów"
-
-#. module: mrp
-#: wizard_button:change_production_qty,confirm,validate:0
-msgid "Validate"
-msgstr "Zatwierdź"
-
-#. module: mrp
-#: model:process.transition,name:mrp.process_transition_purchaseprocure0
-msgid "Procurement Purchase"
-msgstr "Zapotrzebowanie zakupu"
-
-#. module: mrp
-#: field:mrp.production.workcenter.line,hour:0
+#: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
 msgstr "Liczba godzin"
 
 #. module: mrp
-#: view:mrp.procurement:0
+#: view:mrp.routing:0
+msgid "Work Center Operations"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
 msgid "Notes"
 msgstr "Uwagi"
 
@@ -1017,18 +1155,20 @@ msgstr "Uwagi"
 #: model:ir.model,name:mrp.model_mrp_bom
 #: view:mrp.bom:0
 #: field:mrp.production,bom_id:0
+#: field:mrp.production.order,bom_id:0
+#: model:process.node,name:mrp.process_node_billofmaterial0
 msgid "Bill of Material"
 msgstr "Zestawienie materiałowe"
 
 #. module: mrp
-#: wizard_view:mrp.workcenter.load,init:0
+#: view:mrp.workcenter.load:0
 msgid "Select time unit"
 msgstr "Wybierz jednostkę czasu"
 
 #. module: mrp
-#: wizard_field:product_price,init,number:0
-msgid "Number of products to produce"
-msgstr "Liczba produktów do wyprodukowania"
+#: view:report.workcenter.load:0
+msgid "Work Center load"
+msgstr ""
 
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
@@ -1036,137 +1176,139 @@ msgid "Location where the system will stock the finished products."
 msgstr "Strefa, w której system umieści gotowe produkty."
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
-msgid "Material routing"
-msgstr "Marszruta materiałowa"
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
 
 #. module: mrp
-#: selection:mrp.workcenter.load,init,time_unit:0
+#: field:stock.change.standard.price,change_parent_price:0
+msgid "Change Parent Price"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_producttostockrules0
+msgid ""
+"The Minimum Stock Rule is an automatic procurement rule based on a mini and "
+"maxi quantity. It's available in the Inventory management menu and "
+"configured by product."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
 msgid "Day by day"
 msgstr "Dzień po dniu"
 
-#. module: mrp
-#: model:process.node,name:mrp.process_node_productminimumstockrule0
-msgid "Minimum stock rule"
-msgstr "Reguła minimalnego zapasu"
-
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Revisions"
 msgstr "Wersje"
 
 #. module: mrp
-#: field:mrp.bom,product_efficiency:0
-msgid "Product Efficiency"
-msgstr "Efektywność produktu"
-
-#. module: mrp
-#: model:ir.model,name:mrp.model_stock_warehouse_orderpoint
-msgid "Orderpoint minimum rule"
-msgstr "Reguła minimalnego punktu zamawiania"
-
-#. module: mrp
-#: model:process.transition,name:mrp.process_transition_servicemts0
-msgid "Service Make to Stock"
-msgstr "Usługa Na zapas"
-
-#. module: mrp
-#: field:mrp.production,sale_ref:0
-msgid "Sale Ref"
-msgstr "Odnośnik sprzedaży"
-
-#. module: mrp
-#: field:mrp.procurement,priority:0
 #: field:mrp.production,priority:0
-#: rml:mrp.production.order:0
+#: field:mrp.production.order,priority:0
 msgid "Priority"
 msgstr "Priorytet"
 
 #. module: mrp
-#: field:mrp.procurement,location_id:0
-#: field:stock.warehouse.orderpoint,location_id:0
-msgid "Location"
-msgstr "Strefa magazynowa"
+#: model:ir.model,name:mrp.model_stock_picking
+msgid "Picking List"
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_procurement_new
-#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_new
-msgid "New Procurement"
-msgstr "Nowe zapotrzebowanie"
+#: view:mrp.production.order:0
+msgid "Month -1"
+msgstr ""
 
 #. module: mrp
-#: rml:mrp.production.order:0
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Manufacturing order '%s' is scheduled for the %s."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
 msgid "Production Order N° :"
 msgstr "Nr zamówienia produkcji"
 
 #. module: mrp
-#: selection:mrp.workcenter,type:0
-msgid "Tool"
-msgstr "Narzędzie"
-
-#. module: mrp
-#: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
-"Strefa, w której system oczekuje produktów jako materiałów do produkcji."
 
 #. module: mrp
-#: rml:mrp.production.order:0
-#: wizard_field:product.product.procurement,init,date_planned:0
-msgid "Planned Date"
-msgstr "Planowana data"
+#: model:ir.model,name:mrp.model_mrp_production_product_line
+msgid "Production Scheduled Product"
+msgstr ""
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_purchaseprocure0
-msgid "Procurement orders"
-msgstr "Zapotrzebowania"
+#: help:res.company,manufacturing_lead:0
+msgid "Security days for each manufacturing operation."
+msgstr "Dni na wszelki wypadek dla każdej operacji produkcyjnej."
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_mts0
+#: model:process.transition,name:mrp.process_transition_servicemts0
+#: model:process.transition,name:mrp.process_transition_stockmts0
 msgid "Make to Stock"
 msgstr "Na zapas"
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_servicemto0
-msgid "If product type is service and procure method is Make to order"
-msgstr "Jeśli typ produktu jest Usługa i metoda nabycia jest Na zamówienie."
+#: selection:mrp.production.order,month:0
+msgid "July"
+msgstr ""
 
 #. module: mrp
-#: field:res.company,schedule_range:0
-msgid "Scheduler Range"
-msgstr "Zakres planowania"
+#: model:process.transition,note:mrp.process_transition_stockrfq0
+msgid ""
+"In case the Supply method of the product is Buy, the system creates a "
+"purchase order."
+msgstr ""
 
 #. module: mrp
-#: field:stock.warehouse.orderpoint,product_max_qty:0
-msgid "Max Quantity"
-msgstr "Ilość maks."
-
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
 msgstr "Zapotrzebowanie"
 
 #. module: mrp
-#: model:ir.actions.wizard,name:mrp.product_procurement_wizard
-msgid "Procurement Request"
-msgstr "Utwórz zapotrzebowanie"
-
-#. module: mrp
-#: model:ir.actions.wizard,name:mrp.wizard_price
+#: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
+#: view:mrp.product_price:0
 msgid "Product Cost Structure"
 msgstr "Struktura kosztów produktu"
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "Minimum Stock Procure"
-msgstr "Zapotrzebowanie z zapasu minimalnego"
+#: model:ir.model,name:mrp.model_mrp_installer
+msgid "mrp.installer"
+msgstr ""
 
 #. module: mrp
-#: help:res.company,po_lead:0
-msgid "This is the leads/security time for each purchase order."
-msgstr "To jest czas na wszelki wypadek dla każdego zamówienia zakupu."
+#: view:mrp.production:0
+msgid "Production Work Centers"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:mrp.production.order,month:0
+msgid "Month"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/wizard/change_production_qty.py:0
+#, python-format
+msgid "Active Id is not found"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Search for mrp workcenter"
+msgstr ""
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1175,56 +1317,45 @@ msgstr "Struktura Zest. Mat."
 
 #. module: mrp
 #: field:mrp.production,date_start:0
+#: field:mrp.production.order,date_start:0
 msgid "Start Date"
 msgstr "Data początkowa"
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Cost "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr "Konto dla czasu"
 
 #. module: mrp
-#: selection:mrp.bom,revision_type:0
-msgid "alphabetical indices"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
 msgstr ""
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_productionorder0
-msgid "Procurement for raw materials."
-msgstr "Zapotrzebowanie na materiały do produkcji."
+#: view:mrp.production:0
+msgid "Destination Loc."
+msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
-#: rml:mrp.production.order:0
-msgid "Note"
-msgstr "Uwaga"
+#: field:mrp.production.order,product_id2:0
+msgid "Product Consumed"
+msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
-msgid "Procure Stockable Product"
-msgstr "Zapotrzebowanie na produkty rejestrowane"
-
-#. module: mrp
-#: field:mrp.bom,method:0
-msgid "Method"
-msgstr "Metoda"
-
-#. module: mrp
-#: wizard_view:product_price,init:0
-msgid "Paid ?"
-msgstr "Zapłacone ?"
-
-#. module: mrp
-#: model:process.node,note:mrp.process_node_routing0
-msgid "Define a routing to describe the manufacturing steps."
-msgstr "Zdefiniuj marszrutę, aby opisać kroki produkcyjne."
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost "
+msgstr ""
 
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Aktywne"
 
@@ -1233,47 +1364,52 @@ msgstr "Aktywne"
 msgid "Procure Products"
 msgstr "Zapotrzebowanie na produkty"
 
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+msgid "Work Center Loads"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
 #: view:mrp.bom:0
 #: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
 #: view:mrp.property:0
+#: view:procurement.order:0
+#: field:procurement.order,property_ids:0
 msgid "Properties"
 msgstr "Właściwości"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
 #: field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "Planowana data"
 
 #. module: mrp
-#: view:mrp.procurement:0
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
+#. module: mrp
 #: view:mrp.production:0
 msgid "Extra Information"
 msgstr "Dodatkowe informacje"
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_billofmaterial0
-msgid "Define the product structure, with sub-products and/or components."
-msgstr "Definiuj strukturę produktu z produktami ubocznymi lub komponentami."
-
-#. module: mrp
-#: model:process.node,note:mrp.process_node_minimumstockrule0
-msgid ""
-"Procurement is created if the product quantity is lower than the minimum "
-"limit."
+#: model:ir.model,name:mrp.model_change_production_qty
+msgid "Change Quantity of Products"
 msgstr ""
-"Zapotrzebowanie jest tworzone, gdy ilość produktu jest niższa niż minimum."
 
 #. module: mrp
-#: field:mrp.procurement,date_close:0
-msgid "Date Closed"
-msgstr "Data zamknięcia"
+#: model:process.node,note:mrp.process_node_productionorder0
+msgid "Drives the procurement orders for raw material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: view:mrp.production.order:0
+msgid "Current"
+msgstr ""
 
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
@@ -1281,41 +1417,28 @@ msgid "General Account"
 msgstr "Konto główne"
 
 #. module: mrp
-#: field:mrp.property,composition:0
-msgid "Properties composition"
-msgstr "Kompozycja właściwości"
-
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_action4
-#: model:ir.ui.menu,name:mrp.menu_production_orders_waiting4
-msgid "Production Orders Waiting Products"
-msgstr "Zamówienia produkcji oczekujące na materiały"
-
-#. module: mrp
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 msgid "SO Number"
 msgstr "Numer ZS"
 
 #. module: mrp
-#: model:ir.actions.wizard,name:mrp.wizard_change_production_qty
-msgid "Change Product Qty."
-msgstr "Zmień ilość produktu"
-
-#. module: mrp
-#: selection:mrp.procurement,state:0
 #: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
 msgid "Done"
 msgstr "Wykonano"
 
 #. module: mrp
-#: help:stock.warehouse.orderpoint,qty_multiple:0
-msgid "The procurement quantity will by rounded up to this multiple."
-msgstr "Ilość zapotrzebowania będzie zaokrąglona do tej wielokrotności."
+#: model:ir.model,name:mrp.model_stock_change_standard_price
+msgid "Change Standard Price"
+msgstr ""
 
 #. module: mrp
-#: field:stock.warehouse.orderpoint,logic:0
-msgid "Reordering Mode"
-msgstr "Tryb ponownego zamawiania"
+#: field:mrp.production,origin:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,origin:0
+msgid "Source Document"
+msgstr ""
 
 #. module: mrp
 #: constraint:ir.model:0
@@ -1326,24 +1449,25 @@ msgstr ""
 "specjalnych !"
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_procureproducts0
-msgid "Central document to procure products"
-msgstr "Centralny dokument na zapotrzebowanie produktów"
+#: help:stock.change.standard.price,change_parent_price:0
+msgid ""
+"This will change the price of parent products also according to the BoM "
+"structure specified for the product."
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_action3
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action3
-msgid "Production Orders in Progress"
-msgstr "Zamówienia produkcji w trakcie przetwarzania"
+#: model:ir.actions.act_window,name:mrp.mrp_production_action2
+msgid "Manufacturing Orders To Start"
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.act_product_product_2_stock_warehouse_orderpoint
-#: model:ir.actions.act_window,name:mrp.act_stock_warehouse_2_stock_warehouse_orderpoint
-#: model:ir.actions.act_window,name:mrp.action_orderpoint_form
-#: model:ir.ui.menu,name:mrp.menu_action_orderpoint_form
-#: view:stock.warehouse.orderpoint:0
-msgid "Minimum Stock Rules"
-msgstr "Reguły minimalnych zapasów"
+#: model:ir.model,name:mrp.model_mrp_workcenter
+#: field:mrp.production.workcenter.line,workcenter_id:0
+#: field:mrp.routing.workcenter,workcenter_id:0
+#: view:mrp.workcenter:0
+#: field:report.workcenter.load,workcenter_id:0
+msgid "Work Center"
+msgstr ""
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
@@ -1351,12 +1475,15 @@ msgid "Capacity per Cycle"
 msgstr "Ilość na cykl"
 
 #. module: mrp
+#: model:ir.model,name:mrp.model_product_product
+#: view:mrp.bom:0
 #: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
+#: view:mrp.production:0
 #: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_id:0
 #: field:mrp.production.product.line,product_id:0
-#: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Produkt"
 
@@ -1368,30 +1495,54 @@ msgstr "Suma godzin"
 
 #. module: mrp
 #: field:mrp.production,location_src_id:0
+#: field:mrp.production.order,location_src_id:0
 msgid "Raw Materials Location"
 msgstr "Strefa materiałów do produkcji"
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_product_bom_structure
-msgid "Product BoM Structure"
-msgstr "Struktura Zest. Mat. produktu"
+#: view:mrp.product_price:0
+msgid "Print Cost Structure of Product."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos:0
+#: field:mrp.production.product.line,product_uos:0
+msgid "Product UOS"
+msgstr "JS produktu"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action
+#: model:ir.actions.act_window,name:mrp.mrp_production_action_planning
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+#: view:mrp.production:0
+msgid "Manufacturing Orders"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Consume Products"
+msgstr ""
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
 #: field:mrp.production,product_uom:0
+#: field:mrp.production.order,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
-#: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
 msgstr "JM produktu"
 
 #. module: mrp
-#: help:mrp.procurement,origin:0
-msgid ""
-"Reference of the document that created this procurement.\n"
-"This is automatically completed by Open ERP."
+#: model:process.node,name:mrp.process_node_stock0
+#: model:process.transition,name:mrp.process_transition_servicemto0
+#: model:process.transition,name:mrp.process_transition_stockproduct0
+msgid "Make to Order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
+msgid "Production Analysis"
 msgstr ""
-"Oznaczenie dokumentu, który utworzył to zapotrzebowanie\n"
-"Jest automatycznie wypełniane przez OpenERP."
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
@@ -1399,9 +1550,15 @@ msgid "Production Products"
 msgstr "Produkty wyprodukowane"
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_stockproduct0
-msgid "Product type is Stockable and procure method is make to stock"
-msgstr "Typ produktu jest Rejestrowany i metoda nabycia jest Na zapas."
+#: field:mrp.production,date_finished:0
+#: field:mrp.production.order,date_finished:0
+msgid "End Date"
+msgstr "Data końcowa"
+
+#. module: mrp
+#: field:mrp.workcenter,resource_id:0
+msgid "Resource"
+msgstr ""
 
 #. module: mrp
 #: help:mrp.bom,date_start:0
@@ -1412,40 +1569,25 @@ msgstr ""
 "ma być zawsze ważny."
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
 #: field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr "JS produktu"
 
 #. module: mrp
-#: field:mrp.procurement,product_uom:0
-msgid "Product UoM"
-msgstr "JM produktu"
+#: view:mrp.production.order:0
+msgid "#Line Orders"
+msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_workcenter
-#: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
-msgid "Workcenter"
-msgstr "Centrum robocze"
-
-#. module: mrp
-#: selection:mrp.procurement,priority:0
 #: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
 msgid "Very Urgent"
 msgstr "Bardzo pilne"
 
 #. module: mrp
-#: field:mrp.procurement,purchase_id:0
-#: field:stock.warehouse.orderpoint,procurement_id:0
-msgid "Purchase Order"
-msgstr "Zamówienie zakupu"
-
-#. module: mrp
-#: view:mrp.production:0
-msgid "Production Workcenters"
-msgstr "Centra robocze produkcji"
+#: view:change.production.qty:0
+msgid "Approve"
+msgstr ""
 
 #. module: mrp
 #: view:mrp.property.group:0
@@ -1453,24 +1595,15 @@ msgid "Properties categories"
 msgstr "Kategorie właściwości"
 
 #. module: mrp
-#: help:mrp.procurement,procure_method:0
-msgid ""
-"If you encode manually a procurement, you probably want to use a make to "
-"order method."
+#: help:mrp.production.workcenter.line,sequence:0
+msgid "Gives the sequence order when displaying a list of work orders."
 msgstr ""
-"Jeśli wprowadziłeś zapotrzebowanie ręcznie, to prawdopodobnie chcesz "
-"zastosować metodę 'Na zamówienie'."
 
 #. module: mrp
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 msgid "Source Location"
 msgstr "Strefa źródłowa"
 
-#. module: mrp
-#: model:process.transition,name:mrp.process_transition_servicerfq0
-msgid "Stockable Order Request"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 #: view:mrp.production.product.line:0
@@ -1483,25 +1616,31 @@ msgid "Production Products Consommation"
 msgstr "Zużycie materiałów w produkcji"
 
 #. module: mrp
-#: selection:mrp.bom,revision_type:0
-msgid "numeric indices"
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost "
 msgstr ""
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_servicerfq0
-msgid "If Procure method is Make to order and supply method is buy"
+#: help:mrp.workcenter,note:0
+msgid ""
+"Description of the workcenter. Explain here what's a cycle according to this "
+"workcenter."
+msgstr "Opis centrum roboczego. Opisz co jest cyklem dla tego centrum."
+
+#. module: mrp
+#: help:mrp.product.produce,mode:0
+msgid ""
+"'Consume only' mode will only consume the products with the quantity "
+"selected.\n"
+"'Consume & Produce' mode will consume as well as produce the products with "
+"the quantity selected and it will finish the production order when total "
+"ordered quantities are produced."
 msgstr ""
-"Jeśli metoda nabycia jest Na zamówienie i metoda zaopatrzenia jest Kupno"
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_procurestockableproduct0
-msgid "if Product type is Stockable in procurement order"
-msgstr "Jeśli w zapotrzebowaniu produkt jest typu Rejestrowany."
-
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 msgid "Work Orders"
 msgstr "Centra robocze"
 
@@ -1511,38 +1650,46 @@ msgid "Cost per cycle"
 msgstr "Koszt cyklu"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of material revisions"
-msgstr "Wersje zaestawienia materiałowego"
+#: model:process.node,name:mrp.process_node_serviceproduct0
+#: model:process.node,name:mrp.process_node_serviceproduct1
+msgid "Service"
+msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-msgid "Planification"
-msgstr "Planowanie"
+#: selection:mrp.production,state:0
+#: selection:mrp.production.order,state:0
+msgid "Cancelled"
+msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: model:process.transition,name:mrp.process_transition_bom0
+#: view:mrp.production.order:0
 msgid "BOM"
 msgstr "Zest. Mat. (BoM)"
 
 #. module: mrp
-#: help:mrp.bom,type:0
+#: help:mrp.bom,product_uom:0
 msgid ""
-"Use a phantom bill of material in raw materials lines that have to be "
-"automatically computed in on eproduction order and not one per level.If you "
-"put \"Phantom/Set\" at the root level of a bill of material it is considered "
-"as a set or pack: the products are replaced by the components between the "
-"sale order to the picking without going through the production order.The "
-"normal BoM will generate one production order per BoM level."
+"UoM (Unit of Measure) is the unit of measurement for the inventory control"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_bom0
+msgid ""
+"The Bill of Material is the product's decomposition. The components (that "
+"are products themselves) can also have their own Bill of Material (multi-"
+"level)."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,company_id:0
+#: field:mrp.production,company_id:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,company_id:0
+#: field:mrp.routing,company_id:0
+#: field:mrp.routing.workcenter,company_id:0
+#: view:mrp.workcenter:0
+msgid "Company"
 msgstr ""
-"Stosuj fantomowe zestawienie materiałów w pozycjach materiałów do produkcji, "
-"które mają być automatycznie wyliczone na zamówieniach produkcji, a nie po "
-"każdym poziomie. Jeśli ustawisz \"Fantom / Zestaw\" na najwyższym poziomie "
-"zestawienia materiałowego to będzie ono traktowane jak zestaw - produkty "
-"będą zamienione na komponenty pomiędzy zamówieniem sprzedaży a pobraniem bez "
-"przechodzenia przez zamówienie produkcji. Zwykłe zestawienie materiałowe "
-"będzie generowało jedno zamówienie produkcji na każdy poziom zestawienia."
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
@@ -1550,16 +1697,7 @@ msgid "Time for 1 cycle (hour)"
 msgstr "Czas jednego cyklu (w godz.)"
 
 #. module: mrp
-#: wizard_view:product.product.procurement,done:0
-msgid "Your procurement request has been sent !"
-msgstr "Twoje zapytanie ofertowe zostało wysłane!"
-
-#. module: mrp
-#: wizard_view:product.product.procurement,init:0
-msgid "Internal Procurement Request"
-msgstr "Wewnętrzne zapytanie ofertowe"
-
-#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1568,44 +1706,47 @@ msgstr "Wewnętrzne zapytanie ofertowe"
 msgid "Production Order"
 msgstr "Zamówienie produkcji"
 
+#. module: mrp
+#: help:mrp.production,routing_id:0
+msgid ""
+"The list of operations (list of workcenters) to produce the finished "
+"product. The routing is mainly used to compute workcenter costs during "
+"operations and to plan future loads on workcenters based on production "
+"plannification."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productminimumstockrule0
+msgid "Automatic procurement rule"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Compute Data"
 msgstr "Oblicz dane"
 
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_property_group_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
-msgid "Property Categories"
-msgstr "Kategorie właściwości"
-
-#. module: mrp
-#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc1
-#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc1
-msgid "Compute Procurements Only"
-msgstr "Oblicz tylko zapotrzebowania"
-
 #. module: mrp
 #: field:mrp.production,product_uos_qty:0
 msgid "Product UoS Qty"
 msgstr "Ilość produktu w JS"
 
 #. module: mrp
-#: rml:bom.structure:0
+#: view:mrp.bom:0
+msgid "Components"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
 #: model:ir.actions.report.xml,name:mrp.report_bom_structure
 msgid "BOM Structure"
 msgstr "Struktura Zest. Mat."
 
 #. module: mrp
-#: field:mrp.bom,date_stop:0
-msgid "Valid Until"
-msgstr "Ważne do"
-
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_procurement_action11
-#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action11
-msgid "Temporary Procurement Exceptions"
-msgstr "Tymczasowe wyjątki zapotrzebowania"
+#: help:mrp.workcenter,capacity_per_cycle:0
+msgid ""
+"Number of operations this workcenter can do in parallel. If this workcenter "
+"represents a team of 5 workers, the capacity per cycle is 5."
+msgstr ""
 
 #. module: mrp
 #: field:mrp.bom,date_start:0
@@ -1617,6 +1758,11 @@ msgstr "Ważne od"
 msgid "Normal BoM"
 msgstr "Zwykłe zestawienie materiałowe"
 
+#. module: mrp
+#: field:res.company,manufacturing_lead:0
+msgid "Manufacturing Lead Time"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_uos_qty:0
 #: field:mrp.production.product.line,product_uos_qty:0
@@ -1624,33 +1770,19 @@ msgid "Product UOS Qty"
 msgstr "Ilość produktu w JS"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-msgid "Confirmed"
-msgstr "Potwierdzone"
+#: field:mrp.bom,date_stop:0
+msgid "Valid Until"
+msgstr "Ważne do"
 
 #. module: mrp
-#: wizard_view:mrp.procurement.compute,init:0
-#: wizard_view:mrp.procurement.orderpoint.compute,init:0
-msgid "Parameters"
-msgstr "Parametry"
-
-#. module: mrp
-#: view:mrp.procurement:0
+#: view:mrp.product.produce:0
 msgid "Confirm"
 msgstr "Potwierdź"
 
 #. module: mrp
-#: field:mrp.production,workcenter_lines:0
-msgid "Workcenters Utilisation"
-msgstr "Wykorzystanie centrów roboczych"
-
-#. module: mrp
-#: help:mrp.bom,product_efficiency:0
-msgid ""
-"Efficiency on the production. A factor of 0.9 means a loss of 10% in the "
-"production."
+#: field:mrp.bom,product_efficiency:0
+msgid "Manufacturing Efficiency"
 msgstr ""
-"Efektywność produkcji. Współczynnik 0,9 oznacza stratę 10% produkcji."
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
@@ -1658,19 +1790,47 @@ msgid "Product Rounding"
 msgstr "Zaokrąglenie ilości"
 
 #. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: field:mrp.production.workcenter.line,name:0
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume Only"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Recreate Picking"
 msgstr "Utwórz ponownie pobranie"
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_serviceonorder0
-msgid "If procurement is make to order"
-msgstr "Jeśli nabycie jest 'Na zamówienie'"
+#: help:mrp.bom,type:0
+msgid ""
+"If a sub-product is used in several products, it can be useful to create its "
+"own BoM. Though if you don't want separated production orders for this sub-"
+"product, select Set/Phantom as BoM type. If a Phantom BoM is used for a root "
+"product, it will be sold and shipped as a set of components, instead of "
+"being produced."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,method:0
+msgid "Method"
+msgstr "Metoda"
+
+#. module: mrp
+#: help:mrp.production,state:0
+msgid ""
+"When the production order is created the state is set to 'Draft'.\n"
+" If the order is confirmed the state is set to 'Waiting Goods'.\n"
+" If any exceptions are there, the state is set to 'Picking Exception'.       "
+"                             \n"
+"If the stock is available then the state is set to 'Ready to Produce'.\n"
+" When the production gets started then the state is set to 'In Production'.\n"
+" When the production is over, the state is set to 'Done'."
+msgstr ""
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -1678,15 +1838,10 @@ msgid "On Order"
 msgstr "Na zamówienie"
 
 #. module: mrp
-#: model:process.node,name:mrp.process_node_minimumstockrule0
-msgid "Minimum Stock Rule"
-msgstr "Reguła zapasu minimalnego"
-
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action_new
-#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action_new
-msgid "New Bill of Materials"
-msgstr "Nowe zestawienie materiałowe"
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Konfiguracja"
 
 #. module: mrp
 #: field:mrp.workcenter,time_stop:0
@@ -1694,7 +1849,7 @@ msgid "Time after prod."
 msgstr "Czas po produkcji"
 
 #. module: mrp
-#: wizard_field:mrp.workcenter.load,init,time_unit:0
+#: field:mrp.workcenter.load,time_unit:0
 msgid "Type of period"
 msgstr "Typ okresu"
 
@@ -1709,15 +1864,24 @@ msgid "Number of Hours"
 msgstr "Liczba godzin"
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_procurement_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action
+#: model:process.node,name:mrp.process_node_purchaseprocure0
 msgid "Procurement Orders"
 msgstr "Zapotrzebowania"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_property
-msgid "Property"
-msgstr "Właściwość"
+#: help:mrp.bom,product_rounding:0
+msgid "Rounding applied on the product quantity."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
+msgid "Working Period"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stock0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
@@ -1730,55 +1894,40 @@ msgid "Time in hours for the setup."
 msgstr "Czas dla tego kroku w godzinach"
 
 #. module: mrp
-#: selection:mrp.production,state:0
-msgid "Canceled"
-msgstr "Anulowano"
+#: selection:mrp.production.order,month:0
+msgid "December"
+msgstr ""
 
 #. module: mrp
-#: selection:mrp.property,composition:0
-msgid "plus"
-msgstr "plus"
+#: field:mrp.installer,config_logo:0
+msgid "Image"
+msgstr ""
 
 #. module: mrp
 #: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:procurement.order,bom_id:0
 msgid "BoM"
 msgstr "Zest. Mat."
 
 #. module: mrp
-#: help:mrp.bom,routing_id:0
-msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan futur loads on workcenters based on production "
-"plannification."
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Zmiany wartości zapasów"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_mts0
+#: model:process.node,note:mrp.process_node_servicemts0
+msgid "Assignment from stock."
 msgstr ""
-"Lista operacji (lista centrów roboczych) do wyprodukowania produktu "
-"gotowego. Marszruta jest głownie stosowana do obliczeń kosztów operacji "
-"centrów roboczych i do planowania przyszłego obłożenia centrów w oparciu o "
-"plany."
 
 #. module: mrp
 #: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
 msgid "Waiting Goods"
 msgstr "Czeka na materiały"
 
-#. module: mrp
-#: model:process.process,name:mrp.process_process_stockableproductprocess0
-msgid "Stockable Product Process"
-msgstr "Proces produktu rejestrowanego"
-
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_new
-#: model:ir.ui.menu,name:mrp.menu_production_orders_new
-msgid "New Production Order"
-msgstr "Nowe zamówienie produkcji"
-
-#. module: mrp
-#: model:process.node,note:mrp.process_node_rfq0
-msgid "A Request for Quotation is created and sent to the supplier."
-msgstr "Zapytanie ofertowe zostało utworzone i wysłane do dostawcy."
-
 #. module: mrp
 #: field:mrp.bom.revision,last_indice:0
 msgid "last indice"
@@ -1791,77 +1940,101 @@ msgid "BoM Revisions"
 msgstr "Wersje Zest. Mat."
 
 #. module: mrp
-#: view:mrp.procurement:0
-msgid "Retry"
-msgstr "Powtórz"
-
-#. module: mrp
-#: selection:mrp.procurement,state:0
+#: view:mrp.production:0
 #: selection:mrp.production,state:0
+#: selection:mrp.production.order,state:0
 msgid "Draft"
 msgstr "Projekt"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
+#: field:report.mrp.inout,date:0
+#: field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Tydzień"
+
+#. module: mrp
+#: field:mrp.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: mrp
 #: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
 msgid "Normal"
 msgstr "Normalne"
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_productionprocureproducts0
-msgid "When any procuere products, it comes into the prpcurement orders"
-msgstr "Kiedy produkt jest potrzebny, to powstaje zapotrzebowanie"
+#: model:process.node,note:mrp.process_node_routing0
+msgid "Manufacturing Steps."
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_action2
-#: model:ir.ui.menu,name:mrp.menu_production_orders_start
-msgid "Production Orders To Start"
-msgstr "Zamówienia produkcji do rozpoczęcia"
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Cost Structure"
+msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-msgid "Procurement Reason"
-msgstr "Powód zapotrzebowania"
+#: selection:mrp.product.produce,mode:0
+msgid "Consume & Produce"
+msgstr ""
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
-msgid "An entry is being made from billing material to routing."
-msgstr "Został dokonany zapis z zestawienia materiałowego do marszruty."
+#: selection:mrp.production.order,month:0
+msgid "November"
+msgstr ""
 
 #. module: mrp
-#: help:mrp.workcenter,timesheet_id:0
-msgid "The normal working time of the workcenter."
-msgstr "Normalny czas roboczy centrum roboczego."
+#: field:mrp.bom,bom_id:0
+msgid "Parent BoM"
+msgstr "Nadrzędne Zest. Mat."
 
 #. module: mrp
-#: selection:stock.warehouse.orderpoint,logic:0
-msgid "Order to Max"
-msgstr "Zamów do maks."
+#: field:mrp.workcenter.load,measure_unit:0
+msgid "Amount measuring unit"
+msgstr "Jednostka miary wielkości"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "January"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct0
+msgid "Product type is Stockable or Consumable."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/wizard/change_production_qty.py:0
+#, python-format
+msgid "Error"
+msgstr "Błąd"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
-#: model:process.node,name:mrp.process_node_billofmaterial0
+#: field:product.product,bom_ids:0
 msgid "Bill of Materials"
 msgstr "Zestawienia materiałowe"
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_procureserviceproduct0
-msgid "In procurement order, if product type is service"
-msgstr "W zapotrzebowaniach, jeśli typ produktu jest Usługa"
+#: help:mrp.routing.workcenter,routing_id:0
+msgid ""
+"Routing indicates all the workcenters used, for how long and/or cycles.If "
+"Routing is indicated then,the third tab of a production order (workcenters) "
+"will be automatically pre-completed."
+msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,procure_method:0
-msgid "from stock"
-msgstr "z zapasu"
+#: model:ir.model,name:mrp.model_mrp_bom_revision
+msgid "Bill of Material Revision"
+msgstr ""
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
 #: view:mrp.routing.workcenter:0
+#: view:mrp.workcenter:0
 msgid "General Information"
 msgstr "Informacje ogólne"
 
@@ -1871,55 +2044,72 @@ msgid "Productions"
 msgstr "Produkcje"
 
 #. module: mrp
-#: wizard_button:product.product.procurement,done,end:0
-msgid "Close"
-msgstr "Zamknij"
+#: model:ir.model,name:mrp.model_mrp_routing
+#: view:mrp.bom:0
+#: field:mrp.bom,routing_id:0
+#: view:mrp.production:0
+#: field:mrp.production,routing_id:0
+#: field:mrp.production.order,routing_id:0
+#: view:mrp.routing:0
+#: model:process.node,name:mrp.process_node_routing0
+msgid "Routing"
+msgstr "Marszruta"
 
 #. module: mrp
-#: field:mrp.production,sale_name:0
-msgid "Sale Name"
-msgstr "Nazwa sprzedaży"
+#: field:mrp.installer,mrp_operations:0
+msgid "Manufacturing Operations"
+msgstr ""
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_productminimumstockrule0
-msgid "Create minimum stock rules"
-msgstr "Utwórz reguły zapasów minimalnych"
+#: help:mrp.production,origin:0
+msgid ""
+"Reference of the document that generated this production order request."
+msgstr ""
 
 #. module: mrp
-#: wizard_field:product.product.procurement,init,warehouse_id:0
-#: field:stock.warehouse.orderpoint,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazyn"
-
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_production
+#: view:mrp.production.order:0
 #: field:stock.move,production_id:0
 msgid "Production"
 msgstr "Produkcja"
 
 #. module: mrp
-#: model:process.node,name:mrp.process_node_serviceproduct0
-#: model:process.node,name:mrp.process_node_serviceproduct1
-msgid "Service Product"
-msgstr "Produkt - usługa"
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,close_move:0
-msgid "Close Move at end"
-msgstr "Zamknij przesunięcie na końcu"
+#: model:ir.model,name:mrp.model_mrp_product_price
+msgid "Product Price"
+msgstr ""
 
 #. module: mrp
-#: wizard_view:change_production_qty,confirm:0
+#: model:ir.actions.act_window,name:mrp.action_mrp_installer
+msgid "MRP Applications Configuration"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move_split
+msgid "Split in Production lots"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Change Quantity"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+#: model:ir.actions.act_window,name:mrp.action_change_production_qty
 msgid "Change Product Qty"
 msgstr "Zmień ilość produktu"
 
 #. module: mrp
+#: view:mrp.bom.revision:0
 #: field:mrp.bom.revision,description:0
 #: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
+#: view:mrp.property.group:0
 #: field:mrp.routing,note:0
+#: view:mrp.routing.workcenter:0
 #: field:mrp.routing.workcenter,note:0
 #: view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
@@ -1927,31 +2117,61 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-msgid "Running"
-msgstr "Uruchomione"
+#: help:mrp.bom,routing_id:0
+msgid ""
+"The list of operations (list of workcenters) to produce the finished "
+"product. The routing is mainly used to compute workcenter costs during "
+"operations and to plan future loads on workcenters based on production "
+"planning."
+msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_root
+#: view:board.board:0
+msgid "Manufacturing board"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned_end:0
+msgid "Scheduled End Date"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
 msgid "Manufacturing"
 msgstr "Produkowanie"
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_procurement_action3
-#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action3
-msgid "Unscheduled procurements"
-msgstr "Zapotrzebowania nie zaplanowane"
+#: view:board.board:0
+msgid "Next Production Orders"
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_bom_tree_action
-#: model:ir.ui.menu,name:mrp.menu_bom_tree
-msgid "Bill of Material Structure"
-msgstr "Struktura zestawień materiałowych"
+#: selection:mrp.production.order,month:0
+msgid "February"
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.wizard,name:mrp.wizard_workcenter_load
-msgid "Workcenter load"
-msgstr "Obciążenie centrum roboczego"
+#: model:ir.actions.act_window,name:mrp.mrp_property_group_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
+msgid "Property Groups"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "April"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procurestockableproduct0
+msgid ""
+"Depending on the chosen method to supply the stockable products, the "
+"procurement order creates a RFQ, a production order, ... "
+msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
@@ -1959,20 +2179,23 @@ msgid "Time in hours for the cleaning."
 msgstr "Czas czyszczenia w godzinach"
 
 #. module: mrp
-#: view:mrp.procurement:0
-msgid "Procurement Details"
-msgstr "Szczegóły zapotrzebowania"
-
-#. module: mrp
-#: model:process.transition,note:mrp.process_transition_bom0
-msgid "You can see its bill of material which are used to make product"
+#: model:process.transition,name:mrp.process_transition_purchaseprocure0
+msgid "Automatic RFQ"
 msgstr ""
-"Możesz obejrzeć zestawienie materiałowe, które zostało zastosowane do "
-"wytworzenia produktu"
 
 #. module: mrp
-#: field:mrp.production,date_planned_end:0
-msgid "Scheduled End"
+#: model:process.transition,note:mrp.process_transition_servicemto0
+msgid ""
+"If the service has a 'Produce' supply method, this creates a task in the "
+"project management module of OpenERP."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_productionprocureproducts0
+msgid ""
+"In order to supply raw material (to be purchased or produced), the "
+"production order creates as much procurement orders as components listed in "
+"the BOM, through a run of the schedulers (MRP)."
 msgstr ""
 
 #. module: mrp
@@ -1982,67 +2205,675 @@ msgstr "Na zapas"
 
 #. module: mrp
 #: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
 msgstr "Numeracja"
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
-#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
-msgid "Bill of Materials Components"
-msgstr "Komponenty zestawienia materiałowego"
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
+msgid "Resource Leaves"
+msgstr ""
 
 #. module: mrp
-#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
-msgid "Week"
-msgstr "Tydzień"
+#: help:mrp.bom,sequence:0
+msgid "Gives the sequence order when displaying a list of bills of material."
+msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.next_id_77
-msgid "Reporting"
-msgstr "Raportowanie"
+#: view:mrp.production:0
+#: field:mrp.production,move_lines:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,products_to_consume:0
+msgid "Products to Consume"
+msgstr ""
 
 #. module: mrp
-#: view:report.workcenter.load:0
-msgid "Workcenters load"
-msgstr "Obciążenie centrów roboczych"
+#: view:mrp.production.order:0
+#: field:mrp.production.order,year:0
+msgid "Year"
+msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_report_workcenter_load
-msgid "Workcenter Load"
-msgstr "Obciążenie centrum roboczego"
+#~ msgid "Not used in computations, for information purpose only."
+#~ msgstr "Nie używane w obliczeniach, tylko do informacji"
 
-#. module: mrp
-#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
-msgid "MRP Management - Reporting"
-msgstr "Zarządzanie MRP - Raportowanie"
+#~ msgid "Do nothing"
+#~ msgstr "Nic nie rób"
 
-#. module: mrp
-#: field:report.mrp.inout,value:0
-msgid "Stock value"
-msgstr "Wycena zapasów"
+#~ msgid "Status"
+#~ msgstr "Stan"
 
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
-#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
-msgid "Workcenter Loads"
-msgstr "Obciążenia centrum roboczego"
+#~ msgid "Details"
+#~ msgstr "Szczegóły"
 
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
-#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
-msgid "Weekly Stock Value Variation"
-msgstr "Tygodniowe odchylenie wartości zapasów"
+#~ msgid "Compute Stock Minimum Rules Only"
+#~ msgstr "Oblicz tylko reguły minimalnych zapasów"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_report_mrp_inout
-#: view:report.mrp.inout:0
-msgid "Stock value variation"
-msgstr "Zmiany wartości zapasów"
+#~ msgid "UoS Quantity"
+#~ msgstr "Ilość JS"
 
-#. module: mrp
-#: view:board.board:0
-msgid "Next production orders"
-msgstr "Następne zamówienie produkcji"
+#~ msgid "Origin"
+#~ msgstr "Pochodzenie"
+
+#~ msgid "MRP & Logistic Scheduler"
+#~ msgstr "MRP i planowanie logistyczne"
+
+#~ msgid "Product & Location"
+#~ msgstr "Produkt i strefa"
+
+#~ msgid "Analytic Accounting"
+#~ msgstr "Księgowość analityczna"
+
+#~ msgid "Products Consummed"
+#~ msgstr "Zużyte produkty"
+
+#~ msgid "If the stock of a product is under 0, it will act like an orderpoint"
+#~ msgstr ""
+#~ "Jeśli zapas produktu jest poniżej 0, to to zadziała jak punkt zamawiania."
+
+#~ msgid "you can see the minimum stock rules from product"
+#~ msgstr "możesz sprawdzić reguły minimalnego zapasu w produkcie"
+
+#~ msgid "Service on Order"
+#~ msgstr "Usługa na zamówienie"
+
+#~ msgid "Production Orders"
+#~ msgstr "Zamówienia produkcji"
+
+#~ msgid "max"
+#~ msgstr "max"
+
+#~ msgid "product"
+#~ msgstr "produkt"
+
+#~ msgid ""
+#~ "Rounding applied on the product quantity. For integer only values, put 1.0"
+#~ msgstr ""
+#~ "Zaokrąglenie stosowane do ilości produktu. Aby wykluczyć liczby ułamkowe "
+#~ "ustaw 1,0."
+
+#~ msgid "Reservation"
+#~ msgstr "Rezerwacja"
+
+#~ msgid "Print product price"
+#~ msgstr "Drukuj cenę produktu"
+
+#~ msgid "If Procure method is Make to order and supply method is produce"
+#~ msgstr ""
+#~ "Jeśli metoda nabycia jest 'Na zamówienie' i metoda zaopatrzenia jest "
+#~ "'Produkcja'"
+
+#~ msgid "Latest error"
+#~ msgstr "Ostatni błąd"
+
+#~ msgid "Production Orders Planning"
+#~ msgstr "Planowanie zamówień produkcyjnych"
+
+#~ msgid "Ready"
+#~ msgstr "Gotowe"
+
+#~ msgid "Workcenter Operations"
+#~ msgstr "Operacje centrum roboczego"
+
+#~ msgid "Waiting"
+#~ msgstr "Oczekiwanie"
+
+#~ msgid "Production orders are created for the product manufacturing."
+#~ msgstr "Zamówienia produkcji są tworzone do wytworzenia produktu."
+
+#~ msgid "Min Quantity"
+#~ msgstr "Ilość min."
+
+#~ msgid "Production orders"
+#~ msgstr "Zamówienia produkcji"
+
+#~ msgid "Security Days"
+#~ msgstr "Dni na wszelki wypadek"
+
+#~ msgid "If Product type is service"
+#~ msgstr "Jeśli typem produktu jest usługa"
+
+#~ msgid "Production done"
+#~ msgstr "Produkcja wykonana"
+
+#~ msgid "The system waits for requested products in stock."
+#~ msgstr "System czeka na wymagane produkty."
+
+#~ msgid "Workcenter Name"
+#~ msgstr "Nazwa centrym roboczego"
+
+#~ msgid "Machine"
+#~ msgstr "Maszyna"
+
+#~ msgid "Human Resource"
+#~ msgstr "Zasoby ludzkie"
+
+#~ msgid "on order"
+#~ msgstr "na zamówienie"
+
+#~ msgid "Workcenters"
+#~ msgstr "Centra robocze"
+
+#~ msgid "Compute All Schedulers"
+#~ msgstr "Oblicz wszystkie planowania"
+
+#~ msgid "min"
+#~ msgstr "min"
+
+#~ msgid "Time Efficiency"
+#~ msgstr "Efektywność czasu"
+
+#~ msgid "Scheduler Parameters"
+#~ msgstr "Parametry planisty"
+
+#~ msgid "Unit of Measure"
+#~ msgstr "Jednostka miary"
+
+#~ msgid "A cycle is defined in the workcenter definition."
+#~ msgstr "Cykle są w definicji centrum roboczego"
+
+#~ msgid "Material routing"
+#~ msgstr "Marszruta materiałowa"
+
+#~ msgid "Number of products to produce"
+#~ msgstr "Liczba produktów do wyprodukowania"
+
+#~ msgid "Wait for available products for reservation"
+#~ msgstr "Czeka na zarezerwowanie dostępnych produktów"
+
+#~ msgid "Location"
+#~ msgstr "Strefa magazynowa"
+
+#~ msgid "Product Efficiency"
+#~ msgstr "Efektywność produktu"
+
+#~ msgid "Orderpoint minimum rule"
+#~ msgstr "Reguła minimalnego punktu zamawiania"
+
+#~ msgid "Minimum stock rule"
+#~ msgstr "Reguła minimalnego zapasu"
+
+#~ msgid "Max Quantity"
+#~ msgstr "Ilość maks."
+
+#~ msgid ""
+#~ "Location where the system will look for products used in raw materials."
+#~ msgstr ""
+#~ "Strefa, w której system oczekuje produktów jako materiałów do produkcji."
+
+#~ msgid "Planned Date"
+#~ msgstr "Planowana data"
+
+#~ msgid "If product type is service and procure method is Make to order"
+#~ msgstr "Jeśli typ produktu jest Usługa i metoda nabycia jest Na zamówienie."
+
+#~ msgid "Tool"
+#~ msgstr "Narzędzie"
+
+#~ msgid "Note"
+#~ msgstr "Uwaga"
+
+#~ msgid "Define the product structure, with sub-products and/or components."
+#~ msgstr "Definiuj strukturę produktu z produktami ubocznymi lub komponentami."
+
+#~ msgid "Define a routing to describe the manufacturing steps."
+#~ msgstr "Zdefiniuj marszrutę, aby opisać kroki produkcyjne."
+
+#~ msgid "Paid ?"
+#~ msgstr "Zapłacone ?"
+
+#~ msgid "Change Product Qty."
+#~ msgstr "Zmień ilość produktu"
+
+#~ msgid "Production Orders Waiting Products"
+#~ msgstr "Zamówienia produkcji oczekujące na materiały"
+
+#~ msgid "Date Closed"
+#~ msgstr "Data zamknięcia"
+
+#~ msgid "Minimum Stock Rules"
+#~ msgstr "Reguły minimalnych zapasów"
+
+#~ msgid "Production Workcenters"
+#~ msgstr "Centra robocze produkcji"
+
+#~ msgid "Purchase Order"
+#~ msgstr "Zamówienie zakupu"
+
+#~ msgid "Product UoM"
+#~ msgstr "JM produktu"
+
+#~ msgid "Workcenter"
+#~ msgstr "Centrum robocze"
+
+#~ msgid "If Procure method is Make to order and supply method is buy"
+#~ msgstr ""
+#~ "Jeśli metoda nabycia jest Na zamówienie i metoda zaopatrzenia jest Kupno"
+
+#~ msgid "Planification"
+#~ msgstr "Planowanie"
+
+#~ msgid "Internal Procurement Request"
+#~ msgstr "Wewnętrzne zapytanie ofertowe"
+
+#~ msgid "Your procurement request has been sent !"
+#~ msgstr "Twoje zapytanie ofertowe zostało wysłane!"
+
+#~ msgid "Property Categories"
+#~ msgstr "Kategorie właściwości"
+
+#~ msgid "Workcenters Utilisation"
+#~ msgstr "Wykorzystanie centrów roboczych"
+
+#~ msgid "If procurement is make to order"
+#~ msgstr "Jeśli nabycie jest 'Na zamówienie'"
+
+#~ msgid ""
+#~ "Efficiency on the production. A factor of 0.9 means a loss of 10% in the "
+#~ "production."
+#~ msgstr ""
+#~ "Efektywność produkcji. Współczynnik 0,9 oznacza stratę 10% produkcji."
+
+#~ msgid "Minimum Stock Rule"
+#~ msgstr "Reguła zapasu minimalnego"
+
+#~ msgid "Parameters"
+#~ msgstr "Parametry"
+
+#~ msgid "New Bill of Materials"
+#~ msgstr "Nowe zestawienie materiałowe"
+
+#~ msgid "Canceled"
+#~ msgstr "Anulowano"
+
+#~ msgid "New Production Order"
+#~ msgstr "Nowe zamówienie produkcji"
+
+#~ msgid "A Request for Quotation is created and sent to the supplier."
+#~ msgstr "Zapytanie ofertowe zostało utworzone i wysłane do dostawcy."
+
+#~ msgid "plus"
+#~ msgstr "plus"
+
+#~ msgid ""
+#~ "The list of operations (list of workcenters) to produce the finished "
+#~ "product. The routing is mainly used to compute workcenter costs during "
+#~ "operations and to plan futur loads on workcenters based on production "
+#~ "plannification."
+#~ msgstr ""
+#~ "Lista operacji (lista centrów roboczych) do wyprodukowania produktu "
+#~ "gotowego. Marszruta jest głownie stosowana do obliczeń kosztów operacji "
+#~ "centrów roboczych i do planowania przyszłego obłożenia centrów w oparciu o "
+#~ "plany."
+
+#~ msgid "Retry"
+#~ msgstr "Powtórz"
+
+#~ msgid "The normal working time of the workcenter."
+#~ msgstr "Normalny czas roboczy centrum roboczego."
+
+#~ msgid "Order to Max"
+#~ msgstr "Zamów do maks."
+
+#~ msgid "Production Orders To Start"
+#~ msgstr "Zamówienia produkcji do rozpoczęcia"
+
+#~ msgid "Sale Name"
+#~ msgstr "Nazwa sprzedaży"
+
+#~ msgid "from stock"
+#~ msgstr "z zapasu"
+
+#~ msgid "Create minimum stock rules"
+#~ msgstr "Utwórz reguły zapasów minimalnych"
+
+#~ msgid "Bill of Material Structure"
+#~ msgstr "Struktura zestawień materiałowych"
+
+#~ msgid "Running"
+#~ msgstr "Uruchomione"
+
+#~ msgid "Warehouse"
+#~ msgstr "Magazyn"
+
+#~ msgid "Workcenter load"
+#~ msgstr "Obciążenie centrum roboczego"
+
+#~ msgid "Bill of Materials Components"
+#~ msgstr "Komponenty zestawienia materiałowego"
+
+#~ msgid "You can see its bill of material which are used to make product"
+#~ msgstr ""
+#~ "Możesz obejrzeć zestawienie materiałowe, które zostało zastosowane do "
+#~ "wytworzenia produktu"
+
+#~ msgid "BoM Hyerarchy"
+#~ msgstr "Hierarchia Zest. Mat."
+
+#~ msgid ""
+#~ "Use a phantom bill of material in raw materials lines that have to be "
+#~ "automatically computed in on eproduction order and not one per level.If you "
+#~ "put \"Phantom/Set\" at the root level of a bill of material it is considered "
+#~ "as a set or pack: the products are replaced by the components between the "
+#~ "sale order to the picking without going through the production order.The "
+#~ "normal BoM will generate one production order per BoM level."
+#~ msgstr ""
+#~ "Stosuj fantomowe zestawienie materiałów w pozycjach materiałów do produkcji, "
+#~ "które mają być automatycznie wyliczone na zamówieniach produkcji, a nie po "
+#~ "każdym poziomie. Jeśli ustawisz \"Fantom / Zestaw\" na najwyższym poziomie "
+#~ "zestawienia materiałowego to będzie ono traktowane jak zestaw - produkty "
+#~ "będą zamienione na komponenty pomiędzy zamówieniem sprzedaży a pobraniem bez "
+#~ "przechodzenia przez zamówienie produkcji. Zwykłe zestawienie materiałowe "
+#~ "będzie generowało jedno zamówienie produkcji na każdy poziom zestawienia."
+
+#~ msgid "Routing Workcenters"
+#~ msgstr "Centra robocze marszruty"
+
+#~ msgid "Packing list"
+#~ msgstr "Lista przesunięć"
+
+#~ msgid "Stockable Stock"
+#~ msgstr "Zapas rejestrowany"
+
+#~ msgid "Best price (not yet active!)"
+#~ msgstr "Najlepsza cena (jeszcze nie aktywne!)"
+
+#~ msgid "Ask New Products"
+#~ msgstr "Pytaj o nowe produkty"
+
+#~ msgid ""
+#~ "Number of operation this workcenter can do in parallel. If this workcenter "
+#~ "represent a team of 5 workers, the capacity per cycle is 5."
+#~ msgstr ""
+#~ "Liczba operacji, którą to centrum robocze jest w stanie wykonać równolegle. "
+#~ "Jeśli centrum składa się z 5 pracowników, to ilość na cykl wynosi 5."
+
+#~ msgid "Number of Cycle"
+#~ msgstr "Liczba cykli"
+
+#~ msgid "Internal Ref."
+#~ msgstr "Wewn. odnośnik"
+
+#~ msgid "Stockable Production Order"
+#~ msgstr "Zamówienie produkcji na zapas"
+
+#~ msgid "Sale Ref"
+#~ msgstr "Odnośnik sprzedaży"
+
+#~ msgid "Production scheduled products"
+#~ msgstr "Produkty zaplanowane do produkcji"
+
+#~ msgid "Working Time"
+#~ msgstr "Czas pracy"
+
+#~ msgid "Scheduler Range"
+#~ msgstr "Zakres planowania"
+
+#~ msgid "Product to stock rules"
+#~ msgstr "Produkt do reguł zapasu"
+
+#~ msgid "This is the leads/security time for each purchase order."
+#~ msgstr "To jest czas na wszelki wypadek dla każdego zamówienia zakupu."
+
+#~ msgid "Purchase Lead Time"
+#~ msgstr "Czas na zakup"
+
+#~ msgid "Routing workcenter usage"
+#~ msgstr "Wykorzystanie centrum roboczego w marszrucie"
+
+#~ msgid "Reordering Mode"
+#~ msgstr "Tryb ponownego zamawiania"
+
+#~ msgid "Properties composition"
+#~ msgstr "Kompozycja właściwości"
+
+#~ msgid "Manufacturity Lead Time"
+#~ msgstr "Czas produkcji"
+
+#~ msgid "If Product type is Stockable and procure method is make to stock"
+#~ msgstr ""
+#~ "Jeśli typ produktu jest 'Produkt rejestrowany' i metoda nabycia jest 'Na "
+#~ "zapas'"
+
+#~ msgid "Factor that multiplies all times expressed in the workcenter."
+#~ msgstr "Współczynnik mnożący wszystkie czasy podane w centrum roboczym."
+
+#~ msgid "Production Orders in Progress"
+#~ msgstr "Zamówienia produkcji w trakcie przetwarzania"
+
+#~ msgid ""
+#~ "This is the internal picking list take bring the raw materials to the "
+#~ "production plan."
+#~ msgstr ""
+#~ "To jest wenętrzna lista przesunięć (pobrań), która dostarcza metriały do "
+#~ "produkcji wg planu."
+
+#~ msgid "For stockable and consumable"
+#~ msgstr "Dla rejestrowanych i pomocniczych"
+
+#~ msgid "Qty Multiple"
+#~ msgstr "Wielokrotność"
+
+#~ msgid "Product type is Stockable and procure method is make to stock"
+#~ msgstr "Typ produktu jest Rejestrowany i metoda nabycia jest Na zapas."
+
+#~ msgid "If Product type is service and procure method is Make to stock"
+#~ msgstr "Jeśli typ produktu jest Usługa i metoda nabycia jest 'Na zapas'"
+
+#~ msgid "Serivce Stockable Order"
+#~ msgstr "Zamówienie usług Rejestrowanych"
+
+#~ msgid "Exception"
+#~ msgstr "Wyjątek"
+
+#~ msgid "References"
+#~ msgstr "Odnośniki"
+
+#~ msgid "Stockable Product Process"
+#~ msgstr "Proces produktu rejestrowanego"
+
+#~ msgid "An entry is being made from billing material to routing."
+#~ msgstr "Został dokonany zapis z zestawienia materiałowego do marszruty."
+
+#~ msgid "Automatic orderpoint"
+#~ msgstr "Punkt automatycznego zamawiania"
+
+#~ msgid "Service Product"
+#~ msgstr "Produkt - usługa"
+
+#~ msgid "Confirmed"
+#~ msgstr "Potwierdzone"
+
+#~ msgid "Validate"
+#~ msgstr "Zatwierdź"
+
+#~ msgid "Packing Exception"
+#~ msgstr "Wyjątek przesunięcia"
+
+#~ msgid "Bill of material revisions"
+#~ msgstr "Wersje zaestawienia materiałowego"
+
+#~ msgid "Service Make to Stock"
+#~ msgstr "Usługa Na zapas"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "To są dni dodane do twojej obietnicy klientowi na wszelki wypadek (wysyłka "
+#~ "nastąpi o tyle dni wcześniej)."
+
+#~ msgid "Property"
+#~ msgstr "Właściwość"
+
+#~ msgid "Close Move at end"
+#~ msgstr "Zamknij przesunięcie na końcu"
+
+#~ msgid "Close"
+#~ msgstr "Zamknij"
+
+#~ msgid "A purchase order is created for a sub-contracting demand."
+#~ msgstr "Zamówienie zakupu zostało utworzone dla podwykonawcy."
+
+#~ msgid "Service Product Process"
+#~ msgstr "Proces usługi"
+
+#~ msgid "Workcenters load"
+#~ msgstr "Obciążenie centrów roboczych"
+
+#~ msgid "MRP Management - Reporting"
+#~ msgstr "Zarządzanie MRP - Raportowanie"
+
+#~ msgid "Workcenter Loads"
+#~ msgstr "Obciążenia centrum roboczego"
+
+#~ msgid "Next production orders"
+#~ msgstr "Następne zamówienie produkcji"
+
+#~ msgid "Procure Service Product"
+#~ msgstr "Zapotrzebowanie na usługę"
+
+#~ msgid "Procurements"
+#~ msgstr "Zapotrzebowania"
+
+#~ msgid ""
+#~ "Triggers an automatic procurement for all products that have a virtual stock "
+#~ "under 0. You should probably not use this option, we suggest using a MTO "
+#~ "configuration on products."
+#~ msgstr ""
+#~ "Wyzwala automatyczne zapotrzebowanie dla wszystkich produktów o zapasie "
+#~ "poniżej 0. Prawdopodobnie nie powinieneś stosować tej opcji. Sugerujemy "
+#~ "ustawienie konfiguracji produktów 'Na zamówienie'."
+
+#~ msgid ""
+#~ "When the virtual stock goes belong the Min Quantity, Open ERP generates a "
+#~ "procurement to bring the virtual stock to the Max Quantity."
+#~ msgstr ""
+#~ "Kiedy zapas wirtualny będzie poniżej ilości minimalnej, to Open ERP "
+#~ "wygeneruje zapotrzebowanie, aby zapas wzrósł do wartości maksymalnej."
+
+#~ msgid "This wizard will schedule procurements."
+#~ msgstr "Ten kreator zaplanuje zapotrzebowania."
+
+#~ msgid "Make Procurement"
+#~ msgstr "Wykonaj zapotrzebowanie"
+
+#~ msgid "Procurement Process"
+#~ msgstr "Proces zapotrzebowania"
+
+#~ msgid "Exceptions Procurements"
+#~ msgstr "Wyjątki zapotrzebowania"
+
+#~ msgid "Automatic Procurements"
+#~ msgstr "Automatyczne zapotrzebowania"
+
+#~ msgid "Procurement Lines"
+#~ msgstr "Pozycje zapotrzebowania"
+
+#~ msgid "Production Procure Products"
+#~ msgstr "Zapotrzebowanie produktów z produkcji"
+
+#~ msgid "From minimum stock rules, it goes for procure product."
+#~ msgstr "Z reguł minimalnych zapasów jest tworzone zapotrzebowanie produktu."
+
+#~ msgid ""
+#~ "This wizard will planify the procurement for this product. This procurement "
+#~ "may generate task, production orders or purchase orders."
+#~ msgstr ""
+#~ "Ten kreator zaplanuje zapotrzebowanie dla tego produktu. Zapotrzebowanie "
+#~ "może wygenerować zadania, zamówienia produkcji lub zamówienia zakupu."
+
+#~ msgid "Exceptions Procurements to Fix"
+#~ msgstr "Wyjątki zapotrzebowania do poprawienia"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Metoda zpotrzebowania"
+
+#~ msgid "Procurement convert into the draft purchase order."
+#~ msgstr "Zapotrzebowanie zmienia się w projekt zamówienia zakupu."
+
+#~ msgid "Run procurement"
+#~ msgstr "Uruchom zapotrzebowanie"
+
+#~ msgid "Procurement orders"
+#~ msgstr "Zapotrzebowania"
+
+#~ msgid ""
+#~ "Procurement is created if the product quantity is lower than the minimum "
+#~ "limit."
+#~ msgstr ""
+#~ "Zapotrzebowanie jest tworzone, gdy ilość produktu jest niższa niż minimum."
+
+#~ msgid "Minimum Stock Procure"
+#~ msgstr "Zapotrzebowanie z zapasu minimalnego"
+
+#~ msgid "New Procurement"
+#~ msgstr "Nowe zapotrzebowanie"
+
+#~ msgid "Compute Procurements"
+#~ msgstr "Oblicz zapotrzebowania"
+
+#~ msgid "The procurement quantity will by rounded up to this multiple."
+#~ msgstr "Ilość zapotrzebowania będzie zaokrąglona do tej wielokrotności."
+
+#~ msgid "Procurement Purchase"
+#~ msgstr "Zapotrzebowanie zakupu"
+
+#~ msgid "Compute Procurements Only"
+#~ msgstr "Oblicz tylko zapotrzebowania"
+
+#~ msgid "Central document to procure products"
+#~ msgstr "Centralny dokument na zapotrzebowanie produktów"
+
+#~ msgid "Temporary Procurement Exceptions"
+#~ msgstr "Tymczasowe wyjątki zapotrzebowania"
+
+#~ msgid ""
+#~ "If you encode manually a procurement, you probably want to use a make to "
+#~ "order method."
+#~ msgstr ""
+#~ "Jeśli wprowadziłeś zapotrzebowanie ręcznie, to prawdopodobnie chcesz "
+#~ "zastosować metodę 'Na zamówienie'."
+
+#~ msgid ""
+#~ "Reference of the document that created this procurement.\n"
+#~ "This is automatically completed by Open ERP."
+#~ msgstr ""
+#~ "Oznaczenie dokumentu, który utworzył to zapotrzebowanie\n"
+#~ "Jest automatycznie wypełniane przez OpenERP."
+
+#~ msgid "if Product type is Stockable in procurement order"
+#~ msgstr "Jeśli w zapotrzebowaniu produkt jest typu Rejestrowany."
+
+#~ msgid "Unscheduled procurements"
+#~ msgstr "Zapotrzebowania nie zaplanowane"
+
+#~ msgid "When any procuere products, it comes into the prpcurement orders"
+#~ msgstr "Kiedy produkt jest potrzebny, to powstaje zapotrzebowanie"
+
+#~ msgid "Procurement Reason"
+#~ msgstr "Powód zapotrzebowania"
+
+#~ msgid "In procurement order, if product type is service"
+#~ msgstr "W zapotrzebowaniach, jeśli typ produktu jest Usługa"
+
+#~ msgid "Procurement Details"
+#~ msgstr "Szczegóły zapotrzebowania"
+
+#~ msgid ""
+#~ "This is the time frame analysed by the scheduler when computing "
+#~ "procurements. All procurement that are not between today and today+range are "
+#~ "skipped for futur computation."
+#~ msgstr ""
+#~ "To jest rama czasowa do obliczeń planisty. Wszystkie zapotrzebowania, "
+#~ "których daty są poza zakresem od (dzisiaj) do (dzisiaj + zakres planowania) "
+#~ "są pomijane w obliczeniach."
+
+#~ msgid "Procurement Request"
+#~ msgstr "Utwórz zapotrzebowanie"
+
+#~ msgid "Procurement for raw materials."
+#~ msgstr "Zapotrzebowanie na materiały do produkcji."
+
+#~ msgid "Procure Stockable Product"
+#~ msgstr "Zapotrzebowanie na produkty rejestrowane"
diff --git a/addons/point_of_sale/i18n/sv.po b/addons/point_of_sale/i18n/sv.po
index 5d5cc64b8ed..a116ef92915 100644
--- a/addons/point_of_sale/i18n/sv.po
+++ b/addons/point_of_sale/i18n/sv.po
@@ -6,26 +6,35 @@ msgid ""
 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 09:39+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-24 21:48+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <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-09-29 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
-msgid "Total paid"
+#: field:pos.discount,discount_notes:0
+msgid "Discount Notes"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
-msgid "Qty of product"
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+msgid "Sales by day"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_confirm
+msgid "Point of Sale Confirm"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
+msgid "Apply Discount"
 msgstr ""
 
 #. module: point_of_sale
@@ -33,224 +42,135 @@ msgstr ""
 msgid "Set to draft"
 msgstr ""
 
-#. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_report_transaction_pos
-msgid "transaction for the pos"
-msgstr ""
-
-#. module: point_of_sale
-#: wizard_view:pos.discount,init:0
-#: rml:pos.receipt:0
-msgid "Discount :"
-msgstr ""
-
-#. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_nb:0
-msgid "Piece number"
-msgstr ""
-
 #. module: point_of_sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,name:0
-msgid "Order Description"
+#: field:report.transaction.pos,product_nb:0
+msgid "Product Nb."
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_scan_product
-msgid "Scan Product"
+#: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
+msgid "Point Of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Document"
+#: view:report.pos.order:0
+msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Net Total"
+msgstr "Totalt netto"
+
+#. module: point_of_sale
+#: view:all.closed.cashbox.of.the.day:0
+msgid "All Cashboxes Of the day :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_tree2
-msgid "Orders of the day"
+#: model:ir.ui.menu,name:point_of_sale.menu_close_statement
+msgid "Close Registers"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
-msgid "Sales (summary)"
+#: model:ir.model,name:point_of_sale.model_pos_box_out
+msgid "Pos Box Out"
 msgstr ""
 
 #. module: point_of_sale
-#: help:pos.order,user_id:0
-msgid "This is the logged in user (not necessarily the salesman)."
-msgstr ""
-
-#. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
-msgid "Select an Open Sale Order"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.lines:0
-msgid "Company"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid ","
+#: model:ir.actions.act_window,name:point_of_sale.action_report_cash_register_all
+#: model:ir.ui.menu,name:point_of_sale.menu_report_cash_register_all
+msgid "Register Analysis"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Base"
+#: view:pos.close.statement:0
+msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
+msgid "Open Register"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
-msgid "Subtotal"
+#: view:report.cash.register:0
+#: field:report.cash.register,day:0
+#: view:report.pos.order:0
+#: field:report.pos.order,day:0
+msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Partner Ref."
+#: view:pos.make.payment:0
+msgid "Add payment :"
+msgstr "Lägg till betalning:"
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+#: view:report.pos.order:0
+msgid "My Sales"
+msgstr "Min försäljning"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_box_out
+msgid "Box Out"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
+#: report:pos.sales.user.today.current.user:0
+msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,name:0
-msgid "Line Description"
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
+#: field:report.transaction.pos,amount:0
+msgid "Amount"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,shop_id:0
-msgid "Shop"
+#: help:pos.order,user_id:0
+msgid ""
+"Person who uses the the register. It could be a reliever, a student or an "
+"interim employee."
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.refund_order,init,refund_n_quit:0
-msgid "Ok"
-msgstr ""
-
-#. module: point_of_sale
-#: view:pos.order:0
-#: field:pos.order,note:0
-msgid "Notes"
-msgstr ""
-
-#. module: point_of_sale
-#: field:stock.picking,pos_order:0
-msgid "Pos order"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
-msgid "Detail of Sales"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.order,amount_tax:0
-msgid "Taxes"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
-msgid "Sale line"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.lines:0
-msgid "No. Of Articles"
-msgstr ""
-
-#. module: point_of_sale
-#: field:pos.config.journal,code:0
-#: rml:pos.details:0
-msgid "Code"
-msgstr ""
-
-#. module: point_of_sale
-#: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
-msgid "Validity Date"
-msgstr ""
-
-#. module: point_of_sale
-#: view:pos.order:0
-#: field:pos.order,pickings:0
-msgid "Picking"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
-msgstr ""
+msgstr "Moms"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_refund
-msgid "Refund Orders"
-msgstr ""
-
-#. module: point_of_sale
-#: field:pos.order,last_out_picking:0
-msgid "Last Output Picking"
-msgstr ""
-
-#. module: point_of_sale
-#: wizard_view:pos.config.journal,init:0
-msgid "Select default journals"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
-msgid "Qty"
-msgstr ""
-
-#. module: point_of_sale
-#: field:pos.order,user_id:0
-msgid "Logged in User"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.details:0
-msgid "VAT(%)"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr ""
 
@@ -260,183 +180,149 @@ msgid "Total Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-msgid "Disc"
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "May"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.receipt:0
-msgid "Fax :"
-msgstr ""
+#: help:account.journal,special_journal:0
+msgid "Will put all the orders in waiting status till being accepted"
+msgstr "Detta lägger ordrarna i väntande status tills de blir accepterade"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
-msgid "Scan Barcode"
-msgstr ""
-
-#. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
+msgstr "Företag"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Total of the day"
+msgstr "Totalt för dagen"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,average_price:0
+msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,payments:0
-msgid "Order Payments"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Date :"
-msgstr ""
-
-#. module: point_of_sale
-#: view:pos.order:0
-msgid "Ma_ke Payment"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
-msgid "Confirm"
-msgstr ""
-
-#. module: point_of_sale
-#: view:pos.order:0
-msgid "POS Orders"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
-msgid "Sales total"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Supplier Invoice"
-msgstr ""
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Total discount"
+msgstr "Totala rabatter"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order.line:0
-msgid "Sum of subtotals"
-msgstr ""
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
+msgid "Add payment"
+msgstr "Lägg till betalning"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
-msgid "Payment date"
-msgstr ""
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
+msgid "Sales by month"
+msgstr "Månadsförsäljning"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
-msgid "Payment name"
-msgstr ""
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_today
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
+msgid "Sales by User"
+msgstr "Försäljning per användare"
 
 #. module: point_of_sale
-#: field:pos.order,lines:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Disc.(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
-msgid "Point Of Sale"
+#: field:pos.box.entries,ref:0
+#: field:pos.box.out,ref:0
+msgid "Ref"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,create_date:0
-msgid "Creation Date"
+#: view:report.pos.order:0
+#: field:report.pos.order,price_total:0
+msgid "Total Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "PRO-FORMA"
+#: view:product.product:0
+msgid "Miscelleanous"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_rep
-msgid "Reporting"
+#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
+#: report:pos.sales.user:0
+msgid "Sales Report"
 msgstr ""
 
 #. module: point_of_sale
-#: view:report.transaction.pos:0
-msgid "POS "
+#: view:pos.order:0
+msgid "Other Information"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_pos_config_journal
-msgid "Point of Sale journal configuration."
+#: view:product.product:0
+msgid "Product Type"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Total :"
+#: view:pos.order:0
+#: view:pos.payment.report.date:0
+msgid "Dates"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.config.journal,init,default_journal:0
-msgid "Default journal"
+#: field:res.company,company_discount:0
+msgid "Max Discount(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,account_receivable:0
-msgid "Default Receivable"
+#: view:pos.box.out:0
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_sale_get
-msgid "Get From Order"
+#: code:addons/point_of_sale/pos.py:0
+#, python-format
+msgid "No valid pricelist line found !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
-msgid "Configuration"
-msgstr "Konfiguration"
-
-#. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.order.line,price_unit:0
-msgid "Unit Price"
+#: report:pos.details:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+msgid "["
 msgstr ""
 
 #. module: point_of_sale
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line_day
-msgid "POS Lines of the day"
-msgstr ""
-
-#. module: point_of_sale
-#: field:pos.order,nb_print:0
-msgid "Number of Print"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_wizard_default_journal
-msgid "Default journals"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Draft Invoice"
+#: field:report.sales.by.margin.pos,total:0
+#: field:report.sales.by.margin.pos.month,total:0
+msgid "Margin"
 msgstr ""
 
 #. module: point_of_sale
@@ -445,13 +331,8 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_add_product
-msgid "Add products"
+#: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
+msgid "Register management"
 msgstr ""
 
 #. module: point_of_sale
@@ -460,74 +341,538 @@ msgid "Total qty"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line
-msgid "POS Lines"
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
+msgid "Sales by user monthly"
+msgstr ""
+
+#. module: point_of_sale
+#: help:pos.order,user_salesman_id:0
+msgid "User who is logged into the system."
+msgstr ""
+
+#. module: point_of_sale
+#: field:product.product,income_pdt:0
+msgid "Product for Input"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Mode of Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
+msgid "Daily Operations"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Search Cash Statements"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Are you sure you want to close your sales ?"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "August"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "June"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
+msgid "Sales by User Monthly"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Closing Date"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "October"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.bank.statement.line,am_out:0
+msgid "To count"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/pos.py:0
+#, python-format
+msgid "You don't have enough access to validate this sale!"
 msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-msgid "Sales Order POS"
+msgid "Quotations"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.config.journal,init,set_default_journal:0
-msgid "Define default journals"
+#: field:report.pos.order,delay_payment:0
+msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
-#: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_root
-msgid "Point of Sale"
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
+msgid "Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,salesman_id:0
-msgid "Salesman"
+#: help:account.journal,auto_cash:0
+msgid "This field authorize the automatic creation of the cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: view:account.bank.statement:0
+msgid "Period"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
+msgid "Net Total:"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,name:0
+msgid "Line Description"
+msgstr ""
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Codes"
+msgstr ""
+
+#. module: point_of_sale
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+msgid "Print Report"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:0
+#, python-format
+msgid "Please check that income account is set to %s"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_add_product.py:0
+#: code:addons/point_of_sale/wizard/pos_return.py:0
+#: model:ir.actions.act_window,name:point_of_sale.action_add_product
+#: model:ir.model,name:point_of_sale.model_pos_add_product
+#, python-format
+msgid "Add Product"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,invoice_am:0
+msgid "Invoice Amount"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
+#: field:pos.config.journal,journal_id:0
+#: field:pos.order,sale_journal:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
 #: selection:pos.order,state:0
-msgid "Invoiced"
+#: selection:report.pos.order,state:0
+msgid "Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.config.journal,init,default_journal_rebate:0
-msgid "Default rebate journal"
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Ending Balance"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.wizard_default_journal
-msgid "Wizard default journals"
+#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
+msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
-msgid "Total of the day"
+#: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
+msgid "Products for Output Operations"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
-msgid "Add"
+#: view:pos.payment.report.date:0
+msgid "Sale by Date and User"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
-msgid "Draft"
+#: code:addons/point_of_sale/pos.py:0
+#, python-format
+msgid ""
+"Cannot delete a point of sale which is closed or contains confirmed "
+"cashboxes!"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
-msgid "Paid"
+#: field:report.cash.register,date:0
+msgid "Create Date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: model:ir.model,name:point_of_sale.model_pos_open_statement
+#: view:pos.confirm:0
+#: view:pos.open.statement:0
+msgid "Open Statements"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.add.product:0
+msgid "Save & New"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Sales total(Revenue)"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Total paid"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,check_dtls:0
+msgid "Check Details"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Qty of product"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,contract_number:0
+msgid "Contract Number"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "March"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/pos.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist in the sale form !\n"
+"' \\n                'Please set one before choosing a product."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_users_product_re
+#: report:pos.user.product:0
+msgid "User's Product"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Partner Ref."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
+#: model:ir.model,name:point_of_sale.model_pos_close_statement
+#: view:pos.close.statement:0
+msgid "Close Statements"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.box.entries,journal_id:0
+#: field:pos.box.out,journal_id:0
+msgid "Register"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/pos.py:0
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product\" \\n                   "
+" \" and quantity.\n"
+"You have to change either the product,\" \\n                    \" the "
+"quantity or the pricelist."
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.journal:0
+msgid "Extended Configureation"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Starting Balance"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.payment.report.user:0
+msgid "Payment By User"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,type_rec:0
+msgid "Type of Receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_accepted
+msgid "Accepted Sales"
+msgstr ""
+
+#. module: point_of_sale
+#: help:account.journal,check_dtls:0
+msgid ""
+"This field authorize Validation of Cashbox without checking ending details"
+msgstr ""
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+msgid "St.Name"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Sales total"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "Sum of subtotals"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_date:0
+msgid "Payment date"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,lines:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:account.invoice:0
+msgid "Error: Invalid Bvr Number (wrong checksum)."
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS "
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+msgid "Total :"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/pos.py:0
+#, python-format
+msgid "Create line failed !"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.sales.by.margin.pos,product_name:0
+#: field:report.sales.by.margin.pos.month,product_name:0
+msgid "Product Name"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/pos.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
+#: field:pos.order,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Total invoiced"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,product_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_return
+msgid "Point of sale return"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month
+msgid "Sales by margin monthly"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: field:report.sales.by.margin.pos,date_order:0
+#: field:report.sales.by.margin.pos.month,date_order:0
+#: field:report.sales.by.user.pos,date_order:0
+#: field:report.sales.by.user.pos.month,date_order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Today's Closed Cashbox"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: field:product.product,expense_pdt:0
+msgid "Product for expenses"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sales_user_today_current_user
+#: view:pos.sales.user.today.current_user:0
+msgid "Sales for Current User"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "September"
+msgstr ""
+
+#. module: point_of_sale
+#: model:account.journal,name:point_of_sale.pos_bankcard_journal
+msgid "Bancontact Journal"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Opening Date"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,disc:0
+msgid "Disc."
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr ""
 
@@ -537,155 +882,63 @@ msgid "POS Order lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "E-mail :"
+#: view:pos.receipt:0
+msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
-msgid "Total invoiced"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree_today
-msgid "Sales of the day"
-msgstr ""
-
-#. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order.line:0
-msgid "POS Order line"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_discount
-msgid "Discount"
-msgstr ""
-
-#. module: point_of_sale
-#: field:report.transaction.pos,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: point_of_sale
-#: field:pos.payment,payment_date:0
-msgid "Payment Date"
-msgstr ""
-
-#. module: point_of_sale
-#: field:pos.payment,payment_name:0
-msgid "Payment Name"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
-msgid "Sales by user"
+#: view:report.pos.order:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,add:0
-#: view:pos.order:0
-msgid "_Add product"
+#: field:pos.order,num_sale:0
+msgid "Internal Note"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.receipt:0
-msgid ":"
+#: model:ir.model,name:point_of_sale.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
-msgid "Period:"
+#: model:ir.model,name:point_of_sale.model_report_transaction_pos
+msgid "transaction for the pos"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree
-msgid "All the sales"
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:0
+#, python-format
+msgid "UserError "
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
-msgid "Compute"
+#: model:ir.model,name:point_of_sale.model_pos_box_entries
+msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Total:"
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:0
+#, python-format
+msgid "You can't modify this order. It has already been paid"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: point_of_sale
-#: view:pos.order:0
-msgid "Create _Invoice"
-msgstr ""
-
-#. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.order.line,qty:0
-msgid "Quantity"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Refund"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
-msgid "Mode of payment"
-msgstr ""
-
-#. module: point_of_sale
-#: wizard_button:pos.payment,ask_pay,add_pay:0
-msgid "Ma_ke payment"
-msgstr ""
-
-#. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
-msgid "Apply Discount"
-msgstr ""
-
-#. module: point_of_sale
-#: field:pos.order,pricelist_id:0
-msgid "Pricelist"
-msgstr ""
-
-#. module: point_of_sale
-#: wizard_field:pos.discount,init,discount:0
-msgid "Discount percentage"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
-msgid "Receipt"
-msgstr ""
-
-#. module: point_of_sale
-#: wizard_view:pos.refund_order,init:0
-msgid "Refund order :"
+#: field:pos.details,date_end:0
+#: field:pos.sale.user,date_end:0
+msgid "Date End"
 msgstr ""
 
 #. module: point_of_sale
@@ -694,61 +947,586 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Net Total:"
-msgstr ""
-
-#. module: point_of_sale
-#: view:pos.order:0
-msgid "Other"
-msgstr ""
-
-#. module: point_of_sale
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-msgid "Done"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
-#: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
-msgid "Invoice"
-msgstr ""
-
-#. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
-#: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-msgid "Close"
+msgid "Return Picking"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
+msgid "Sales (summary)"
+msgstr ""
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Information"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
+msgid "Input Operations"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_sales_user_today
+msgid "Sale by Users"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.payment.report:0
+msgid "Payment For Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,first_name:0
+msgid "First Name"
+msgstr ""
+
+#. module: point_of_sale
+#: view:res.company:0
+msgid "Other"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_order_line
+msgid "Lines of Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-msgid "Order lines"
+#: view:report.transaction.pos:0
+msgid "Amount total"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.journal:0
+#: field:account.journal,journal_users:0
+msgid "Users"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+msgid "Price"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.scan.product,gencod:0
+msgid "Barcode"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
+msgid "Output Operations"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Start Period"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+msgid "Name"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+msgid "]"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
+#: view:report.cash.register:0
+#: view:report.pos.order:0
+msgid "Group By..."
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Document"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "POS Orders"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
+msgid "All Closed CashBox"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/pos.py:0
+#, python-format
+msgid "No Pricelist !"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
+msgid "Select an Open Sale Order"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Order date"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Base"
+msgstr ""
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Account"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,sale_manager:0
+msgid "Salesman Manager"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Notes"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: field:pos.order,amount_tax:0
+msgid "Taxes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
+msgid "Sale line"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.config.journal,code:0
+#: report:pos.details:0
+msgid "Code"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_product_input
+#: model:ir.actions.act_window,name:point_of_sale.action_product_output
+#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale_product
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_products
+msgid "Products"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report
+msgid "Payment Report For Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,special_journal:0
+msgid "Special Journal"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:account.invoice:0
+msgid "Error: BVR reference is required."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_all_closed_cashbox_of_the_day
+msgid "All closed cashbox of the day"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,user_id:0
+msgid "Connected Salesman"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_out.py:0
+#, python-format
+msgid ""
+"The maximum value you can still withdraw is exceeded. \n"
+" Remaining value is equal to %d "
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Print the receipt of the sale"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
+msgid "Qty"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+#: view:report.pos.order:0
+msgid "Month -1"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sale_user
+#: model:ir.model,name:point_of_sale.model_pos_sale_user
+#: view:pos.payment.report.user:0
+msgid "Sale by User"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:0
+#: code:addons/point_of_sale/wizard/pos_box_out.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:0
+#, python-format
+msgid ""
+"You can not open a Cashbox for \"%s\".\n"
+"Please close its related Register.' %(journal.name)))\n"
+"            \n"
+"            number = ''\n"
+"            if journal.sequence_id:\n"
+"                number = sequence_obj.get_id(cr, uid, "
+"journal.sequence_id.id)\n"
+"            else:\n"
+"                number = sequence_obj.get(cr, uid, 'account.cash.statement"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm
+msgid "Sale Confirm"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "state"
+msgstr ""
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Prices"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "July"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/pos.py:0
+#, python-format
+msgid "Please provide an account for the product: %s"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.pos.order,delay_validation:0
+msgid "Delay Validation"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,nb_print:0
+msgid "Number of Print"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_make_payment
+msgid "Point of Sale Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "End Period"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,auto_cash:0
+msgid "Automatic Opening"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,price_ded:0
+msgid "Discount(Amount)"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_add_product.py:0
+#, python-format
+msgid "Active ID is not found"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.bank.statement.line,is_acc:0
+msgid "Is accompte"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/pos.py:0
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product\" \\n                \" "
+"and quantity.\n"
+"You have to change either the product,\" \\n                \" the quantity "
+"or the pricelist."
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+#: field:report.cash.register,month:0
+#: view:report.pos.order:0
+#: field:report.pos.order,month:0
+msgid "Month"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Sales Order POS"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+msgid "Statement Name"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
+#: model:ir.ui.menu,name:point_of_sale.menu_cash_register
+#: field:pos.make.payment,journal:0
+msgid "Cash Register"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.payment.report.date,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_receipt
+msgid "Point of sale receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_payment.py:0
+#, python-format
+msgid "No order lines defined for this sale "
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_today
+msgid "Sales by User Daily margin"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,note_2:0
+msgid "Customer Note"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_open_statement
+msgid "Open Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/pos.py:0
+#, python-format
+msgid "No order lines defined for this sale."
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.cash.register,balance_start:0
+msgid "Opening Balance"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,amount_paid:0
+#: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
+msgid "Paid"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
+msgid "All sales lines"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:pos.order,state:0
+#: selection:report.cash.register,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.make.payment:0
+msgid "The register must be opened to be able to execute a payment."
+msgstr ""
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+msgid "Total:"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
+msgid "Sales by margin"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_config_journal
+msgid "Journal Configuration"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Statement lines"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,invoice_id:0
+msgid "Nbr Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/pos.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist in the sale form !\n"
+"' \\n                    'Please set one before choosing a product."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
+msgid "Receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,invoice_wanted:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
+#: field:pos.order,invoice_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_get_sale
+msgid "Get From Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+#: selection:report.cash.register,state:0
+msgid "Open"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
-msgid "Add payment :"
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_repport_date
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_payment_report_date
+msgid "Sales lines Report"
 msgstr ""
 
 #. module: point_of_sale
@@ -759,122 +1537,90 @@ msgstr ""
 "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
 #. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_pos_payment
-msgid "Pos Payment"
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
+msgid "Close Register"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
-msgid "Total discount"
+#: model:ir.actions.act_window,name:point_of_sale.action_box_entries
+#: view:pos.box.entries:0
+msgid "Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,invoice_wanted:0
-msgid "Create Invoice"
+#: selection:pos.order,price_type:0
+msgid "Tax excluded"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.refund_order,init:0
-msgid "Refund "
+#: field:report.sales.by.margin.pos,net_margin_per_qty:0
+#: field:report.sales.by.margin.pos.month,net_margin_per_qty:0
+msgid "Net margin per Qty"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_pos_order_line
-msgid "Lines of Point of Sale"
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: code:addons/point_of_sale/pos.py:0
+#, python-format
+msgid ""
+"There is no receivable account defined for this journal:'\\n                 "
+"   ' \"%s\" (id:%d)"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
-#: view:report.transaction.pos:0
-msgid "Amount total"
+#: model:ir.model,name:point_of_sale.model_report_pos_order
+msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.order:0
-msgid "Invoicing"
-msgstr ""
-
-#. module: point_of_sale
-#: field:pos.config.journal,journal_id:0
-#: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
-msgid "Journal"
-msgstr ""
-
-#. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
-msgid "Barcode"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Canceled Invoice"
-msgstr ""
-
-#. module: point_of_sale
-#: view:report.transaction.pos:0
-msgid "POS"
-msgstr ""
-
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
 msgid "Pos Lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Tel. :"
+#: field:product.product,disc_controle:0
+msgid "Discount Control"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_nb:0
-msgid "Piece Number"
+#: field:report.cash.register,balance_end_real:0
+msgid "Closing Balance"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.config.journal,init,default_journal_gift:0
-msgid "Default gift journal"
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_details
+msgid "Sale Details"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
-#: view:pos.order:0
-msgid "Payment"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_tree3
-msgid "All orders"
-msgstr ""
-
-#. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
-msgid "Sale Order"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree_month
-msgid "Sales of the month"
-msgstr ""
-
-#. module: point_of_sale
-#: view:pos.order:0
-msgid "D_iscount"
+#: field:pos.payment.report.date,date_end:0
+msgid "End Date"
 msgstr ""
 
 #. module: point_of_sale
@@ -882,23 +1628,716 @@ msgstr ""
 msgid "Date Ordered"
 msgstr ""
 
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_report_user
+#: model:ir.model,name:point_of_sale.model_pos_payment_report_user
+msgid "Sales lines by Users"
+msgstr ""
+
+#. module: point_of_sale
+#: field:res.company,max_diff:0
+msgid "Max Difference for Cashboxes"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+#: view:pos.confirm:0
+#: view:pos.open.statement:0
+msgid "Yes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_cash_register
+#: view:report.cash.register:0
+msgid "Point of Sale Cash Register Analysis"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Mode of Taxes"
+msgstr ""
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Product Description"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
+#: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register
+msgid "Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.details,date_start:0
+#: field:pos.sale.user,date_start:0
+msgid "Date Start"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
+msgid "Total"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.sale.user:0
+msgid "Sale By User"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: model:ir.actions.report.xml,name:point_of_sale.account_statement
+msgid "Statement"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,name:0
+msgid "Order Description"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.make.payment,num_sale:0
+msgid "Num.File"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment_report
+#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_date
+#: model:ir.model,name:point_of_sale.model_pos_payment_report
+#: view:pos.payment.report:0
+msgid "Payment Report"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_view_pos_return
+msgid "Return lines"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,serial_number:0
+msgid "Serial Number"
+msgstr ""
+
 #. module: point_of_sale
 #: view:pos.order:0
+msgid "Reprint"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:0
+#: code:addons/point_of_sale/wizard/pos_box_out.py:0
+#, python-format
+msgid "You have to open at least one cashbox"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_user
+msgid "Today's Payment By User"
+msgstr ""
+
+#. module: point_of_sale
+#: field:stock.picking,pos_order:0
+msgid "Pos order"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_payment.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "No. Of Articles"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,date_validity:0
+msgid "Validity Date"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,pickings:0
+msgid "Picking"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,picking_id:0
+msgid "Last Output Picking"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.user.product:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS Report"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_discount
+msgid "Add Discount"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,qty_rfd:0
+msgid "Refunded Quantity"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.scan.product:0
+msgid "Scan Barcode"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.box.entries,product_id:0
+#: field:pos.box.out,product_id:0
+msgid "Operation"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
+msgid "Sales Order"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,journal_entry:0
+msgid "Journal Entry"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
+msgid "Confirm"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.payment.report.date:0
+msgid "Sales Lines"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.discount,discount:0
+msgid "Discount "
+msgstr ""
+
+#. module: point_of_sale
+#: model:account.journal,name:point_of_sale.pos_visa_journal
+msgid "Visa Journal"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/pos.py:0
+#, python-format
+msgid "Modify line failed !"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_name:0
+msgid "Payment name"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:0
+#, python-format
+msgid "Registers are already closed."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_rep
+msgid "Reporting"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
+msgid "Products for Input Operations"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today_current_user
+msgid "Today's Sales by Current User"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.entries:0
+msgid "Put Money"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#. module: point_of_sale
+#: report:pos.user.product:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/pos.py:0
+#, python-format
+msgid ""
+"There is no income '\\n                        'account defined for this "
+"product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,date_validation:0
+#: field:report.pos.order,date_validation:0
+msgid "Validation Date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
+msgid "Invoices"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "December"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,total_discount:0
+msgid "Total Discount"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Take Money"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_details
+#: model:ir.model,name:point_of_sale.model_pos_sales_user_today_current_user
+msgid "Sales Details"
+msgstr ""
+
+#. module: point_of_sale
+#: field:product.product,am_out:0
+msgid "Control for Output Operations"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:0
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:0
+#, python-format
+msgid "Message"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
+#: model:ir.model,name:point_of_sale.model_pos_order
+#: model:ir.ui.menu,name:point_of_sale.menu_point_root
+msgid "Point of Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+#: view:pos.confirm:0
+#: view:pos.open.statement:0
+msgid "No"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,notice:0
+msgid "Discount Notice"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.scan.product:0
+msgid "Add"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Order line"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid "Are you sure you want to open the statements ?"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_payment_report_date
+msgid "POS Payment Report according to date"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/pos.py:0
+#, python-format
+msgid "Please provide a partner for the sale."
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,user_salesman_id:0
+msgid "Cashier"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
+#: field:report.transaction.pos,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
+msgid "Sales by user"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "November"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Print Receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "January"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Orders lines"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/pos.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,journal_id:0
+msgid "Sales Journal"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Refund"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/report/pos_invoice.py:0
+#, python-format
+msgid "Please create an invoice for this sale."
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: field:report.pos.order,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+msgid "Disc(%)"
+msgstr ""
+
+#. module: point_of_sale
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
+msgid "Close"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Order lines"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,price_subtotal:0
+msgid "Subtotal w/o Tax"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
+msgid "Pyament Report"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,jl_id:0
+msgid "Cash Journals"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.details:0
+msgid "POS Details :"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.sales.user.today:0
+msgid "Today's Sales By User"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+msgid "Please fill these fields for entries to the box:"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_out.py:0
+#, python-format
+msgid "please check that account is set to %s"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
+#: field:pos.config.journal,name:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+msgid "Description"
+msgstr ""
+
+#. module: point_of_sale
+#: model:account.journal,name:point_of_sale.pos_cash_journal
+msgid "Cash Journal"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Sales lines"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,note:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.add.product:0
+msgid "Save & Close"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Running"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_all_closed_cashbox_of_the_day
+msgid "All Cashboxes Of the day"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all
+#: model:ir.ui.menu,name:point_of_sale.menu_report_pos_order_all
+#: view:report.pos.order:0
+msgid "Point of Sale Analysis"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.make.payment,partner_id:0
+#: view:pos.order:0
+#: field:pos.order,partner_id:0
+#: view:report.pos.order:0
+msgid "Customer"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.make.payment,is_acc:0
+#: field:pos.make.payment,product_id:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
+msgid "Advance"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "February"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "    Today    "
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,remboursed:0
+msgid "Remboursed"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree_open
+msgid "Opened Sales"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "April"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Supplier Refund"
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+msgid "Print Date"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
-msgid "Description"
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_month
+msgid "Sales by User Monthly margin"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Search Sales Order"
 msgstr ""
 
 #. module: point_of_sale
@@ -907,67 +2346,24 @@ msgid "Account Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_id:0
-#: field:pos.payment,payment_id:0
-msgid "Payment Term"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
-#: field:report.transaction.pos,amount:0
-msgid "Amount"
-msgstr ""
-
-#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_add_product.py:0
+#: code:addons/point_of_sale/wizard/pos_return.py:0
+#: view:pos.make.payment:0
 #: view:pos.order:0
-msgid "Actions"
+#, python-format
+msgid "Make Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: help:pos.order,salesman_id:0
-msgid "This is the salesman actually making the order."
+#: model:ir.model,name:point_of_sale.model_pos_sales_user_today
+#: view:pos.sales.user.today:0
+msgid "Sales User Today"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
-msgid "Mode of Taxes"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
-msgid "Print Date:"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
-msgid "Company:"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.lines:0
-msgid "Print Date"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "OPERATION N° :"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.lines:0
-#: field:pos.order,amount_total:0
-msgid "Total"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
-msgid "Price"
+#: view:report.cash.register:0
+#: field:report.cash.register,year:0
+#: view:report.pos.order:0
+#: field:report.pos.order,year:0
+msgid "Year"
 msgstr ""
diff --git a/addons/project_scrum/i18n/ru.po b/addons/project_scrum/i18n/ru.po
index 5cd546304df..781d3fb1b72 100644
--- a/addons/project_scrum/i18n/ru.po
+++ b/addons/project_scrum/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-22 19:39+0000\n"
+"PO-Revision-Date: 2010-10-23 07:03+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-10-23 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-10-24 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index ab2266375ee..36024f72900 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-22 10:50+0000\n"
+"PO-Revision-Date: 2010-10-24 15:52+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-10-23 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -686,7 +686,7 @@ msgstr "Налоговая позиция"
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Request for Quotation N°"
-msgstr "Запрос на расценки №"
+msgstr "Запрос цен №"
 
 #. module: purchase
 #: field:purchase.order,invoice_id:0
@@ -746,7 +746,7 @@ msgstr "Получено"
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
 msgid "Request for Quotation"
-msgstr "Запрос цены"
+msgstr "Запрос цен"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinginvoice0
@@ -775,7 +775,7 @@ msgid ""
 "    Request for quotation, Create Supplier Invoice, Print Order..."
 msgstr ""
 "Модуль управления закупками\n"
-"    Запрос цены, создание счета поставщика, печать заказа..."
+"    Запрос цен, создание счета поставщика, печать заказа..."
 
 #. module: purchase
 #: field:purchase.order.line,product_id:0
@@ -859,7 +859,7 @@ msgstr "Контроль закупок"
 #: model:ir.actions.act_window,name:purchase.purchase_form_action2
 #: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
 msgid "Request For Quotations"
-msgstr "Запрос цены"
+msgstr "Запрос цен"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -922,7 +922,7 @@ msgstr "Итоговая цена"
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Quotation"
-msgstr "Опубликованная цена"
+msgstr "Предложение (оферта)"
 
 #. module: purchase
 #: selection:report.purchase.order.category,state:0
diff --git a/addons/purchase_analytic_plans/i18n/ru.po b/addons/purchase_analytic_plans/i18n/ru.po
index ac960e8f8ba..80364d09207 100644
--- a/addons/purchase_analytic_plans/i18n/ru.po
+++ b/addons/purchase_analytic_plans/i18n/ru.po
@@ -6,27 +6,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:28+0000\n"
-"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-24 15:20+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@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-09-30 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase_analytic_plans
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильный XML для просмотра архитектуры!"
+
+#. module: purchase_analytic_plans
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Название объекта должно начинаться с x_  и не должно содержать специальных "
+"символов !"
+
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
 msgid "Analytic Distribution"
 msgstr "Аналитическое распределение"
 
+#. module: purchase_analytic_plans
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr "Позиция заказа на закупку"
+
+#. module: purchase_analytic_plans
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order
+msgid "Purchase Order"
+msgstr "Заказ на закупку"
+
 #. module: purchase_analytic_plans
 #: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
 msgid "Purchase Analytic Distribution Management"
 msgstr "Управление аналитическим распределением закупок"
-
-#. module: purchase_analytic_plans
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
diff --git a/addons/resource/i18n/de.po b/addons/resource/i18n/de.po
index 63c3fdd1e05..d70131a7a06 100644
--- a/addons/resource/i18n/de.po
+++ b/addons/resource/i18n/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-18 06:50+0000\n"
-"PO-Revision-Date: 2010-10-11 07:17+0000\n"
-"Last-Translator: Ferdinand-chricar <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-24 09:08+0000\n"
+"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: German <de@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-10-13 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
@@ -59,6 +59,7 @@ msgstr "Abwesende Ressourcen"
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
 #: view:resource.calendar.leaves:0
+#: view:resource.resource:0
 msgid "Working Time"
 msgstr "Arbeitszeit"
 
@@ -73,7 +74,6 @@ msgid "Thursday"
 msgstr "Donnerstag"
 
 #. module: resource
-#: view:resource.calendar:0
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 msgid "Group By..."
@@ -149,6 +149,11 @@ msgstr "Wochentag"
 msgid "Starting date"
 msgstr "Anfangsdatum"
 
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Reason"
+msgstr ""
+
 #. module: resource
 #: view:resource.resource:0
 #: field:resource.resource,user_id:0
@@ -187,25 +192,11 @@ msgstr "Ressource"
 #: view:resource.calendar:0
 #: field:resource.calendar,name:0
 #: field:resource.calendar.attendance,name:0
-#: view:resource.calendar.leaves:0
 #: field:resource.calendar.leaves,name:0
 #: field:resource.resource,name:0
 msgid "Name"
 msgstr "Bezeichnung"
 
-#. module: resource
-#: model:ir.module.module,description:resource.module_meta_information
-msgid ""
-"\n"
-"    Module for resource management\n"
-"     A resource represent something that can be scheduled\n"
-"     (a developer on a task or a workcenter on manufacturing orders).\n"
-"     This module manages a resource calendar associated to every resource.\n"
-"     It also manages the leaves of every resource.\n"
-"\n"
-"    "
-msgstr ""
-
 #. module: resource
 #: help:resource.resource,active:0
 msgid ""
@@ -299,9 +290,14 @@ msgid "Resource Leaves"
 msgstr "Ressource Abwesenheiten"
 
 #. module: resource
-#: view:resource.calendar:0
-msgid "Manager"
-msgstr "Manager"
+#: view:resource.resource:0
+msgid "General Information"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Inactive"
+msgstr ""
 
 #. module: resource
 #: code:addons/resource/faces/resource.py:0
@@ -329,7 +325,16 @@ msgstr "Arbeitsdetail"
 msgid "Start Date"
 msgstr "Startdatum"
 
+#. module: resource
+#: code:addons/resource/resource.py:0
+#, python-format
+msgid " (copy)"
+msgstr ""
+
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Saturday"
 msgstr "Samstag"
+
+#~ msgid "Manager"
+#~ msgstr "Manager"
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 611e5e32534..0cb51bbb046 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-22 20:01+0000\n"
+"PO-Revision-Date: 2010-10-24 17:27+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-10-23 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -43,6 +43,9 @@ msgid ""
 "But it's not compatible with the selected packaging.\n"
 "Here is a proposition of quantities according to the packaging: "
 msgstr ""
+"Вы выбрали количество %d единиц.\n"
+"Но это не соответствует выбранной упаковке.\n"
+"Предложение количеств в соответствии с упаковкой: "
 
 #. module: sale
 #: view:sale.report:0
@@ -135,6 +138,11 @@ msgid ""
 "the product is a service, shipped quantities means hours spent on the "
 "associated tasks."
 msgstr ""
+"Заказ на продажу будет автоматически создавать черновик счета. Заказанное и "
+"доставленное количество может не совпадать. Вы можете выбрать на основе чего "
+"будет счет, на основе заказанного количества или на основе доставленного. "
+"Если продукция это услуги, то доставленное количество это часы потраченные "
+"на выполнение услуг."
 
 #. module: sale
 #: view:sale.report:0
@@ -280,7 +288,7 @@ msgstr "Закупка скорректирована"
 #. module: sale
 #: view:sale.order:0
 msgid "Conditions"
-msgstr ""
+msgstr "Условия"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -358,7 +366,7 @@ msgstr "Дата предложения"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_open_invoice
 msgid "Sale Open Invoice"
-msgstr ""
+msgstr "Открыть счет на продажу"
 
 #. module: sale
 #: field:sale.order,fiscal_position:0
@@ -384,7 +392,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,number_packages:0
 msgid "Number Packages"
-msgstr ""
+msgstr "Количество упаковок"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -560,7 +568,7 @@ msgstr "Кол-во позиций"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sale Make Invoice"
-msgstr ""
+msgstr "Создать счет на продажу"
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
@@ -586,7 +594,7 @@ msgstr "Сумма до налогов"
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
 msgid "Lines to Invoice"
-msgstr ""
+msgstr "Позиции в счет"
 
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
@@ -598,6 +606,8 @@ msgstr "Количество  (ед.изм.)"
 msgid ""
 "Provides some features to improve the layout of the Sales Order reports."
 msgstr ""
+"Предоставляет некоторые возможности для улучшения шаблона отчета заказа на "
+"продажу."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -684,7 +694,7 @@ msgstr "Доставлено"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "invalid mode for test_state"
-msgstr ""
+msgstr "неверный режим для test_state"
 
 #. module: sale
 #: help:sale.order,amount_tax:0
@@ -739,7 +749,7 @@ msgstr "Продажи по месяцу"
 #. module: sale
 #: field:res.company,security_lead:0
 msgid "Security Days"
-msgstr ""
+msgstr "Запас по сроку (дней)"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
@@ -759,22 +769,22 @@ msgstr "Расширенные фильтры..."
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
-msgstr ""
+msgstr "Исключительная ситуация"
 
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Компании"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: sale
 #: view:sale.order:0
@@ -789,6 +799,11 @@ msgid ""
 "the sale order. There is 1 pick list by sale order line which evolves with "
 "the availability of parts."
 msgstr ""
+"Форма комплектовочного листа создается как только подтверждается заказ на "
+"продажу, в одно время с заказом на снабжение. Он представляет из себя "
+"выделение продукции для заказа на закупку. Для каждой позиции заказа свой "
+"комплектовочный лист, который изменяется в зависимости от доступности "
+"продукции."
 
 #. module: sale
 #: report:sale.order:0
@@ -799,13 +814,13 @@ msgstr "Ваша ссылка"
 #: help:sale.order,partner_order_id:0
 msgid ""
 "The name and address of the contact who requested the order or quotation."
-msgstr ""
+msgstr "Имя и адрес контакта запросившего заказ или предложение."
 
 #. module: sale
 #: help:res.company,security_lead:0
 msgid ""
 "This is the days added to what you promise to customers for security purpose"
-msgstr ""
+msgstr "Это количество дней, добавляемых к обещанному сроку для надежности"
 
 #. module: sale
 #: view:sale.order:0
@@ -816,7 +831,7 @@ msgstr "Кол-во"
 #. module: sale
 #: view:sale.order:0
 msgid "References"
-msgstr ""
+msgstr "Ссылки"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -832,12 +847,12 @@ msgstr "Отмена"
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist version for current sale order"
-msgstr ""
+msgstr "Версия каталога для текущего заказа на продажу"
 
 #. module: sale
 #: field:sale.installer,sale_order_dates:0
 msgid "Sales Order Dates"
-msgstr ""
+msgstr "Даты заказа на продажу"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
@@ -858,12 +873,12 @@ msgstr "Создать счет"
 #. module: sale
 #: field:sale.installer,sale_margin:0
 msgid "Margins in Sales Orders"
-msgstr ""
+msgstr "Прибыль в заказах на продажу"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Excluded"
-msgstr ""
+msgstr "Всего без налогов"
 
 #. module: sale
 #: view:sale.order:0
@@ -876,6 +891,9 @@ msgid ""
 "Incoterm which stands for 'International Commercial terms' implies its a "
 "series of sales terms which are used in the commercial transaction"
 msgstr ""
+"Инкотерм, который обозначает 'Международные торговые термины ', представляют "
+"собой стандартные условия договора международной купли-продажи, которые "
+"определены заранее в международно признанном документе."
 
 #. module: sale
 #: field:sale.order,partner_order_id:0
@@ -886,7 +904,7 @@ msgstr "Контакт"
 #: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
 #: view:sale.open.invoice:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "Открыть счет"
 
 #. module: sale
 #: report:sale.order:0
@@ -897,12 +915,12 @@ msgstr "Цена"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_installer
 msgid "Sales Application Configuration"
-msgstr ""
+msgstr "Настройка продаж"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_forceassignation0
 msgid "Force Assignation"
-msgstr ""
+msgstr "Назначить насильно"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -912,7 +930,7 @@ msgstr "в заказе"
 #. module: sale
 #: model:process.node,note:sale.process_node_invoiceafterdelivery0
 msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
+msgstr "На основании отгруженного или заказанного количества."
 
 #. module: sale
 #: field:sale.order,picking_ids:0
@@ -932,12 +950,12 @@ msgstr "Адрес доставки :"
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
 msgid "Drives procurement and invoicing"
-msgstr ""
+msgstr "Управлять снабжением и выставлением счетов"
 
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Sequence Number"
-msgstr ""
+msgstr "Последовательный номер"
 
 #. module: sale
 #: field:product.product,pricelist_sale:0
@@ -956,6 +974,8 @@ msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
 "The real stock is %.2f %s. (without reservations)"
 msgstr ""
+"Вы планируете продать %.2f %s но имеете только %.2f %s !\n"
+"Действительные запасы %.2f %s. (без резервов)"
 
 #. module: sale
 #: field:sale.installer,delivery:0
@@ -966,23 +986,23 @@ msgstr "Стоимость доставки"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The sale order '%s' has been set in draft state."
-msgstr ""
+msgstr "Заказ на продажу '%s' был установлен в состояние \"Черновик\"."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The sale order '%s' has been cancelled."
-msgstr ""
+msgstr "Заказ на продажу '%s' был отменен."
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Create Pick List"
-msgstr ""
+msgstr "Создать комплектовочный лист"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Product Category"
-msgstr ""
+msgstr "Продажи по категориям продукции"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
@@ -1004,7 +1024,7 @@ msgstr "Подтвердить предложение цен"
 #: view:sale.order.line:0
 #: view:sale.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Объединять по..."
 
 #. module: sale
 #: view:sale.order:0
@@ -1015,7 +1035,7 @@ msgstr "Воссоздать счет"
 #: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
 msgid "Deliveries to Invoice"
-msgstr ""
+msgstr "Доставки в Счета"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1026,7 +1046,7 @@ msgstr "В ожидании расписания"
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "Метод снабжения"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
@@ -1037,7 +1057,7 @@ msgstr ""
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Pick List"
-msgstr ""
+msgstr "Комплектовочный лист"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -1047,7 +1067,7 @@ msgstr "Счет из доставки"
 #. module: sale
 #: view:sale.order:0
 msgid "Order date"
-msgstr ""
+msgstr "Дата заказа"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
@@ -1073,7 +1093,7 @@ msgstr "Подтвердить заказ"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleprocurement0
 msgid "Create Procurement Order"
-msgstr ""
+msgstr "Создать заказ на снабжение"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order
@@ -1098,6 +1118,9 @@ msgid ""
 "salesman. Depending on the Invoicing control of the sale order, the invoice "
 "is based on delivered or on ordered quantities."
 msgstr ""
+"Заказ на продажу генерирует счет как только он подтверждается менеджером "
+"продаж. В зависимости от режима управления выставлением счетов по заказам на "
+"продажу, счет основан на доставленном или заказанном количестве."
 
 #. module: sale
 #: field:sale.order,order_policy:0
@@ -1107,13 +1130,13 @@ msgstr "Политика доставки"
 #. module: sale
 #: model:ir.model,name:sale.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Движение запасов"
 
 #. module: sale
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "Создать счета"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -1125,6 +1148,11 @@ msgid ""
 "The 'Waiting Schedule' state is set when the invoice is confirmed but "
 "waiting for the scheduler to run on the date 'Ordered Date'."
 msgstr ""
+"Дает состояние предложения или заказа на продажу. \n"
+"Исключительная ситуация автоматически устанавливается если при обработке "
+"счета или при комплектовании была использована операция \"Отмена\". \n"
+"Состояние \"Ожидание расписания\" устанавливается когда счет подтвержден, но "
+"ожидает когда планировщик сработает по дате \"Дата заказа\"."
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -1139,6 +1167,16 @@ msgid ""
 "           \n"
 "* The 'Cancelled' state is set when a user cancel the sale order related."
 msgstr ""
+"* Состояние 'Черновик' устанавливается когда соответствующий заказ на "
+"продажу в состоянии 'Черновик'.                     \n"
+"* Состояние 'Подтверждено' устанавливается когда соответствующий заказ на "
+"продажу подтвержден.                     \n"
+"* Состояние 'Исключительна ситуация' устанавливается когда соответствующий "
+"заказ на продажу в состоянии 'Исключительна ситуация'.                     \n"
+"* Состояние 'Выполнено' устанавливается когда позиция заказа на продажу "
+"скомплектована.                     \n"
+"* Состояние 'Отменено' устанавливается когда соответствующий заказ на "
+"продажу отменен пользователем."
 
 #. module: sale
 #: view:sale.order:0
@@ -1159,7 +1197,7 @@ msgstr "Сумма аванса"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_sales_product_total_price
 msgid "Sales by Product's Category"
-msgstr ""
+msgstr "Продажи по категориям продукции"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -1182,17 +1220,19 @@ msgid ""
 "The salesman confirms the quotation. The state of the sale order becomes 'In "
 "progress' or 'Manual in progress'."
 msgstr ""
+"Менеджер продаж подтверждает предложение. Состояние заказа на продажу "
+"становится \"В процессе\" или \"В процессе вручную\"."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Ошибка !"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #. module: sale
 #: field:sale.order.line,procurement_id:0
@@ -1225,7 +1265,7 @@ msgstr "Комплектовочная информация !"
 #: view:sale.report:0
 #: field:sale.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Месяц"
 
 #. module: sale
 #: model:ir.module.module,shortdesc:sale.module_meta_information
@@ -1236,17 +1276,17 @@ msgstr "Управление продажами"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid " Quantity: "
-msgstr ""
+msgstr " Количество: "
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "Будет проверено бухгалтером"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Drives procurement orders for every sale order line."
-msgstr ""
+msgstr "Управляет заказами на снабжение для каждой позиции заказа на продажу"
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -1270,7 +1310,7 @@ msgstr ""
 #. module: sale
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Ошибка ! Нельзя создать зацикленные меню."
 
 #. module: sale
 #: help:sale.config.picking_policy,step:0
@@ -1280,11 +1320,14 @@ msgid ""
 "and simple methods to deliver products to the customer in one or two "
 "operations by the worker."
 msgstr ""
+"По умолчанию Open ERP в состоянии управлять сложными маршрутами и путями ТМЦ "
+"на ваш склад и в места хранения партнера. Это позволит настроить наиболее "
+"общие и простые методы доставки ТМЦ до заказчика за одно или два действия."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
 msgid "Old Quotations"
-msgstr ""
+msgstr "Старые предложения"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1296,12 +1339,12 @@ msgstr "Оплачено"
 #: model:ir.ui.menu,name:sale.menu_report_product_all
 #: view:sale.report:0
 msgid "Sales Analysis"
-msgstr ""
+msgstr "Анализ продаж"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Draft state of sale order"
-msgstr ""
+msgstr "Заказа на закупку в состояние \"Черновик\""
 
 #. module: sale
 #: field:sale.order.line,property_ids:0
@@ -1336,12 +1379,12 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Related Invoices"
-msgstr ""
+msgstr "Связанные счета"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sale order to invoice."
-msgstr ""
+msgstr "Подтвержденный заказ на продажу в счет."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -1381,7 +1424,7 @@ msgstr "Счет"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel sale order line!"
-msgstr ""
+msgstr "Нельзя отменить позицию заказа на продажу!"
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
@@ -1409,7 +1452,7 @@ msgstr "Политика комплектования"
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Document of the move to the customer."
-msgstr ""
+msgstr "Документ перемещения к заказчику."
 
 #. module: sale
 #: field:sale.config.picking_policy,order_policy:0
@@ -1419,7 +1462,7 @@ msgstr "Политика доставки по умолчанию"
 #. module: sale
 #: field:sale.order,incoterm:0
 msgid "Incoterm"
-msgstr ""
+msgstr "Инкотерм"
 
 #. module: sale
 #: model:ir.model,name:sale.model_product_product
@@ -1433,17 +1476,17 @@ msgstr "Продукция"
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_invoiced
 msgid "Invoicing"
-msgstr ""
+msgstr "Выставление счетов"
 
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sale order is confirmed"
-msgstr ""
+msgstr "Дата на которую подтвержден заказ на продажу"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
 msgid "Cancel Assignation"
-msgstr ""
+msgstr "Отменить назначение"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_picking_policy
@@ -1453,7 +1496,7 @@ msgstr "sale.config.picking_policy"
 #. module: sale
 #: field:sale.order,invoice_quantity:0
 msgid "Invoice on"
-msgstr ""
+msgstr "Счет на"
 
 #. module: sale
 #: report:sale.order:0
@@ -1463,35 +1506,35 @@ msgstr "Дата заказа"
 #. module: sale
 #: field:sale.order.line,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "Вторая ед. изм."
 
 #. module: sale
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
-msgstr ""
+msgstr "В процессе вручную"
 
 #. module: sale
 #: field:sale.order.line,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "Ед. изм. продукции"
 
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_sales_by_salesman
 #: view:sale.report:0
 msgid "Sales By Salesman"
-msgstr ""
+msgstr "Продажи по менеджеру продаж"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Logistic"
-msgstr ""
+msgstr "Логистика"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order"
-msgstr ""
+msgstr "Заказ"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
@@ -1511,7 +1554,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,client_order_ref:0
 msgid "Customer Reference"
-msgstr ""
+msgstr "Ссылка на клиента"
 
 #. module: sale
 #: field:sale.order,amount_total:0
@@ -1526,6 +1569,9 @@ msgid ""
 "output area and the customer is done through the Delivery Order manually or "
 "automatically."
 msgstr ""
+"В зависимости от настройки исходящего места хранения, перемещение между "
+"зоной отгрузки и заказчиком выполняется с помощью заказа на доставку вручную "
+"или автоматически."
 
 #. module: sale
 #: help:sale.order,shipped:0
@@ -1533,19 +1579,21 @@ msgid ""
 "It indicates that the sale order has been delivered. This field is updated "
 "only after the scheduler have been launched !"
 msgstr ""
+"Показывает, что заказ был доставлен. Это поле обновляется только после "
+"запуска планировщика !"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
 #: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
 #: view:sale.order:0
 msgid "Make Invoices"
-msgstr ""
+msgstr "Сделать счета"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "To Invoice"
-msgstr ""
+msgstr "В счет"
 
 #. module: sale
 #: field:sale.config.picking_policy,step:0
@@ -1559,12 +1607,12 @@ msgstr "Шаги по доставке заказа на продажу"
 #: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Компания"
 
 #. module: sale
 #: field:sale.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Дата выставления счета"
 
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
@@ -1582,18 +1630,19 @@ msgstr "Исключительная ситуация счета"
 msgid ""
 "Gives the margin of profitability by calculating the difference between Unit "
 "Price and Cost Price."
-msgstr ""
+msgstr "Дает прибыль вычитая себестоимость из цены за единицу продукции."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "You must first cancel all invoices attached to this sale order."
 msgstr ""
+"Сначала вы должны отменить все счета связанные с этим заказом на продажу."
 
 #. module: sale
 #: report:sale.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Чистый итог:"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1614,29 +1663,29 @@ msgstr "Магазин"
 #. module: sale
 #: view:sale.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Месяц   "
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,uom_name:0
 msgid "Default UoM"
-msgstr ""
+msgstr "Ед. изм. по умолчанию"
 
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
-msgstr ""
+msgstr "Дата подтверждения"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Внимание"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order"
-msgstr ""
+msgstr "Заказ на продажу"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
@@ -1692,7 +1741,7 @@ msgstr "Настройки"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "There is no sale journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Журнал продаж для этой компании не определен: \"%s\" (id:%d)"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -1705,6 +1754,8 @@ msgid ""
 "For every sale order line, a procurement order is created to supply the sold "
 "product."
 msgstr ""
+"Для каждой позиции заказа создается заказ на снабжение для закупки проданной "
+"продукции."
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
@@ -1714,7 +1765,7 @@ msgstr "Доставка целиком"
 #. module: sale
 #: view:sale.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Месяц-1    "
 
 #. module: sale
 #: help:sale.config.picking_policy,picking_policy:0
@@ -1729,7 +1780,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Source document"
-msgstr ""
+msgstr "Исходный документ"
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
@@ -1745,23 +1796,23 @@ msgstr "Счета"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: sale
 #: field:sale.config.picking_policy,config_logo:0
 #: field:sale.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Изображение"
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax"
-msgstr ""
+msgstr "Сумма без налога"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Uninvoiced"
-msgstr ""
+msgstr "Счет не выставлен"
 
 #. module: sale
 #: view:sale.order:0
@@ -1813,7 +1864,7 @@ msgstr "Черновик"
 #: field:sale.config.picking_policy,progress:0
 #: field:sale.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Настройка выполняется"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
@@ -1823,7 +1874,7 @@ msgstr "Продажи продукции"
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Ordered Date"
-msgstr ""
+msgstr "Дата заказа"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
@@ -1845,7 +1896,7 @@ msgstr "Прямая доставка"
 #. module: sale
 #: field:sale.installer,sale_journal:0
 msgid "Invoicing journals"
-msgstr ""
+msgstr "Журналы счетов"
 
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
@@ -1857,17 +1908,17 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,shipped_qty_1:0
 msgid "Shipped Qty"
-msgstr ""
+msgstr "Доставленное  кол-во"
 
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "You invoice has been successfully created!"
-msgstr ""
+msgstr "Ваш счет был успешно создан!"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:0
@@ -1878,6 +1929,11 @@ msgid ""
 "1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
 "2.The Sale Order Line is Invoiced!"
 msgstr ""
+"Счет не может быть создан для этой позиции заказа на продажу по одной из "
+"следующих причин:\n"
+"1. Состояние этой позиции заказа на продажу - \"Черновик\" или "
+"\"Отменено\"!\n"
+"2. Счет на позицию заказа на продажу уже выставлен!"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
@@ -1887,19 +1943,19 @@ msgstr "Заказы в процессе выполнения"
 #. module: sale
 #: field:sale.installer,sale_layout:0
 msgid "Sales Order Layout Improvement"
-msgstr ""
+msgstr "Улучшение шаблонов заказов на продажу"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Ошибка"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,delay:0
 msgid "Commitment Delay"
-msgstr ""
+msgstr "Задержка по обязательствам"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
@@ -1914,7 +1970,7 @@ msgstr ""
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Дата заказа"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -1930,7 +1986,7 @@ msgstr "Магазин"
 #. module: sale
 #: view:board.board:0
 msgid "Sales By Customer"
-msgstr ""
+msgstr "Продажи по заказчику"
 
 #. module: sale
 #: view:sale.open.invoice:0
@@ -1940,13 +1996,13 @@ msgstr "Закрыть"
 #. module: sale
 #: field:sale.order,shipped:0
 msgid "Delivered"
-msgstr ""
+msgstr "Доставлено"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Not enough stock !"
-msgstr ""
+msgstr "Запасов не достаточно !"
 
 #. module: sale
 #: view:sale.order:0
@@ -1972,12 +2028,14 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: sale
 #: help:sale.installer,sale_order_dates:0
 msgid "Adds commitment, requested and effective dates on Sales Orders."
 msgstr ""
+"Добавить обязательства, вступление в силу и требуемые даты по заказу на "
+"продажу."
 
 #. module: sale
 #: view:sale.order:0
@@ -1989,7 +2047,7 @@ msgstr "Клиент"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. module: sale
 #: help:sale.installer,sale_journal:0
@@ -2004,18 +2062,18 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Included"
-msgstr ""
+msgstr "Всего налог"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "Искать заказ на продажу"
 
 #. module: sale
 #: field:sale.order,payment_term:0
@@ -2030,6 +2088,9 @@ msgid ""
 "production of products regarding to the rules and to the sale order's "
 "parameters. "
 msgstr ""
+"Заказ на снабжение автоматически создастся как только заказ на продажу будет "
+"подтвержден или счет будет оплачен. Это управляет снабжением и производством "
+"продукции по правилам и параметрам заказа на продажу. "
 
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
@@ -2045,13 +2106,13 @@ msgstr "Предложение №"
 #: field:sale.order,picked_rate:0
 #: view:sale.report:0
 msgid "Picked"
-msgstr ""
+msgstr "Скомплектовано"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Год"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
diff --git a/addons/sale_crm/i18n/it.po b/addons/sale_crm/i18n/it.po
index 0631fc7fe21..5bad838075b 100644
--- a/addons/sale_crm/i18n/it.po
+++ b/addons/sale_crm/i18n/it.po
@@ -6,40 +6,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 08:37+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-24 08:37+0000\n"
 "Last-Translator: OpenERP Administrators <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-09-30 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
-#: model:process.transition,name:sale_crm.process_transition_crmopportunityquotation
-msgid "Crm opportunity quotation"
-msgstr "Crm possibilità di preventivo"
+#: field:crm.make.sale,partner_id:0
+msgid "Customer"
+msgstr "Cliente"
 
 #. module: sale_crm
-#: model:process.transition,name:sale_crm.process_transition_opportunityanalytic0
-msgid "Opportunity Analytic"
-msgstr "Opportunità Analitica"
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
 
 #. module: sale_crm
-#: help:crm.case.make_order,init,partner_id:0
-msgid "Use this partner if there is no partner on the case"
-msgstr "Utilizza questo partner se non c'è alcun partner su questo caso"
+#: view:account.invoice.report:0
+#: view:board.board:0
+msgid "Monthly Turnover"
+msgstr ""
 
 #. module: sale_crm
-#: wizard_button:sale_crm.make_case,init,create:0
-msgid "Create"
-msgstr "Crea"
+#: view:crm.make.sale:0
+msgid "Convert to Quotation"
+msgstr "Converti in Quotazione"
 
 #. module: sale_crm
-#: selection:crm.case.make_order,init,picking_policy:0
-msgid "All at once"
-msgstr "Tutto in una volta"
+#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#, python-format
+msgid "is converted to Quotation."
+msgstr "è convertito in Quotazione"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#, python-format
+msgid "Data Insufficient!"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#, python-format
+msgid "Customer has no addresses defined!"
+msgstr ""
+
+#. module: sale_crm
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr "_Crea"
+
+#. module: sale_crm
+#: help:crm.make.sale,close:0
+msgid ""
+"Check this to close the opportunity after having created the sale order."
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.lead:0
+msgid "Convert to Quote"
+msgstr "Converti in preventivo"
 
 #. module: sale_crm
 #: constraint:ir.ui.view:0
@@ -47,161 +83,164 @@ msgid "Invalid XML for View Architecture!"
 msgstr "XML non valido per Visualizzazione Architettura!"
 
 #. module: sale_crm
-#: model:process.transition,note:sale_crm.process_transition_crmopportunityquotation
-msgid "Opportunity goes into the quotation"
-msgstr "Da opportunità a preventivo"
+#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#, python-format
+msgid "Converted to Sales Quotation(id: %s)."
+msgstr ""
 
 #. module: sale_crm
-#: model:process.node,name:sale_crm.process_node_contractanalytic0
-msgid "Analytic account"
-msgstr "Contabilità Analitica"
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sale"
+msgstr ""
 
 #. module: sale_crm
-#: model:process.node,note:sale_crm.process_node_crmquotation0
-msgid "Convert opportunity to quotation"
-msgstr "Converte opportunità in preventivo"
+#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#, python-format
+msgid "Opportunity "
+msgstr "Opportunità "
 
 #. module: sale_crm
-#: wizard_field:sale_crm.make_case,init,description:0
-msgid "Your action"
-msgstr "La Tua Azione"
+#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#, python-format
+msgid "Opportunity: %s"
+msgstr "Opportunità:%s"
 
 #. module: sale_crm
-#: wizard_field:crm.case.make_order,init,picking_policy:0
-msgid "Packing Policy"
-msgstr "Politiche Preparazione Merci"
-
-#. module: sale_crm
-#: wizard_button:crm.case.make_order,init,order:0
-msgid "Create Quote"
-msgstr "Crea preventivo"
-
-#. module: sale_crm
-#: model:process.node,note:sale_crm.process_node_contractpricelist0
-msgid "Contract Volume (pricelist)"
-msgstr "Volume di contratto (listino prezzi)"
-
-#. module: sale_crm
-#: model:process.node,name:sale_crm.process_node_crmopportunity0
-msgid "CRM Opportunity"
-msgstr "Opportunità CRM"
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sale Order"
+msgstr ""
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
-msgid "Sale CRM Stuff"
-msgstr "Materiale vendita CRM"
-
-#. module: sale_crm
-#: model:process.transition,note:sale_crm.process_transition_opportunityquotation0
-msgid "Opportunity convert into quotation"
-msgstr "Opportunità convertita in preventivo"
-
-#. module: sale_crm
-#: selection:crm.case.make_order,init,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Consegna Diretta"
-
-#. module: sale_crm
-#: model:process.transition,name:sale_crm.process_transition_opportunityquotation0
-msgid "Opportunity Quotation"
-msgstr "Opportunità di preventivo"
-
-#. module: sale_crm
-#: model:process.node,name:sale_crm.process_node_crmquotation0
-msgid "Quotation"
-msgstr "Preventivo"
-
-#. module: sale_crm
-#: view:crm.case:0
-#: wizard_view:crm.case.make_order,init:0
-msgid "Convert to Quote"
-msgstr "Converti in preventivo"
-
-#. module: sale_crm
-#: help:crm.case.make_order,init,close:0
-msgid "Check this to close the case after having created the sale order."
+msgid "Creates Sales order from Opportunity"
 msgstr ""
-"Selezionare questo per chiudere il caso dopo aver creato l'ordine di vendita"
 
 #. module: sale_crm
-#: wizard_field:crm.case.make_order,init,partner_id:0
-msgid "Customer"
-msgstr "Cliente"
+#: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
+msgid "Quotations"
+msgstr "Quotazioni"
 
 #. module: sale_crm
-#: model:process.transition,note:sale_crm.process_transition_opportunitypricelist0
-msgid "Opporunity convert to the Pricelist"
-msgstr "Opportunità trasformata in Listino Prezzi"
-
-#. module: sale_crm
-#: wizard_field:sale_crm.make_case,init,user:0
-msgid "User Responsible"
-msgstr "Utente Responsabile"
-
-#. module: sale_crm
-#: model:process.node,note:sale_crm.process_node_contractanalytic0
-msgid "Reflect the contract made with customer"
-msgstr "Rispecchia il contratto stipulato con il client"
-
-#. module: sale_crm
-#: wizard_field:crm.case.make_order,init,products:0
-msgid "Products"
-msgstr "Prodotti"
-
-#. module: sale_crm
-#: wizard_field:crm.case.make_order,init,close:0
-msgid "Close Case"
-msgstr "Chiudi il caso"
-
-#. module: sale_crm
-#: model:ir.actions.wizard,name:sale_crm.sale_crm_make_case_wizard
-#: wizard_view:sale_crm.make_case,init:0
-msgid "Make Case"
-msgstr "Crea Caso"
-
-#. module: sale_crm
-#: wizard_field:crm.case.make_order,init,shop_id:0
+#: field:crm.make.sale,shop_id:0
 msgid "Shop"
 msgstr "Negozio"
 
 #. module: sale_crm
-#: model:process.node,note:sale_crm.process_node_crmopportunity0
-msgid "The CRM Opportunity can lead to a quotation."
-msgstr "La opportunità CRM può portare a un preventivo"
+#: view:board.board:0
+msgid "My Quotations"
+msgstr "Le mie Quotazioni"
 
 #. module: sale_crm
-#: model:process.transition,name:sale_crm.process_transition_opportunitypricelist0
-msgid "Opportunity Pricelist"
-msgstr "Opportunità Listino Prezzi"
+#: field:crm.make.sale,close:0
+msgid "Close Opportunity"
+msgstr "Chiudi Opportunità"
 
 #. module: sale_crm
-#: model:process.node,name:sale_crm.process_node_contractpricelist0
-msgid "Contract Pricelist"
-msgstr "Listino Contratti"
+#: view:sale.order:0
+#: field:sale.order,section_id:0
+msgid "Sales Team"
+msgstr ""
 
 #. module: sale_crm
-#: wizard_field:sale_crm.make_case,init,name:0
-msgid "Case Description"
-msgstr "Descrizione Caso"
-
-#. module: sale_crm
-#: wizard_field:crm.case.make_order,init,analytic_account:0
-#: model:process.transition,note:sale_crm.process_transition_opportunityanalytic0
-msgid "Analytic Account"
-msgstr "Conto Analitico"
-
-#. module: sale_crm
-#: model:ir.actions.wizard,name:sale_crm.sale_crm_wizard
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
 msgid "Make Quotation"
 msgstr "Genera quotazione"
 
 #. module: sale_crm
-#: wizard_button:crm.case.make_order,init,end:0
-#: wizard_button:sale_crm.make_case,init,end:0
+#: view:crm.make.sale:0
 msgid "Cancel"
 msgstr "Annulla"
 
-#. module: sale_crm
-#: wizard_field:sale_crm.make_case,init,section:0
-msgid "Case Section"
-msgstr "Sezione del caso"
+#~ msgid "All at once"
+#~ msgstr "Tutto in una volta"
+
+#~ msgid "Crm opportunity quotation"
+#~ msgstr "Crm possibilità di preventivo"
+
+#~ msgid "Opportunity Analytic"
+#~ msgstr "Opportunità Analitica"
+
+#~ msgid "Use this partner if there is no partner on the case"
+#~ msgstr "Utilizza questo partner se non c'è alcun partner su questo caso"
+
+#~ msgid "Create"
+#~ msgstr "Crea"
+
+#~ msgid "Opportunity goes into the quotation"
+#~ msgstr "Da opportunità a preventivo"
+
+#~ msgid "Analytic account"
+#~ msgstr "Contabilità Analitica"
+
+#~ msgid "Convert opportunity to quotation"
+#~ msgstr "Converte opportunità in preventivo"
+
+#~ msgid "Your action"
+#~ msgstr "La Tua Azione"
+
+#~ msgid "Packing Policy"
+#~ msgstr "Politiche Preparazione Merci"
+
+#~ msgid "Create Quote"
+#~ msgstr "Crea preventivo"
+
+#~ msgid "Contract Volume (pricelist)"
+#~ msgstr "Volume di contratto (listino prezzi)"
+
+#~ msgid "CRM Opportunity"
+#~ msgstr "Opportunità CRM"
+
+#~ msgid "Opportunity convert into quotation"
+#~ msgstr "Opportunità convertita in preventivo"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Consegna Diretta"
+
+#~ msgid "Opportunity Quotation"
+#~ msgstr "Opportunità di preventivo"
+
+#~ msgid "Quotation"
+#~ msgstr "Preventivo"
+
+#~ msgid "Check this to close the case after having created the sale order."
+#~ msgstr ""
+#~ "Selezionare questo per chiudere il caso dopo aver creato l'ordine di vendita"
+
+#~ msgid "Opporunity convert to the Pricelist"
+#~ msgstr "Opportunità trasformata in Listino Prezzi"
+
+#~ msgid "User Responsible"
+#~ msgstr "Utente Responsabile"
+
+#~ msgid "Reflect the contract made with customer"
+#~ msgstr "Rispecchia il contratto stipulato con il client"
+
+#~ msgid "Products"
+#~ msgstr "Prodotti"
+
+#~ msgid "Close Case"
+#~ msgstr "Chiudi il caso"
+
+#~ msgid "Make Case"
+#~ msgstr "Crea Caso"
+
+#~ msgid "The CRM Opportunity can lead to a quotation."
+#~ msgstr "La opportunità CRM può portare a un preventivo"
+
+#~ msgid "Opportunity Pricelist"
+#~ msgstr "Opportunità Listino Prezzi"
+
+#~ msgid "Case Description"
+#~ msgstr "Descrizione Caso"
+
+#~ msgid "Case Section"
+#~ msgstr "Sezione del caso"
+
+#~ msgid "Contract Pricelist"
+#~ msgstr "Listino Contratti"
+
+#~ msgid "Analytic Account"
+#~ msgstr "Conto Analitico"
+
+#~ msgid "Sale CRM Stuff"
+#~ msgstr "Materiale vendita CRM"
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index 293bea9ce98..ad29f1a3d1f 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-22 11:45+0000\n"
+"PO-Revision-Date: 2010-10-24 15:35+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-10-23 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -4129,7 +4129,7 @@ msgstr "Партия изделий"
 #: view:stock.production.lot:0
 #: view:stock.tracking:0
 msgid "Traceability"
-msgstr "Возможность учета движения"
+msgstr "Учет движения"
 
 #. module: stock
 #: view:stock.picking:0
diff --git a/addons/stock_location/i18n/ru.po b/addons/stock_location/i18n/ru.po
index d19c1869fc5..17ae5c04f2f 100644
--- a/addons/stock_location/i18n/ru.po
+++ b/addons/stock_location/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-22 10:37+0000\n"
+"PO-Revision-Date: 2010-10-24 08:03+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-10-23 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
@@ -50,7 +50,7 @@ msgstr "Параметры"
 #. module: stock_location
 #: field:stock.location.path,location_from_id:0
 msgid "Source Location"
-msgstr "Местоположение источника"
+msgstr "Источник места хранения"
 
 #. module: stock_location
 #: help:product.pulled.flow,cancel_cascade:0
@@ -72,7 +72,7 @@ msgstr "Тип снабжения"
 #. module: stock_location
 #: help:product.pulled.flow,location_src_id:0
 msgid "Location used by Destination Location to supply"
-msgstr "Местоположение используемое местом назначения поставки"
+msgstr "Место хранения используемое местом назначения для поставки"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -92,7 +92,7 @@ msgstr ""
 #: model:ir.model,name:stock_location.model_stock_location
 #: field:product.pulled.flow,location_id:0
 msgid "Location"
-msgstr "Местоположение"
+msgstr "Место хранения"
 
 #. module: stock_location
 #: field:product.pulled.flow,invoice_state:0
@@ -163,7 +163,7 @@ msgstr "Зона отгрузки"
 #. module: stock_location
 #: model:ir.module.module,shortdesc:stock_location.module_meta_information
 msgid "Warehouse Locations Paths"
-msgstr ""
+msgstr "Пути мест хранения склада"
 
 #. module: stock_location
 #: view:product.product:0
@@ -253,7 +253,8 @@ msgstr "Имя"
 msgid ""
 "These rules set the right path of the product in the whole location tree."
 msgstr ""
-"В этом параметре указывается конкретный каталог продукта в дереве каталогов."
+"Эти правила устанавливают правильный путь ТМЦ во всей структуре мест "
+"хранения."
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
@@ -291,7 +292,7 @@ msgstr ""
 #. module: stock_location
 #: help:product.pulled.flow,location_id:0
 msgid "Is the destination location that needs supplying"
-msgstr "Место назначения которое нуждается в поставке"
+msgstr "Место хранения которое нуждается в поставке"
 
 #. module: stock_location
 #: field:stock.location.path,product_id:0
@@ -302,7 +303,7 @@ msgstr "Продукция"
 #: code:addons/stock_location/procurement_pull.py:0
 #, python-format
 msgid "Pulled from another location via procurement %d"
-msgstr "Взято из другого места по снабжению %d"
+msgstr "Взято из другого места хранения по снабжению %d"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.stock_location_qualitytest0
@@ -338,7 +339,7 @@ msgstr ""
 #. module: stock_location
 #: field:product.pulled.flow,location_src_id:0
 msgid "Location Source"
-msgstr "Источник местоположения"
+msgstr "Место хранения источника"
 
 #. module: stock_location
 #: field:stock.location.path,location_dest_id:0
diff --git a/addons/warning/i18n/ru.po b/addons/warning/i18n/ru.po
index e319119104b..abaa879cee3 100644
--- a/addons/warning/i18n/ru.po
+++ b/addons/warning/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-22 16:37+0000\n"
+"PO-Revision-Date: 2010-10-23 07:02+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-10-23 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-24 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/wiki_sale_faq/i18n/ru.po b/addons/wiki_sale_faq/i18n/ru.po
index c10c2fdf06c..ee2eb0a12c5 100644
--- a/addons/wiki_sale_faq/i18n/ru.po
+++ b/addons/wiki_sale_faq/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-22 19:35+0000\n"
+"PO-Revision-Date: 2010-10-23 07:02+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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-10-23 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-24 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_sale_faq

From 0e233a7dcb744389bb63eae8edd9c7236b20c140 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 25 Oct 2010 10:23:36 +0530
Subject: [PATCH 073/114] [REF]

bzr revid: mra@mra-laptop-20101025045336-ovh54n0q31db0hfp
---
 addons/account/account_move_line.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 8200a7fc321..ffea12170a2 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -365,7 +365,7 @@ class account_move_line(osv.osv):
             return [('id', '=', '0')]
         return [('id', 'in', [x[0] for x in res])]
 
-    def _invoice_search(self, cursor, user, obj, name, args, context):
+    def _invoice_search(self, cursor, user, obj, name, args, context=None):
         if not args:
             return []
         invoice_obj = self.pool.get('account.invoice')
@@ -410,7 +410,7 @@ class account_move_line(osv.osv):
             return [('id', '=', '0')]
         return [('id', 'in', [x[0] for x in res])]
 
-    def _get_move_lines(self, cr, uid, ids, context={}):
+    def _get_move_lines(self, cr, uid, ids, context=None):
         result = []
         for move in self.pool.get('account.move').browse(cr, uid, ids, context=context):
             for line in move.line_id:
@@ -460,7 +460,7 @@ class account_move_line(osv.osv):
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }
 
-    def _get_date(self, cr, uid, context):
+    def _get_date(self, cr, uid, context=None):
         period_obj = self.pool.get('account.period')
         dt = time.strftime('%Y-%m-%d')
         if ('journal_id' in context) and ('period_id' in context):
@@ -476,7 +476,9 @@ class account_move_line(osv.osv):
                 dt = period.date_start
         return dt
 
-    def _get_currency(self, cr, uid, context={}):
+    def _get_currency(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         if not context.get('journal_id', False):
             return False
         cur = self.pool.get('account.journal').browse(cr, uid, context['journal_id']).currency
@@ -1247,4 +1249,4 @@ class account_move_line(osv.osv):
 
 account_move_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 62bc7b96e8507576643ee7963be7bad4fb40ccc2 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Mon, 25 Oct 2010 11:19:21 +0530
Subject: [PATCH 074/114] [REF] account

bzr revid: psi@tinyerp.co.in-20101025054921-uw9fnjpnvu72143t
---
 addons/account/wizard/account_invoice_refund.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index b5059447ebc..638240664b4 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -36,7 +36,7 @@ class account_invoice_refund(osv.osv_memory):
        'period': fields.many2one('account.period', 'Force period'),
        'journal_id': fields.many2one('account.journal', 'Refund Journal', help='You can select here the journal to use for the refund invoice that will be created. If you leave that field empty, it will use the same journal as the current invoice.'),
        'description': fields.char('Description', size=128, required=True),
-       'filter_refund': fields.selection([('modify', 'Modify'), ('refund', 'Refund'), ('cancel', 'Cancel')], "Refund Type", required=True, help='Refund invoice base on this type. You can not Modify and Cancel if the invoice is already rencociled'),
+       'filter_refund': fields.selection([('modify', 'Modify'), ('refund', 'Refund'), ('cancel', 'Cancel')], "Refund Type", required=True, help='Refund invoice base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
     }
 
     def _get_journal(self, cr, uid, context=None):
@@ -214,7 +214,7 @@ class account_invoice_refund(osv.osv_memory):
             invoice_domain.append(('id', '=', created_inv))
             result['domain'] = invoice_domain
             return result
-        
+
     def invoice_refund(self, cr, uid, ids, context=None):
         data_refund = self.read(cr, uid, ids, [],context=context)[0]['filter_refund']
         return self.compute_refund(cr, uid, ids, data_refund, context=context)

From e0c99e20f61553d68861fb44121d7e4ed46ff739 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Mon, 25 Oct 2010 11:57:48 +0530
Subject: [PATCH 075/114] [FIX] account: journal items Unicode strings with
 encoding declaration are not supported

bzr revid: vth@tinyerp.com-20101025062748-2yr1ded7x50k1c4w
---
 addons/account/wizard/account_move_journal.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 5756fed4264..e65b9b88f10 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -22,6 +22,7 @@
 from osv import osv
 from tools.translate import _
 import tools
+from lxml import etree
 
 class account_move_journal(osv.osv_memory):
     _name = "account.move.journal"
@@ -103,8 +104,11 @@ class account_move_journal(osv.osv_memory):
             </group>
         </form>""" % (tools.ustr(journal), tools.ustr(period))
 
+        view = etree.fromstring(view.encode('utf8'))
+        xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
+        view = xarch
         res.update({
-            'arch':view
+            'arch': view
         })
         return res
 

From 3fb84c26b6e34f9962b0099c34897c41832bce60 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Mon, 25 Oct 2010 12:13:16 +0530
Subject: [PATCH 076/114] [FIX] account: Analytical journal items missing
 closing bracket in domain

bzr revid: vth@tinyerp.com-20101025064316-4pgdx5brt5a06a7d
---
 addons/account/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 02536fc184c..e2f0bdf5709 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -197,7 +197,7 @@
                     <group col='6' colspan='4'>
                         <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-sale" help="Analytic Journal Items related to a sale journal."/>
                         <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
-                        <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation')]" icon="terp-folder-orange"/>
+                        <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <field name="name"/>

From 58407193d73a068e94529c49bc684019ad0b6835 Mon Sep 17 00:00:00 2001
From: cpa-openerp <cpa@tinyerp.com>
Date: Mon, 25 Oct 2010 12:26:25 +0530
Subject: [PATCH 077/114] [FIX] PRODUCT : fixed name_search for proper operator
 supplied.

bzr revid: cpa@tinyerp.com-20101025065625-x6m4m80fvddwr1b3
---
 addons/product/product.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 60a8cf97783..b43f40b1cbc 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -492,7 +492,7 @@ class product_product(osv.osv):
         if not context:
             context={}
         if name:
-            ids = self.search(cr, user, [('default_code','=',name)]+ args, limit=limit, context=context)
+            ids = self.search(cr, user, [('default_code',operator,name)]+ args, limit=limit, context=context)
             if not len(ids):
                 ids = self.search(cr, user, [('ean13','=',name)]+ args, limit=limit, context=context)
             if not len(ids):

From 69032a7c840c756cb685a88f4574c2d3942b6fd1 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 25 Oct 2010 13:01:36 +0530
Subject: [PATCH 078/114] [REF]

bzr revid: mra@mra-laptop-20101025073136-67ddwmjil7hkpkr6
---
 addons/membership/membership.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 1e92781d57d..b8f3ae4cb34 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -314,7 +314,7 @@ class Partner(osv.osv):
                     'Membership amount', digits=(16, 2),
                     help = 'The price negotiated by the partner'),
         'membership_state': fields.function(
-                    __get_membership_state, method = True,
+                    __get_membership_state, method=True,
                     string = 'Current Membership State', type = 'selection',
                     selection = STATE,
                     store = {
@@ -329,7 +329,7 @@ class Partner(osv.osv):
     -Invoiced Member: A member whose invoice has been created.
     -Paid Member: A member who has paid the membership amount."""),
         'membership_start': fields.function(
-                    _membership_date, method = True, multi = 'membeship_start',
+                    _membership_date, method=True, multi = 'membeship_start',
                     string = 'Start membership date', type = 'date',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
@@ -337,15 +337,15 @@ class Partner(osv.osv):
                         'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
                     }, help="Date from which membership becomes active."),
         'membership_stop': fields.function(
-                    _membership_date, method = True,
-                    string = 'Stop membership date', type = 'date', multi='membership_stop',
+                    _membership_date, method=True,
+                    string = 'Stop membership date', type='date', multi='membership_stop',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
                         'res.partner': (lambda self, cr, uid, ids, c={}:ids, ['free_member'], 10)
                     }, help="Date until which membership remains active."),
         'membership_cancel': fields.function(
-                    _membership_date, method = True,
+                    _membership_date, method=True,
                     string = 'Cancel membership date', type='date', multi='membership_cancel',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 11),

From 67a308bade4d8581dd452c57d8d875b2513c723c Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 25 Oct 2010 13:41:24 +0530
Subject: [PATCH 079/114] [REF]

bzr revid: mra@mra-laptop-20101025081124-pt93sse1lff03npb
---
 addons/account/wizard/account_move_journal.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index e65b9b88f10..7f64f52c100 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -19,10 +19,11 @@
 #
 ##############################################################################
 
+from lxml import etree
+
 from osv import osv
 from tools.translate import _
 import tools
-from lxml import etree
 
 class account_move_journal(osv.osv_memory):
     _name = "account.move.journal"

From 793d723cb3a50fdfb338348c77c02af785a224f5 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 25 Oct 2010 14:01:13 +0530
Subject: [PATCH 080/114] [FIX] Membership: membership lines does not updated
 properly

bzr revid: mra@mra-laptop-20101025083113-rti9jr8k2llzftjt
---
 addons/membership/membership.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index b8f3ae4cb34..41435cd3cac 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -49,13 +49,21 @@ STATE_PRIOR = {
 class membership_line(osv.osv):
     '''Member line'''
 
+    def _get_partners(self, cr, uid, ids, context=None):
+        list_membership_line = []
+        member_line_obj = self.pool.get('membership.membership_line')
+        for partner in self.pool.get('res.partner').browse(cr, uid, ids, context=context):
+            if partner.member_lines:
+                list_membership_line += member_line_obj.search(cr, uid, [('id', 'in', [ l.id for l in partner.member_lines])], context=context)
+        return list_membership_line
+
     def _get_membership_lines(self, cr, uid, ids, context=None):
-            list_membership_line = []
-            member_line_obj = self.pool.get('membership.membership_line')
-            for invoice in self.pool.get('account.invoice').browse(cr, uid, ids, context=context):
-                if invoice.invoice_line:
-                    list_membership_line += member_line_obj.search(cr, uid, [('account_invoice_line', 'in', [ l.id for l in invoice.invoice_line])], context=context)
-            return list_membership_line
+        list_membership_line = []
+        member_line_obj = self.pool.get('membership.membership_line')
+        for invoice in self.pool.get('account.invoice').browse(cr, uid, ids, context=context):
+            if invoice.invoice_line:
+                list_membership_line += member_line_obj.search(cr, uid, [('account_invoice_line', 'in', [ l.id for l in invoice.invoice_line])], context=context)
+        return list_membership_line
 
     def _check_membership_date(self, cr, uid, ids, context=None):
         """Check if membership product is not in the past
@@ -146,6 +154,7 @@ class membership_line(osv.osv):
                         string='Membership State', type='selection',
                         selection=STATE, store = {
                         'account.invoice': (_get_membership_lines, ['state'], 10),
+                        'res.partner': (_get_partners, ['membership_state'], 12),
                         }, help="""It indicates the membership state.
     -Non Member: A member who has not applied for any membership.
     -Cancelled Member: A member who has cancelled his membership.

From 320cd68fdc4f104fc6ea867a0df22507c47c6b30 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Mon, 25 Oct 2010 11:03:21 +0200
Subject: [PATCH 081/114] [FIX] fixed calendar search algorithm

bzr revid: olt@tinyerp.com-20101025090321-cirhp4k36st1evef
---
 addons/base_calendar/base_calendar.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 326ed33b83d..dfbdc745613 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1292,8 +1292,8 @@ true, it will allow you to hide the event alarm information without removing it.
 
             count = 0
             for data in cr.dictfetchall():
-                start_date = base_start_date and datetime.strptime(base_start_date[:10], "%Y-%m-%d") or False
-                until_date = base_until_date and datetime.strptime(base_until_date[:10], "%Y-%m-%d") or False
+                start_date = base_start_date and datetime.strptime(base_start_date[:10]+ ' 00:00:00' , "%Y-%m-%d %H:%M:%S") or False
+                until_date = base_until_date and datetime.strptime(base_until_date[:10]+ ' 23:59:59', "%Y-%m-%d %H:%M:%S") or False
                 if count > limit:
                     break
                 event_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S")
@@ -1426,8 +1426,9 @@ true, it will allow you to hide the event alarm information without removing it.
         args_without_date = []
         start_date = False
         until_date = False
+
         for arg in args:
-            if arg[0] not in ('date', unicode('date')):
+            if arg[0] not in ('date', unicode('date'), 'date_deadline', unicode('date_deadline')):
                 args_without_date.append(arg)
             else:
                 if arg[1] in ('>', '>='):

From e54dbddd6771f28b7c9621891d63455f6e05156c Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Mon, 25 Oct 2010 14:54:24 +0530
Subject: [PATCH 082/114] [IMP] sale modules : Cleaning modules

bzr revid: pso@tinyerp.com-20101025092424-h4ovhk9oidooby4j
---
 .../sale_analytic_plans.py                    |  4 +-
 addons/sale_journal/sale_journal.py           |  3 -
 addons/sale_layout/sale_layout.py             | 56 +++++++++----------
 addons/sale_margin/sale_margin.py             |  4 +-
 4 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py
index 9fffae1d74a..cc006f3afc0 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans.py
+++ b/addons/sale_analytic_plans/sale_analytic_plans.py
@@ -30,7 +30,7 @@ class sale_order_line(osv.osv):
         if context is None:
             context = {}
         line_obj = self.pool.get('account.invoice.line')
-        create_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context=context)
+        create_ids = super(sale_order_line, self).invoice_line_create(cr, uid, ids, context=context)
         i = 0
         for line in self.browse(cr, uid, ids, context):
             line_obj.write(cr, uid, [create_ids[i]], {'analytics_id': line.analytics_id.id})
@@ -39,4 +39,4 @@ class sale_order_line(osv.osv):
 
 sale_order_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 5e66c74590b..5434df1725e 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -18,11 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import time
 
 from osv import osv, fields
-import netsvc
-from tools.translate import _
 
 class sale_journal_invoice_type(osv.osv):
     _name = 'sale_journal.invoice.type'
diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py
index 5d3f7d65f9f..e5554aba07c 100755
--- a/addons/sale_layout/sale_layout.py
+++ b/addons/sale_layout/sale_layout.py
@@ -26,8 +26,6 @@ import decimal_precision as dp
 class sale_order_line(osv.osv):
 
     def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
-        tax_obj = self.pool.get('account.tax')
-        cur_obj = self.pool.get('res.currency')
         res = {}
         context = context or {}
         for line in self.browse(cr, uid, ids, context=context):
@@ -51,33 +49,33 @@ class sale_order_line(osv.osv):
         return invoice_line_ids
 
     def onchange_sale_order_line_view(self, cr, uid, id, type, context={}, *args):
-            temp = {}
-            temp['value'] = {}
-            if (not type):
-                return {}
-            if type != 'article':
-                temp = {
-                    'value': {
-                    'product_id': False,
-                    'uos_id': False,
-                    'account_id': False,
-                    'price_unit': 0.0,
-                    'price_subtotal': 0.0,
-                    'quantity': 0,
-                    'discount': 0.0,
-                    'invoice_line_tax_id': False,
-                    'account_analytic_id': False,
-                    'product_uom_qty': 0.0,
-                    },
-                }
-                if type == 'line':
-                    temp['value']['name'] = ' '
-                if type == 'break':
-                    temp['value']['name'] = ' '
-                if type == 'subtotal':
-                    temp['value']['name'] = 'Sub Total'
-                return temp
+        temp = {}
+        temp['value'] = {}
+        if (not type):
             return {}
+        if type != 'article':
+            temp = {
+                'value': {
+                'product_id': False,
+                'uos_id': False,
+                'account_id': False,
+                'price_unit': 0.0,
+                'price_subtotal': 0.0,
+                'quantity': 0,
+                'discount': 0.0,
+                'invoice_line_tax_id': False,
+                'account_analytic_id': False,
+                'product_uom_qty': 0.0,
+                },
+            }
+            if type == 'line':
+                temp['value']['name'] = ' '
+            if type == 'break':
+                temp['value']['name'] = ' '
+            if type == 'subtotal':
+                temp['value']['name'] = 'Sub Total'
+            return temp
+        return {}
 
     def create(self, cr, user, vals, context=None):
         if vals.has_key('layout_type'):
@@ -103,8 +101,6 @@ class sale_order_line(osv.osv):
         default['layout_type'] = self.browse(cr, uid, id).layout_type
         return super(sale_order_line, self).copy(cr, uid, id, default, context)
 
-
-    _name = "sale.order.line"
     _order = "order_id, sequence asc"
     _description = "Sale Order line"
     _inherit = "sale.order.line"
diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index 4ca88f9da19..2f756d5ecda 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -19,7 +19,6 @@
 ##############################################################################
 
 from osv import fields, osv
-from tools import config
 
 class sale_order_line(osv.osv):
     _inherit = "sale.order.line"
@@ -108,4 +107,5 @@ class account_invoice_line(osv.osv):
         return super(account_invoice_line, self).create(cr, uid, vals, context)
 
 account_invoice_line()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From ab0d2601142d361d27ff806f2568135de2345149 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 25 Oct 2010 15:02:36 +0530
Subject: [PATCH 083/114] [MOD]: Usability Improvment in cancel & validate
 button  position

bzr revid: dbr@tinyerp.com-20101025093236-mdsrvgyuvq8q2nbl
---
 .../account_voucher/voucher_payment_receipt_view.xml   |  4 ++--
 addons/account_voucher/voucher_sales_purchase_view.xml |  2 +-
 addons/event/res_partner_view.xml                      |  2 +-
 addons/hr_evaluation/hr_evaluation_view.xml            |  4 ++--
 addons/hr_payroll/hr_payroll_view.xml                  |  2 +-
 addons/lunch/lunch_view.xml                            | 10 +++++-----
 addons/marketing_campaign/marketing_campaign_view.xml  |  2 +-
 addons/mrp_repair/mrp_repair_view.xml                  |  4 ++--
 addons/project_scrum/project_scrum_view.xml            |  2 +-
 addons/stock/stock_view.xml                            |  2 +-
 addons/survey/survey_view.xml                          |  4 ++--
 11 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index f6b41f318ed..31f7ffa148d 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -216,8 +216,8 @@
                         <field name="state"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                     </group>
                 </form>
             </field>
@@ -324,8 +324,8 @@
                         <field name="state"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index ed6e98ad17d..c2ddc41a18a 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -259,9 +259,9 @@
                         <field name="state"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                         <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 2fafec3e2ef..53f5413040f 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -37,9 +37,9 @@
                             <field name="unit_price"/>
                             <field name="price_subtotal"/>
                             <field name="state"/>
+                            <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                             <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
                             <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                            <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                         </tree>
                     </field>
                 </page>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 82d13f1cf1c..b0f3ea45a83 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -187,10 +187,10 @@
                             icon="gtk-cancel"/>
                     <button name="button_plan_in_progress" string="Start Evaluation" states="draft" type="object"
                             icon="gtk-execute"/>
-                    <button name="button_final_validation" string="Validate Evaluation" states="wait" type="object"
-                            icon="gtk-execute"/>
                     <button name="button_done" string="Done" states="progress" type="object"
                             icon="gtk-jump-to"/>
+                    <button name="button_final_validation" string="Validate Evaluation" states="wait" type="object"
+                            icon="gtk-go-forward"/>
                     </group>
               </form>
             </field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 641c565704e..68cc03e8c0e 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -915,9 +915,9 @@
                     </notebook>
                     <group col="6" colspan="6">
                         <field name="state"/>
+                        <button name="cancel_sheet" string="Cancel Sheet" states="draft" icon="gtk-cancel"  type="object"/>
                         <button name="confirm_sheet"  icon="gtk-apply" string="Confirm Sheet" states="draft" type="object"/>
                         <button name="set_to_draft" string="Set to Draft"  icon="gtk-convert"  states="cancel,confirm" type="object"/>
-                        <button name="cancel_sheet" string="Cancel Sheet" states="draft" icon="gtk-cancel"  type="object"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 7fb2a7056ef..3fdd81a1ab5 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -54,16 +54,16 @@
                     <field name="category"/>
                     <field name="price" sum="Total price"/>
                     <field name="state"/>
-                    <button colspan="1"
-                              name="%(action_lunch_order_confirm)d"
-                              string="Confirm Order"
-                              type="action" states="draft"
-                              icon="terp-gtk-go-back-rtl" />
                     <button colspan="1"
                               name="%(action_lunch_order_cancel)d"
                               string="Cancel Order"
                               type="action" states="confirmed"
                               icon="gtk-cancel" />
+                    <button colspan="1"
+                              name="%(action_lunch_order_confirm)d"
+                              string="Confirm Order"
+                              type="action" states="draft"
+                              icon="terp-gtk-go-back-rtl" />
                 </tree>
             </field>
         </record>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 26690757234..defe936068b 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -343,9 +343,9 @@
                 <field name="partner_id"/>
                 <field name="date"/>
                 <field name="state"/>
+                <button string="Cancel" states="todo" name="button_cancel" type="object" icon="terp-gtk-stop"/>
                 <button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
                 <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
-                <button string="Cancel" states="todo" name="button_cancel" type="object" icon="terp-gtk-stop"/>
             </tree>
         </field>
     </record>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index a8d90f1e48c..05b27911aff 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -100,6 +100,8 @@
                             <field name="state"/>
                             <button name="cancel" states="draft" string="Cancel Repair" icon="gtk-stop"/>
                             <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action" icon="gtk-stop"/>
+                            <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action" icon="gtk-stop"/>
+                            <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                             <button name="repair_confirm" states="draft" string="Confirm Repair" icon="terp-camera_test"/>
                             <button name="repair_ready" states="confirmed" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
                             <button name="action_repair_start" states="ready" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
@@ -107,8 +109,6 @@
                             <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="terp-dolar"/>
                             <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="terp-emblem-important"/>
                             <button name="action_invoice_create" states="2binvoiced" string="Make Invoice" icon="terp-dolar"/>
-                            <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action" icon="gtk-stop"/>
-                            <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                         </group>
                     </page>
                     <page string="Invoicing">
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 6978f09c8f6..a9f220fd3c0 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -102,10 +102,10 @@
                                             help="Change Type"/>
                                         <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                                         <field name="state" invisible="context.get('set_visible',False)"/>
+                                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-stop" help="For cancelling the task"/>
                                         <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="terp-camera_test" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                                         <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
                                         <button name="do_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
-                                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-stop" help="For cancelling the task"/>
                                 </tree>
                             </field>
                         </page>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9e3de5fca7c..cda98358ae5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1391,9 +1391,9 @@
                     <separator colspan="4"/>
                     <field name="state"/>
                     <group col="4" colspan="2">
+                        <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
                         <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
                         <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                        <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
                         <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
                     </group>
                 </form>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 713f3dbf7a4..484fd856212 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1064,10 +1064,10 @@
                      <field name="response" readonly="1"/>
                     <group colspan="4" col="6">
                      <field name="state"/>
-                         <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
+                        <button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
+                        <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
                         <button name="survey_req_waiting_answer" string="Watting Answer" states="draft" type="object" icon="gtk-new"/>
                         <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
-                        <button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>

From 3ea865c72a70d25a353dcd86a3da59203815fe22 Mon Sep 17 00:00:00 2001
From: "SMA(OpenERP)" <>
Date: Mon, 25 Oct 2010 15:24:30 +0530
Subject: [PATCH 084/114] [IMP] Account: invoice add view_id on creation of
 customer invoices (for webclient logs on sale order..)

bzr revid: mra@mra-laptop-20101025095430-o82g6z3yrhrvv3mm
---
 addons/account/invoice.py | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 0552701f28e..44ebafb9bbd 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -354,12 +354,26 @@ class account_invoice(osv.osv):
             res['arch'] = etree.tostring(doc)
         return res
 
+    def get_log_context(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        mob_obj = self.pool.get('ir.model.data')
+        res = mob_obj.get_object_reference(cr, uid, 'account', 'invoice_form') or False
+        view_id = res and res[1] or False
+        context.update({'view_id': view_id})
+        return context
+
     def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
         try:
             res = super(account_invoice, self).create(cr, uid, vals, context)
             for inv_id, name in self.name_get(cr, uid, [res], context=context):
+                ctx = context.copy()
+                if vals.get('type', 'in_invoice') in ('out_invoice', 'out_refund'):
+                    ctx = self.get_log_context(cr, uid, context=ctx)
                 message = _("Invoice '%s' is waiting for validation.") % name
-                self.log(cr, uid, inv_id, message)
+                self.log(cr, uid, inv_id, message, context=ctx)
             return res
         except Exception, e:
             if '"journal_id" viol' in e.args[0]:
@@ -961,7 +975,9 @@ class account_invoice(osv.osv):
             'analytic_account_id':x.get('account_analytic_id',False),
         }
 
-    def action_number(self, cr, uid, ids, *args):
+    def action_number(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         #TODO: not correct fix but required a frech values before reading it.
         self.write(cr, uid, ids, {})
 
@@ -995,9 +1011,11 @@ class account_invoice(osv.osv):
                         (ref, move_id))
 
             for inv_id, name in self.name_get(cr, uid, [id]):
+                ctx = context.copy()
+                if obj_inv.type in ('out_invoice', 'out_refund'):
+                    ctx = self.get_log_context(cr, uid, context=ctx)
                 message = _('Invoice ') + " '" + name + "' "+ _("is validated.")
-                self.log(cr, uid, inv_id, message)
-
+                self.log(cr, uid, inv_id, message, context=ctx)
         return True
 
     def action_cancel(self, cr, uid, ids, *args):

From abe84f365be91c5a815afacaf47f0cf734bd608a Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 25 Oct 2010 15:27:41 +0530
Subject: [PATCH 085/114] [MOD/IMP] Icons improved

bzr revid: vir@tinyerp.com-20101025095741-s84hfn0rev963oz5
---
 addons/crm/crm_lead_view.xml                          | 4 ++--
 addons/crm/crm_opportunity_view.xml                   | 4 ++--
 addons/crm/report/crm_lead_report_view.xml            | 4 ++--
 addons/marketing_campaign/marketing_campaign_view.xml | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 1b1e7ec04e9..dff880c7fce 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -347,8 +347,8 @@
                     <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
                     <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Category" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'categ_id'}"/>
-                    <filter string="Campaign" icon="terp-stock_symbol-selection"
+                    <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
+                    <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
                         domain="[]" context="{'group_by':'type_id'}" />
                     <filter string="Channel" icon="terp-call-start"
                         domain="[]" context="{'group_by':'channel_id'}" />
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 644d12cfc77..6b308abcd78 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -330,9 +330,9 @@
                                 context="{'group_by':'priority'}" />
                             <filter string="Category" icon="terp-stock_symbol-selection"
                                 domain="[]" context="{'group_by':'categ_id'}" />
-                            <filter string="Campaign" icon="terp-stock_symbol-selection"
+                            <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
                                 domain="[]" context="{'group_by':'type_id'}" groups="base.group_extended"/>
-                            <filter string="Channel" icon="terp-stock_symbol-selection"
+                            <filter string="Channel" icon="terp-call-start"
                                 domain="[]" context="{'group_by':'channel_id'}" />
                             <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                             <separator orientation="vertical" />
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index b711bd68fb5..6f24d89bec2 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -139,9 +139,9 @@
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
-                        <filter string="Campaign" icon="terp-stock_symbol-selection"
+                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
                             domain="[]" context="{'group_by':'type_id'}" />
-                        <filter string="Channel" icon="terp-stock_symbol-selection"
+                        <filter string="Channel" icon="terp-call-start"
                             domain="[]" context="{'group_by':'channel_id'}" />
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize"
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index defe936068b..044746adc2c 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -195,9 +195,9 @@
                <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
                <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
                <separator orientation="vertical"/>
-               <filter icon="terp-project" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
-               <filter icon="terp-project" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
-               <filter icon="terp-project" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
+               <filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
+               <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
+               <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
                <separator orientation="vertical"/>
                <field name="name" select="1"/>
                <field name="campaign_id" select="1"/>
@@ -458,7 +458,7 @@
         view_type="form" />
 
     <!-- Campaign Statistics -->
-    <act_window 
+    <act_window
         context="{'search_default_campaign_id': [active_id]}"
         id="act_marketing_campaing_stat"
         name="Campaign Statistics" res_model="campaign.analysis"

From 0d2c8796b4aabd97ec8ab1376e27813630a8b324 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 25 Oct 2010 12:05:40 +0200
Subject: [PATCH 086/114] [FIX] orm._check_concurrency: pop values from context
 after check to avoid false positives (e.g. nested writes) - one check per
 transaction is enough

bzr revid: odo@openerp.com-20101025100540-oy374900sveb2o5f
---
 bin/osv/orm.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index c24de8c07c2..a639a775b01 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -3191,15 +3191,17 @@ class orm(orm_template):
             return
         if not (context.get(self.CONCURRENCY_CHECK_FIELD) and self._log_access):
             return
-        def key(oid):
-            return "%s,%s" % (self._name, oid)
-        santa = "(id = %s AND %s < COALESCE(write_date, create_date, now())::timestamp)"
-        for i in range(0, len(ids), cr.IN_MAX):
-            sub_ids = tools.flatten(((oid, context[self.CONCURRENCY_CHECK_FIELD][key(oid)])
-                                     for oid in ids[i:i+cr.IN_MAX]
-                                     if key(oid) in context[self.CONCURRENCY_CHECK_FIELD]))
-            if not sub_ids: continue
-            cr.execute("SELECT 1 FROM %s WHERE %s" % (self._table, " OR ".join([santa]*(len(sub_ids)/2))), sub_ids)
+        check_clause = "(id = %s AND %s < COALESCE(write_date, create_date, now())::timestamp)"
+        for sub_ids in cr.split_for_in_conditions(ids):
+            ids_to_check = []
+            for id in sub_ids:
+                id_ref = "%s,%s" % (self._name, id)
+                update_date = context[self.CONCURRENCY_CHECK_FIELD].pop(id_ref, None)
+                if update_date:
+                    ids_to_check.extend([id, update_date])
+            if not ids_to_check:
+                continue
+            cr.execute("SELECT 1 FROM %s WHERE %s" % (self._table, " OR ".join([check_clause]*(len(ids_to_check)/2))), tuple(ids_to_check))
             if cr.fetchone():
                 raise except_orm('ConcurrencyException', _('Records were modified in the meanwhile'))
 

From 443bbac2a313e652b7b101ffef6e11b178cfd9ea Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 25 Oct 2010 15:56:25 +0530
Subject: [PATCH 087/114] [IMP] account: net profit and net loss with
 translatable

bzr revid: mra@mra-laptop-20101025102625-6ss4h9vmxi4zuumf
---
 addons/account/report/account_balance_sheet.py | 13 +++++++------
 addons/account/report/account_profit_loss.py   |  9 +++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index 8655c458724..4d3e06dee05 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -26,6 +26,7 @@ import rml_parse
 from report import report_sxw
 from account.report import account_profit_loss
 from common_report_header import common_report_header
+from tools.translate import _
 
 class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
     def __init__(self, cr, uid, name, context=None):
@@ -61,12 +62,12 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
         self.context = context
 
     def sum_dr(self):
-        if self.res_bl['type'] == 'Net Profit':
+        if self.res_bl['type'] == _('Net Profit'):
             self.result_sum_dr += self.res_bl['balance']*-1
         return self.result_sum_dr
 
     def sum_cr(self):
-        if self.res_bl['type'] == 'Net Loss':
+        if self.res_bl['type'] == _('Net Loss'):
             self.result_sum_cr += self.res_bl['balance']
         return self.result_sum_cr
 
@@ -105,13 +106,13 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
         accounts = account_pool.browse(cr, uid, account_ids, context=ctx)
 
         if not self.res_bl:
-            self.res_bl['type'] = 'Net Profit'
+            self.res_bl['type'] = _('Net Profit')
             self.res_bl['balance'] = 0.0
 
-        if self.res_bl['type'] == 'Net Profit':
-            self.res_bl['type'] = 'Net Profit'
+        if self.res_bl['type'] == _('Net Profit'):
+            self.res_bl['type'] = _('Net Profit')
         else:
-            self.res_bl['type'] = 'Net Loss'
+            self.res_bl['type'] = _('Net Loss')
         pl_dict  = {
             'code': self.res_bl['type'],
             'name': self.res_bl['type'],
diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py
index 3d4ff1accf6..9469c3e0d7e 100644
--- a/addons/account/report/account_profit_loss.py
+++ b/addons/account/report/account_profit_loss.py
@@ -24,6 +24,7 @@ import pooler
 import rml_parse
 from report import report_sxw
 from common_report_header import common_report_header
+from tools.translate import _
 
 class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header):
 
@@ -62,12 +63,12 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header):
         return self.res_pl
 
     def sum_dr(self):
-        if self.res_pl['type'] == 'Net Profit':
+        if self.res_pl['type'] == _('Net Profit'):
             self.result_sum_dr += self.res_pl['balance']
         return self.result_sum_dr
 
     def sum_cr(self):
-        if self.res_pl['type'] == 'Net Loss':
+        if self.res_pl['type'] == _('Net Loss'):
             self.result_sum_cr += self.res_pl['balance']
         return self.result_sum_cr
 
@@ -114,10 +115,10 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header):
                     else:
                         accounts_temp.append(account)
             if self.result_sum_dr > self.result_sum_cr:
-                self.res_pl['type'] = 'Net Loss'
+                self.res_pl['type'] = _('Net Loss')
                 self.res_pl['balance'] = (self.result_sum_dr - self.result_sum_cr)
             else:
-                self.res_pl['type'] = 'Net Profit'
+                self.res_pl['type'] = _('Net Profit')
                 self.res_pl['balance'] = (self.result_sum_cr - self.result_sum_dr)
             self.result[typ] = accounts_temp
             cal_list[typ] = self.result[typ]

From 077baac7afc4d910651c605c7702616aefda893b Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 25 Oct 2010 16:11:02 +0530
Subject: [PATCH 088/114] [REF]

bzr revid: mra@mra-laptop-20101025104102-ip0z7x2dqp0y6npl
---
 addons/account/report/rml_parse.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/report/rml_parse.py b/addons/account/report/rml_parse.py
index 91fc986e7ea..c71c0254849 100644
--- a/addons/account/report/rml_parse.py
+++ b/addons/account/report/rml_parse.py
@@ -19,11 +19,11 @@
 #
 ##############################################################################
 
-from report import report_sxw
 import time
 import re
 import sys
 
+from report import report_sxw
 
 class rml_parse(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
@@ -145,3 +145,4 @@ class rml_parse(report_sxw.rml_parse):
         else:
             return Stringer
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From c1e92a2fc3d4ce32646152ff1c3c6f88fe50b95e Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 25 Oct 2010 16:23:38 +0530
Subject: [PATCH 089/114] [REM] sale/test/so_make_invoice.yml => remove
 cancellation of sale order line test

bzr revid: mra@mra-laptop-20101025105338-vomc3k2xzcjucw5a
---
 addons/sale/test/so_make_invoice.yml | 82 ++++------------------------
 1 file changed, 10 insertions(+), 72 deletions(-)

diff --git a/addons/sale/test/so_make_invoice.yml b/addons/sale/test/so_make_invoice.yml
index 5dfe16d2fac..053521208bf 100644
--- a/addons/sale/test/so_make_invoice.yml
+++ b/addons/sale/test/so_make_invoice.yml
@@ -1,5 +1,5 @@
 -
-  In order to test the 'Make Invoices' wizard of sale module in the Open-ERP, 
+  In order to test the 'Make Invoices' wizard of sale module in the Open-ERP,
   I create two Sale order,group them and create invoice.
 -
   I create a Sale Order for Slider Mobile for qty 100 having order_policy manual.
@@ -28,7 +28,7 @@
     shop_id: sale.shop
 -
   I confirm the Sale Order.
-- 
+-
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_so3}
 -
   I create a Sale Order for products Slider Mobile and LG Viewty Smart for qty 100 having order_policy manual.
@@ -56,7 +56,7 @@
         product_id: sale.product_product_lgviewtysmart0
         product_uos_qty: 100.0
         th_weight: 0.0
-        type: make_to_order      
+        type: make_to_order
     order_policy: manual
     partner_id: sale.res_partner_cleartrail0
     partner_invoice_id: sale.res_partner_address_2
@@ -65,72 +65,10 @@
     picking_policy: direct
     pricelist_id: product.list0
     shop_id: sale.shop
-- 
+-
   I confirm the Sale Order.
-- 
+-
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_so4}
--
-  Then I cancel the sale order line
--
-  I click on the "Cancel" button of sale order line and verify that it gives a warning message.
--
-  !python {model: sale.order.line}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so4"))
-    sol = so.order_line[1] 
-    self.button_cancel(cr, uid, [sol.id], {"lang": "en_US", "tz": False, "active_model":
-      "ir.ui.menu", "active_ids": [ref("sale.menu_invoicing_sales_order_lines")],
-      "search_default_uninvoiced": 1, "active_id": ref("sale.menu_invoicing_sales_order_lines"),
-      })  
--   
-  I verify that picking has been generated for the sale order.
-- 
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so4"))
-    assert so.picking_ids,"Picking has not been generated for sale_order_so4"
--
-  Then I cancel its related stock move from Outgoing Products
--
-  !python {model: stock.move}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so4"))
-    pick_obj = self.pool.get('stock.picking')
-    pick_id = pick_obj.search(cr, uid, [('origin', '=', so.name),('type','=','out')])
-    pick_brw = pick_obj.browse(cr,uid,pick_id)[0]
-    move_obj = self.pool.get('stock.move')
-    move_id = move_obj.search(cr, uid, [('picking_id', '=', pick_brw.name),('name','=','LG Viewty Smart')])
-    self.action_cancel(cr,uid,move_id)
--    
-  Then I cancel its related stock move from Delivery Order
-- 
-  !python {model: stock.move}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so4"))
-    pick_obj = self.pool.get('stock.picking')
-    pick_id = pick_obj.search(cr, uid, [('origin', '=', so.name)])
-    pick_brw = pick_obj.browse(cr,uid,pick_id)[0]
-    move_obj = self.pool.get('stock.move')
-    move_id = move_obj.search(cr, uid, [('picking_id', '=', pick_brw.name),('name','=','LG Viewty Smart')])
-    self.action_cancel(cr,uid,move_id)
--
-  Then I cancel the sale order line for LG Viewty Smart
--
-  !python {model: sale.order.line}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so4"))
-    sol = so.order_line[1] 
-    self.button_cancel(cr, uid, [sol.id], {"lang": "en_US", "tz": False, "active_model":
-      "ir.ui.menu", "active_ids": [ref("sale.menu_invoicing_sales_order_lines")],
-      "search_default_uninvoiced": 1, "active_id": ref("sale.menu_invoicing_sales_order_lines"),
-      })
--
-  I verify that the state of sale order line is cancel  
--
-  !python {model: sale.order.line}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so4"))
-    chk = self.search(cr, uid, [('order_id', '=', so.name),('state','=','cancel')])
-    assert chk,"Sale order line has not been cancelled"
 -
   Then I click on the "Make Invoices" button
 -
@@ -151,8 +89,8 @@
     inv = self.search(cr, uid, [('origin','=','Test_SO004|Test_SO003|')])
     assert inv, "Invoices has not been generated"
 -
-  I verify that an account invoice line with origin 'Test_SO004' is created 
-- 
+  I verify that an account invoice line with origin 'Test_SO004' is created
+-
   !python {model: account.invoice.line}: |
     sale_order_obj = self.pool.get('sale.order')
     acc_inv_obj = self.pool.get('account.invoice')
@@ -161,7 +99,7 @@
     inv_line = self.search(cr, uid, [('origin','=',so.name),('name','=','Slider Mobile'),('invoice_id','=',inv)])
     assert inv_line, "Account invoice line has not been created"
 -
-  I verify that an account invoice line with origin 'Test_SO003' is created 
+  I verify that an account invoice line with origin 'Test_SO003' is created
 -
   !python {model: account.invoice.line}: |
     sale_order_obj = self.pool.get('sale.order')
@@ -181,7 +119,7 @@
         wf_service.trg_validate(uid, 'account.invoice',id,'invoice_open', cr)
 -
   I assign an analytic journal to the bank journal
-- 
+-
   !record {model: account.journal, id: sale.account_journal_bankjournal0}:
     analytic_journal_id: account.cose_journal_sale
 -
@@ -197,7 +135,7 @@
         ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
         name='tst')
 -
-  I verify the invoice is in Paid state 
+  I verify the invoice is in Paid state
 -
   !python {model: account.invoice}: |
     invoice_id = self.search(cr, uid, [('origin','=','Test_SO004|Test_SO003|'),('state','=','paid')])

From ea26bded7aa4f8427bbf8f9a3760ec93dc84a586 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 25 Oct 2010 12:55:55 +0200
Subject: [PATCH 090/114] [FIX] orm._check_concurrency: mention one conflicting
 record in exception message

bzr revid: odo@openerp.com-20101025105555-owkglzq1btuvtrrx
---
 bin/osv/orm.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index a639a775b01..e64f59f626b 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -3201,9 +3201,11 @@ class orm(orm_template):
                     ids_to_check.extend([id, update_date])
             if not ids_to_check:
                 continue
-            cr.execute("SELECT 1 FROM %s WHERE %s" % (self._table, " OR ".join([check_clause]*(len(ids_to_check)/2))), tuple(ids_to_check))
-            if cr.fetchone():
-                raise except_orm('ConcurrencyException', _('Records were modified in the meanwhile'))
+            cr.execute("SELECT id FROM %s WHERE %s" % (self._table, " OR ".join([check_clause]*(len(ids_to_check)/2))), tuple(ids_to_check))
+            res = cr.fetchone()
+            if res:
+                # mention the first one only to keep the error message readable
+                raise except_orm('ConcurrencyException', _('A document was modified since you last viewed it (%s:%d)') % (self._description, res[0]))
 
     def check_access_rule(self, cr, uid, ids, operation, context=None):
         """Verifies that the operation given by ``operation`` is allowed for the user

From 6450419768e0696544e4ca7e2f38919f4bc0f071 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 25 Oct 2010 16:38:53 +0530
Subject: [PATCH 091/114] [REM] membership: remove boolean membership on
 membership product form

bzr revid: mra@mra-laptop-20101025110853-190qe8ibri26ax0e
---
 addons/membership/membership_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 1c552306fc6..e3c0bb9a1e2 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -63,7 +63,6 @@
                       <field name="active"/>
                       <field name="membership_date_from" required="1"/>
                       <field name="membership_date_to" required="1"/>
-					  <field name="membership"/>	
                       <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">

From 03361fc0fbd6116123ac264c8c0ab0010fcea9af Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Mon, 25 Oct 2010 16:46:23 +0530
Subject: [PATCH 092/114] [REF] membership

bzr revid: vth@tinyerp.com-20101025111623-cw6aeccp6twxhinb
---
 addons/membership/membership.py | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 41435cd3cac..12a36fb7e8a 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -156,12 +156,12 @@ class membership_line(osv.osv):
                         'account.invoice': (_get_membership_lines, ['state'], 10),
                         'res.partner': (_get_partners, ['membership_state'], 12),
                         }, help="""It indicates the membership state.
-    -Non Member: A member who has not applied for any membership.
-    -Cancelled Member: A member who has cancelled his membership.
-    -Old Member: A member whose membership date has expired.
-    -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.
-    -Invoiced Member: A member whose invoice has been created.
-    -Paid Member: A member who has paid the membership amount."""),
+                        -Non Member: A member who has not applied for any membership.
+                        -Cancelled Member: A member who has cancelled his membership.
+                        -Old Member: A member whose membership date has expired.
+                        -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.
+                        -Invoiced Member: A member whose invoice has been created.
+                        -Paid Member: A member who has paid the membership amount."""),
         'company_id': fields.related('account_invoice_line', 'invoice_id', 'company_id', type="many2one", relation="res.company", string="Company", readonly=True, store=True)
     }
     _rec_name = 'partner'
@@ -331,12 +331,12 @@ class Partner(osv.osv):
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
                         'res.partner': (_get_partners, ['free_member', 'membership_state', 'associate_member'], 10)
                     }, help="""It indicates the membership state.
-    -Non Member: A member who has not applied for any membership.
-    -Cancelled Member: A member who has cancelled his membership.
-    -Old Member: A member whose membership date has expired.
-    -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.
-    -Invoiced Member: A member whose invoice has been created.
-    -Paid Member: A member who has paid the membership amount."""),
+                    -Non Member: A member who has not applied for any membership.
+                    -Cancelled Member: A member who has cancelled his membership.
+                    -Old Member: A member whose membership date has expired.
+                    -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.
+                    -Invoiced Member: A member whose invoice has been created.
+                    -Paid Member: A member who has paid the membership amount."""),
         'membership_start': fields.function(
                     _membership_date, method=True, multi = 'membeship_start',
                     string = 'Start membership date', type = 'date',
@@ -351,7 +351,7 @@ class Partner(osv.osv):
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
-                        'res.partner': (lambda self, cr, uid, ids, c={}:ids, ['free_member'], 10)
+                        'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
                     }, help="Date until which membership remains active."),
         'membership_cancel': fields.function(
                     _membership_date, method=True,
@@ -359,7 +359,7 @@ class Partner(osv.osv):
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 11),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
-                        'res.partner': (lambda self, cr, uid, ids, c={}:ids, ['free_member'], 10)
+                        'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
                     }, help="Date on which membership has been cancelled"),
     }
     _defaults = {
@@ -395,7 +395,7 @@ class Partner(osv.osv):
     def create_membership_invoice(self, cr, uid, ids, product_id=None, datas=None, context=None):
         """ Create Customer Invoice of Membership for partners.
         @param datas: datas has dictionary value which consist Id of Membership product and Cost Amount of Membership.
-                      datas = {'membership_product_id': None, 'amount':None}
+                      datas = {'membership_product_id': None, 'amount': None}
         """
         invoice_obj = self.pool.get('account.invoice')
         invoice_line_obj = self.pool.get('account.invoice.line')
@@ -452,7 +452,7 @@ Partner()
 class product_template(osv.osv):
     _inherit = 'product.template'
     _columns = {
-        'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price')),
+        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Sale Price')),
     }
 product_template()
 

From 7dd856840ecc75542f42fc18d4e800cdca3f71da Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 25 Oct 2010 16:55:25 +0530
Subject: [PATCH 093/114] [IMP] Improvement in view

bzr revid: vir@tinyerp.com-20101025112525-e0zkf3viuh6pjyer
---
 addons/stock/stock_view.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index cda98358ae5..ad01514cd0b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -758,6 +758,8 @@
                         <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
+                        <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Internal Pickings to invoice"/>
+                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="address_id"/>
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
@@ -770,11 +772,7 @@
                         <separator orientation="vertical" />
                         <filter string="Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
-                    </group>
-                    <newline/>
-                    <group expand="0" string="Extended Filters..." colspan="4" col="8">
-                        <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Internal Pickings to invoice"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
                     </group>
                 </search>
             </field>

From 6bc2e55c1f70f27f7f02ea2bb7eff4684ffc2780 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Mon, 25 Oct 2010 16:55:40 +0530
Subject: [PATCH 094/114] [FIX] account: Refund wizard was giving error with
 modify option

bzr revid: psi@tinyerp.co.in-20101025112540-wao88mnmornmqmxd
---
 addons/account/wizard/account_invoice_refund.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index 638240664b4..4adc25a049d 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -179,7 +179,6 @@ class account_invoice_refund(osv.osv_memory):
                         invoice_lines = inv_obj._refund_cleanup_lines(cr, uid, invoice_lines)
                         tax_lines = inv_tax_obj.read(cr, uid, invoice['tax_line'], context=context)
                         tax_lines = inv_obj._refund_cleanup_lines(cr, uid, tax_lines)
-
                         invoice.update({
                             'type': inv.type,
                             'date_invoice': date,
@@ -190,28 +189,24 @@ class account_invoice_refund(osv.osv_memory):
                             'period_id': period,
                             'name': description
                         })
-
                         for field in ('address_contact_id', 'address_invoice_id', 'partner_id',
                                 'account_id', 'currency_id', 'payment_term', 'journal_id'):
                                 invoice[field] = invoice[field] and invoice[field][0]
-
                         inv_id = inv_obj.create(cr, uid, invoice, {})
                         if inv.payment_term.id:
                             data = inv_obj.onchange_payment_term_date_invoice(cr, uid, [inv_id], inv.payment_term.id, date)
                             if 'value' in data and data['value']:
                                 inv_obj.write(cr, uid, [inv_id], data['value'])
                         created_inv.append(inv_id)
-
             if inv.type in ('out_invoice', 'out_refund'):
                 xml_id = 'action_invoice_tree3'
             else:
                 xml_id = 'action_invoice_tree4'
-
             result = mod_obj._get_id(cr, uid, 'account', xml_id)
             id = mod_obj.read(cr, uid, result, ['res_id'], context=context)['res_id']
             result = act_obj.read(cr, uid, id, context=context)
             invoice_domain = eval(result['domain'])
-            invoice_domain.append(('id', '=', created_inv))
+            invoice_domain.append(('id', 'in', created_inv))
             result['domain'] = invoice_domain
             return result
 
@@ -219,6 +214,7 @@ class account_invoice_refund(osv.osv_memory):
         data_refund = self.read(cr, uid, ids, [],context=context)[0]['filter_refund']
         return self.compute_refund(cr, uid, ids, data_refund, context=context)
 
+
 account_invoice_refund()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 240676e0f98f60d726499fd0d226874c68be928e Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 25 Oct 2010 17:23:01 +0530
Subject: [PATCH 095/114] [MOD] Set an extended option before group by

bzr revid: vir@tinyerp.com-20101025115301-lhnff2c6gimwfoyw
---
 .../account_voucher/account_voucher_view.xml  | 14 +++++-----
 .../voucher_payment_receipt_view.xml          | 28 +++++++++----------
 .../voucher_sales_purchase_view.xml           | 28 +++++++++----------
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 79509542015..6ff07ed3d11 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -107,13 +107,6 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
-                   <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
-                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    </group>
                     <newline/>
                     <group expand="0" string="Extended options..." col='8' colspan='4'>
                         <field name="reference"/>
@@ -121,6 +114,13 @@
                         <field name="narration"/>
                         <field name="amount"/>
                    </group>
+                   <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="10">
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 31f7ffa148d..a9ead2ab7d8 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -23,13 +23,6 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
-                   <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
-                        <filter string="Customer" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    </group>
                     <newline/>
                     <group expand="0" string="Extended options..." col='8' colspan='4'>
                         <field name="reference"/>
@@ -37,6 +30,13 @@
                         <field name="narration"/>
                         <field name="amount"/>
                    </group>
+                   <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="10">
+                        <filter string="Customer" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -63,13 +63,6 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
-                   <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
-                        <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    </group>
                     <newline/>
                     <group expand="0" string="Extended options..." col='8' colspan='4'>
                         <field name="reference"/>
@@ -77,6 +70,13 @@
                         <field name="narration"/>
                         <field name="amount"/>
                    </group>
+                   <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="10">
+                        <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index c2ddc41a18a..0669a2793d9 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -22,13 +22,6 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
-                   <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
-                        <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    </group>
                     <newline/>
                     <group expand="0" string="Extended options..." col='8' colspan='4'>
                         <field name="reference"/>
@@ -36,6 +29,13 @@
                         <field name="narration"/>
                         <field name="amount"/>
                    </group>
+                   <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="10">
+                        <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -61,13 +61,6 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
-                   <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
-                        <filter string="Customer" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    </group>
                     <newline/>
                     <group expand="0" string="Extended options..." col='8' colspan='4'>
                         <field name="reference"/>
@@ -75,6 +68,13 @@
                         <field name="narration"/>
                         <field name="amount"/>
                    </group>
+                   <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="10">
+                        <filter string="Customer" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                 </search>
             </field>
         </record>

From 51652a2fe35f067fc418db73d45350d26afedbfd Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 25 Oct 2010 17:32:21 +0530
Subject: [PATCH 096/114] [MOD]: Usability Improvment in view

bzr revid: dbr@tinyerp.com-20101025120221-7v19g4kqaf6vxg6y
---
 addons/account/account_view.xml               | 13 +++++-----
 addons/account/project/project_view.xml       | 12 ++++-----
 .../report/account_entries_report_view.xml    | 26 +++++++++----------
 addons/crm/crm_opportunity_view.xml           |  2 +-
 .../wizard/project_task_reevaluate_view.xml   |  2 +-
 .../wizard/report_webkit_actions_view.xml     |  2 +-
 addons/stock/wizard/stock_partial_picking.py  |  2 +-
 7 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 9232a53addb..8158b43b533 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1164,6 +1164,13 @@
                         <field name="period_id" context="{'period_id':self, 'search_default_period_id':self}"/>
                     </group>
                     <newline/>
+                    <group expand="0" string="Extended options...">
+                        <field name="ref" select="1" string="Reference"/>
+                        <field name="name" select="1"/>
+                        <field name="narration" select="1"/>
+                        <field name="balance" string="Debit/Credit" select='1'/>
+                    </group>
+                    <newline/>
                     <group expand="0" string="Group By..." colspan="12" col="10">
                         <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
@@ -1173,12 +1180,6 @@
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended options...">
-                        <field name="ref" select="1" string="Reference"/>
-                        <field name="name" select="1"/>
-                        <field name="narration" select="1"/>
-                        <field name="balance" string="Debit/Credit" select='1'/>
-                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 02536fc184c..14bf534eec4 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -205,6 +205,12 @@
                         <field name="user_id">
                             <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
                         </field>
+                    </group>
+					<newline/>
+                    <group expand="0" string="Extended options...">
+                        <field name="journal_id" widget="selection"/>
+                        <field name="product_id" widget="selection"/>
+                        <field name="amount" select="1"/>
                     </group>
                     <newline/>
                     <group string="Group By..." expand="0">
@@ -216,12 +222,6 @@
                         <separator orientation="vertical"/>
                         <filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/>
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended options...">
-                        <field name="journal_id" widget="selection"/>
-                        <field name="product_id" widget="selection"/>
-                        <field name="amount" select="1"/>
-                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 954bfe3ff94..10c274ef529 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -87,6 +87,19 @@
                     <field name="journal_id" widget="selection"/>
                     <field name="period_id"/>
                 </group>
+                 <newline/>
+                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="fiscalyear_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="product_id"/>
+                    <field name="partner_id"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <newline/>
+                    <field name="date_created"/>
+                    <field name="date"/>
+                    <field name="date_maturity"/>
+                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
@@ -106,19 +119,6 @@
                     <filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
                     <filter string="Fiscal Year" icon="terp-go-year" context="{'group_by':'fiscalyear_id'}"/>
                  </group>
-                 <newline/>
-                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="fiscalyear_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="product_id"/>
-                    <field name="partner_id"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="date_created"/>
-                    <field name="date"/>
-                    <field name="date_maturity"/>
-                 </group>
             </search>
         </field>
     </record>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 6b308abcd78..a13c3675fa1 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -75,7 +75,7 @@
                                 <field name="state"/>
                                 <button name="case_cancel" string="Cancel"
                                     states="draft" type="object"
-                                    icon="gtk-close" />
+                                    icon="gtk-cancel" />
                                 <button name="case_mark_lost" string="Mark Lost"
                                     states="open,pending" type="object"
                                     icon="gtk-cancel" />
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index db7bda3afe7..f0158631f51 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -14,7 +14,7 @@
                     <group col="2" colspan="2">
                     </group>
                     <group col="2" colspan="2">
-                        <button icon="gtk-close" special="cancel" string="_Cancel"/>
+                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
                         <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1"/>
                     </group>
                 </form>
diff --git a/addons/report_webkit/wizard/report_webkit_actions_view.xml b/addons/report_webkit/wizard/report_webkit_actions_view.xml
index 7ef262642e1..76d166fc070 100644
--- a/addons/report_webkit/wizard/report_webkit_actions_view.xml
+++ b/addons/report_webkit/wizard/report_webkit_actions_view.xml
@@ -12,7 +12,7 @@
                      <field name="open_action"/>
                     <separator string="" colspan="6"/>
                     <group colspan="6" col="4" >
-                        <button string="_Cancel" icon="gtk-close" special="cancel" />
+                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
                         <button name="do_action" type="object" string="_Ok" icon="gtk-ok" />
                     </group>
                 </form>
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 6f84e5ec12c..6b3b130b0dc 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -141,7 +141,7 @@ class stock_partial_picking(osv.osv_memory):
                 <button icon='gtk-cancel' special="cancel"
                     string="_Cancel" />
                 <button name="do_partial" string="_Validate"
-                    colspan="1" type="object" icon="gtk-apply" />
+                    colspan="1" type="object" icon="gtk-go-forward" />
             </group>
         </form>"""
         result['arch'] = _moves_arch_lst

From 063e1718c9dee5a7bffccbeb820b3ecc446af0ba Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 25 Oct 2010 18:01:24 +0530
Subject: [PATCH 097/114] [MOD] Icons improved

bzr revid: vir@tinyerp.com-20101025123124-nowyqll9de4q052f
---
 addons/account/account_view.xml               | 2 +-
 addons/stock_planning/stock_planning_view.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 8158b43b533..5f817303d35 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -129,7 +129,7 @@
             <field name="arch" type="xml">
                 <search string="Search Period">
                     <group>
-                        <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                        <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="code"/>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 8d8c3cd3790..aaf7e77c0b2 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -198,8 +198,8 @@
                     <field name="create_uid"/>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}"/>
-                        <filter string="Warehouse " icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
+                        <filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
                        <separator orientation="vertical"/>
                        <filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" />
@@ -302,8 +302,8 @@
                     <field name="product_id"/>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}"/>
-                        <filter string="Warehouse " icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
+                        <filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
                        <separator orientation="vertical"/>
                     </group>

From ec3e9cd800aa0811a1aaa6007ed11769fc82c07a Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Mon, 25 Oct 2010 18:04:08 +0530
Subject: [PATCH 098/114] [MOD/IMP] purchase_*,stock: Improvement in usebility
 Icon

bzr revid: amp@tinyerp.com-20101025123408-f8i6ld3yerq57ywq
---
 .../report/account_invoice_report_view.xml    |  4 +-
 addons/purchase/purchase_view.xml             |  2 +-
 .../purchase/report/purchase_report_view.xml  |  2 +-
 .../stock/report/report_stock_move_view.xml   | 56 +++++++++----------
 addons/stock/stock_view.xml                   | 35 ++++++------
 5 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 839bfb2ed26..b8a3c126e11 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -73,11 +73,11 @@
                            domain="[('state','not in', ('draft','cancel'))]"
                            help = "Open and Paid Invoices"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-sale" string="Customer"
+                    <filter icon="terp-personal" string="Customer"
                             name="customer"
                             domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
                             help="Customer Invoices And Refunds"/>
-                    <filter icon="terp-purchase"
+                    <filter icon="terp-personal"
                             string="supplier"
                             separator="1"
                             domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index f825a11cac5..addbfc2bdb4 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -372,7 +372,7 @@
                         </group>
                         <newline/>
                         <group expand="0" string="Group By...">
-                        <filter string="Product" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by' : 'product_id'}" />
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by' : 'product_id'}" />
                         <filter icon="terp-gtk-jump-to-rtl" string="Order Reference" domain="[]" context="{'group_by' :'order_id'}"/>
                          <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index f5d1f7a3b42..a346e9d3973 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -70,7 +70,7 @@
                         string="Quotations"
                         name="quotes"
                         domain="[('state','=','draft')]"/>
-                <filter icon="terp-accessories-archiver"
+                <filter icon="terp-gtk-jump-to-rtl"
                         string="Orders"
                         name="orders"
                         domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 507f475a13e..e3dc3b49c6d 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -83,11 +83,11 @@
                 <separator orientation="vertical"/>
                 <filter string="Done"
                     name="done"
-                    icon="terp-check"
+                    icon="terp-dialog-close"
                     domain="[('state','=','done')]"
                     help = "Completed Stock-Moves"/>
                 <filter string="Todo"
-                    icon="terp-stock"
+                    icon="terp-gtk-go-back-rtl"
                     domain="[('state','in',('assigned','waiting','confirmed'))]"
                     help = "Future Stock-Moves"/>
 
@@ -100,6 +100,17 @@
                 <field name="partner_id" context="{'contact_display':'partner'}"/>
                 </group>
                 <newline/>
+                <group expand="0" string="Extended Filters..."  groups="base.group_extended">
+                    <field name="location_id" />
+                    <field name="location_dest_id" />
+                    <field name="categ_id"/>
+                    <field name="stock_journal"/>
+                    <separator orientation="vertical"/>
+                    <field name="company_id" groups="base.group_multi_company" widget = "selection"/>
+                    <newline/>
+                    <field name="date"/>
+                </group>
+                <newline/>
                 <group expand="1" string="Group By...">
                     <filter name="group_partner" string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
@@ -111,7 +122,7 @@
                     <filter string="Source Location" name="src_location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_id'}"/>
                     <filter string="Dest. Location" name="dest_location" icon="terp-gtk-jump-to-ltr"  context="{'group_by':'location_dest_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Type" name="group_type" icon="terp-gtk-jump-to-rtl" context="{'group_by':'type'}" help="Shipping type specify, goods coming in or going out"/>
+                    <filter string="Type" name="group_type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}" help="Shipping type specify, goods coming in or going out"/>
                     <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Stock journal" name="group_stock_journal" icon="terp-folder-orange" context="{'group_by':'stock_journal'}"/>
                     <separator orientation="vertical"/>
@@ -121,17 +132,6 @@
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'date'}" help="Month Planned"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"  help="Year Planned"/>
                 </group>
-                <newline/>
-                <group expand="0" string="Extended Filters..."  groups="base.group_extended">
-                    <field name="location_id" />
-                    <field name="location_dest_id" />
-                    <field name="categ_id"/>
-                    <field name="stock_journal"/>
-                    <separator orientation="vertical"/>
-                    <field name="company_id" groups="base.group_multi_company" widget = "selection"/>
-                    <newline/>
-                    <field name="date"/>
-                </group>
             </search>
         </field>
     </record>
@@ -207,20 +207,6 @@
                     <field name="company_id" groups="base.group_multi_company"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." >
-                    <filter string="Partner" name="group_partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter name="group_product_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'product_categ_id'}"/>
-                    <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                     <filter name="group_lot" string="Lot" context="{'group_by':'prodlot_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter name="group_company" string="Company" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
-                    <filter name="group_location" string="Location" context="{'group_by':'location_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                </group>
-                <newline/>
                 <group expand="0" string="Extended Filters..."  groups="base.group_extended">
                     <field name="partner_id" context="{'contact_display':'partner'}"/>
                     <field name="product_categ_id" />
@@ -230,6 +216,20 @@
                     <field name="date"/>
                     <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('location_type','=','scrap')]"/>
                 </group>
+                <newline/>
+                <group expand="1" string="Group By..." >
+                    <filter string="Partner" name="group_partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter name="group_product_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'product_categ_id'}"/>
+                    <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                     <filter name="group_lot" string="Lot" context="{'group_by':'prodlot_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter name="group_company" string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
+                    <filter name="group_location" string="Location" icon="terp-go-home" context="{'group_by':'location_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                </group>
             </search>
         </field>
     </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ad01514cd0b..6021fd68ce3 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -967,7 +967,7 @@
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
                     </group>
                 </search>
             </field>
@@ -1182,7 +1182,7 @@
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
                     </group>
                     <group expand="0" string="Extended Filters..." colspan="4" col="8">
                         <filter string="To invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
@@ -1246,7 +1246,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/>
                     </group>
                 </search>
             </field>
@@ -1408,7 +1408,7 @@
                     <group col="14" colspan="4">
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-check" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
+                        <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
                         <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
                         <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
                         <separator orientation="vertical"/>
@@ -1602,26 +1602,26 @@
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
-                        <filter icon="terp-check" name="received" string="Done" domain="[('state','=','done')]"/>
+                        <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
                         <separator orientation="vertical"/>
                         <field name="origin"/>
                         <field name="partner_id" string="Partner"/>
                         <field name="product_id"/>
                     </group>
                     <newline/>
+                    <group expand="0" string="Extended options..." groups="base.group_extended">
+                       <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
+                    </group>
+                    <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Supplier" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Order" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'origin'}"/>
+                        <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended options..." groups="base.group_extended">
-                       <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
-                    </group>
                 </search>
             </field>
         </record>
@@ -1637,27 +1637,26 @@
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
-                        <filter icon="terp-check" name="received" string="Done" domain="[('state','=','done')]"/>
+                        <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
                         <separator orientation="vertical"/>
                         <field name="origin"/>
                         <field name="partner_id" string="Partner"/>
                         <field name="product_id"/>
                     </group>
                     <newline/>
+                    <group expand="0" string="Extended options..." groups="base.group_extended">
+                       <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
+                    </group>
+                    <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <filter string="Customer" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Order" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'origin'}"/>
+                        <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended options..." groups="base.group_extended">
-                       <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
-                    </group>
                 </search>
             </field>
         </record>

From 06ae11efd0f151a77ff6935b78493ba7a9d05913 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 25 Oct 2010 18:24:08 +0530
Subject: [PATCH 099/114] [FIX] Sale: regresion

bzr revid: mra@mra-laptop-20101025125408-6yd1ra6v0geyl7mc
---
 addons/sale/wizard/sale_line_invoice.py | 46 ++++++++++++-------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index c5a6a0e9846..0b6a5219b0c 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -27,33 +27,33 @@ class sale_order_line_make_invoice(osv.osv_memory):
     _name = "sale.order.line.make.invoice"
     _description = "Sale OrderLine Make_invoice"
     def make_invoices(self, cr, uid, ids, context):
-        """ 
+        """
              To make invoices.
-            
+
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
-             @param ids: the ID or list of IDs 
-             @param context: A standard dictionary 
-             
-             @return: A dictionary which of fields with values. 
-        
-        """        
+             @param ids: the ID or list of IDs
+             @param context: A standard dictionary
+
+             @return: A dictionary which of fields with values.
+
+        """
 
         res = False
         invoices = {}
 
     #TODO: merge with sale.py/make_invoice
         def make_invoice(order, lines):
-            """ 
+            """
                  To make invoices.
-                
-                 @param order: 
-                 @param lines: 
-                
-                 @return:  
-            
-            """            
+
+                 @param order:
+                 @param lines:
+
+                 @return:
+
+            """
             a = order.partner_id.property_account_receivable.id
             if order.partner_id and order.partner_id.property_payment_term.id:
                 pay_term = order.partner_id.property_payment_term.id
@@ -90,12 +90,12 @@ class sale_order_line_make_invoice(osv.osv_memory):
                     invoices[line.order_id.id].append((line, lid))
                 sales_order_line_obj.write(cr, uid, [line.id],
                         {'invoiced': True})
-            for result in invoices.values():
-                order = result[0][0].order_id
-                il = map(lambda x: x[1], result)
-                res = make_invoice(order, il)
-                cr.execute('INSERT INTO sale_order_invoice_rel \
-                        (order_id,invoice_id) values (%s,%s)', (order.id, res))
+        for result in invoices.values():
+            order = result[0][0].order_id
+            il = map(lambda x: x[1], result)
+            res = make_invoice(order, il)
+            cr.execute('INSERT INTO sale_order_invoice_rel \
+                    (order_id,invoice_id) values (%s,%s)', (order.id, res))
 
             flag = True
             data_sale = sales_order_obj.browse(cr, uid, line.order_id.id)
@@ -109,7 +109,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
 
         if not invoices:
             raise osv.except_osv(_('Warning'), _('Invoice cannot be created for this Sale Order Line due to one of the following reasons:\n1.The state of this sale order line is either "draft" or "cancel"!\n2.The Sale Order Line is Invoiced!'))
-        
+
         return {}
 
 sale_order_line_make_invoice()

From 1a6b6a9af8c5c316243b3ff6be77e45832d18228 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 25 Oct 2010 18:37:49 +0530
Subject: [PATCH 100/114] [REF] account: Speling mistake

bzr revid: ara@tinyerp.com-20101025130749-8mc353htz29s3v1n
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 9a4875580f8..922256dece6 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1557,7 +1557,7 @@
 
 
         <menuitem
-             name="Manual Reconcilication" icon="STOCK_EXECUTE"
+             name="Manual Reconciliation" icon="STOCK_EXECUTE"
              action="action_account_manual_reconcile"
              id="menu_manual_reconcile"
              parent="account.periodical_processing_reconciliation"/>

From 97de79788ef433548884a1c4fe72788c55faa737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Borja=20L=C3=B3pez=20Soil=C3=A1n?= <>
Date: Mon, 25 Oct 2010 19:24:20 +0530
Subject: [PATCH 101/114] [FIX] Slicing functionality support added to
 safe_eval()

bzr revid: ach@tinyerp.com-20101025135420-pv6iex4np1l9l7is
---
 bin/tools/safe_eval.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/tools/safe_eval.py b/bin/tools/safe_eval.py
index 476ffe5e5a9..ffb9293e183 100644
--- a/bin/tools/safe_eval.py
+++ b/bin/tools/safe_eval.py
@@ -55,7 +55,8 @@ _EXPR_OPCODES = _CONST_OPCODES.union(set(opmap[x] for x in [
 _SAFE_OPCODES = _EXPR_OPCODES.union(set(opmap[x] for x in [
     'STORE_MAP', 'LOAD_NAME', 'CALL_FUNCTION', 'COMPARE_OP', 'LOAD_ATTR',
     'STORE_NAME', 'GET_ITER', 'FOR_ITER', 'LIST_APPEND', 'JUMP_ABSOLUTE',
-    'DELETE_NAME', 'JUMP_IF_TRUE', 'JUMP_IF_FALSE','MAKE_FUNCTION','JUMP_FORWARD'
+    'DELETE_NAME', 'JUMP_IF_TRUE', 'JUMP_IF_FALSE','MAKE_FUNCTION','JUMP_FORWARD',
+    'SLICE+0', 'SLICE+1', 'SLICE+2', 'SLICE+3'
     ] if x in opmap))
 
 _logger = logging.getLogger('safe_eval')

From 12ddd46d74b6b77734d72dc08af7ec11c690554b Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Mon, 25 Oct 2010 16:26:16 +0200
Subject: [PATCH 102/114] [IMP] analytic: removed decimal precision on quantity
 function field on analytic account

bzr revid: qdp-launchpad@tinyerp.com-20101025142616-vgmzxx8ff8nlz2if
---
 addons/analytic/analytic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 5bcba9a90a5..674da6a3679 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -118,7 +118,7 @@ class account_analytic_account(osv.osv):
         'balance': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'debit': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'credit': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
-        'quantity': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Quantity', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
+        'quantity': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
         'quantity_max': fields.float('Maximum Quantity', help='Sets the higher limit of quantity of hours.'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'contact_id': fields.many2one('res.partner.address', 'Contact'),

From 8ce6226a06259c933dc7c8f67d4b63ba4652a0ef Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Mon, 25 Oct 2010 17:22:58 +0200
Subject: [PATCH 103/114] [FIX] account: remove uneeded default value for
 company in account.model

bzr revid: qdp-launchpad@tinyerp.com-20101025152258-c2vuqdpokr2p7knl
---
 addons/account/account.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index f6fb7ce8d19..ea0b98e26bf 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2025,7 +2025,6 @@ class account_model(osv.osv):
 
     _defaults = {
         'legend': lambda self, cr, uid, context:_('You can specify year, month and date in the name of the model using the following labels:\n\n%(year)s: To Specify Year \n%(month)s: To Specify Month \n%(date)s: Current Date\n\ne.g. My model on %(date)s'),
-         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.model', context=c),
     }
     def generate(self, cr, uid, ids, datas={}, context=None):
         move_ids = []

From 4aaa3a4354926dd3c4b9def8844853da1df5f8d2 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Mon, 25 Oct 2010 17:23:33 +0200
Subject: [PATCH 104/114] [FIX] account: fixed an untranslated term

bzr revid: qdp-launchpad@tinyerp.com-20101025152333-bl8btjwqne2qagfh
---
 addons/account/installer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/installer.py b/addons/account/installer.py
index 5bd6a881e07..83ddff6065d 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -322,7 +322,7 @@ class account_installer(osv.osv_memory):
                     #create the bank journal
                     vals_journal = {}
                     vals_journal = {
-                        'name': vals_bnk['name'] + ' Journal',
+                        'name': vals_bnk['name'] + _(' Journal'),
                         'code': _(vals_bnk['name'][:3]).upper(),
                         'sequence_id': seq_id,
                         'type': 'cash',

From 5a377aaa6fb102d846891b9e87e14ac4ba687b52 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Mon, 25 Oct 2010 17:28:34 +0200
Subject: [PATCH 105/114] [FIX] analytic: replaced tabs in sql query with 4
 spaces

bzr revid: qdp-launchpad@tinyerp.com-20101025152834-5u49o7j0yeom0a4r
---
 addons/analytic/analytic.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 674da6a3679..1eb904e59d7 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -66,17 +66,17 @@ class account_analytic_account(osv.osv):
         cr.execute("""
               SELECT a.id,
                      sum(
-			CASE WHEN l.amount > 0
-			THEN l.amount 
-			ELSE 0.0
-			END
-		     ) as debit,
-		     sum(
-			CASE WHEN l.amount < 0
-			THEN -l.amount
-			ELSE 0.0 
-			END
-		     ) as credit,
+                         CASE WHEN l.amount > 0
+                         THEN l.amount 
+                         ELSE 0.0
+                         END
+                          ) as debit,
+                     sum(
+                         CASE WHEN l.amount < 0
+                         THEN -l.amount
+                         ELSE 0.0 
+                         END
+                          ) as credit,
                      COALESCE(SUM(l.amount),0) AS balance,
                      COALESCE(SUM(l.unit_amount),0) AS quantity
               FROM account_analytic_account a 

From 6498ee2251f282febebe638905b05965ed29673a Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 26 Oct 2010 04:36:43 +0000
Subject: [PATCH 106/114] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101026043643-bhe128ecdxwced2d
---
 bin/addons/base/i18n/it.po    | 5717 ++++++++++++++++++++++-----------
 bin/addons/base/i18n/pt_BR.po | 5639 +++++++++++++++++++++-----------
 bin/addons/base/i18n/ru.po    |    4 +-
 3 files changed, 7513 insertions(+), 3847 deletions(-)

diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index 240b05d4306..f7c1d73bfc1 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -6,25 +6,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-10-17 07:49+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-25 15:03+0000\n"
+"Last-Translator: LoReNicolò <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-10-18 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: base
+#: view:ir.filters:0
+#: field:ir.model.fields,domain:0
+#: field:ir.rule,domain:0
+#: field:ir.rule,domain_force:0
+#: field:res.partner.title,domain:0
+msgid "Domain"
+msgstr "Dominio"
+
 #. module: base
 #: model:res.country,name:base.sh
 msgid "Saint Helena"
 msgstr "Sant'Elena"
 
 #. module: base
-#: wizard_view:res.partner.sms_send,init:0
-msgid "SMS - Gateway: clickatell"
-msgstr "SMS - Gateway: clickatell"
+#: view:ir.actions.report.xml:0
+msgid "Other Configuration"
+msgstr "Altre configurazioni"
 
 #. module: base
 #: view:res.lang:0
@@ -32,6 +41,12 @@ msgid "%j - Day of the year as a decimal number [001,366]."
 msgstr "%j - Giorno dell'anno come numero decimale [001,366]."
 
 #. module: base
+#: selection:ir.property,type:0
+msgid "DateTime"
+msgstr "DataOra"
+
+#. module: base
+#: view:ir.values:0
 #: field:ir.values,meta_unpickle:0
 msgid "Metadata"
 msgstr "Metadati"
@@ -49,24 +64,27 @@ msgid "You can not create this kind of document! (%s)"
 msgstr "Non puoi creare questo tipo di documento! (%s)"
 
 #. module: base
-#: wizard_field:module.lang.import,init,code:0
+#: field:base.language.import,code:0
 msgid "Code (eg:en__US)"
 msgstr "Codice (Es:it__IT)"
 
 #. module: base
 #: view:workflow:0
+#: view:workflow.activity:0
 #: field:workflow.activity,wkf_id:0
 #: field:workflow.instance,wkf_id:0
+#: field:workflow.transition,wkf_id:0
+#: field:workflow.workitem,wkf_id:0
 msgid "Workflow"
 msgstr "Flusso di lavoro"
 
 #. module: base
-#: view:wizard.module.lang.export:0
-msgid "To browse official translations, you can visit this link: "
-msgstr "Per visualizzare le traduzioni ufficiali, visita questo link: "
+#: view:partner.sms.send:0
+msgid "SMS - Gateway: clickatell"
+msgstr "SMS - Gateway: clickatell"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Hungarian / Magyar"
 msgstr "Hungarian / Magyar"
 
@@ -75,49 +93,31 @@ msgstr "Hungarian / Magyar"
 msgid "Workflow On"
 msgstr "Flusso di lavoro per"
 
+#. module: base
+#: field:ir.actions.act_window,display_menu_tip:0
+msgid "Display Menu Tips"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Views"
 msgstr "Viste Create"
 
 #. module: base
-#: view:workflow.activity:0
-msgid "Outgoing transitions"
-msgstr "Transizioni in Uscita"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-emblem-important"
+msgstr ""
 
 #. module: base
-#: selection:ir.report.custom,frequency:0
-msgid "Yearly"
-msgstr "Annuale"
+#: field:res.partner,ref:0
+msgid "Reference"
+msgstr "Riferimenti"
 
 #. module: base
 #: field:ir.actions.act_window,target:0
 msgid "Target Window"
 msgstr "Finestra di Destinazione"
 
-#. module: base
-#: model:ir.actions.todo,note:base.config_wizard_simple_view
-msgid ""
-"Choose between the \"Simplified Interface\" or the extended one.\n"
-"If you are testing or using OpenERP for the first time, we suggest you to "
-"use\n"
-"the simplified interface, which has less options and fields but is easier "
-"to\n"
-"understand. You will be able to switch to the extended view later.\n"
-"            "
-msgstr ""
-"Scegliere tra \"Interfaccia Semplificata\" o \"Interfaccia Estesa\".\n"
-"Se si sta testando OpenERP per la prima volta, vi consigliamo di usare\n"
-"l'interfaccia semplificata, che ha meno opzioni e campi ed è più semplice da "
-"\n"
-"comprendere. Si potrà cambiare tipo di interfaccia in seguito.\n"
-"            "
-
-#. module: base
-#: field:ir.rule,operand:0
-msgid "Operand"
-msgstr "Operando"
-
 #. module: base
 #: model:res.country,name:base.kr
 msgid "South Korea"
@@ -140,21 +140,15 @@ msgstr "ir.ui.view.custom"
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_custom
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.custom"
-msgstr "ir.actions.report.custom"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CANCEL"
 msgstr "STOCK_CANCEL"
 
 #. module: base
-#: field:ir.report.custom,sortby:0
-msgid "Sorted By"
-msgstr "Ordinato per"
+#: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
+msgid "Wood Suppliers"
+msgstr "Fornitori di legno"
 
 #. module: base
 #: field:ir.sequence,number_increment:0
@@ -167,18 +161,19 @@ msgstr "Incrementa Numero"
 msgid "Company's Structure"
 msgstr "Struttura Azienda"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_report_custom_fields
-msgid "ir.report.custom.fields"
-msgstr "ir.report.custom.fields"
-
 #. module: base
 #: view:res.partner:0
 msgid "Search Partner"
 msgstr "Ricerca Partner"
 
 #. module: base
-#: code:addons/base/module/wizard/wizard_export_lang.py:0
+#: code:addons/base/res/res_user.py:0
+#, python-format
+msgid "\"smtp_server\" needs to be set to send mails to users"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_export_language.py:0
 #, python-format
 msgid "new"
 msgstr "nuovo"
@@ -189,7 +184,6 @@ msgid "STOCK_GOTO_TOP"
 msgstr "STOCK_GOTO_TOP"
 
 #. module: base
-#: field:ir.actions.report.custom,multi:0
 #: field:ir.actions.report.xml,multi:0
 msgid "On multiple doc."
 msgstr "Su documenti multipli"
@@ -199,6 +193,11 @@ msgstr "Su documenti multipli"
 msgid "Number of Modules"
 msgstr "Numero di Moduli"
 
+#. module: base
+#: help:multi_company.default,company_dest_id:0
+msgid "Company to store the current record"
+msgstr "Azienda dove salvare il record corrente"
+
 #. module: base
 #: field:res.partner.bank.type.field,size:0
 msgid "Max. Size"
@@ -210,7 +209,7 @@ msgid "Contact Name"
 msgstr "Nome Contatto"
 
 #. module: base
-#: code:addons/base/module/wizard/wizard_export_lang.py:0
+#: code:addons/base/module/wizard/base_export_language.py:0
 #, python-format
 msgid ""
 "Save this document to a %s file and edit it with a specific software or a "
@@ -224,20 +223,6 @@ msgstr ""
 msgid "STOCK_DELETE"
 msgstr "STOCK_DELETE"
 
-#. module: base
-#: code:addons/base/ir/ir_model.py:0
-#, python-format
-msgid "Password mismatch !"
-msgstr "Le password non corrispondono !"
-
-#. module: base
-#: code:addons/base/module/module.py:0
-#, python-format
-msgid "This url '%s' must provide an html file with links to zip modules"
-msgstr ""
-"Questo indirizzo URL '%s' deve condurre ad un file html contenente "
-"collegamenti a diversi moduli in formato .zip."
-
 #. module: base
 #: selection:res.request,state:0
 msgid "active"
@@ -254,34 +239,32 @@ msgid "%y - Year without century as a decimal number [00,99]."
 msgstr "%y - Anno senza secolo come numero decimale [00,99]."
 
 #. module: base
-#: selection:ir.ui.menu,icon:0
-msgid "STOCK_GOTO_FIRST"
-msgstr "STOCK_GOTO_FIRST"
+#: selection:maintenance.contract.wizard,state:0
+msgid "Validated"
+msgstr "Convalidato"
 
 #. module: base
-#: selection:ir.report.custom.fields,operation:0
-msgid "Get Max"
-msgstr "Visualizza Massimo"
-
-#. module: base
-#: help:ir.actions.act_window,limit:0
-msgid "Default limit for the list view"
-msgstr "Limite Predefinito per la vista 'Lista'"
+#: field:res.partner,credit_limit:0
+msgid "Credit Limit"
+msgstr "Limite Credito"
 
 #. module: base
 #: field:ir.model.data,date_update:0
 msgid "Update Date"
 msgstr "Data Aggiornamento"
 
+#. module: base
+#: view:ir.attachment:0
+msgid "Owner"
+msgstr "Proprietario"
+
 #. module: base
 #: field:ir.actions.act_window,src_model:0
 msgid "Source Object"
 msgstr "Oggetto Origine"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: view:ir.actions.todo:0
-#: model:ir.ui.menu,name:base.menu_ir_actions_todo_form
 msgid "Config Wizard Steps"
 msgstr "Passaggi Procedura Configurazione"
 
@@ -291,8 +274,14 @@ msgid "ir.ui.view_sc"
 msgstr "ir.ui.view_sc"
 
 #. module: base
+#: field:res.widget.user,widget_id:0
+msgid "Widget"
+msgstr "Oggetto"
+
+#. module: base
+#: view:ir.model.access:0
 #: field:ir.model.access,group_id:0
-#: field:ir.rule,rule_group:0
+#: view:res.config.users:0
 msgid "Group"
 msgstr "Gruppo"
 
@@ -303,28 +292,12 @@ msgstr "Gruppo"
 msgid "Field Name"
 msgstr "Nome Campo"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree_uninstall
-#: model:ir.ui.menu,name:base.menu_module_tree_uninstall
-msgid "Uninstalled modules"
-msgstr "Moduli non Installati"
-
-#. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "txt"
-msgstr "txt"
-
 #. module: base
 #: wizard_view:server.action.create,init:0
 #: wizard_field:server.action.create,init,type:0
 msgid "Select Action Type"
 msgstr "Selezionare il Tipo di Azione"
 
-#. module: base
-#: selection:ir.actions.todo,type:0
-msgid "Configure"
-msgstr "Configurare"
-
 #. module: base
 #: model:res.country,name:base.tv
 msgid "Tuvalu"
@@ -332,7 +305,6 @@ msgstr "Tuvalu"
 
 #. module: base
 #: selection:ir.model,state:0
-#: selection:ir.model.grid,state:0
 msgid "Custom Object"
 msgstr "Oggetto Personalizzato"
 
@@ -368,24 +340,19 @@ msgid "French Guyana"
 msgstr "Guyana Francese"
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Vista originale"
+#: selection:base.language.install,lang:0
+msgid "Greek / Ελληνικά"
+msgstr "Greco / Ελληνικά"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnian / bosanski jezik"
 
 #. module: base
-#: help:ir.actions.report.xml,attachment_use:0
-msgid ""
-"If you check this, then the second time the user prints with same attachment "
-"name, it returns the previous report."
+#: selection:base.language.install,lang:0
+msgid "Serbian / Serbia"
 msgstr ""
-"Se selezionate questo campo, la seconda volta che un utente stamperà "
-"utilizzando lo stesso nome per l'allegato, verrà restituito il report "
-"precedente."
 
 #. module: base
 #: help:res.lang,iso_code:0
@@ -400,6 +367,7 @@ msgstr "STOCK_MEDIA_REWIND"
 
 #. module: base
 #: field:ir.actions.todo,note:0
+#: selection:ir.property,type:0
 msgid "Text"
 msgstr "Testo"
 
@@ -409,7 +377,7 @@ msgid "Country Name"
 msgstr "Nome Nazione"
 
 #. module: base
-#: model:res.country,name:base.coreturn
+#: model:res.country,name:base.co
 msgid "Colombia"
 msgstr "Colombia"
 
@@ -419,9 +387,9 @@ msgid "Schedule Upgrade"
 msgstr "Pianifica l'aggiornamento"
 
 #. module: base
-#: field:ir.actions.report.custom,report_id:0
-msgid "Report Ref."
-msgstr "Rif. Report"
+#: selection:base.language.install,lang:0
+msgid "Mongolian / Mongolia"
+msgstr ""
 
 #. module: base
 #: help:res.country,code:0
@@ -433,10 +401,14 @@ msgstr ""
 "Puoi utilizzare questo campo per una ricerca rapida."
 
 #. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
+#: model:res.country,name:base.pw
+msgid "Palau"
+msgstr "Palau"
+
+#. module: base
+#: view:ir.values:0
+msgid "Action To Launch"
+msgstr "Azione da Lanciare"
 
 #. module: base
 #: view:res.partner:0
@@ -444,10 +416,15 @@ msgid "Sales & Purchases"
 msgstr "Vendite e Acquisti"
 
 #. module: base
-#: view:ir.actions.wizard:0
-#: field:wizard.ir.model.menu.create.line,wizard_id:0
-msgid "Wizard"
-msgstr "Procedura"
+#: view:ir.translation:0
+msgid "Untranslated"
+msgstr "Non tradotti"
+
+#. module: base
+#: help:ir.actions.act_window,context:0
+msgid ""
+"Context dictionary as Python expression, empty by default (Default: {})"
+msgstr ""
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -462,9 +439,9 @@ msgid "Wizards"
 msgstr "Auto-Composizioni"
 
 #. module: base
-#: selection:res.config.view,view:0
-msgid "Extended Interface"
-msgstr "Interfaccia Estesa"
+#: model:res.partner.category,name:base.res_partner_category_miscellaneoussuppliers0
+msgid "Miscellaneous Suppliers"
+msgstr ""
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
@@ -478,7 +455,12 @@ msgid "Select the Action Window, Report, Wizard to be executed."
 msgstr "Selezionare Finestra Azione, Report e Wizard da eseguire"
 
 #. module: base
-#: view:wizard.module.lang.export:0
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gtk-jump-to-ltr"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
 msgid "Export done"
 msgstr "Esportazione Completata"
 
@@ -487,21 +469,31 @@ msgstr "Esportazione Completata"
 msgid "Model Description"
 msgstr "Descrizione Modello"
 
+#. module: base
+#: help:ir.actions.act_window,src_model:0
+msgid ""
+"Optional model name of the objects on which this action should be visible"
+msgstr ""
+
 #. module: base
 #: field:workflow.transition,trigger_expr_id:0
 msgid "Trigger Expression"
 msgstr "Espressione attivatrice"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Korean / Korea, Democratic Peoples Republic of"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.jo
 msgid "Jordan"
 msgstr "Giordania"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:0
-#, python-format
-msgid "You can not remove the model '%s' !"
-msgstr "Non puoi rimuovere il modello '%s' !"
+#: view:ir.module.module:0
+msgid "Certified"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.er
@@ -509,36 +501,48 @@ msgid "Eritrea"
 msgstr "Eritrea"
 
 #. module: base
-#: view:res.config.view:0
-msgid "Configure simple view"
-msgstr "Configura Vista Semplice"
-
-#. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Bulgarian / български"
 msgstr "Bulgarian / български"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_base_action_rule
+msgid "Automated Actions"
+msgstr "Azioni automatiche"
+
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_actions
 msgid "ir.actions.actions"
 msgstr "ir.actions.actions"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_report_custom
-#: view:ir.report.custom:0
-msgid "Custom Report"
-msgstr "Report Personalizzato"
+#: view:partner.wizard.ean.check:0
+msgid "Want to check Ean ? "
+msgstr ""
 
 #. module: base
-#: selection:ir.report.custom,type:0
-msgid "Bar Chart"
-msgstr "Grafico a barre"
+#: field:ir.values,key2:0
+msgid "Event Type"
+msgstr "Tipo Evento"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_DIALOG_ERROR"
 msgstr "STOCK_DIALOG_ERROR"
 
+#. module: base
+#: view:base.language.export:0
+msgid ""
+"OpenERP translations (core, modules, clients) are managed through "
+"Launchpad.net, our open source project management facility. We use their "
+"online interface to synchronize all translations efforts."
+msgstr ""
+
+#. module: base
+#: field:res.partner,title:0
+msgid "Partner Form"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_INDEX"
@@ -567,6 +571,21 @@ msgstr "Cambogia, Regno della"
 msgid "Sequences"
 msgstr "Sequenze"
 
+#. module: base
+#: model:ir.model,name:base.model_base_language_import
+msgid "Language Import"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_config_users
+msgid "res.config.users"
+msgstr "res.config.users"
+
+#. module: base
+#: model:ir.model,name:base.model_base_language_export
+msgid "base.language.export"
+msgstr "base.language.export"
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_DIALOG_QUESTION"
@@ -577,13 +596,24 @@ msgstr "STOCK_DIALOG_QUESTION"
 msgid "Papua New Guinea"
 msgstr "Papua Nuova Guinea"
 
+#. module: base
+#: help:ir.actions.report.xml,report_type:0
+msgid "Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."
+msgstr ""
+"Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."
+
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-folder-yellow"
+msgstr "terp-folder-yellow"
+
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
 msgid "Basic Partner"
 msgstr "Partner Base"
 
 #. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid ","
 msgstr ","
 
@@ -592,18 +622,42 @@ msgstr ","
 msgid "My Partners"
 msgstr "Miei Partners"
 
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "XML Report"
+msgstr "XML Report"
+
 #. module: base
 #: model:res.country,name:base.es
 msgid "Spain"
 msgstr "Spagna"
 
 #. module: base
-#: wizard_view:module.upgrade,end:0
-#: wizard_view:module.upgrade,start:0
-msgid "You may have to reinstall some language pack."
-msgstr "Potrebbe essere necessario reinstallare alcuni file di lingua"
+#: model:ir.ui.menu,name:base.menu_translation_export
+msgid "Import / Export"
+msgstr "Importa / Esporta"
 
 #. module: base
+#: help:ir.actions.act_window,domain:0
+msgid ""
+"Optional domain filtering of the destination data, as a Python expression"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
+#: model:ir.model,name:base.model_base_module_upgrade
+msgid "Module Upgrade"
+msgstr ""
+
+#. module: base
+#: view:res.config.users:0
+msgid ""
+"Groups are used to define access rights on objects and the visibility of "
+"screens and menus"
+msgstr ""
+
+#. module: base
+#: field:res.partner,mobile:0
 #: field:res.partner.address,mobile:0
 msgid "Mobile"
 msgstr "Cellulare"
@@ -619,6 +673,15 @@ msgstr "Oman"
 msgid "Payment term"
 msgstr "Termine di Pagamento"
 
+#. module: base
+#: code:addons/base/res/res_config.py:0
+#, python-format
+msgid ""
+"\n"
+"\n"
+"This addon is already installed on your system"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nu
 msgid "Niue"
@@ -630,11 +693,17 @@ msgid "Work Days"
 msgstr "Giorni Lavorativi"
 
 #. module: base
-#: help:ir.values,action_id:0
-msgid "This field is not used, it only helps you to select the right action."
+#: selection:ir.module.module,license:0
+msgid "Other OSI Approved Licence"
+msgstr ""
+
+#. module: base
+#: help:res.config.users,context_lang:0
+#: help:res.users,context_lang:0
+msgid ""
+"Sets the language for the user's user interface, when UI translations are "
+"available"
 msgstr ""
-"Questo campo non è utilizzato, ti aiuta solamente a selezionare l'azione "
-"corretta."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
@@ -652,6 +721,12 @@ msgstr "India"
 msgid "maintenance contract modules"
 msgstr "Moduli di contratto di manutenzione"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.res_request_link-act
+#: model:ir.ui.menu,name:base.menu_res_request_link_act
+msgid "Request Reference Types"
+msgstr ""
+
 #. module: base
 #: view:ir.values:0
 msgid "client_action_multi, client_action_relate"
@@ -669,27 +744,28 @@ msgid "Child Categories"
 msgstr "Categorie Secondarie"
 
 #. module: base
-#: selection:wizard.module.lang.export,format:0
+#: selection:base.language.export,format:0
 msgid "TGZ Archive"
 msgstr "File TGZ"
 
-#. module: base
-#: field:res.partner.som,factor:0
-msgid "Factor"
-msgstr "Fattore"
-
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
 msgstr "%B - Nome del mese completo"
 
 #. module: base
-#: field:ir.actions.report.xml,report_type:0
-#: field:ir.actions.todo,type:0
+#: view:ir.attachment:0
+#: field:ir.attachment,type:0
+#: field:ir.model,state:0
+#: field:ir.model.fields,state:0
+#: field:ir.property,type:0
 #: field:ir.server.object.lines,type:0
 #: field:ir.translation,type:0
+#: view:ir.ui.view:0
+#: view:ir.values:0
 #: field:ir.values,key:0
 #: view:res.partner:0
+#: view:res.partner.address:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -704,9 +780,14 @@ msgid "Guam (USA)"
 msgstr "Guam (USA)"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_model_grid
-msgid "Objects Security Grid"
-msgstr "Griglia di Sicurezza degli Oggetti"
+#: selection:ir.ui.menu,icon:0
+msgid "STOCK_EDIT"
+msgstr "STOCK_EDIT"
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_hr_project
+msgid "Human Resources Dashboard"
+msgstr ""
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -735,29 +816,17 @@ msgid "Cayman Islands"
 msgstr "Isole Cayman"
 
 #. module: base
-#: model:res.country,name:base.ir
-msgid "Iran"
-msgstr "Iran"
+#: field:ir.module.module,contributors:0
+msgid "Contributors"
+msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.res_request-act
-#: model:ir.ui.menu,name:base.menu_res_request_act
-msgid "My Requests"
-msgstr "Le Mie Richieste"
+#: selection:ir.property,type:0
+msgid "Char"
+msgstr ""
 
 #. module: base
-#: field:ir.sequence,name:0
-#: field:ir.sequence.type,name:0
-msgid "Sequence Name"
-msgstr "Nome Sequenza"
-
-#. module: base
-#: model:res.country,name:base.td
-msgid "Chad"
-msgstr "Chad"
-
-#. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Spanish (AR) / Español (AR)"
 msgstr "Spanish (AR) / Español (AR)"
 
@@ -766,25 +835,33 @@ msgstr "Spanish (AR) / Español (AR)"
 msgid "Uganda"
 msgstr "Uganda"
 
+#. module: base
+#: field:ir.model.access,perm_unlink:0
+msgid "Delete Access"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ne
 msgid "Niger"
 msgstr "Nigeria"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Chinese (HK)"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ba
 msgid "Bosnia-Herzegovina"
 msgstr "Bosnia-Erzegovina"
 
 #. module: base
-#: field:ir.report.custom.fields,alignment:0
-msgid "Alignment"
-msgstr "Allineamento"
-
-#. module: base
-#: selection:ir.rule,operator:0
-msgid ">="
-msgstr ">="
+#: view:base.language.export:0
+msgid ""
+"To improve or expand the official translations, you should use directly "
+"Lauchpad's web interface (Rosetta). If you need to perform mass translation, "
+"Launchpad also allows uploading full .po files at once"
+msgstr ""
 
 #. module: base
 #: view:res.lang:0
@@ -797,27 +874,12 @@ msgstr ""
 "come numero decimale [00,53]. Tutti i giorni in un nuovo anno che precedono "
 "il primo Lunedì sono considerati come appartenenti ala settimana 0."
 
-#. module: base
-#: field:res.partner.event,planned_cost:0
-msgid "Planned Cost"
-msgstr "Costo Pianificato"
-
-#. module: base
-#: model:ir.model,name:base.model_ir_model_config
-msgid "ir.model.config"
-msgstr "ir.model.config"
-
 #. module: base
 #: field:ir.module.module,website:0
 #: field:res.partner,website:0
 msgid "Website"
 msgstr "Sito Web"
 
-#. module: base
-#: view:ir.module.repository:0
-msgid "Repository"
-msgstr "Repository"
-
 #. module: base
 #: model:res.country,name:base.gs
 msgid "S. Georgia & S. Sandwich Isls."
@@ -828,6 +890,11 @@ msgstr "Isole di S. Georgia e S. Sandwich"
 msgid "Action URL"
 msgstr "URL dell'azione"
 
+#. module: base
+#: field:base.module.import,module_name:0
+msgid "Module Name"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_JUSTIFY_FILL"
@@ -844,26 +911,37 @@ msgid "Haiti"
 msgstr "Haiti"
 
 #. module: base
-#: selection:ir.translation,type:0
-msgid "RML"
-msgstr "RML"
-
-#. module: base
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Search"
 msgstr "Ricerca"
 
 #. module: base
-#: code:addons/base/ir/ir_report_custom.py:0
-#, python-format
-msgid "Pie charts need exactly two fields"
-msgstr "I Grafici a Torta necessitano di due campi"
+#: view:ir.rule:0
+msgid ""
+"2. Group-specific rules are combined together with a logical AND operator"
+msgstr ""
 
 #. module: base
-#: help:wizard.module.lang.export,lang:0
+#: help:base.language.export,lang:0
 msgid "To export a new language, do not select a language."
 msgstr "Per esportare una nuova lingua, non selezionare una lingua"
 
+#. module: base
+#: view:res.request:0
+msgid "Request Date"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_hr_dasboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_purchase_root
+msgid "Purchases"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.md
 msgid "Moldavia"
@@ -875,20 +953,16 @@ msgid "Features"
 msgstr "Funzionalità"
 
 #. module: base
-#: field:ir.report.custom,frequency:0
-msgid "Frequency"
-msgstr "Frequenza"
-
-#. module: base
-#: field:ir.report.custom.fields,fc0_op:0
-#: field:ir.report.custom.fields,fc1_op:0
-#: field:ir.report.custom.fields,fc2_op:0
-#: field:ir.report.custom.fields,fc3_op:0
-msgid "Relation"
-msgstr "Relazione"
+#: view:ir.module.module:0
+#: report:ir.module.reference.graph:0
+#: field:maintenance.contract.module,version:0
+msgid "Version"
+msgstr "Versione"
 
 #. module: base
+#: view:ir.model.access:0
 #: field:ir.model.access,perm_read:0
+#: view:ir.rule:0
 msgid "Read Access"
 msgstr "Accesso in lettura"
 
@@ -902,20 +976,16 @@ msgstr "ir.exports"
 msgid "STOCK_MISSING_IMAGE"
 msgstr "STOCK_MISSING_IMAGE"
 
-#. module: base
-#: view:res.users:0
-msgid "Define New Users"
-msgstr "Definire Nuovi Utenti"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_REMOVE"
 msgstr "STOCK_REMOVE"
 
 #. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "raw"
-msgstr "grezzo"
+#: code:addons/base/module/wizard/base_update_translations.py:0
+#, python-format
+msgid "No language with code \"%s\" exists"
+msgstr ""
 
 #. module: base
 #: help:ir.actions.server,email:0
@@ -929,20 +999,15 @@ msgstr ""
 "campo che fornisce l'indirizzo corretto."
 
 #. module: base
-#: field:res.roles,name:0
-msgid "Role Name"
-msgstr "Nome Ruolo"
-
-#. module: base
-#: field:res.partner,user_id:0
-msgid "Dedicated Salesman"
-msgstr "Venditore Dedicato"
-
-#. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "-"
 msgstr "-"
 
+#. module: base
+#: view:wizard.ir.model.menu.create:0
+msgid "Create _Menu"
+msgstr ""
+
 #. module: base
 #: field:res.payterm,name:0
 msgid "Payment Term (short name)"
@@ -956,12 +1021,26 @@ msgid "Bank"
 msgstr "Banca"
 
 #. module: base
-#: view:res.lang:0
-msgid "Examples"
-msgstr "Esempi"
+#: model:ir.model,name:base.model_ir_exports_line
+msgid "ir.exports.line"
+msgstr "ir.exports.line"
 
 #. module: base
+#: help:base.language.install,overwrite:0
+msgid ""
+"If you check this box, your customized translations will be overwritten and "
+"replaced by the official ones."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_rml:0
+msgid "Main report file path"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_action_report_xml
 #: field:ir.module.module,reports_by_module:0
+#: model:ir.ui.menu,name:base.menu_ir_action_report_xml
 msgid "Reports"
 msgstr "Resoconti"
 
@@ -971,9 +1050,15 @@ msgid "On Create"
 msgstr "Alla Creazione"
 
 #. module: base
-#: wizard_view:base.module.import,init:0
-msgid "Please give your module .ZIP file to import."
-msgstr "Definisci il file .ZIP del modulo da importare."
+#: code:addons/base/ir/ir_model.py:0
+#, python-format
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+"'%s' contiene troppi punti. Gli IDS XML non devono contenere punti! Questi "
+"sono usati per riferisti ad altri modelli di dato, come in: "
+"module.reference_id"
 
 #. module: base
 #: field:ir.default,value:0
@@ -981,28 +1066,40 @@ msgid "Default Value"
 msgstr "Valore Predefinito"
 
 #. module: base
-#: wizard_field:res.partner.sms_send,init,user:0
+#: field:partner.sms.send,user:0
+#: field:res.config.users,login:0
 #: field:res.users,login:0
 msgid "Login"
 msgstr "Login"
 
+#. module: base
+#: view:ir.actions.server:0
+msgid ""
+"Access all the fields related to the current object using expressions, i.e. "
+"object.partner_id.name "
+msgstr ""
+
 #. module: base
 #: view:maintenance.contract:0
 #: field:maintenance.contract,module_ids:0
 msgid "Covered Modules"
 msgstr "Moduli coperti"
 
+#. module: base
+#: model:ir.model,name:base.model_res_country_state
+msgid "Country state"
+msgstr "Stato Nazione"
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Float"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_COPY"
 msgstr "STOCK_COPY"
 
-#. module: base
-#: code:addons/base/ir/ir_model.py:0
-#, python-format
-msgid "Model %s Does not Exist !"
-msgstr "Il modello %s non esiste!"
-
 #. module: base
 #: code:addons/base/module/module.py:0
 #, python-format
@@ -1019,9 +1116,9 @@ msgid "res.request.link"
 msgstr "res.request.link"
 
 #. module: base
-#: wizard_button:module.module.update,init,update:0
-msgid "Check new modules"
-msgstr "Cerca Nuovi Moduli"
+#: field:ir.actions.wizard,name:0
+msgid "Wizard Info"
+msgstr "Informazioni procedura guidata"
 
 #. module: base
 #: model:res.country,name:base.km
@@ -1029,11 +1126,11 @@ msgid "Comoros"
 msgstr "Isole Comore"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_server_action
-#: view:ir.actions.server:0
-#: model:ir.ui.menu,name:base.menu_server_action
-msgid "Server Actions"
-msgstr "Azioni Server"
+#: help:res.log,secondary:0
+msgid ""
+"Do not display this log if it belongs to the same object the user is working "
+"on"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.tp
@@ -1041,9 +1138,22 @@ msgid "East Timor"
 msgstr "Timor Est"
 
 #. module: base
-#: view:ir.rule:0
-msgid "Simple domain setup"
-msgstr "Configurazione Dominio Semplice"
+#: model:res.company,follow_up_msg:base.main_company
+msgid ""
+"Date : %(date)s\n"
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Please find in attachment a reminder of all your unpaid invoices, for a "
+"total amount due of:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s"
+msgstr ""
 
 #. module: base
 #: field:res.currency,accuracy:0
@@ -1060,6 +1170,11 @@ msgstr "Kyrgyzstan"
 msgid "wizard.ir.model.menu.create.line"
 msgstr "wizard.ir.model.menu.create.line"
 
+#. module: base
+#: field:ir.attachment,res_id:0
+msgid "Attached ID"
+msgstr "ID Allegato"
+
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1096,22 +1211,6 @@ msgstr "ir.rule"
 msgid "Days"
 msgstr "Giorni"
 
-#. module: base
-#: field:ir.report.custom.fields,width:0
-msgid "Fixed Width"
-msgstr "Larghezza Fissa"
-
-#. module: base
-#: model:res.company,overdue_msg:base.main_company
-msgid ""
-"Would your payment have been carried out after this mail was sent, please "
-"consider the present one as void. Do not hesitate to contact our accounting "
-"department at (+32).81.81.37.00."
-msgstr ""
-"Se il vostro pagamento è stato effettuato prima del ricevimento di questa "
-"mail, prego considerate nullo questo avvertimento. Non esitate a contattare "
-"la nostra amministrazione al (+32).81.81.37.00."
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "terp-calendar"
@@ -1123,33 +1222,37 @@ msgid "STOCK_YES"
 msgstr "STOCK_YES"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_report_custom
-#: model:ir.ui.menu,name:base.menu_ir_action_report_custom
-msgid "Report Custom"
-msgstr "Report Personalizzato"
+#: help:ir.actions.server,condition:0
+msgid ""
+"Condition that is to be tested before action is executed, e.g. "
+"object.list_price > object.cost_price"
+msgstr ""
+"Condizione da verificare prima che l'azione sia eseguita, per esempio "
+"object.list_price > object.cost_price"
 
 #. module: base
-#: code:addons/base/res/partner/partner.py:0
 #: code:addons/base/res/res_company.py:0
-#: code:addons/base/res/res_user.py:0
 #, python-format
 msgid " (copy)"
 msgstr " (copia)"
 
-#. module: base
-#: view:ir.sequence:0
-msgid "Year without century: %(y)s"
-msgstr "Anno senza secolo: %(y)s"
-
 #. module: base
 #: view:res.lang:0
 msgid "7.  %H:%M:%S      ==> 18:25:20"
 msgstr "7. %H:%M:%S ==> 18:25:20"
 
 #. module: base
-#: help:res.users,company_id:0
-msgid "The company this user is currently working on."
-msgstr "L'azienda per la quale lavora attualmente l'utente."
+#: view:res.partner:0
+#: view:res.partner.category:0
+#: field:res.partner.category,partner_ids:0
+msgid "Partners"
+msgstr "Partner"
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_widget_act_window
+#: model:ir.ui.menu,name:base.menu_res_widget_act_window
+msgid "Homepage Widgets"
+msgstr ""
 
 #. module: base
 #: help:ir.actions.server,message:0
@@ -1160,6 +1263,16 @@ msgstr ""
 "Inserisci il messaggo. Puoi usare i campi oggetto. i.e.'Caro [[ "
 "object.partner_id.name ]]'"
 
+#. module: base
+#: field:ir.attachment,res_model:0
+msgid "Attached Model"
+msgstr "Modello di Allegato"
+
+#. module: base
+#: view:ir.rule:0
+msgid "Domain Setup"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,trigger_name:0
 msgid "Trigger Name"
@@ -1172,7 +1285,6 @@ msgstr "ir.model.access"
 
 #. module: base
 #: field:ir.cron,priority:0
-#: field:ir.ui.view,priority:0
 #: field:res.request,priority:0
 #: field:res.request.link,priority:0
 msgid "Priority"
@@ -1209,20 +1321,21 @@ msgstr "STOCK_JUSTIFY_LEFT"
 msgid "Malawi"
 msgstr "Malawi"
 
+#. module: base
+#: code:addons/base/res/res_user.py:0
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
 #. module: base
 #: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Tipo Indirizzo"
 
 #. module: base
-#: selection:ir.actions.todo,start_on:0
-msgid "Auto"
-msgstr "Automatico"
-
-#. module: base
-#: view:res.request:0
-msgid "End of Request"
-msgstr "Fine Richiesta"
+#: view:ir.ui.menu:0
+msgid "Full Path"
+msgstr ""
 
 #. module: base
 #: view:res.request:0
@@ -1242,22 +1355,35 @@ msgstr ""
 "settimana 0."
 
 #. module: base
-#: wizard_view:module.lang.install,init:0
-msgid "Note that this operation may take a few minutes."
-msgstr "Questa operazione potrebbe richiedere alcuni minuti"
+#: code:addons/base/ir/ir_model.py:0
+#, python-format
+msgid ""
+"Model %s Does not Exist !\" % vals['relation']))\n"
+"\n"
+"            if self.pool.get(vals['model']):\n"
+"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
+"                #Added context to _auto_init for special treatment to custom "
+"field for select_level\n"
+"                ctx = context.copy()\n"
+"                "
+"ctx.update({'field_name':vals['name'],'field_state':'manual','select':vals.ge"
+"t('select_level','0"
+msgstr ""
 
 #. module: base
-#: help:ir.sequence,condition:0
-msgid ""
-"If set, sequence will only be used in case this python expression matches, "
-"and will precede other sequences."
+#: view:ir.ui.view:0
+msgid "Advanced"
 msgstr ""
-"Se impostata, la sequenza verrà utilizzata solo nel caso in cui questa "
-"espressione python si verifica, e precederà le altre sequenze."
+
+#. module: base
+#: model:res.country,name:base.fi
+msgid "Finland"
+msgstr "Finlandia"
 
 #. module: base
 #: selection:ir.actions.act_window,view_type:0
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Tree"
@@ -1274,23 +1400,54 @@ msgid "STOCK_CLEAR"
 msgstr "STOCK_CLEAR"
 
 #. module: base
+#: help:res.config.users,password:0
 #: help:res.users,password:0
 msgid ""
 "Keep empty if you don't want the user to be able to connect on the system."
 msgstr ""
 "Tenere vuoto se non si vuole che l'utente possa collegarsi al sistema"
 
+#. module: base
+#: view:ir.actions.server:0
+msgid "Create / Write / Copy"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "https://help.launchpad.net/Translations"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.act_window,view_mode:0
-#: field:res.config.view,view:0
 msgid "View Mode"
 msgstr "Modalità Visualizzazione"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: view:base.language.import:0
+msgid ""
+"When using CSV format, please also check that the first line of your file is "
+"one of the following:"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_log_act_window
+#: model:ir.ui.menu,name:base.menu_res_log_act_window
+#: view:res.log:0
+msgid "Logs"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
 msgid "Spanish / Español"
 msgstr "Spanish / Español"
 
+#. module: base
+#: view:base.module.update:0
+msgid ""
+"This wizard will scan all module repositories on the server side to detect "
+"newly added modules as well as any change to existing modules."
+msgstr ""
+
 #. module: base
 #: field:res.company,logo:0
 msgid "Logo"
@@ -1322,11 +1479,6 @@ msgstr "Nuova Finestra"
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#. module: base
-#: selection:res.partner.event,partner_type:0
-msgid "Commercial Prospect"
-msgstr "Potenziale Cliente Commerciale"
-
 #. module: base
 #: code:addons/base/res/partner/partner.py:0
 #, python-format
@@ -1347,30 +1499,48 @@ msgid "Ireland"
 msgstr "Irlanda"
 
 #. module: base
-#: wizard_field:module.module.update,update,update:0
+#: field:base.module.update,update:0
 msgid "Number of modules updated"
 msgstr "Numero di moduli aggiornati"
 
+#. module: base
+#: view:workflow.activity:0
+msgid "Workflow Activity"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"Example: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 AND "
+"GROUP_A_RULE_2) OR (GROUP_B_RULE_1 AND GROUP_B_RULE_2) )"
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-stock_align_left_24"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.act_window,groups_id:0
 #: model:ir.actions.act_window,name:base.action_res_groups
+#: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,groups_id:0
+#: view:ir.actions.todo:0
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
+#: view:ir.model:0
 #: field:ir.model.fields,groups:0
+#: field:ir.rule,groups:0
+#: view:ir.ui.menu:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
+#: field:res.config.users,groups_id:0
 #: view:res.groups:0
 #: view:res.users:0
 #: field:res.users,groups_id:0
 msgid "Groups"
 msgstr "Gruppi"
 
-#. module: base
-#: constraint:res.users:0
-msgid "This user can not connect using this company !"
-msgstr "Questo utente non può connettersi a questa azienda!"
-
 #. module: base
 #: model:res.country,name:base.bz
 msgid "Belize"
@@ -1386,6 +1556,18 @@ msgstr "Georgia"
 msgid "Poland"
 msgstr "Polonia"
 
+#. module: base
+#: help:ir.actions.act_window,view_mode:0
+msgid ""
+"Comma-separated list of allowed view modes, such as 'form', 'tree', "
+"'calendar', etc. (Default: tree,form)"
+msgstr ""
+
+#. module: base
+#: view:workflow:0
+msgid "Workflow Editor"
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
@@ -1393,18 +1575,14 @@ msgid "To be removed"
 msgstr "Da Rimuovere"
 
 #. module: base
-#: field:ir.values,meta:0
-msgid "Meta Datas"
-msgstr "Metadati"
+#: view:maintenance.contract.wizard:0
+msgid "Maintenance contract added !"
+msgstr "Contratto di manutenzione aggiunto !"
 
 #. module: base
-#: view:wizard.module.update_translations:0
-msgid ""
-"This wizard will detect new terms in the application so that you can update "
-"them manually."
-msgstr ""
-"Questa procedura rileverà nuovi termini nell'applicazione in modo da poterli "
-"aggiornare manualmente"
+#: model:ir.model,name:base.model_ir_sequence
+msgid "ir.sequence"
+msgstr "ir.sequence"
 
 #. module: base
 #: help:ir.actions.server,expression:0
@@ -1422,6 +1600,11 @@ msgstr ""
 msgid "Wizard Field"
 msgstr "Campo Procedura"
 
+#. module: base
+#: view:ir.rule:0
+msgid "Groups (no group = global)"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_SELECT_COLOR"
@@ -1432,6 +1615,13 @@ msgstr "STOCK_SELECT_COLOR"
 msgid "STOCK_NO"
 msgstr "STOCK_NO"
 
+#. module: base
+#: selection:res.config.users,view:0
+#: selection:res.config.view,view:0
+#: selection:res.users,view:0
+msgid "Simplified"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.st
 msgid "Saint Tome (Sao Tome) and Principe"
@@ -1442,11 +1632,6 @@ msgstr "São Tomé e Príncipe"
 msgid "Invoice"
 msgstr "Fattura"
 
-#. module: base
-#: selection:ir.ui.menu,icon:0
-msgid "STOCK_REDO"
-msgstr "STOCK_REDO"
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -1465,9 +1650,13 @@ msgstr ""
 "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
 "speciali!"
 
+#. module: base
+#: field:ir.actions.configuration.wizard,note:0
+msgid "Next Wizard"
+msgstr "Prossima Procedura"
+
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
-#: field:ir.report.custom,menu_id:0
 #: view:ir.ui.menu:0
 #: field:ir.ui.menu,name:0
 msgid "Menu"
@@ -1479,23 +1668,20 @@ msgid "Current Rate"
 msgstr "Tasso corrente"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
-msgid "Greek / Ελληνικά"
-msgstr "Greco / Ελληνικά"
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Vista originale"
 
 #. module: base
-#: view:ir.values:0
-msgid "Action To Launch"
-msgstr "Azione da Lanciare"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-camera_test"
+msgstr ""
 
 #. module: base
-#: selection:ir.report.custom.fields,fc0_op:0
-#: selection:ir.report.custom.fields,fc1_op:0
-#: selection:ir.report.custom.fields,fc2_op:0
-#: selection:ir.report.custom.fields,fc3_op:0
-#: selection:ir.rule,operator:0
-msgid "in"
-msgstr "in"
+#: code:addons/base/res/res_user.py:0
+#, python-format
+msgid "Make sure you have no users linked with the group(s)!"
+msgstr ""
 
 #. module: base
 #: field:ir.actions.url,target:0
@@ -1507,26 +1693,15 @@ msgstr "Obiettivo Azione"
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#. module: base
-#: field:ir.model.config,password_check:0
-msgid "Confirmation"
-msgstr "Conferma"
-
-#. module: base
-#: code:addons/base/ir/ir_report_custom.py:0
-#, python-format
-msgid "Enter at least one field !"
-msgstr "Inserisci almeno un campo !"
-
 #. module: base
 #: field:ir.ui.view_sc,name:0
 msgid "Shortcut Name"
 msgstr "Nome Scorciatoia"
 
 #. module: base
-#: field:res.partner,credit_limit:0
-msgid "Credit Limit"
-msgstr "Limite Credito"
+#: help:ir.actions.act_window,limit:0
+msgid "Default limit for the list view"
+msgstr "Limite Predefinito per la vista 'Lista'"
 
 #. module: base
 #: help:ir.actions.server,write_id:0
@@ -1543,15 +1718,16 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #. module: base
-#: model:ir.ui.menu,name:base.menu_translation_export
-msgid "Import / Export"
-msgstr "Importa / Esporta"
+#: view:base.module.update:0
+msgid "Please be patient, as this operation may take a few seconds..."
+msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_config_user_form
-#: view:res.users:0
-msgid "Configure User"
-msgstr "Configura Utente"
+#: help:ir.values,action_id:0
+msgid "This field is not used, it only helps you to select the right action."
+msgstr ""
+"Questo campo non è utilizzato, ti aiuta solamente a selezionare l'azione "
+"corretta."
 
 #. module: base
 #: field:ir.actions.server,email:0
@@ -1559,7 +1735,7 @@ msgid "Email Address"
 msgstr "Indirizzo di posta elettronica"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "French (BE) / Français (BE)"
 msgstr "Francese (BE) / Français (BE)"
 
@@ -1596,10 +1772,9 @@ msgid "Field Mappings"
 msgstr "Mappatura Campi"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.res_request-closed
-#: model:ir.ui.menu,name:base.next_id_12_close
-msgid "My Closed Requests"
-msgstr "Mie richieste chiuse"
+#: view:base.language.export:0
+msgid "Export Translations"
+msgstr ""
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
@@ -1611,11 +1786,6 @@ msgstr "Personalizzazione"
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#. module: base
-#: selection:ir.report.custom.fields,alignment:0
-msgid "left"
-msgstr "sinistra"
-
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_close
 msgid "ir.actions.act_window_close"
@@ -1631,6 +1801,28 @@ msgstr "Destinazione"
 msgid "Lithuania"
 msgstr "Lituania"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_view_partner_clear_ids
+#: model:ir.model,name:base.model_partner_clear_ids
+#: view:partner.clear.ids:0
+msgid "Clear IDs"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,model:0
+msgid ""
+"Name of object whose function will be called when this scheduler will run. "
+"e.g. 'res.partener'"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:0
+#, python-format
+msgid ""
+"You Can Not Load Translation For language Due To Invalid Language/Country "
+"Code"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_PRINT_PREVIEW"
@@ -1642,10 +1834,9 @@ msgid "Slovenia"
 msgstr "Slovenia"
 
 #. module: base
-#: view:res.partner.canal:0
-#: field:res.partner.event,canal_id:0
-msgid "Channel"
-msgstr "Canale"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-stock_format-default"
+msgstr ""
 
 #. module: base
 #: view:res.lang:0
@@ -1657,6 +1848,11 @@ msgstr "%p - Equivalenti di AM o PM."
 msgid "Iteration Actions"
 msgstr "Iterazione di azioni"
 
+#. module: base
+#: help:multi_company.default,company_id:0
+msgid "Company where the user is connected"
+msgstr ""
+
 #. module: base
 #: field:maintenance.contract,date_stop:0
 msgid "Ending Date"
@@ -1682,16 +1878,6 @@ msgstr "Isola di Norfolk"
 msgid "STOCK_MEDIA_PLAY"
 msgstr "STOCK_MEDIA_PLAY"
 
-#. module: base
-#: field:ir.rule,operator:0
-msgid "Operator"
-msgstr "Operatore"
-
-#. module: base
-#: wizard_view:module.lang.install,start:0
-msgid "Installation Done"
-msgstr "Installazione Completata"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_OPEN"
@@ -1703,11 +1889,6 @@ msgstr "STOCK_OPEN"
 msgid "Client Action"
 msgstr "Azione Cliente"
 
-#. module: base
-#: selection:ir.report.custom.fields,alignment:0
-msgid "right"
-msgstr "destra"
-
 #. module: base
 #: model:res.country,name:base.bd
 msgid "Bangladesh"
@@ -1718,6 +1899,11 @@ msgstr "Bangladesh"
 msgid "Error! You can not create recursive companies."
 msgstr "Attenzione: non puoi creare aziende ricorsive"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-go-home"
+msgstr ""
+
 #. module: base
 #: selection:maintenance.contract,state:0
 msgid "Valid"
@@ -1756,20 +1942,21 @@ msgid "Armenia"
 msgstr "Armenia"
 
 #. module: base
-#: view:ir.sequence:0
-msgid "Year with century: %(year)s"
-msgstr "Anno del secolo: %(year)"
-
-#. module: base
-#: selection:ir.report.custom,frequency:0
-msgid "Daily"
-msgstr "Quotidiano"
+#: model:ir.actions.act_window,name:base.ir_property_form
+#: model:ir.ui.menu,name:base.menu_ir_property_form_all
+msgid "Configuration Parameters"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
 msgstr "Svezia"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-document-new"
+msgstr ""
+
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
 #: selection:ir.ui.view,type:0
@@ -1793,6 +1980,32 @@ msgstr "Tipo Conto Bancario"
 msgid "terp-project"
 msgstr "terp-project"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-personal+"
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-personal-"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,config_logo:0
+#: field:base.language.import,config_logo:0
+#: field:base.language.install,config_logo:0
+#: field:base.module.import,config_logo:0
+#: field:base.module.update,config_logo:0
+#: field:base.update.translations,config_logo:0
+#: field:ir.actions.configuration.wizard,config_logo:0
+#: field:ir.wizard.screen,config_logo:0
+#: field:res.config,config_logo:0
+#: field:res.config.installer,config_logo:0
+#: field:res.config.users,config_logo:0
+#: field:res.config.view,config_logo:0
+msgid "Image"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.server:0
 msgid "Iteration Action Configuration"
@@ -1803,18 +2016,36 @@ msgstr "Configurazione iterazione di azione"
 msgid "Austria"
 msgstr "Austria"
 
+#. module: base
+#: selection:base.language.install,state:0
+#: selection:base.module.import,state:0
+#: selection:base.module.update,state:0
+msgid "done"
+msgstr ""
+
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: model:ir.ui.menu,name:base.menu_calendar_configuration
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Calendar"
 msgstr "Calendario"
 
+#. module: base
+#: field:res.partner.address,partner_id:0
+msgid "Partner Name"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,signal_send:0
 msgid "Signal (subflow.*)"
 msgstr "Signal (subflow.*)"
 
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_17
+msgid "HR sector"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
 msgid "Module dependency"
@@ -1831,9 +2062,11 @@ msgid "STOCK_JUSTIFY_CENTER"
 msgstr "STOCK_JUSTIFY_CENTER"
 
 #. module: base
-#: view:res.config.view:0
-msgid "Choose Your Mode"
-msgstr "Scegli la tua Modalità"
+#: selection:res.config.users,view:0
+#: selection:res.config.view,view:0
+#: selection:res.users,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base
 #: field:res.company,rml_footer1:0
@@ -1847,7 +2080,6 @@ msgstr "Report - Piè di Pagina 2"
 
 #. module: base
 #: view:ir.model.access:0
-#: model:ir.ui.menu,name:base.menu_security_access
 #: view:res.groups:0
 #: field:res.groups,model_access:0
 msgid "Access Controls"
@@ -1860,9 +2092,9 @@ msgid "Dependencies"
 msgstr "Dipendenze"
 
 #. module: base
-#: field:ir.report.custom.fields,bgcolor:0
-msgid "Background Color"
-msgstr "Colore di Sfondo"
+#: field:multi_company.default,company_id:0
+msgid "Main Company"
+msgstr "Azienda Principale"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -1885,9 +2117,11 @@ msgid "Contact Titles"
 msgstr "Qualifiche Contatti"
 
 #. module: base
-#: model:ir.model,name:base.model_res_partner_som
-msgid "res.partner.som"
-msgstr "res.partner.som"
+#: view:base.language.import:0
+msgid ""
+"Please double-check that the file encoding is set to UTF-8 (sometimes called "
+"Unicode) when the translator exports it."
+msgstr ""
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_activity
@@ -1905,14 +2139,9 @@ msgid "Uruguay"
 msgstr "Uruguay"
 
 #. module: base
-#: view:res.partner.event:0
-msgid "Document Link"
-msgstr "Collegamento Documento"
-
-#. module: base
-#: model:ir.model,name:base.model_res_partner_title
-msgid "res.partner.title"
-msgstr "res.partner.title"
+#: field:ir.rule,perm_write:0
+msgid "Apply For Write"
+msgstr ""
 
 #. module: base
 #: field:ir.sequence,prefix:0
@@ -1925,7 +2154,7 @@ msgid "Loop Action"
 msgstr "Azione ripetuta"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "German / Deutsch"
 msgstr "German / Deutsch"
 
@@ -1945,9 +2174,9 @@ msgid "Sir"
 msgstr "Sig."
 
 #. module: base
-#: wizard_button:module.upgrade,next,start:0
-msgid "Start Upgrade"
-msgstr "Inizia Aggiornamento"
+#: view:base.module.import:0
+msgid "Select module package to import (.zip file):"
+msgstr ""
 
 #. module: base
 #: field:ir.default,ref_id:0
@@ -1955,7 +2184,7 @@ msgid "ID Ref."
 msgstr "Rif. ID"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "French / Français"
 msgstr "French / Français"
 
@@ -1971,23 +2200,18 @@ msgstr "Mappatura dei campi"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module
+#: view:ir.model.data:0
 #: field:ir.model.data,module:0
 #: view:ir.module.module:0
 #: field:ir.module.module.dependency,module_id:0
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "Module"
 msgstr "Modulo"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.action_res_bank_form
-#: model:ir.ui.menu,name:base.menu_action_res_bank_form
-msgid "Bank List"
-msgstr "Lista Banche"
-
 #. module: base
 #: field:ir.attachment,description:0
+#: view:ir.module.module:0
 #: field:ir.module.module,description:0
-#: view:res.partner:0
 #: field:res.partner.bank,name:0
 #: view:res.partner.event:0
 #: field:res.partner.event,description:0
@@ -2002,25 +2226,30 @@ msgid "Instances"
 msgstr "Istanze"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_attachment
-msgid "ir.attachment"
-msgstr "ir.attachment"
+#: help:res.partner,employee:0
+msgid "Check this box if the partner is an Employee."
+msgstr ""
 
 #. module: base
-#: field:res.users,action_id:0
-msgid "Home Action"
-msgstr "Azione Home"
+#: field:ir.actions.report.xml,auto:0
+msgid "Custom python parser"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: base
+#: view:res.partner.canal:0
+msgid "Channel"
+msgstr "Canale"
 
 #. module: base
 #: field:res.lang,grouping:0
 msgid "Separator Format"
 msgstr "Formato Separatore"
 
-#. module: base
-#: view:wizard.module.lang.export:0
-msgid "Export language"
-msgstr "Esporta Lingua"
-
 #. module: base
 #: selection:maintenance.contract.wizard,state:0
 msgid "Unvalidated"
@@ -2032,8 +2261,9 @@ msgid "Database Structure"
 msgstr "Struttura Database"
 
 #. module: base
-#: model:ir.actions.wizard,name:base.res_partner_mass_mailing_wizard
-#: wizard_view:res.partner.spam_send,init:0
+#: model:ir.actions.act_window,name:base.action_partner_mass_mail
+#: model:ir.model,name:base.model_partner_wizard_spam
+#: view:partner.wizard.spam:0
 msgid "Mass Mailing"
 msgstr "Mailing di Massa"
 
@@ -2042,11 +2272,6 @@ msgstr "Mailing di Massa"
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#. module: base
-#: wizard_view:module.lang.import,init:0
-msgid "You can also import .po files."
-msgstr "Possibile importare anche .po files"
-
 #. module: base
 #: code:addons/base/maintenance/maintenance.py:0
 #, python-format
@@ -2064,36 +2289,24 @@ msgstr "Per favore specificare una azione da lanciare !"
 msgid "STOCK_JUSTIFY_RIGHT"
 msgstr "STOCK_JUSTIFY_RIGHT"
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_function
-msgid "Function of the contact"
-msgstr "Funzione del Contatto"
-
-#. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree_upgrade
-#: model:ir.ui.menu,name:base.menu_module_tree_upgrade
-msgid "Modules to be installed, upgraded or removed"
-msgstr "Moduli da installare, aggiornare o rimuovere"
-
 #. module: base
 #: view:res.payterm:0
 msgid "Payment Term"
 msgstr "Termini di pagamento"
 
-#. module: base
-#: field:ir.report.custom,footer:0
-msgid "Report Footer"
-msgstr "Piè di pagina del Report"
-
 #. module: base
 #: selection:res.lang,direction:0
 msgid "Right-to-Left"
 msgstr "Da destra a sinistra"
 
 #. module: base
-#: wizard_view:module.lang.import,init:0
-msgid "Import language"
-msgstr "Importa Lingua"
+#: view:ir.actions.act_window:0
+#: model:ir.actions.act_window,name:base.actions_ir_filters_view
+#: view:ir.filters:0
+#: model:ir.model,name:base.model_ir_filters
+#: model:ir.ui.menu,name:base.menu_ir_filters
+msgid "Filters"
+msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_cron_act
@@ -2103,12 +2316,17 @@ msgid "Scheduled Actions"
 msgstr "Azioni Programmate"
 
 #. module: base
-#: field:res.partner,title:0
 #: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
+#: field:res.widget,title:0
 msgid "Title"
 msgstr "Qualifica"
 
+#. module: base
+#: help:ir.property,res_id:0
+msgid "If not set, acts as a default value for new resources"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_SAVE"
@@ -2125,6 +2343,14 @@ msgstr "terp-account"
 msgid "Recursion error in modules dependencies !"
 msgstr "Errore di ricorsione delle dipendenze dei moduli !"
 
+#. module: base
+#: view:base.language.install:0
+msgid ""
+"This wizard helps you add a new language to your OpenERP system. After "
+"loading a new language it becomes available as default interface language "
+"for users and partners."
+msgstr ""
+
 #. module: base
 #: view:ir.model:0
 msgid "Create a Menu"
@@ -2138,21 +2364,10 @@ msgid ""
 msgstr "Seleziona la casella se il partner è soggetto IVA."
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_module_category_tree
-#: model:ir.ui.menu,name:base.menu_action_module_category_tree
-msgid "Categories of Modules"
-msgstr "Categorie di Moduli"
-
-#. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Ukrainian / украї́нська мо́ва"
 msgstr "Ucraino / украї́нська мо́ва"
 
-#. module: base
-#: selection:ir.actions.todo,state:0
-msgid "Not Started"
-msgstr "Non Avviato"
-
 #. module: base
 #: model:res.country,name:base.ru
 msgid "Russian Federation"
@@ -2163,21 +2378,38 @@ msgstr "Federazione Russa"
 msgid "Company Name"
 msgstr "Nome Azienda"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.action_res_roles_form
-#: model:ir.ui.menu,name:base.menu_action_res_roles_form
-#: view:res.roles:0
-#: view:res.users:0
-#: field:res.users,roles_id:0
-msgid "Roles"
-msgstr "Ruoli"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country
 #: model:ir.ui.menu,name:base.menu_country_partner
 msgid "Countries"
 msgstr "Nazioni"
 
+#. module: base
+#: selection:ir.translation,type:0
+msgid "RML  (deprecated - use Report)"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Registra Regole"
+
+#. module: base
+#: view:ir.property:0
+msgid "Field Information"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Search Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_view_partner_wizard_ean_check
+#: view:partner.wizard.ean.check:0
+msgid "Ean check"
+msgstr ""
+
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2198,44 +2430,20 @@ msgstr "Errore: non puoi creare Categorie ricorsive"
 msgid "%x - Appropriate date representation."
 msgstr "%x - Rappresentazione di data appropriata"
 
-#. module: base
-#: help:ir.module.repository,filter:0
-msgid ""
-"Regexp to search module on the repository webpage:\n"
-"- The first parenthesis must match the name of the module.\n"
-"- The second parenthesis must match the whole version number.\n"
-"- The last parenthesis must match the extension of the module."
-msgstr ""
-"Espressioni regolari per cercare un modulo nella pagina web del repository\n"
-"-La prima parentesi deve combaciare con il nome del modulo\n"
-"-La seconda parentesi deve combaciare con l'intero numero di versione\n"
-"-L'ultima parentesi deve combaciare con l'estensione del modulo"
-
-#. module: base
-#: view:res.lang:0
-msgid "%M - Minute as a decimal number [00,59]."
-msgstr "%M - Minuto come numero decimale [00,59]."
-
 #. module: base
 #: model:res.country,name:base.tj
 msgid "Tajikistan"
 msgstr "Tagikistan"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.act_values_form_action
-#: model:ir.ui.menu,name:base.menu_values_form_action
-msgid "Connect Actions To Client Events"
-msgstr "Collega Azioni a Eventi per clienti"
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-2 or later version"
 msgstr "GPL-2 o successiva"
 
 #. module: base
-#: selection:res.partner.event,type:0
-msgid "Prospect Contact"
-msgstr "Contatto Possibile Cliente"
+#: model:res.partner.title,shortcut:base.res_partner_title_sir
+msgid "M."
+msgstr ""
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_wizard
@@ -2243,6 +2451,11 @@ msgstr "Contatto Possibile Cliente"
 msgid "ir.actions.wizard"
 msgstr "ir.actions.wizard"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-mail-forward"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nr
 msgid "Nauru"
@@ -2256,6 +2469,7 @@ msgstr "ir.property"
 #. module: base
 #: selection:ir.actions.act_window,view_type:0
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Form"
@@ -2283,12 +2497,7 @@ msgid "Categories"
 msgstr "Categorie"
 
 #. module: base
-#: model:ir.actions.wizard,name:base.res_partner_send_sms_wizard
-#: wizard_button:res.partner.sms_send,init,send:0
-msgid "Send SMS"
-msgstr "Invia SMS"
-
-#. module: base
+#: view:ir.module.module:0
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "To be upgraded"
@@ -2305,9 +2514,9 @@ msgid "terp-purchase"
 msgstr "terp-purchase"
 
 #. module: base
-#: wizard_field:module.module.update,init,repositories:0
-msgid "Repositories"
-msgstr "Repositories"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-stock_effects-object-colorize"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.cf
@@ -2320,9 +2529,20 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #. module: base
-#: model:res.partner.title,name:base.res_partner_title_ltd
-msgid "Ltd"
-msgstr "Ltd"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-dolar_ok!"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_partner_sms_send
+#: view:partner.sms.send:0
+msgid "Send SMS"
+msgstr "Invia SMS"
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Hindi / India"
+msgstr ""
 
 #. module: base
 #: field:res.partner,ean13:0
@@ -2349,6 +2569,17 @@ msgstr "Certificato di qualità"
 msgid "6.  %d, %m         ==> 05, 12"
 msgstr "6. %d, %m ==> 05, 12"
 
+#. module: base
+#: field:res.config.users,date:0
+#: field:res.users,date:0
+msgid "Last Connection"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,help:0
+msgid "Action description"
+msgstr ""
+
 #. module: base
 #: help:res.partner,customer:0
 msgid "Check this box if the partner is a customer."
@@ -2363,9 +2594,10 @@ msgid "Languages"
 msgstr "Lingue"
 
 #. module: base
-#: model:res.country,name:base.pw
-msgid "Palau"
-msgstr "Palau"
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:res.country,name:base.ec
@@ -2373,7 +2605,7 @@ msgid "Ecuador"
 msgstr "Ecuador"
 
 #. module: base
-#: code:addons/base/module/wizard/wizard_export_lang.py:0
+#: code:addons/base/module/wizard/base_export_language.py:0
 #, python-format
 msgid ""
 "Save this document to a .CSV file and open it with your favourite "
@@ -2386,6 +2618,8 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form
+#: model:ir.actions.act_window,name:base.action_partner_form
+#: model:ir.ui.menu,name:base.menu_partner_form
 #: view:res.partner:0
 msgid "Customers"
 msgstr "Clienti"
@@ -2406,7 +2640,7 @@ msgstr ""
 "lingua di stampa sarà l'inglese."
 
 #. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "Menu :"
 msgstr "Menu :"
 
@@ -2416,9 +2650,9 @@ msgid "Base Field"
 msgstr "Campo Base"
 
 #. module: base
-#: wizard_view:module.module.update,update:0
-msgid "New modules"
-msgstr "Nuovi Moduli"
+#: field:ir.actions.todo,restart:0
+msgid "Restart"
+msgstr ""
 
 #. module: base
 #: field:ir.actions.report.xml,report_sxw_content:0
@@ -2426,16 +2660,18 @@ msgstr "Nuovi Moduli"
 msgid "SXW content"
 msgstr "Contenuto SXW"
 
+#. module: base
+#: view:ir.actions.wizard:0
+#: field:wizard.ir.model.menu.create.line,wizard_id:0
+msgid "Wizard"
+msgstr "Procedura"
+
 #. module: base
 #: view:ir.cron:0
 msgid "Action to Trigger"
 msgstr "Azione da innescare"
 
 #. module: base
-#: field:ir.report.custom.fields,fc0_operande:0
-#: field:ir.report.custom.fields,fc1_operande:0
-#: field:ir.report.custom.fields,fc2_operande:0
-#: field:ir.report.custom.fields,fc3_operande:0
 #: selection:ir.translation,type:0
 msgid "Constraint"
 msgstr "Vincolo"
@@ -2447,23 +2683,32 @@ msgid "Default"
 msgstr "Predefinito"
 
 #. module: base
+#: view:ir.model.fields:0
 #: field:ir.model.fields,required:0
 #: field:res.partner.bank.type.field,required:0
 msgid "Required"
 msgstr "Obbligatorio"
 
 #. module: base
-#: field:ir.model.fields,domain:0
-#: field:ir.rule,domain:0
-#: field:res.partner.title,domain:0
-msgid "Domain"
-msgstr "Dominio"
+#: view:res.users:0
+msgid "Default Filters"
+msgstr ""
 
 #. module: base
 #: field:res.request.history,name:0
 msgid "Summary"
 msgstr "Riepilogo"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-mail-replied"
+msgstr ""
+
+#. module: base
+#: field:multi_company.default,expression:0
+msgid "Expression"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.server,subject:0
 msgid ""
@@ -2479,14 +2724,11 @@ msgid "Header/Footer"
 msgstr "Intestazione / Piè di pagina"
 
 #. module: base
-#: model:res.country,name:base.lb
-msgid "Lebanon"
-msgstr "Libano"
-
-#. module: base
-#: wizard_field:module.lang.import,init,name:0
-msgid "Language name"
-msgstr "Nome lingua"
+#: help:ir.actions.act_window,help:0
+msgid ""
+"Optional help text for the users with a description of the target view, such "
+"as its usage and purpose."
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.va
@@ -2494,23 +2736,19 @@ msgid "Holy See (Vatican City State)"
 msgstr "Stato del Vaticano"
 
 #. module: base
-#: help:ir.actions.server,condition:0
-msgid ""
-"Condition that is to be tested before action is executed, e.g. "
-"object.list_price > object.cost_price"
-msgstr ""
-"Condizione da verificare prima che l'azione sia eseguita, per esempio "
-"object.list_price > object.cost_price"
-
-#. module: base
-#: wizard_field:base.module.import,init,module_file:0
+#: field:base.module.import,module_file:0
 msgid "Module .ZIP file"
 msgstr "File .ZIP del modulo"
 
 #. module: base
-#: field:res.roles,child_id:0
-msgid "Children"
-msgstr "Bambini"
+#: field:ir.ui.view,xml_id:0
+msgid "XML ID"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_16
+msgid "Telecom sector"
+msgstr ""
 
 #. module: base
 #: field:workflow.transition,trigger_model:0
@@ -2518,17 +2756,12 @@ msgid "Trigger Object"
 msgstr "Oggetto di innesco"
 
 #. module: base
-#: selection:ir.report.custom,state:0
-msgid "Subscribed"
-msgstr "Iscritto"
-
-#. module: base
-#: wizard_view:module.lang.install,init:0
-#: wizard_view:module.upgrade,next:0
-msgid "System Upgrade"
-msgstr "Aggiornamento Sistema"
+#: view:res.users:0
+msgid "Current Activity"
+msgstr ""
 
 #. module: base
+#: view:workflow.activity:0
 #: field:workflow.activity,in_transitions:0
 msgid "Incoming Transitions"
 msgstr "Transizioni in Ingresso"
@@ -2539,11 +2772,9 @@ msgid "Suriname"
 msgstr "Suriname"
 
 #. module: base
-#: field:ir.values,key2:0
-#: view:res.partner.event.type:0
-#: field:res.partner.event.type,name:0
-msgid "Event Type"
-msgstr "Tipo Evento"
+#: model:ir.ui.menu,name:base.marketing_menu
+msgid "Marketing"
+msgstr ""
 
 #. module: base
 #: view:res.partner.bank:0
@@ -2566,27 +2797,21 @@ msgstr ""
 "Si è tentato di fare l'upgrade di un modulo che dipenda dal modulo: %s.\n"
 "Ma questo modulo non è disponibile nel sistema."
 
-#. module: base
-#: view:res.partner.address:0
-msgid "Partner Address"
-msgstr "Indirizzo Partner"
-
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
 msgstr "Licenza"
 
-#. module: base
-#: code:addons/base/ir/ir_report_custom.py:0
-#, python-format
-msgid "Invalid operation"
-msgstr "Operazione non valida"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_SAVE_AS"
 msgstr "STOCK_SAVE_AS"
 
+#. module: base
+#: selection:ir.actions.todo,restart:0
+msgid "Always"
+msgstr ""
+
 #. module: base
 #: selection:ir.translation,type:0
 msgid "SQL Constraint"
@@ -2597,6 +2822,13 @@ msgstr "Vincoli SQL"
 msgid "Model"
 msgstr "Modello"
 
+#. module: base
+#: view:base.language.install:0
+msgid ""
+"The selected language has been successfully installed. You must change the "
+"preferences of the user and open a new menu to view the changes."
+msgstr ""
+
 #. module: base
 #: field:ir.actions.act_window.view,view_id:0
 #: field:ir.default,page:0
@@ -2616,15 +2848,20 @@ msgid "Equatorial Guinea"
 msgstr "Guinea Equatoriale"
 
 #. module: base
-#: wizard_view:base.module.import,init:0
-msgid "Module Import"
-msgstr "Importazione Modulo"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-stage"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:0
-#, python-format
-msgid "You can not remove the field '%s' !"
-msgstr "Non puoi rimuovere il campo '%s' !"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gdu-smart-failing"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+#: model:ir.actions.act_window,name:base.action_view_base_module_import
+msgid "Module Import"
+msgstr "Importazione Modulo"
 
 #. module: base
 #: field:res.bank,zip:0
@@ -2634,6 +2871,7 @@ msgid "Zip"
 msgstr "CAP"
 
 #. module: base
+#: view:ir.module.module:0
 #: field:ir.module.module,author:0
 msgid "Author"
 msgstr "Autore"
@@ -2649,12 +2887,12 @@ msgid "STOCK_UNDELETE"
 msgstr "STOCK_UNDELETE"
 
 #. module: base
-#: view:res.lang:0
-msgid "%c - Appropriate date and time representation."
-msgstr "%c - Rappresentazione appropriata della data e dell'ora."
+#: selection:ir.ui.menu,icon:0
+msgid "STOCK_EXECUTE"
+msgstr "STOCK_EXECUTE"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Finland / Suomi"
 msgstr "Finlandese / Suomi"
 
@@ -2663,6 +2901,11 @@ msgstr "Finlandese / Suomi"
 msgid "Bolivia"
 msgstr "Bolivia"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-folder-orange"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.gh
 msgid "Ghana"
@@ -2674,9 +2917,9 @@ msgid "Direction"
 msgstr "Direzione"
 
 #. module: base
-#: model:ir.model,name:base.model_wizard_module_update_translations
-msgid "wizard.module.update_translations"
-msgstr "wizard.module.update_translations"
+#: selection:base.language.install,lang:0
+msgid "Latvian / Latvia"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -2686,18 +2929,20 @@ msgstr "wizard.module.update_translations"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
-#: view:wizard.ir.model.menu.create:0
-#: field:wizard.ir.model.menu.create,view_ids:0
 msgid "Views"
 msgstr "Visualizzazioni"
 
 #. module: base
 #: view:res.groups:0
 #: field:res.groups,rule_groups:0
-#: field:res.users,rules_id:0
 msgid "Rules"
 msgstr "Regole"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Urdu / Pakistan"
+msgstr ""
+
 #. module: base
 #: code:addons/base/module/module.py:0
 #, python-format
@@ -2723,20 +2968,26 @@ msgstr "Guatemala"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_form
+#: model:ir.ui.menu,name:base.menu_low_workflow
 #: model:ir.ui.menu,name:base.menu_workflow
+#: model:ir.ui.menu,name:base.menu_workflow_root
 msgid "Workflows"
 msgstr "Workflow"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_config_wizard_form
-#: model:ir.ui.menu,name:base.menu_config_module
-msgid "Configuration Wizard"
-msgstr "Procedura Configurazione"
+#: model:ir.actions.act_window,name:base.action_config_user_form
+msgid "Create Users"
+msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_res_roles
-msgid "res.roles"
-msgstr "res.roles"
+#: view:ir.values:0
+msgid "tree_but_action, client_print_multi"
+msgstr "tree_but_action, client_print_multi"
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_retailers0
+msgid "Retailers"
+msgstr ""
 
 #. module: base
 #: help:ir.cron,priority:0
@@ -2748,37 +2999,46 @@ msgstr ""
 "10=Non Urgente"
 
 #. module: base
-#: view:res.users:0
+#: view:res.config:0
+#: view:res.config.installer:0
 msgid "Skip"
 msgstr "Salta"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.res_request_link-act
-#: model:ir.ui.menu,name:base.menu_res_request_link_act
-msgid "Accepted Links in Requests"
-msgstr "Link Accettati nella Richiesta"
-
 #. module: base
 #: model:res.country,name:base.ls
 msgid "Lesotho"
 msgstr "Lesotho"
 
+#. module: base
+#: code:addons/base/ir/ir_model.py:0
+#, python-format
+msgid "You can not remove the model '%s' !"
+msgstr "Non puoi rimuovere il modello '%s' !"
+
 #. module: base
 #: model:res.country,name:base.ke
 msgid "Kenya"
 msgstr "Kenia"
 
 #. module: base
-#: view:res.config.view:0
-msgid ""
-"Choose the simplified interface if you are testing OpenERP for the first "
-"time. Less used options or fields are automatically hidden. You will be able "
-"to change this, later, through the Administration menu."
+#: view:res.partner.event:0
+msgid "Event"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_custom_reports
+msgid "Custom Reports"
+msgstr ""
+
+#. module: base
+#: view:base.module.configuration:0
+msgid "System Configuration Done"
+msgstr ""
+
+#. module: base
+#: view:ir.property:0
+msgid "Generic"
 msgstr ""
-"Scegli l'interfaccia semplificata se stai testando OpenERP per la prima "
-"volta. Le funzioni e le opzioni utilizzate meno spesso vengono nascoste "
-"automaticamente. Potrai tornare all'interfaccia completa dal Menu di "
-"Amministrazione"
 
 #. module: base
 #: model:res.country,name:base.sm
@@ -2800,17 +3060,16 @@ msgstr "Perù"
 msgid "Set NULL"
 msgstr "Imposta a NULL"
 
-#. module: base
-#: field:res.partner.event,som:0
-#: field:res.partner.som,name:0
-msgid "State of Mind"
-msgstr "Impressione"
-
 #. module: base
 #: model:res.country,name:base.bj
 msgid "Benin"
 msgstr "Benin"
 
+#. module: base
+#: help:ir.sequence,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -2821,23 +3080,47 @@ msgstr "STOCK_CONNECT"
 msgid "Not Searchable"
 msgstr "Non Cercabile"
 
-#. module: base
-#: field:res.partner.event.type,key:0
-msgid "Key"
-msgstr "Chiave"
-
-#. module: base
-#: field:ir.cron,nextcall:0
-msgid "Next Call Date"
-msgstr "Data della prossima chiamata"
-
 #. module: base
 #: field:res.company,rml_header:0
 msgid "RML Header"
 msgstr "Intestazione RML"
 
 #. module: base
-#: wizard_field:res.partner.sms_send,init,app_id:0
+#: code:addons/base/module/module.py:0
+#, python-format
+msgid ""
+"Unable %s the module \"%s\" because an external dependencie is not met: %s' "
+"% (newstate, module.name, e.args[0])))\n"
+"            if not module.dependencies_id:\n"
+"                mdemo = module.demo\n"
+"            if module.state in states_to_update:\n"
+"                self.write(cr, uid, [module.id], {'state': newstate, "
+"'demo':mdemo})\n"
+"            demo = demo or mdemo\n"
+"        return demo\n"
+"\n"
+"    def button_install(self, cr, uid, ids, context={}):\n"
+"        return self.state_update(cr, uid, ids, 'to install', "
+"['uninstalled'], context)\n"
+"\n"
+"    def button_install_cancel(self, cr, uid, ids, context={}):\n"
+"        self.write(cr, uid, ids, {'state': 'uninstalled', 'demo':False})\n"
+"        return True\n"
+"\n"
+"    def button_uninstall(self, cr, uid, ids, context={}):\n"
+"        for module in self.browse(cr, uid, ids):\n"
+"            cr.execute('''select m.state,m.name\n"
+"                from\n"
+"                    ir_module_module_dependency d\n"
+"                join\n"
+"                    ir_module_module m on (d.module_id=m.id)\n"
+"                where\n"
+"                    d.name=%s and\n"
+"                    m.state not in ('uninstalled','uninstallable','to remove"
+msgstr ""
+
+#. module: base
+#: field:partner.sms.send,app_id:0
 msgid "API ID"
 msgstr "API ID"
 
@@ -2847,22 +3130,24 @@ msgid "Mauritius"
 msgstr "Mauritius"
 
 #. module: base
-#: wizard_view:module.module.update,init:0
-msgid "Scan for new modules"
-msgstr "Cerca nuovi Moduli"
+#: view:ir.model.access:0
+#: view:ir.rule:0
+msgid "Full Access"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
+#: view:ir.actions.report.xml:0
+#: view:ir.actions.wizard:0
+#: view:ir.model.fields:0
 #: model:ir.ui.menu,name:base.menu_security
 msgid "Security"
 msgstr "Sicurezza"
 
 #. module: base
-#: code:addons/base/ir/ir_report_custom.py:0
-#, python-format
-msgid "Using a relation field which uses an unknown object"
+#: model:res.widget,title:base.openerp_twitter_favorites
+msgid "OpenERP Favorites"
 msgstr ""
-"Utilizzo di un campo di relazione, che si avvale di un oggetto sconosciuto"
 
 #. module: base
 #: model:res.country,name:base.za
@@ -2870,16 +3155,18 @@ msgid "South Africa"
 msgstr "Sud Africa"
 
 #. module: base
-#: model:ir.model,name:base.model_wizard_module_lang_export
-msgid "wizard.module.lang.export"
-msgstr "wizard.module.lang.export"
-
-#. module: base
+#: view:ir.module.module:0
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "Installed"
 msgstr "Installato"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_translation
+#: model:ir.ui.menu,name:base.menu_action_translation
+msgid "Translation Terms"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.sn
 msgid "Senegal"
@@ -2900,11 +3187,26 @@ msgstr "res.groups"
 msgid "Brazil"
 msgstr "Brasile"
 
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "Affero GPL-3"
+msgstr ""
+
 #. module: base
 #: field:ir.sequence,number_next:0
 msgid "Next Number"
 msgstr "Numero Successivo"
 
+#. module: base
+#: help:workflow.transition,condition:0
+msgid "Expression to be satisfied if we want the transition done."
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gtk-media-pause"
+msgstr ""
+
 #. module: base
 #: view:res.currency:0
 #: field:res.currency,rate_ids:0
@@ -2912,7 +3214,7 @@ msgid "Rates"
 msgstr "Tassi"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Albanian / Shqipëri"
 msgstr "Albania / Shqipëri"
 
@@ -2927,24 +3229,20 @@ msgid "======================================================"
 msgstr "======================================================"
 
 #. module: base
-#: field:ir.report.custom.fields,field_child2:0
-msgid "Field child2"
-msgstr "Campo figlio2"
+#: help:ir.actions.server,mobile:0
+msgid ""
+"Provides fields that be used to fetch the mobile number, e.g. you select the "
+"invoice, then `object.invoice_address_id.mobile` is the field which gives "
+"the correct mobile number"
+msgstr ""
+"Fornisce campi che possono essere usati per reperire il numero di celluare, "
+"ad esempio: seleziona la fattura, poi 'object.invoice_address_id.mobile' è "
+"il campo che da il corretto numero di cellulare"
 
 #. module: base
-#: field:ir.report.custom.fields,field_child3:0
-msgid "Field child3"
-msgstr "Campo figlio3"
-
-#. module: base
-#: field:ir.report.custom.fields,field_child0:0
-msgid "Field child0"
-msgstr "Campo figlio0"
-
-#. module: base
-#: field:ir.report.custom.fields,field_child1:0
-msgid "Field child1"
-msgstr "Campo figlio1"
+#: view:base.module.upgrade:0
+msgid "System update completed"
+msgstr ""
 
 #. module: base
 #: field:ir.model.fields,selection:0
@@ -2957,6 +3255,7 @@ msgid "draft"
 msgstr "Bozza"
 
 #. module: base
+#: selection:ir.property,type:0
 #: field:res.currency,date:0
 #: field:res.currency.rate,name:0
 #: field:res.partner,date:0
@@ -2972,26 +3271,22 @@ msgstr "Percorso SXW"
 
 #. module: base
 #: view:ir.attachment:0
-#: field:ir.attachment,datas:0
 msgid "Data"
 msgstr "Dati"
 
-#. module: base
-#: view:res.users:0
-msgid "Groups are used to defined access rights on each screen and menu."
-msgstr ""
-"I gruppi sono utilizzati per definire i diritti di accesso su ciascuna "
-"schermata e menu"
-
 #. module: base
 #: field:ir.ui.menu,parent_id:0
 #: field:wizard.ir.model.menu.create,menu_id:0
 msgid "Parent Menu"
 msgstr "Menu Superiore"
 
+#. module: base
+#: field:ir.rule,perm_unlink:0
+msgid "Apply For Delete"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.act_window.view,multi:0
-#: help:ir.actions.report.custom,multi:0
 #: help:ir.actions.report.xml,multi:0
 msgid ""
 "If set to true, the action will not be displayed on the right toolbar of a "
@@ -3001,9 +3296,14 @@ msgstr ""
 "destra di un form"
 
 #. module: base
-#: model:ir.ui.menu,name:base.menu_custom_multicompany
-msgid "Multi company"
-msgstr "Multi azienda"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gtk-go-back-rtl"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.al
+msgid "Albania"
+msgstr "Albania"
 
 #. module: base
 #: view:ir.attachment:0
@@ -3033,10 +3333,15 @@ msgid "Mexico"
 msgstr "Messico"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Swedish / svenska"
 msgstr "Swedish / svenska"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_base_config_plugins
+msgid "Plugins"
+msgstr ""
+
 #. module: base
 #: field:res.company,child_ids:0
 msgid "Child Companies"
@@ -3058,17 +3363,17 @@ msgid "General Description"
 msgstr "Descrizione Generale"
 
 #. module: base
-#: selection:res.partner.event,type:0
-msgid "Sale Opportunity"
-msgstr "Opportunità di Vendita"
+#: model:ir.actions.act_window,name:base.action_config_simple_view_form
+msgid "Configure Your Interface"
+msgstr ""
 
 #. module: base
-#: view:maintenance.contract.wizard:0
-msgid "Maintenance contract added !"
-msgstr "Contratto di manutenzione aggiunto !"
+#: field:ir.values,meta:0
+msgid "Meta Datas"
+msgstr "Metadati"
 
 #. module: base
-#: field:ir.rule,field_id:0
+#: field:ir.property,fields_id:0
 #: selection:ir.translation,type:0
 #: field:multi_company.default,field_id:0
 msgid "Field"
@@ -3079,6 +3384,11 @@ msgstr "Campo"
 msgid "Venezuela"
 msgstr "Venezuela"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Malayalam / India"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "9.  %j              ==> 340"
@@ -3089,12 +3399,6 @@ msgstr "9. %j ==> 340"
 msgid "Zambia"
 msgstr "Zambia"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.ir_action_report_xml
-#: model:ir.ui.menu,name:base.menu_ir_action_report_xml
-msgid "Report Xml"
-msgstr "Report XML"
-
 #. module: base
 #: help:res.partner,user_id:0
 msgid ""
@@ -3132,24 +3436,33 @@ msgstr "Kazakistan"
 #: field:ir.module.category,name:0
 #: field:ir.module.module,name:0
 #: field:ir.module.module.dependency,name:0
-#: rml:ir.module.reference:0
-#: field:ir.module.repository,name:0
+#: report:ir.module.reference.graph:0
 #: field:ir.property,name:0
-#: field:ir.report.custom.fields,name:0
+#: field:ir.rule,name:0
+#: field:ir.sequence,name:0
+#: field:ir.sequence.type,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
+#: field:multi_company.default,name:0
 #: field:res.bank,name:0
 #: field:res.config.view,name:0
 #: field:res.lang,name:0
 #: field:res.partner,name:0
 #: field:res.partner.bank.type,name:0
+#: view:res.partner.event:0
 #: field:res.request.link,name:0
-#: field:res.users,name:0
 #: field:workflow,name:0
 #: field:workflow.activity,name:0
 msgid "Name"
 msgstr "Nome"
 
+#. module: base
+#: help:ir.actions.act_window,multi:0
+msgid ""
+"If set to true, the action will not be displayed on the right toolbar of a "
+"form view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ms
 msgid "Montserrat"
@@ -3161,9 +3474,12 @@ msgid "Application Terms"
 msgstr "Termini Applicazione"
 
 #. module: base
-#: selection:ir.report.custom.fields,operation:0
-msgid "Calculate Average"
-msgstr "Calcola Media"
+#: help:res.config.users,context_tz:0
+#: help:res.users,context_tz:0
+msgid ""
+"The user's timezone, used to perform timezone conversions between the server "
+"and the client."
+msgstr ""
 
 #. module: base
 #: field:ir.module.module,demo:0
@@ -3171,7 +3487,7 @@ msgid "Demo data"
 msgstr "Dati Dimostrativi"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "English (UK)"
 msgstr "Inglese (Regno Unito)"
 
@@ -3180,40 +3496,38 @@ msgstr "Inglese (Regno Unito)"
 msgid "Antarctica"
 msgstr "Antartide"
 
+#. module: base
+#: help:workflow.transition,act_from:0
+msgid ""
+"Source activity. When this activity is over, the condition is tested to "
+"determine if we can start the ACT_TO activity."
+msgstr ""
+
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_3
 msgid "Starter Partner"
 msgstr "Partner iniziale"
 
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Your system will be updated."
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_view
 msgid "ir.actions.act_window.view"
 msgstr "ir.actions.act_window.view"
 
 #. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "Web"
 msgstr "Web"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "English (CA)"
 msgstr "Inglese (Canada)"
 
-#. module: base
-#: field:res.partner.event,planned_revenue:0
-msgid "Planned Revenue"
-msgstr "Entrata Pianificata"
-
-#. module: base
-#: wizard_view:module.lang.import,init:0
-msgid ""
-"You have to import a .CSV file wich is encoded in UTF-8.  Please check that "
-"the first line of your file is one of the following:"
-msgstr ""
-"Devi importare un file .CSV codificato in UTF-8. Per favore controlla che la "
-"prima riga del tuo file sia una delle seguenti:"
-
 #. module: base
 #: model:res.country,name:base.et
 msgid "Ethiopia"
@@ -3225,9 +3539,9 @@ msgid "%H - Hour (24-hour clock) as a decimal number [00,23]."
 msgstr "%H - Ora (24 - ore) come numero decimale [00,23]."
 
 #. module: base
-#: view:res.roles:0
-msgid "Role"
-msgstr "Ruolo"
+#: view:res.lang:0
+msgid "%M - Minute as a decimal number [00,59]."
+msgstr "%M - Minuto come numero decimale [00,59]."
 
 #. module: base
 #: help:res.country.state,code:0
@@ -3240,25 +3554,34 @@ msgid "Svalbard and Jan Mayen Islands"
 msgstr "Isole Svalbard e Jan Mayen"
 
 #. module: base
-#: view:ir.rule:0
-msgid "Test"
-msgstr "Test"
+#: model:ir.ui.menu,name:base.menu_view_base_module_update
+msgid " Update Modules List"
+msgstr ""
 
 #. module: base
-#: field:ir.report.custom.fields,groupby:0
+#: view:ir.actions.act_window:0
+#: view:ir.actions.report.xml:0
+#: view:ir.actions.server:0
+#: view:ir.filters:0
+#: view:res.request:0
 msgid "Group By"
 msgstr "Raggruppa per"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:0
-#, python-format
-msgid ""
-"'%s' contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+#: view:res.config:0
+#: view:res.config.installer:0
+msgid "title"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_language_install
+msgid "Install Language"
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Translation"
 msgstr ""
-"'%s' contiene troppi punti. Gli IDS XML non devono contenere punti! Questi "
-"sono usati per riferisti ad altri modelli di dato, come in: "
-"module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -3276,7 +3599,7 @@ msgid "closed"
 msgstr "chiuso"
 
 #. module: base
-#: selection:wizard.module.lang.export,state:0
+#: selection:base.language.export,state:0
 msgid "get"
 msgstr "scarica"
 
@@ -3290,15 +3613,26 @@ msgstr "Su cancellazione proprietà per i campi molti a uno"
 msgid "Write Id"
 msgstr "Scrivere Id"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_product
+msgid "Products"
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-accessories-archiver-minus"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.act_window,domain:0
+#: field:ir.filters,domain:0
 msgid "Domain Value"
 msgstr "Valore Dominio"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
-msgid "STOCK_ITALIC"
-msgstr "STOCK_ITALIC"
+msgid "STOCK_REDO"
+msgstr "STOCK_REDO"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -3328,12 +3662,6 @@ msgstr "Tipo Conto"
 msgid "The name of the group can not start with \"-\""
 msgstr "Il nome del gruppo non può iniziare con '-'"
 
-#. module: base
-#: wizard_view:module.upgrade,end:0
-#: wizard_view:module.upgrade,start:0
-msgid "We suggest you to reload the menu tab (Ctrl+t Ctrl+r)."
-msgstr "Suggerimento: ricarica la scheda Menu (Ctrl+t Ctrl+r)"
-
 #. module: base
 #: view:ir.ui.view_sc:0
 #: field:res.partner.title,shortcut:0
@@ -3346,15 +3674,15 @@ msgid "Init Date"
 msgstr "Data Inizio"
 
 #. module: base
+#: view:workflow.activity:0
 #: field:workflow.activity,flow_start:0
 msgid "Flow Start"
 msgstr "Avvia Flusso"
 
 #. module: base
-#: view:ir.model:0
-#: view:ir.model.fields:0
-msgid "Security on Groups"
-msgstr "Sicurezza Gruppi"
+#: model:ir.model,name:base.model_res_partner_title
+msgid "res.partner.title"
+msgstr "res.partner.title"
 
 #. module: base
 #: view:res.partner.bank:0
@@ -3363,11 +3691,11 @@ msgstr "Titolare del conto"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_values_form
-#: model:ir.ui.menu,name:base.menu_values_form
 msgid "Client Actions Connections"
 msgstr "Connessioni alle azioni del client"
 
 #. module: base
+#: field:ir.attachment,res_name:0
 #: field:ir.ui.view_sc,resource:0
 msgid "Resource Name"
 msgstr "Nome Risorsa"
@@ -3383,20 +3711,26 @@ msgid "Guadeloupe (French)"
 msgstr "Guadalupa (Francia)"
 
 #. module: base
-#: field:ir.report.custom.fields,cumulate:0
-msgid "Accumulate"
-msgstr "Accumula"
-
-#. module: base
-#: code:addons/base/ir/ir_report_custom.py:0
+#: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "Tree can only be used in tabular reports"
-msgstr ""
-"La struttura ad albero può essere utilizzata esclusivamente nei report "
-"tabellari"
+msgid "User Error"
+msgstr "Errore dell'Utente"
 
 #. module: base
-#: rml:ir.module.reference:0
+#: help:workflow.transition,signal:0
+msgid ""
+"When the operation of transition comes from a button pressed in the client "
+"form, signal tests the name of the pressed button. If signal is NULL, no "
+"button is necessary to validate this transition."
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,object_id:0
+msgid "Object affected by this rule"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference.graph:0
 msgid "Directory"
 msgstr "Cartella"
 
@@ -3406,19 +3740,14 @@ msgid "Menu Name"
 msgstr "Nome Menu"
 
 #. module: base
-#: field:ir.report.custom,title:0
-msgid "Report Title"
-msgstr "Titolo del report"
+#: view:ir.module.module:0
+msgid "Author Website"
+msgstr ""
 
 #. module: base
-#: field:ir.report.custom.fields,fontcolor:0
-msgid "Font color"
-msgstr "Colore Carattere"
-
-#. module: base
-#: selection:ir.ui.menu,icon:0
-msgid "STOCK_SORT_DESCENDING"
-msgstr "STOCK_SORT_DESCENDING"
+#: view:ir.attachment:0
+msgid "Month"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.my
@@ -3426,9 +3755,10 @@ msgid "Malaysia"
 msgstr "Malesia"
 
 #. module: base
-#: model:ir.model,name:base.model_res_request_history
-msgid "res.request.history"
-msgstr "res.request.history"
+#: view:base.language.install:0
+#: model:ir.actions.act_window,name:base.action_view_base_language_install
+msgid "Load Official Translation"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.server:0
@@ -3436,15 +3766,18 @@ msgid "Client Action Configuration"
 msgstr "Configurazione azione del client"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_partner_address_form
 #: model:ir.model,name:base.model_res_partner_address
-#: model:ir.ui.menu,name:base.menu_partner_address_form
 #: view:res.partner.address:0
 msgid "Partner Addresses"
 msgstr "Indirizzi Partner"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gtk-stop"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
 msgid "Indonesian / Bahasa Indonesia"
 msgstr "Indonesiano / Bahasa Indonesiano"
 
@@ -3470,12 +3803,6 @@ msgstr ""
 msgid "Events"
 msgstr "Eventi"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.action_res_roles
-#: model:ir.ui.menu,name:base.menu_action_res_roles
-msgid "Roles Structure"
-msgstr "Struttura Ruoli"
-
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_url
 #: selection:ir.ui.menu,action:0
@@ -3499,20 +3826,37 @@ msgid "Partner Contacts"
 msgstr "Contatti del partner"
 
 #. module: base
-#: wizard_field:module.module.update,update,add:0
+#: field:base.module.update,add:0
 msgid "Number of modules added"
 msgstr "Numero di moduli aggiunti"
 
 #. module: base
-#: field:workflow.transition,role_id:0
-msgid "Role Required"
-msgstr "Ruolo Richiesto"
+#: view:res.currency:0
+msgid "Price Accuracy"
+msgstr ""
+
+#. module: base
+#: view:res.config:0
+#: view:res.config.installer:0
+msgid "vsep"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.server,name:base.action_start_configurator
+#: model:ir.ui.menu,name:base.menu_view_base_module_configuration
+msgid "Start Configuration"
+msgstr ""
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Menus"
 msgstr "Menu Creati"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-idea"
+msgstr ""
+
 #. module: base
 #: field:workflow.triggers,workitem_id:0
 msgid "Workitem"
@@ -3535,6 +3879,7 @@ msgstr "STOCK_ZOOM_OUT"
 #: field:ir.ui.menu,action:0
 #: field:ir.values,action_id:0
 #: selection:ir.values,key:0
+#: view:res.users:0
 msgid "Action"
 msgstr "Azione"
 
@@ -3548,6 +3893,16 @@ msgstr "Configurazione Email"
 msgid "ir.cron"
 msgstr "ir.cron"
 
+#. module: base
+#: view:ir.rule:0
+msgid "Combination of rules"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Current Year without Century: %(y)s"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "terp-mrp"
@@ -3578,11 +3933,6 @@ msgstr "Sudan"
 msgid "%m - Month as a decimal number [01,12]."
 msgstr "%m - Mese come numero decimale [01,12]."
 
-#. module: base
-#: view:wizard.module.lang.export:0
-msgid "Export Data"
-msgstr "Esporta Dati"
-
 #. module: base
 #: model:res.country,name:base.fm
 msgid "Micronesia"
@@ -3600,36 +3950,49 @@ msgstr "Riepilogo Richiesta"
 msgid "Menus"
 msgstr "Menu"
 
+#. module: base
+#: selection:ir.module.module.dependency,state:0
+msgid "Uninstallable"
+msgstr "Disinstallabile"
+
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "STOCK_SORT_DESCENDING"
+msgstr "STOCK_SORT_DESCENDING"
+
 #. module: base
 #: model:res.country,name:base.il
 msgid "Israel"
 msgstr "Israele"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-stock_symbol-selection"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_maintenance_contract_form
+#: model:ir.ui.menu,name:base.menu_maintenance_contract
+msgid "Maintenance Contracts"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.wizard,name:base.wizard_server_action_create
 msgid "Create Action"
 msgstr "Crea azione"
 
 #. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "HTML from HTML"
-msgstr "HTML da HTML"
-
-#. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "html"
-msgstr "html"
+#: model:ir.actions.act_window,name:base.action_model_model
+#: model:ir.model,name:base.model_ir_model
+#: model:ir.ui.menu,name:base.ir_model_model_menu
+msgid "Objects"
+msgstr "Oggetti"
 
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
 msgstr "Formato dell'ora"
 
-#. module: base
-#: wizard_view:module.upgrade,next:0
-msgid "Your system will be upgraded."
-msgstr "Il sistema verrà aggiornato"
-
 #. module: base
 #: view:ir.module.module:0
 msgid "Defined Reports"
@@ -3646,15 +4009,17 @@ msgid "Report xml"
 msgstr "Report XML"
 
 #. module: base
+#: field:base.language.export,modules:0
 #: model:ir.actions.act_window,name:base.action_module_open_categ
 #: model:ir.actions.act_window,name:base.open_module_tree
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.menu_management
 #: model:ir.ui.menu,name:base.menu_module_tree
-#: field:wizard.module.lang.export,modules:0
 msgid "Modules"
 msgstr "Moduli"
 
 #. module: base
+#: view:workflow.activity:0
 #: selection:workflow.activity,kind:0
 #: field:workflow.activity,subflow_id:0
 #: field:workflow.workitem,subflow_id:0
@@ -3672,11 +4037,18 @@ msgid "Signal (button Name)"
 msgstr "Segnale (Nome Pulsante)"
 
 #. module: base
+#: model:ir.actions.act_window,name:base.action_res_bank_form
+#: model:ir.ui.menu,name:base.menu_action_res_bank_form
 #: view:res.bank:0
 #: field:res.partner,bank_ids:0
 msgid "Banks"
 msgstr "Banche"
 
+#. module: base
+#: view:res.log:0
+msgid "Unread"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "terp-sale"
@@ -3693,7 +4065,7 @@ msgid "%I - Hour (12-hour clock) as a decimal number [01,12]."
 msgstr "%I - Ora (formato 12 ore) come numero decimale [01,12]."
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Romanian / limba română"
 msgstr "Romanian / limba română"
 
@@ -3729,9 +4101,11 @@ msgid "United Kingdom"
 msgstr "Regno Unito"
 
 #. module: base
-#: view:ir.actions.server:0
-msgid "Create / Write"
-msgstr "Crea / Scrivi"
+#: view:res.config:0
+#: view:res.config.users:0
+#: view:res.config.view:0
+msgid "res_config_contents"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -3741,7 +4115,7 @@ msgstr ""
 "rimuovere."
 
 #. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "Object:"
 msgstr "Oggetto:"
 
@@ -3757,21 +4131,16 @@ msgstr "Botswana"
 msgid "Partner Titles"
 msgstr "Qualifiche Partner"
 
-#. module: base
-#: selection:ir.actions.todo,type:0
-msgid "Service"
-msgstr "Servizio"
-
 #. module: base
 #: help:ir.actions.act_window,auto_refresh:0
 msgid "Add an auto-refresh on the view"
 msgstr "Aggiungi auto-aggiornamento alla vista"
 
 #. module: base
-#: wizard_view:module.upgrade,next:0
-#: wizard_field:module.upgrade,next,module_download:0
-msgid "Modules to download"
-msgstr "Moduli da Scaricare"
+#: field:ir.actions.report.xml,report_rml_content:0
+#: field:ir.actions.report.xml,report_rml_content_data:0
+msgid "RML content"
+msgstr "Contenuto RML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_workitem_form
@@ -3780,12 +4149,22 @@ msgid "Workitems"
 msgstr "Oggetti di Lavoro"
 
 #. module: base
-#: field:wizard.module.lang.export,advice:0
+#: field:base.language.export,advice:0
 msgid "Advice"
 msgstr "Consiglio"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: model:ir.model,name:base.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
+#. module: base
+#: view:base.language.import:0
+msgid "- module,type,name,res_id,src,value"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
 msgid "Lithuanian / Lietuvių kalba"
 msgstr "Lithuanian / Lietuvių kalba"
 
@@ -3804,15 +4183,42 @@ msgid "Inherited View"
 msgstr "Vista Collegata"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: view:ir.translation:0
+msgid "Source Term"
+msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree_install
-#: model:ir.ui.menu,name:base.menu_module_tree_install
-msgid "Installed modules"
-msgstr "Moduli Installati"
+#: model:ir.ui.menu,name:base.menu_main_pm
+msgid "Project"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+msgid "Module file successfully imported!"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: base
+#: view:partner.clear.ids:0
+msgid "Want to Clear Ids ? "
+msgstr ""
+
+#. module: base
+#: selection:res.request,priority:0
+msgid "Low"
+msgstr "Bassa"
+
+#. module: base
+#: field:res.partner,customer:0
+#: view:res.partner.address:0
+#: field:res.partner.address,is_customer_add:0
+#: model:res.partner.category,name:base.res_partner_category_0
+msgid "Customer"
+msgstr "Cliente"
 
 #. module: base
 #: model:res.country,name:base.lc
@@ -3831,16 +4237,9 @@ msgid "Select the object from the model on which the workflow will executed."
 msgstr "Seleziona l'oggetto dal modello su cui il workflow verrà eseguito."
 
 #. module: base
-#: field:ir.model,state:0
-#: field:ir.model.fields,state:0
-#: field:ir.model.grid,state:0
-msgid "Manually Created"
-msgstr "Creato manualmente"
-
-#. module: base
-#: selection:ir.report.custom.fields,operation:0
-msgid "Calculate Count"
-msgstr "Esegui Conteggio"
+#: field:res.partner,employee:0
+msgid "Employee"
+msgstr ""
 
 #. module: base
 #: field:ir.model.access,perm_create:0
@@ -3852,11 +4251,33 @@ msgstr "Accesso in creazione"
 msgid "Fed. State"
 msgstr "Stato fed."
 
+#. module: base
+#: field:ir.actions.server,copy_object:0
+msgid "Copy Of"
+msgstr ""
+
+#. module: base
+#: field:ir.model,osv_memory:0
+msgid "In-memory model"
+msgstr ""
+
+#. module: base
+#: view:partner.clear.ids:0
+msgid "Clear Ids"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.io
 msgid "British Indian Ocean Territory"
 msgstr "Territorio britannico dell'Oceano Indiano"
 
+#. module: base
+#: field:res.config.users,view:0
+#: field:res.config.view,view:0
+#: field:res.users,view:0
+msgid "Interface"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.server:0
 msgid "Field Mapping"
@@ -3889,6 +4310,7 @@ msgid "Left-to-Right"
 msgstr "Da sinistra a destra"
 
 #. module: base
+#: view:res.lang:0
 #: field:res.lang,translatable:0
 msgid "Translatable"
 msgstr "Traducibile"
@@ -3899,29 +4321,47 @@ msgid "Vietnam"
 msgstr "Vietnam"
 
 #. module: base
+#: field:res.config.users,signature:0
+#: view:res.users:0
 #: field:res.users,signature:0
 msgid "Signature"
 msgstr "Firma"
 
+#. module: base
+#: model:ir.model,name:base.model_res_widget_user
+msgid "res.widget.user"
+msgstr ""
+
 #. module: base
 #: field:res.partner.category,complete_name:0
 msgid "Full Name"
 msgstr "Nome Completo"
 
+#. module: base
+#: view:base.module.configuration:0
+msgid "_Ok"
+msgstr ""
+
+#. module: base
+#: help:ir.filters,user_id:0
+msgid "False means for every user"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.mz
 msgid "Mozambique"
 msgstr "Mozambico"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.grant_menu_access
-#: model:ir.ui.menu,name:base.menu_grant_menu_access
-msgid "Manage Menus"
-msgstr "Gestisci i menu"
+#: model:ir.ui.menu,name:base.menu_project_long_term
+msgid "Long Term Planning"
+msgstr ""
 
 #. module: base
 #: field:ir.actions.server,message:0
-#: wizard_field:res.partner.spam_send,init,text:0
+#: view:partner.sms.send:0
+#: field:partner.wizard.spam,text:0
+#: field:res.log,name:0
 msgid "Message"
 msgstr "Messaggio"
 
@@ -3931,7 +4371,12 @@ msgid "On Multiple Doc."
 msgstr "Su multipli doc."
 
 #. module: base
-#: model:ir.ui.menu,name:base.menu_base_config_contact
+#: view:res.partner:0
+#: field:res.partner,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: base
 #: field:res.partner,address:0
 #: view:res.partner.address:0
 msgid "Contacts"
@@ -3943,8 +4388,17 @@ msgid "Faroe Islands"
 msgstr "Isole Fær Øer"
 
 #. module: base
-#: model:ir.actions.wizard,name:base.wizard_upgrade
-#: model:ir.ui.menu,name:base.menu_wizard_upgrade
+#: code:addons/base/res/res_user.py:0
+#, python-format
+msgid ""
+"\"email_from\" needs to be set to send welcome mails '\n"
+"                  'to users"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+#: model:ir.actions.act_window,name:base.action_view_base_module_upgrade_window
+#: model:ir.ui.menu,name:base.menu_view_base_module_upgrade
 msgid "Apply Scheduled Upgrades"
 msgstr "Applica Aggiornamenti Programmati"
 
@@ -3953,26 +4407,38 @@ msgstr "Applica Aggiornamenti Programmati"
 msgid "Maintenance"
 msgstr "Manutenzione"
 
+#. module: base
+#: view:res.widget:0
+msgid "Widgets"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.mp
 msgid "Northern Mariana Islands"
 msgstr "Isole Marianne Settentrionali"
 
 #. module: base
-#: wizard_view:module.lang.import,init:0
-msgid "module,type,name,res_id,src,value"
-msgstr "module,type,name,res_id,src,value"
+#: selection:ir.property,type:0
+msgid "Integer"
+msgstr ""
 
 #. module: base
-#: model:ir.ui.menu,name:base.menu_management
-msgid "Modules Management"
-msgstr "Gestione Moduli"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-mail-"
+msgstr ""
 
 #. module: base
-#: rml:ir.module.reference:0
-#: field:maintenance.contract.module,version:0
-msgid "Version"
-msgstr "Versione"
+#: help:ir.actions.report.xml,report_rml:0
+msgid ""
+"The path to the main report file (depending on Report Type) or NULL if the "
+"content is in another data field"
+msgstr ""
+
+#. module: base
+#: help:res.config.users,company_id:0
+#: help:res.users,company_id:0
+msgid "The company this user is currently working for."
+msgstr ""
 
 #. module: base
 #: model:ir.model,name:base.model_wizard_ir_model_menu_create
@@ -3985,20 +4451,25 @@ msgid "Transition"
 msgstr "Transizione"
 
 #. module: base
-#: field:ir.actions.todo,active:0
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gtk-select-all"
+msgstr ""
+
+#. module: base
 #: field:ir.cron,active:0
-#: field:ir.module.repository,active:0
 #: field:ir.sequence,active:0
 #: field:res.bank,active:0
+#: field:res.config.users,active:0
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
 #: field:res.partner.address,active:0
 #: field:res.partner.canal,active:0
 #: field:res.partner.category,active:0
-#: field:res.partner.event.type,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
+#: view:workflow.instance:0
+#: view:workflow.workitem:0
 msgid "Active"
 msgstr "Attivo"
 
@@ -4017,17 +4488,13 @@ msgstr "Mongolia"
 #: code:addons/base/ir/ir_model.py:0
 #: code:addons/base/maintenance/maintenance.py:0
 #: code:addons/base/module/module.py:0
+#: code:addons/base/res/res_config.py:0
 #: code:addons/base/res/res_currency.py:0
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid "Error"
 msgstr "Errore"
 
-#. module: base
-#: view:res.partner.som:0
-msgid "Partner State of Mind"
-msgstr "Propensione Partner"
-
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "mdx"
@@ -4039,20 +4506,30 @@ msgid "Burundi"
 msgstr "Burundi"
 
 #. module: base
-#: wizard_button:base.module.import,import,open_window:0
-#: wizard_button:module.upgrade,end,end:0
-#: wizard_button:module.upgrade,start,end:0
+#: view:base.language.install:0
+#: view:base.module.import:0
+#: view:base.module.update:0
+#: view:res.request:0
 #: wizard_button:server.action.create,init,end:0
 #: wizard_button:server.action.create,step_1,end:0
-#: view:wizard.module.lang.export:0
 msgid "Close"
 msgstr "Chiudi"
 
+#. module: base
+#: view:res.log:0
+msgid "My Logs"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.bt
 msgid "Bhutan"
 msgstr "Bhutan"
 
+#. module: base
+#: help:ir.sequence,number_next:0
+msgid "Next number of this sequence"
+msgstr ""
+
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_11
 msgid "Textile Suppliers"
@@ -4064,7 +4541,12 @@ msgid "This Window"
 msgstr "Questa Finestra"
 
 #. module: base
-#: field:wizard.module.lang.export,format:0
+#: help:res.log,name:0
+msgid "The logging message."
+msgstr ""
+
+#. module: base
+#: field:base.language.export,format:0
 msgid "File Format"
 msgstr "Formato File"
 
@@ -4078,6 +4560,12 @@ msgstr "Codice ISO"
 msgid "res.config.view"
 msgstr "res.config.view"
 
+#. module: base
+#: view:res.log:0
+#: field:res.log,read:0
+msgid "Read"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_INDENT"
@@ -4094,10 +4582,10 @@ msgid "Saint Vincent & Grenadines"
 msgstr "Saint Vincent e Grenadine"
 
 #. module: base
-#: field:ir.model.config,password:0
 #: field:maintenance.contract,password:0
 #: field:maintenance.contract.wizard,password:0
-#: wizard_field:res.partner.sms_send,init,password:0
+#: field:partner.sms.send,password:0
+#: field:res.config.users,password:0
 #: field:res.users,password:0
 msgid "Password"
 msgstr "Password"
@@ -4108,45 +4596,55 @@ msgstr "Password"
 #: field:ir.model,field_id:0
 #: model:ir.model,name:base.model_ir_model_fields
 #: view:ir.model.fields:0
-#: field:ir.model.grid,field_id:0
-#: field:ir.property,fields_id:0
-#: field:ir.report.custom,fields_child0:0
 #: model:ir.ui.menu,name:base.ir_model_model_fields
 msgid "Fields"
 msgstr "Campi"
 
 #. module: base
-#: wizard_view:base.module.import,import:0
-msgid "Module successfully imported !"
-msgstr "Modulo importato con successo"
+#: model:ir.actions.act_window,name:base.action_partner_employee_form
+msgid "Employees"
+msgstr ""
+
+#. module: base
+#: help:res.log,read:0
+msgid ""
+"If this log item has been read, get() should not send it to the client"
+msgstr ""
 
 #. module: base
 #: field:res.company,rml_header2:0
+#: field:res.company,rml_header3:0
 msgid "RML Internal Header"
 msgstr "Intestazione Interna RML"
 
-#. module: base
-#: selection:ir.report.custom,print_format:0
-msgid "a4"
-msgstr "a4"
-
 #. module: base
 #: field:ir.actions.act_window,search_view_id:0
 msgid "Search View Ref."
 msgstr "Rif. Vista Ricerca"
 
+#. module: base
+#: field:ir.module.module,installed_version:0
+msgid "Latest version"
+msgstr "La versione più recente"
+
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
 msgstr "acc_number"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_address_form
+#: model:ir.ui.menu,name:base.menu_partner_address_form
+msgid "Addresses"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
 msgstr "Birmania"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Chinese (CN) / 简体中文"
 msgstr "Chinese (CN) / 简体中文"
 
@@ -4167,11 +4665,6 @@ msgstr "Indirizzo"
 msgid "Yugoslavia"
 msgstr "Jugoslavia"
 
-#. module: base
-#: wizard_view:module.upgrade,next:0
-msgid "Note that this operation my take a few minutes."
-msgstr "Questa operazione potrebbe richiedere alcuni minuti"
-
 #. module: base
 #: field:ir.model.data,name:0
 msgid "XML Identifier"
@@ -4183,9 +4676,9 @@ msgid "Canada"
 msgstr "Canada"
 
 #. module: base
-#: field:ir.actions.report.xml,report_name:0
-msgid "Internal Name"
-msgstr "Nome Interno"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-rating-rated"
+msgstr ""
 
 #. module: base
 #: selection:ir.module.module.dependency,state:0
@@ -4203,15 +4696,10 @@ msgid "Invalid model name in the action definition."
 msgstr "Nome di modulo non valido nella definizione dell'azione."
 
 #. module: base
-#: wizard_field:res.partner.sms_send,init,text:0
+#: field:partner.sms.send,text:0
 msgid "SMS Message"
 msgstr "Messaggio SMS"
 
-#. module: base
-#: selection:ir.ui.menu,icon:0
-msgid "STOCK_EDIT"
-msgstr "STOCK_EDIT"
-
 #. module: base
 #: model:res.country,name:base.cm
 msgid "Cameroon"
@@ -4237,24 +4725,22 @@ msgstr "Saltato"
 msgid "Custom Field"
 msgstr "Campo Personalizzato"
 
+#. module: base
+#: field:ir.module.module,web:0
+msgid "Has a web component"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.cc
 msgid "Cocos (Keeling) Islands"
 msgstr "Isole Cocos e Keeling"
 
 #. module: base
-#: field:workflow.instance,uid:0
-msgid "User ID"
-msgstr "ID utente"
-
-#. module: base
-#: view:ir.actions.server:0
-msgid ""
-"Access all the fields related to the current object using expression in "
-"double brackets, i.e.[[ object.partner_id.name ]]"
+#: selection:base.language.install,state:0
+#: selection:base.module.import,state:0
+#: selection:base.module.update,state:0
+msgid "init"
 msgstr ""
-"Accedere a tutti i campi correlati all'oggetto corrente utilizzando "
-"espressioni in doppie parentesi quadre, cioè [[ object.partner_id.name ]]"
 
 #. module: base
 #: view:res.lang:0
@@ -4267,15 +4753,20 @@ msgid "Bank type fields"
 msgstr "Campi Tipo Banca"
 
 #. module: base
-#: wizard_view:module.lang.import,init:0
-msgid "type,name,res_id,src,value"
-msgstr "type,name,res_id,src,value"
-
-#. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Dutch / Nederlands"
 msgstr "Dutch / Nederlands"
 
+#. module: base
+#: model:ir.model,name:base.model_res_widget_wizard
+msgid "Add a widget"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,interval_number:0
+msgid "Repeat every x."
+msgstr ""
+
 #. module: base
 #: wizard_view:server.action.create,step_1:0
 #: wizard_field:server.action.create,step_1,report:0
@@ -4283,17 +4774,15 @@ msgid "Select Report"
 msgstr "Seleziona Report"
 
 #. module: base
-#: field:ir.report.custom.fields,fc1_condition:0
-#: field:ir.report.custom.fields,fc2_condition:0
-#: field:ir.report.custom.fields,fc3_condition:0
-msgid "condition"
-msgstr "Condizione"
-
-#. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "1cm 28cm 20cm 28cm"
 msgstr "1cm 28cm 20cm 28cm"
 
+#. module: base
+#: field:ir.module.module,maintainer:0
+msgid "Maintainer"
+msgstr ""
+
 #. module: base
 #: field:ir.sequence,suffix:0
 msgid "Suffix"
@@ -4310,7 +4799,7 @@ msgid "Labels"
 msgstr "Etichette"
 
 #. module: base
-#: wizard_field:res.partner.spam_send,init,from:0
+#: field:partner.wizard.spam,email_from:0
 msgid "Sender's email"
 msgstr "Email Mittente"
 
@@ -4320,7 +4809,7 @@ msgid "Object Field"
 msgstr "Campo Oggetto"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "French (CH) / Français (CH)"
 msgstr "Francese (CH) / Français (CH)"
 
@@ -4330,25 +4819,31 @@ msgid "STOCK_NEW"
 msgstr "STOCK_NEW"
 
 #. module: base
-#: selection:ir.report.custom.fields,operation:0
-msgid "None"
-msgstr "Nessuno"
+#: help:res.config.users,action_id:0
+#: help:res.users,action_id:0
+msgid ""
+"If specified, this action will be opened at logon for this user, in addition "
+"to the standard menu."
+msgstr ""
 
 #. module: base
-#: view:ir.report.custom.fields:0
-msgid "Report Fields"
-msgstr "Campo Rapporto"
-
-#. module: base
-#: view:res.partner:0
-msgid "General"
-msgstr "Generale"
+#: view:ir.values:0
+msgid "Client Actions"
+msgstr ""
 
 #. module: base
 #: field:workflow.transition,act_to:0
 msgid "Destination Activity"
 msgstr "Attività di Destinazione"
 
+#. module: base
+#: code:addons/base/res/res_config.py:0
+#, python-format
+msgid ""
+"Can't set an ir.actions.todo's state to \"\n"
+"                               \"nothingness"
+msgstr ""
+
 #. module: base
 #: view:ir.values:0
 msgid "Connect Events to Actions"
@@ -4364,6 +4859,16 @@ msgstr "STOCK_SORT_ASCENDING"
 msgid "STOCK_ABOUT"
 msgstr "STOCK_ABOUT"
 
+#. module: base
+#: model:ir.model,name:base.model_base_update_translations
+msgid "base.update.translations"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,select_level:0
+msgid "Advanced Search"
+msgstr "Ricerca Avanzata"
+
 #. module: base
 #: field:ir.module.category,parent_id:0
 #: field:res.partner.category,parent_id:0
@@ -4371,13 +4876,14 @@ msgid "Parent Category"
 msgstr "Categoria Superiore"
 
 #. module: base
-#: model:res.country,name:base.fi
-msgid "Finland"
-msgstr "Finlandia"
+#: selection:ir.property,type:0
+msgid "Integer Big"
+msgstr ""
 
 #. module: base
 #: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
+#: view:res.users:0
 msgid "Contact"
 msgstr "Contatto"
 
@@ -4386,6 +4892,11 @@ msgstr "Contatto"
 msgid "ir.ui.menu"
 msgstr "ir.ui.menu"
 
+#. module: base
+#: model:res.country,name:base.us
+msgid "United States"
+msgstr "Stati Uniti d'America"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Uninstall"
@@ -4398,6 +4909,11 @@ msgstr "Annulla Disinstallazione"
 msgid "Communication"
 msgstr "Comunicazione"
 
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "RML Report"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_ir_server_object_lines
 msgid "ir.server.object.lines"
@@ -4414,6 +4930,11 @@ msgstr "Modulo %s: Certificato di qualità non valido"
 msgid "Kuwait"
 msgstr "Kuwait"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-go-week"
+msgstr ""
+
 #. module: base
 #: field:workflow.workitem,inst_id:0
 msgid "Instance"
@@ -4430,6 +4951,11 @@ msgstr ""
 "della stampa. Lasciare vuoto per non salvare il report stampato. Puoi usare "
 "una espressione di python con l'oggetto e le variabili temporali."
 
+#. module: base
+#: selection:ir.property,type:0
+msgid "Many2One"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ng
 msgid "Nigeria"
@@ -4440,6 +4966,11 @@ msgstr "Nigeria"
 msgid "res.partner.event"
 msgstr "res.partner.event"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_sms_send
+msgid "SMS Send"
+msgstr ""
+
 #. module: base
 #: field:res.company,user_ids:0
 msgid "Accepted Users"
@@ -4455,6 +4986,11 @@ msgstr "STOCK_UNDERLINE"
 msgid "Values for Event Type"
 msgstr "Valori per i Tipi di Evento"
 
+#. module: base
+#: model:res.country,name:base.zr
+msgid "Zaire"
+msgstr "Zaire"
+
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Always Searchable"
@@ -4465,6 +5001,16 @@ msgstr "Sempre Ricercabile"
 msgid "STOCK_CLOSE"
 msgstr "STOCK_CLOSE"
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
+msgstr ""
+"Impossibile eliminare un linguaggio Attivo !\n"
+"Disattiva il linguaggio prima di eliminarlo."
+
 #. module: base
 #: model:res.country,name:base.hk
 msgid "Hong Kong"
@@ -4478,9 +5024,9 @@ msgstr ""
 "fatture"
 
 #. module: base
-#: model:ir.ui.menu,name:base.next_id_10
-msgid "Scheduler"
-msgstr "Pianificatore"
+#: selection:ir.ui.menu,icon:0
+msgid "STOCK_ZOOM_100"
+msgstr "STOCK_ZOOM_100"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4508,26 +5054,19 @@ msgid "2.  %a ,%A         ==> Fri, Friday"
 msgstr "2. %a ,%A ==>Ven, Venerdì"
 
 #. module: base
-#: wizard_view:module.lang.install,start:0
-msgid ""
-"The selected language has been successfully installed. You must change the "
-"preferences of the user and open a new menu to view changes."
+#: field:res.widget,content:0
+msgid "Content"
 msgstr ""
-"La lingua selezionata è stata correttamente installata. Devi ora modificare "
-"le preferenze dell'utente e aprire una nuova scheda menu per vedere i "
-"cambiamenti"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_sequence
-msgid "ir.sequence"
-msgstr "ir.sequence"
+#: help:ir.rule,global:0
+msgid "If no group is specified the rule is global and applied to everyone"
+msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_res_partner_event_type
-#: model:ir.ui.menu,name:base.next_id_14
-#: view:res.partner.event:0
-msgid "Partner Events"
-msgstr "Eventi Partner"
+#: model:res.country,name:base.td
+msgid "Chad"
+msgstr "Chad"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_transition
@@ -4540,7 +5079,7 @@ msgid "%a - Abbreviated weekday name."
 msgstr "%a - Nome del giorno della settimana"
 
 #. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "Introspection report on objects"
 msgstr "Rapporto di Introspezione su Oggetti"
 
@@ -4555,9 +5094,15 @@ msgid "Dominica"
 msgstr "Repubblica Dominicana"
 
 #. module: base
-#: model:ir.model,name:base.model_res_currency_rate
-msgid "Currency Rate"
-msgstr "Valore Valuta"
+#: help:ir.cron,nextcall:0
+msgid "Next planned execution date for this scheduler"
+msgstr ""
+
+#. module: base
+#: help:res.config.users,view:0
+#: help:res.users,view:0
+msgid "Choose between the simplified interface and the extended one"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.np
@@ -4565,12 +5110,25 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #. module: base
-#: field:res.partner.event,event_ical_id:0
-msgid "iCal id"
-msgstr "ID iCal"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-dolar"
+msgstr ""
 
 #. module: base
-#: wizard_view:res.partner.sms_send,init:0
+#: help:ir.cron,args:0
+msgid "Arguments to be passed to the method. e.g. (uid,)"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.menu,groups_id:0
+msgid ""
+"If you have groups, the visibility of this menu will be based on these "
+"groups. If this field is empty, OpenERP will compute visibility based on the "
+"related object's read access."
+msgstr ""
+
+#. module: base
+#: view:partner.sms.send:0
 msgid "Bulk SMS send"
 msgstr "Invio SMS di massa"
 
@@ -4579,26 +5137,11 @@ msgstr "Invio SMS di massa"
 msgid "%Y - Year with century as a decimal number."
 msgstr "%Y - Anno con secolo come numero decimale."
 
-#. module: base
-#: selection:ir.report.custom,type:0
-msgid "Pie Chart"
-msgstr "Grafico a Torta"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Seconde: %(sec)s"
 msgstr "Secondi: %(sec)s"
 
-#. module: base
-#: selection:ir.translation,type:0
-#: field:res.bank,code:0
-#: field:res.currency,code:0
-#: field:res.partner,ref:0
-#: field:res.partner.bank.type,code:0
-#: field:res.partner.function,code:0
-msgid "Code"
-msgstr "Codice"
-
 #. module: base
 #: code:addons/base/module/module.py:0
 #, python-format
@@ -4610,10 +5153,9 @@ msgstr ""
 " %s"
 
 #. module: base
-#: model:ir.actions.wizard,name:base.wizard_update
-#: model:ir.ui.menu,name:base.menu_module_update
-msgid "Update Modules List"
-msgstr "Aggiorna Lista Moduli"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-accessories-archiver"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -4621,18 +5163,12 @@ msgid "Continue"
 msgstr "Continua"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Thai / ภาษาไทย"
 msgstr "Thailandia"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_property_form
-#: model:ir.ui.menu,name:base.menu_ir_property_form
-msgid "Default Properties"
-msgstr "Proprietà predefinite"
-
-#. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Slovenian / slovenščina"
 msgstr "Slovenian / slovenščina"
 
@@ -4646,32 +5182,21 @@ msgstr "Ricarica dall'allegato"
 msgid "Bouvet Island"
 msgstr "Isola Bouvet"
 
-#. module: base
-#: field:ir.report.custom,print_orientation:0
-msgid "Print orientation"
-msgstr "Orientamento Stampa"
-
-#. module: base
-#: model:ir.actions.act_window,name:base.action_wizard_lang_export
-#: model:ir.ui.menu,name:base.menu_wizard_lang_export
-msgid "Export a Translation File"
-msgstr "Esporta File Traduzione"
-
 #. module: base
 #: field:ir.attachment,name:0
 msgid "Attachment Name"
 msgstr "Nome Allegato"
 
 #. module: base
-#: wizard_field:module.lang.import,init,data:0
-#: field:wizard.module.lang.export,data:0
+#: field:base.language.export,data:0
+#: field:base.language.import,data:0
 msgid "File"
 msgstr "File"
 
 #. module: base
-#: view:res.users:0
-msgid "Add User"
-msgstr "Aggiungi Utente"
+#: model:ir.actions.act_window,name:base.action_view_base_module_upgrade_install
+msgid "Module Upgrade Install"
+msgstr ""
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_configuration_wizard
@@ -4685,6 +5210,8 @@ msgstr "%b - Nome del mese abbreviato"
 
 #. module: base
 #: field:res.partner,supplier:0
+#: view:res.partner.address:0
+#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_8
 msgid "Supplier"
 msgstr "Fornitore"
@@ -4696,7 +5223,10 @@ msgid "Multi Actions"
 msgstr "Multi Azioni"
 
 #. module: base
+#: view:base.language.export:0
+#: view:base.language.import:0
 #: view:maintenance.contract.wizard:0
+#: view:wizard.ir.model.menu.create:0
 msgid "_Close"
 msgstr "_Chiudi"
 
@@ -4705,17 +5235,44 @@ msgstr "_Chiudi"
 msgid "Full"
 msgstr "Completo"
 
+#. module: base
+#: field:multi_company.default,company_dest_id:0
+msgid "Default Company"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.view,xml_id:0
+msgid "ID of the view defined in xml file"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_module_import
+#: model:ir.ui.menu,name:base.menu_view_base_module_import
+msgid "Import Module"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.as
 msgid "American Samoa"
 msgstr "Samoa americane"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_model_model
-#: model:ir.model,name:base.model_ir_model
-#: model:ir.ui.menu,name:base.ir_model_model_menu
-msgid "Objects"
-msgstr "Oggetti"
+#: code:addons/base/res/res_user.py:0
+#, python-format
+msgid ""
+"--\n"
+"%(name)s %(email)s\n"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,res_model:0
+msgid "Model name of the object to open in the view window"
+msgstr ""
+
+#. module: base
+#: field:res.log,secondary:0
+msgid "Secondary Log"
+msgstr ""
 
 #. module: base
 #: field:ir.model.fields,selectable:0
@@ -4728,8 +5285,9 @@ msgid "Request Link"
 msgstr "Collegamento Rochiesta"
 
 #. module: base
+#: view:ir.attachment:0
+#: selection:ir.attachment,type:0
 #: field:ir.module.module,url:0
-#: field:ir.module.repository,url:0
 msgid "URL"
 msgstr "URL"
 
@@ -4758,11 +5316,33 @@ msgstr "Emirati Arabi Uniti"
 msgid "STOCK_MEDIA_RECORD"
 msgstr "STOCK_MEDIA_RECORD"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_crm_case_job_req_main
+msgid "Recruitment"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Occitan (post 1500) / France"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.re
 msgid "Reunion (French)"
 msgstr "La Réunion"
 
+#. module: base
+#: view:ir.model.access:0
+#: view:ir.rule:0
+#: field:ir.rule,global:0
+msgid "Global"
+msgstr "Globale"
+
+#. module: base
+#: view:res.users:0
+msgid "You must logout and login again after changing your password."
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4779,6 +5359,11 @@ msgstr "Isole Salomone"
 msgid "AccessError"
 msgstr "Errore in Accesso"
 
+#. module: base
+#: view:res.request:0
+msgid "Waiting"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "8.  %I:%M:%S %p  ==> 06:25:20 PM"
@@ -4795,6 +5380,11 @@ msgstr "Traduzioni"
 msgid "Number padding"
 msgstr "Riempimento Numero"
 
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Report"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ua
 msgid "Ukraine"
@@ -4812,15 +5402,20 @@ msgid "Module Category"
 msgstr "Categoria Modulo"
 
 #. module: base
-#: model:res.country,name:base.us
-msgid "United States"
-msgstr "Stati Uniti d'America"
+#: view:partner.wizard.ean.check:0
+msgid "Ignore"
+msgstr ""
 
 #. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "Reference Guide"
 msgstr "Guida di Riferimento"
 
+#. module: base
+#: view:ir.ui.view:0
+msgid "Architecture"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ml
 msgid "Mali"
@@ -4831,6 +5426,26 @@ msgstr "Mali"
 msgid "STOCK_UNINDENT"
 msgstr "STOCK_UNINDENT"
 
+#. module: base
+#: help:res.config.users,email:0
+#: help:res.users,email:0
+msgid ""
+"If an email is provided, the user will be sent a message welcoming him.\n"
+"\n"
+"Warning: if \"email_from\" and \"smtp_server\" aren't configured, it won't "
+"be possible to email new users."
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-face-plain"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Japanese / Japan"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -4857,6 +5472,7 @@ msgid "Brunei Darussalam"
 msgstr "Sultanato del Brunei"
 
 #. module: base
+#: view:ir.actions.act_window:0
 #: field:ir.actions.act_window,view_type:0
 #: field:ir.actions.act_window.view,view_mode:0
 #: field:ir.ui.view,type:0
@@ -4885,17 +5501,10 @@ msgid "ir.actions.todo"
 msgstr "ir.actions.todo"
 
 #. module: base
-#: view:wizard.module.lang.export:0
-msgid "Get file"
-msgstr "Ricevi File"
-
-#. module: base
-#: wizard_view:module.module.update,init:0
-msgid ""
-"This function will check for new modules in the 'addons' path and on module "
-"repositories:"
+#: code:addons/base/res/res_config.py:0
+#, python-format
+msgid "Couldn't find previous ir.actions.todo"
 msgstr ""
-"Questa funzione cercherà nuovi moduli nel percorso 'addons' e nei repository"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4908,7 +5517,7 @@ msgid "General Settings"
 msgstr "Impostazioni generali"
 
 #. module: base
-#: model:ir.ui.menu,name:base.custom_shortcuts
+#: model:ir.ui.menu,name:base.menu_administration_shortcut
 msgid "Custom Shortcuts"
 msgstr "Scorciatoie personalizzate"
 
@@ -4917,18 +5526,29 @@ msgstr "Scorciatoie personalizzate"
 msgid "Algeria"
 msgstr "Algeria"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-stock_format-scientific"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.be
 msgid "Belgium"
 msgstr "Belgio"
 
 #. module: base
+#: selection:base.language.install,lang:0
+msgid "Inuktitut / Canada"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,lang:0
+#: field:base.language.install,lang:0
+#: field:base.update.translations,lang:0
 #: field:ir.translation,lang:0
-#: wizard_field:module.lang.install,init,lang:0
+#: field:res.config.users,context_lang:0
 #: field:res.partner,lang:0
 #: field:res.users,context_lang:0
-#: field:wizard.module.lang.export,lang:0
-#: field:wizard.module.update_translations,lang:0
 msgid "Language"
 msgstr "Lingua"
 
@@ -4939,12 +5559,34 @@ msgstr "Gambia"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_company_form
+#: model:ir.model,name:base.model_res_company
 #: model:ir.ui.menu,name:base.menu_action_res_company_form
 #: model:ir.ui.menu,name:base.menu_res_company_global
 #: view:res.company:0
+#: field:res.config.users,company_ids:0
+#: view:res.users:0
+#: field:res.users,company_ids:0
 msgid "Companies"
 msgstr "Aziende"
 
+#. module: base
+#: model:ir.model,name:base.model_res_widget
+msgid "res.widget"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+"Impossibile eliminare il linguaggio che corrisponde al Linguaggio Preferito "
+"dell'Utente"
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Norwegian Bokmål / Norway"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.server:0
 #: field:ir.actions.server,code:0
@@ -4953,7 +5595,7 @@ msgid "Python Code"
 msgstr "Codice Python"
 
 #. module: base
-#: code:addons/base/module/wizard/wizard_module_import.py:0
+#: code:addons/base/module/wizard/base_module_import.py:0
 #, python-format
 msgid "Can not create the module file: %s !"
 msgstr "Impossibile creare il file del modulo: %s !"
@@ -4964,28 +5606,19 @@ msgid "The kernel of OpenERP, needed for all installation."
 msgstr "Il kernel di OpenERP, necessario per tutta l'installazione."
 
 #. module: base
-#: wizard_button:base.module.import,init,end:0
-#: selection:ir.actions.todo,state:0
-#: wizard_button:module.lang.import,init,end:0
-#: wizard_button:module.lang.install,init,end:0
-#: wizard_button:module.module.update,init,end:0
-#: wizard_button:module.upgrade,next,end:0
-#: wizard_button:res.partner.sms_send,init,end:0
-#: wizard_button:res.partner.spam_send,init,end:0
-#: view:wizard.ir.model.menu.create:0
-#: view:wizard.module.lang.export:0
-#: view:wizard.module.update_translations:0
+#: view:base.language.install:0
+#: view:base.module.import:0
+#: view:base.module.update:0
+#: view:base.module.upgrade:0
+#: view:base.update.translations:0
+#: view:partner.clear.ids:0
+#: view:partner.sms.send:0
+#: view:partner.wizard.spam:0
 msgid "Cancel"
 msgstr "Annulla"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:0
-#, python-format
-msgid "Please specify server option --smtp-from !"
-msgstr "Per favore specificare l'opzione server --smtp-from !"
-
-#. module: base
-#: selection:wizard.module.lang.export,format:0
+#: selection:base.language.export,format:0
 msgid "PO File"
 msgstr "File .PO"
 
@@ -4995,10 +5628,14 @@ msgid "STOCK_SPELL_CHECK"
 msgstr "STOCK_SPELL_CHECK"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_partner_category
-#: model:ir.ui.menu,name:base.menu_partner_category_main
-msgid "Partners by Categories"
-msgstr "Partner per Categoria"
+#: view:ir.model:0
+msgid "Custom"
+msgstr ""
+
+#. module: base
+#: view:res.request:0
+msgid "Current"
+msgstr ""
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_9
@@ -5006,15 +5643,12 @@ msgid "Components Supplier"
 msgstr "Fornitori"
 
 #. module: base
-#: field:ir.actions.act_window,default_user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
-#: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
 #: field:res.groups,users:0
-#: field:res.roles,users:0
 #: view:res.users:0
 msgid "Users"
 msgstr "Utenti"
@@ -5030,10 +5664,10 @@ msgid "Iceland"
 msgstr "Islanda"
 
 #. module: base
-#: view:res.users:0
-msgid "Roles are used to defined available actions, provided by workflows."
-msgstr ""
-"Ruoli utilizzati per definire le azioni disponibili, fornite dai workflow."
+#: model:ir.actions.act_window,name:base.ir_action_window
+#: model:ir.ui.menu,name:base.menu_ir_action_window
+msgid "Window Actions"
+msgstr "Azioni Finestra"
 
 #. module: base
 #: model:res.country,name:base.de
@@ -5056,7 +5690,7 @@ msgid "STOCK_HARDDISK"
 msgstr "STOCK_HARDDISK"
 
 #. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "Reports :"
 msgstr "Repors"
 
@@ -5065,39 +5699,23 @@ msgstr "Repors"
 msgid "STOCK_APPLY"
 msgstr "STOCK_APPLY"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.action_maintenance_contract_form
-#: model:ir.ui.menu,name:base.menu_maintenance_contract
-msgid "Your Maintenance Contracts"
-msgstr "I vostri contratti di assistenza"
-
-#. module: base
-#: view:res.users:0
-msgid ""
-"Please note that you will have to logout and relog if you change your "
-"password."
-msgstr "Ricorda di uscire e rientrare se hai cambiato la password"
-
 #. module: base
 #: model:res.country,name:base.gy
 msgid "Guyana"
 msgstr "Guyana"
 
 #. module: base
-#: selection:ir.module.module,license:0
-msgid "GPL-3"
-msgstr "GPL-3"
-
-#. module: base
-#: selection:ir.module.module,license:0
-msgid "GPL-2"
-msgstr "GPL-2"
-
-#. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Portugese (BR) / português (BR)"
 msgstr "Portugese (BR) / português (BR)"
 
+#. module: base
+#: help:ir.actions.act_window,view_type:0
+msgid ""
+"View type: set to 'tree' for a hierarchical tree view, or 'form' for other "
+"views"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,record_id:0
 msgid "Create Id"
@@ -5108,11 +5726,23 @@ msgstr "Creato Id"
 msgid "Honduras"
 msgstr "Honduras"
 
+#. module: base
+#: help:res.config.users,menu_tips:0
+#: help:res.users,menu_tips:0
+msgid ""
+"Check out this box if you want to always display tips on each menu action"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.eg
 msgid "Egypt"
 msgstr "Egitto"
 
+#. module: base
+#: field:ir.rule,perm_read:0
+msgid "Apply For Read"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.server,model_id:0
 msgid ""
@@ -5121,6 +5751,22 @@ msgstr ""
 "Seleziona l'oggetto sul quale l'azione dovrà lavorare (lettura, scrittura, "
 "creazione)."
 
+#. module: base
+#: code:addons/base/ir/ir_actions.py:0
+#, python-format
+msgid "Please specify server option --email-from !"
+msgstr ""
+
+#. module: base
+#: field:base.language.import,name:0
+msgid "Language Name"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Boolean"
+msgstr ""
+
 #. module: base
 #: view:ir.model:0
 msgid "Fields Description"
@@ -5132,21 +5778,32 @@ msgid "STOCK_CDROM"
 msgstr "STOCK_CDROM"
 
 #. module: base
+#: view:ir.attachment:0
+#: view:ir.cron:0
+#: view:ir.model.access:0
+#: view:ir.model.data:0
+#: view:ir.model.fields:0
+#: view:ir.module.module:0
+#: view:ir.rule:0
+#: view:ir.ui.view:0
+#: view:ir.values:0
+#: view:res.partner:0
+#: view:res.partner.address:0
+#: view:workflow.activity:0
+msgid "Group By..."
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
 #: field:ir.model.fields,readonly:0
 #: field:res.partner.bank.type.field,readonly:0
 msgid "Readonly"
 msgstr "Sola Lettura"
 
 #. module: base
-#: field:res.partner.event,type:0
-msgid "Type of Event"
-msgstr "Tipo Evento"
-
-#. module: base
-#: model:ir.actions.act_window,name:base.ir_sequence_type
-#: model:ir.ui.menu,name:base.menu_ir_sequence_type
-msgid "Sequence Types"
-msgstr "Tipi Sequenza"
+#: selection:ir.ui.menu,icon:0
+msgid "STOCK_ITALIC"
+msgstr "STOCK_ITALIC"
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -5155,11 +5812,24 @@ msgid "To be installed"
 msgstr "Da installare"
 
 #. module: base
+#: help:ir.actions.act_window,display_menu_tip:0
+msgid ""
+"It gives the status if the tip has to be displayed or not when a user "
+"executes an action"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
 #: model:ir.module.module,shortdesc:base.module_meta_information
 #: field:res.currency,base:0
 msgid "Base"
 msgstr "Base"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-dialog-close"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.lr
 msgid "Liberia"
@@ -5171,28 +5841,48 @@ msgstr "Liberia"
 #: view:res.groups:0
 #: view:res.partner:0
 #: field:res.partner,comment:0
-#: field:res.partner.function,ref:0
 msgid "Notes"
 msgstr "Note"
 
 #. module: base
-#: field:ir.property,value:0
+#: selection:ir.ui.menu,icon:0
+msgid "terp-folder-blue"
+msgstr ""
+
+#. module: base
+#: field:ir.property,value_binary:0
+#: field:ir.property,value_datetime:0
+#: field:ir.property,value_float:0
+#: field:ir.property,value_integer:0
+#: field:ir.property,value_reference:0
+#: field:ir.property,value_text:0
 #: selection:ir.server.object.lines,type:0
 #: field:ir.server.object.lines,value:0
+#: view:ir.values:0
 #: field:ir.values,value:0
 #: field:ir.values,value_unpickle:0
 msgid "Value"
 msgstr "Valore"
 
 #. module: base
-#: view:wizard.module.update_translations:0
-msgid "Update Translations"
-msgstr "Aggiorna Traduzioni"
+#: field:ir.sequence,code:0
+#: field:ir.sequence.type,code:0
+#: selection:ir.translation,type:0
+#: field:res.bank,code:0
+#: field:res.currency,code:0
+#: field:res.partner.bank.type,code:0
+msgid "Code"
+msgstr "Codice"
 
 #. module: base
-#: view:res.config.view:0
-msgid "Set"
-msgstr "Imposta"
+#: model:ir.model,name:base.model_res_config_installer
+msgid "res.config.installer"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Sinhalese / Sri Lanka"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.mc
@@ -5205,27 +5895,60 @@ msgid "Minutes"
 msgstr "Minuti"
 
 #. module: base
-#: wizard_view:module.upgrade,end:0
-#: wizard_view:module.upgrade,start:0
-msgid "The modules have been upgraded / installed !"
-msgstr "I moduli sono stati aggiornati / installati !"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gnome-cpu-frequency-applet+"
+msgstr ""
 
 #. module: base
 #: selection:ir.translation,type:0
-#: view:wizard.module.lang.export:0
 msgid "Help"
 msgstr "Aiuto"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: help:res.config.users,menu_id:0
+#: help:res.users,menu_id:0
+msgid ""
+"If specified, the action will replace the standard menu for this user."
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Write Object"
+msgstr "Scrivi Oggetto"
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_fundrising
+msgid "Fund Raising"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_sequence_type
+#: model:ir.ui.menu,name:base.menu_ir_sequence_type
+msgid "Sequence Codes"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Abkhazian (RU)"
+msgstr ""
+
+#. module: base
+#: view:base.module.configuration:0
+msgid ""
+"All pending configuration wizards have been executed. You may restart "
+"individual wizards via the list of configuration wizards."
+msgstr ""
 
 #. module: base
 #: wizard_button:server.action.create,step_1,create:0
 msgid "Create"
 msgstr "Crea"
 
+#. module: base
+#: view:ir.sequence:0
+msgid "Current Year with Century: %(year)s"
+msgstr ""
+
 #. module: base
 #: field:ir.exports,export_fields:0
 msgid "Export ID"
@@ -5237,14 +5960,20 @@ msgid "France"
 msgstr "Francia"
 
 #. module: base
+#: model:ir.model,name:base.model_res_log
+msgid "res.log"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
 #: field:workflow.activity,flow_stop:0
 msgid "Flow Stop"
 msgstr "Arresta Flusso"
 
 #. module: base
-#: model:res.country,name:base.ar
-msgid "Argentina"
-msgstr "Argentina"
+#: selection:ir.cron,interval_type:0
+msgid "Weeks"
+msgstr "Settimane"
 
 #. module: base
 #: model:res.country,name:base.af
@@ -5252,7 +5981,7 @@ msgid "Afghanistan, Islamic State of"
 msgstr "Stato islamico dell'Afghanistan"
 
 #. module: base
-#: code:addons/base/module/wizard/wizard_module_import.py:0
+#: code:addons/base/module/wizard/base_module_import.py:0
 #, python-format
 msgid "Error !"
 msgstr "Errore !"
@@ -5262,6 +5991,11 @@ msgstr "Errore !"
 msgid "country_id"
 msgstr "country_id"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-accessories-archiver+"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_type:0
 msgid "Interval Unit"
@@ -5273,11 +6007,6 @@ msgstr "Unità di Intervallo"
 msgid "Kind"
 msgstr "Tipo"
 
-#. module: base
-#: selection:ir.actions.todo,start_on:0
-msgid "Manual"
-msgstr "Manuale"
-
 #. module: base
 #: field:res.bank,fax:0
 #: field:res.partner.address,fax:0
@@ -5290,15 +6019,11 @@ msgid "Thousands Separator"
 msgstr "Separatore delle migliaia"
 
 #. module: base
+#: field:res.log,create_date:0
 #: field:res.request,create_date:0
 msgid "Created Date"
 msgstr "Data di Creazione"
 
-#. module: base
-#: selection:ir.report.custom,type:0
-msgid "Line Plot"
-msgstr "Trama"
-
 #. module: base
 #: help:ir.actions.server,loop_action:0
 msgid ""
@@ -5309,7 +6034,7 @@ msgstr ""
 "dentro il ciclo."
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Chinese (TW) / 正體字"
 msgstr "Chinese (TW) / 正體字"
 
@@ -5324,44 +6049,67 @@ msgid "res.request"
 msgstr "res.request"
 
 #. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "pdf"
-msgstr "pdf"
+#: view:ir.model:0
+msgid "In Memory"
+msgstr ""
 
 #. module: base
+#: view:ir.actions.todo:0
+msgid "Todo"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: field:ir.attachment,company_id:0
 #: field:ir.default,company_id:0
 #: field:ir.property,company_id:0
 #: field:ir.sequence,company_id:0
 #: field:ir.values,company_id:0
 #: view:res.company:0
+#: field:res.config.users,company_id:0
 #: field:res.currency,company_id:0
 #: field:res.partner,company_id:0
 #: field:res.partner.address,company_id:0
 #: view:res.users:0
-#: field:res.users,company:0
 #: field:res.users,company_id:0
 msgid "Company"
 msgstr "Azienda"
 
+#. module: base
+#: field:ir.attachment,datas:0
+msgid "File Content"
+msgstr "Contenuto del file"
+
 #. module: base
 #: model:res.country,name:base.pa
 msgid "Panama"
 msgstr "Panama"
 
 #. module: base
-#: selection:ir.report.custom,state:0
-msgid "Unsubscribed"
-msgstr "Disiscritto"
+#: model:res.partner.title,name:base.res_partner_title_ltd
+msgid "Ltd"
+msgstr "Ltd"
 
 #. module: base
-#: view:ir.attachment:0
-msgid "Preview"
-msgstr "Anteprima"
+#: help:workflow.transition,group_id:0
+msgid ""
+"The group that a user must have to be authorized to validate this transition."
+msgstr ""
 
 #. module: base
-#: view:ir.actions.configuration.wizard:0
-msgid "Skip Step"
-msgstr "Salta Passaggio"
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gi
+msgid "Gibraltar"
+msgstr "Gibilterra"
+
+#. module: base
+#: field:ir.actions.report.xml,report_name:0
+msgid "Service Name"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.pn
@@ -5369,22 +6117,22 @@ msgid "Pitcairn Island"
 msgstr "Isole Pitcairn"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.res_partner_event_type-act
-#: model:ir.ui.menu,name:base.menu_res_partner_event_type-act
-msgid "Active Partner Events"
-msgstr "Eventi Partner Attivi"
+#: view:base.module.upgrade:0
+msgid ""
+"We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."
+msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_partner_function_form
-#: model:ir.ui.menu,name:base.menu_partner_function_form
-#: view:res.partner.function:0
-msgid "Contact Functions"
-msgstr "Funzioni Contatto"
+#: model:ir.actions.act_window,name:base.action_rule
+#: model:ir.ui.menu,name:base.menu_action_rule
+msgid "Record Rules"
+msgstr "Registra Regole"
 
 #. module: base
-#: view:multi_company.default:0
-msgid "Multi Company"
-msgstr "Multi Azienda"
+#: field:res.config.users,name:0
+#: field:res.users,name:0
+msgid "User Name"
+msgstr ""
 
 #. module: base
 #: view:ir.sequence:0
@@ -5399,11 +6147,17 @@ msgstr "Zona neutrale"
 #. module: base
 #: view:ir.model:0
 #: view:ir.model.fields:0
-#: view:ir.property:0
-#: model:ir.ui.menu,name:base.next_id_15
+#: view:workflow.activity:0
 msgid "Properties"
 msgstr "Proprietà"
 
+#. module: base
+#: help:ir.sequence,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -5414,29 +6168,14 @@ msgstr "%A - Nome intero della settimana"
 msgid "Months"
 msgstr "Mesi"
 
-#. module: base
-#: selection:ir.translation,type:0
-msgid "Selection"
-msgstr "Selezione"
-
 #. module: base
 #: field:ir.actions.act_window,search_view:0
 msgid "Search View"
 msgstr "Vista di Ricerca"
 
-#. module: base
-#: field:ir.rule,domain_force:0
-msgid "Force Domain"
-msgstr "Forza Dominio"
-
-#. module: base
-#: help:ir.sequence,weight:0
-msgid "If two sequences match, the highest weight will be used."
-msgstr ""
-"se due sequenze soddisfano, quella col peso maggiore sarà utilizzata."
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_attachment
+#: view:ir.actions.report.xml:0
 #: view:ir.attachment:0
 #: model:ir.ui.menu,name:base.menu_action_attachment
 msgid "Attachments"
@@ -5452,6 +6191,13 @@ msgstr "_Valida"
 msgid "maintenance.contract.wizard"
 msgstr "maintenance.contract.wizard"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_base_partner
+#: model:ir.ui.menu,name:base.menu_sale_config_sales
+#: model:ir.ui.menu,name:base.menu_sales
+msgid "Sales"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,child_ids:0
 msgid "Other Actions"
@@ -5463,9 +6209,9 @@ msgid "Done"
 msgstr "Completato"
 
 #. module: base
-#: selection:maintenance.contract.wizard,state:0
-msgid "Validated"
-msgstr "Convalidato"
+#: selection:ir.ui.menu,icon:0
+msgid "STOCK_GOTO_FIRST"
+msgstr "STOCK_GOTO_FIRST"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_miss
@@ -5473,7 +6219,9 @@ msgid "Miss"
 msgstr "Sig.rina"
 
 #. module: base
+#: view:ir.model.access:0
 #: field:ir.model.access,perm_write:0
+#: view:ir.rule:0
 msgid "Write Access"
 msgstr "Accesso in scrittura"
 
@@ -5496,22 +6244,30 @@ msgid "Italy"
 msgstr "Italia"
 
 #. module: base
-#: selection:ir.rule,operator:0
-msgid "<>"
-msgstr "<>"
+#: view:ir.actions.todo:0
+#: selection:ir.actions.todo,state:0
+msgid "To Do"
+msgstr ""
 
 #. module: base
-#: selection:ir.rule,operator:0
-msgid "<="
-msgstr "<="
+#: selection:ir.ui.menu,icon:0
+msgid "terp-check"
+msgstr ""
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Estonian / Eesti keel"
 msgstr "Estonian / Eesti keel"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: field:res.config.users,email:0
+#: field:res.partner,email:0
+#: field:res.users,email:0
+msgid "E-mail"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
 msgid "Portugese / português"
 msgstr "Portugese / português"
 
@@ -5520,33 +6276,33 @@ msgstr "Portugese / português"
 msgid "GPL-3 or later version"
 msgstr "GPL-3 o versione successiva"
 
-#. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "HTML from HTML(Mako)"
-msgstr "HTML da HTML (MAKO)"
-
 #. module: base
 #: field:workflow.activity,action:0
 msgid "Python Action"
 msgstr "Puthon Attivo"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "English (US)"
 msgstr "Inglese Americano (U.S.A.)"
 
 #. module: base
-#: field:res.partner.event,probability:0
-msgid "Probability (0.50)"
-msgstr "Probabilità (0.50)"
+#: model:ir.actions.act_window,name:base.action_model_data
+#: view:ir.model.data:0
+#: model:ir.ui.menu,name:base.ir_model_data_menu
+msgid "Object Identifiers"
+msgstr ""
 
 #. module: base
-#: field:ir.report.custom,repeat_header:0
-msgid "Repeat Header"
-msgstr "Ripeti Intestazione"
+#: view:base.language.export:0
+msgid "To browse official translations, you can start with these links:"
+msgstr ""
 
 #. module: base
 #: view:res.bank:0
+#: field:res.config.users,address_id:0
+#: view:res.partner.address:0
+#: view:res.users:0
 #: field:res.users,address_id:0
 msgid "Address"
 msgstr "Indirizzo"
@@ -5556,16 +6312,21 @@ msgstr "Indirizzo"
 msgid "Installed version"
 msgstr "Versione Installata"
 
-#. module: base
-#: model:ir.ui.menu,name:base.menu_workflow_root
-msgid "Workflow Definitions"
-msgstr "Definizione di flusso di lavoro"
-
 #. module: base
 #: model:res.country,name:base.mr
 msgid "Mauritania"
 msgstr "Mauritania"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
+
+#. module: base
+#: view:base.module.update:0
+msgid "Module update result"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 #: field:workflow.workitem,act_id:0
@@ -5594,9 +6355,9 @@ msgid "Congo"
 msgstr "Congo"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_exports_line
-msgid "ir.exports.line"
-msgstr "ir.exports.line"
+#: view:res.lang:0
+msgid "Examples"
+msgstr "Esempi"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -5604,21 +6365,14 @@ msgid "STOCK_MEDIA_PAUSE"
 msgstr "STOCK_MEDIA_PAUSE"
 
 #. module: base
-#: model:ir.model,name:base.model_res_country_state
-msgid "Country state"
-msgstr "Stato Nazione"
+#: model:ir.ui.menu,name:base.menu_tools
+msgid "Tools"
+msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_property_form_all
-#: model:ir.ui.menu,name:base.menu_ir_property_form_all
-msgid "All Properties"
-msgstr "Tutte le Proprietà"
-
-#. module: base
-#: model:ir.actions.act_window,name:base.ir_action_window
-#: model:ir.ui.menu,name:base.menu_ir_action_window
-msgid "Window Actions"
-msgstr "Azioni Finestra"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gtk-go-back-ltr"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.kn
@@ -5633,7 +6387,6 @@ msgstr "STOCK_HOME"
 #. module: base
 #: field:ir.model,name:0
 #: field:ir.model.fields,model:0
-#: field:ir.model.grid,name:0
 #: field:ir.values,model:0
 msgid "Object Name"
 msgstr "Nome Oggetto"
@@ -5648,12 +6401,14 @@ msgstr ""
 "riferisce al campo oggetto."
 
 #. module: base
+#: view:ir.module.module:0
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "Not Installed"
 msgstr "Non installato"
 
 #. module: base
+#: view:workflow.activity:0
 #: field:workflow.activity,out_transitions:0
 msgid "Outgoing Transitions"
 msgstr "Transizioni in Uscita"
@@ -5663,20 +6418,20 @@ msgstr "Transizioni in Uscita"
 msgid "Icon"
 msgstr "Icona"
 
-#. module: base
-#: wizard_button:module.lang.import,init,finish:0
-#: wizard_button:module.lang.install,start,end:0
-#: wizard_button:module.module.update,update,open_window:0
-msgid "Ok"
-msgstr "Ok"
-
 #. module: base
 #: model:res.country,name:base.mq
 msgid "Martinique (French)"
 msgstr "Martinica"
 
 #. module: base
-#: model:ir.ui.menu,name:base.next_id_12
+#: view:ir.sequence.type:0
+msgid "Sequences Type"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_request-act
+#: model:ir.ui.menu,name:base.menu_res_request_act
+#: model:ir.ui.menu,name:base.menu_resquest_ref
 #: view:res.request:0
 msgid "Requests"
 msgstr "Richieste"
@@ -5697,15 +6452,23 @@ msgid "Pakistan"
 msgstr "Pakistan"
 
 #. module: base
-#: model:res.country,name:base.al
-msgid "Albania"
-msgstr "Albania"
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.ws
 msgid "Samoa"
 msgstr "Samoa"
 
+#. module: base
+#: view:base.language.install:0
+#: view:base.module.import:0
+msgid ""
+"Please be patient, this operation may take a few minutes (depending on the "
+"number of modules currently installed)..."
+msgstr ""
+
 #. module: base
 #: field:ir.ui.menu,child_id:0
 msgid "Child IDs"
@@ -5717,6 +6480,12 @@ msgstr "ID dipendenti"
 msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problema nella configurazione 'Record Id' nell'azione del Server!"
 
+#. module: base
+#: view:base.module.import:0
+#: view:base.module.update:0
+msgid "Open Modules"
+msgstr ""
+
 #. module: base
 #: code:addons/base/maintenance/maintenance.py:0
 #, python-format
@@ -5724,9 +6493,7 @@ msgid "This error occurs on database %s"
 msgstr "Questo errore è avvenuto sul database %s"
 
 #. module: base
-#: wizard_button:base.module.import,init,import:0
-#: model:ir.actions.wizard,name:base.wizard_base_module_import
-#: model:ir.ui.menu,name:base.menu_wizard_module_import
+#: view:base.module.import:0
 msgid "Import module"
 msgstr "Importa Modulo"
 
@@ -5735,6 +6502,13 @@ msgstr "Importa Modulo"
 msgid "STOCK_DISCONNECT"
 msgstr "STOCK_DISCONNECT"
 
+#. module: base
+#: help:ir.actions.report.xml,report_file:0
+msgid ""
+"The path to the main report file (depending on Report Type) or NULL if the "
+"content is in another field"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.la
 msgid "Laos"
@@ -5742,25 +6516,50 @@ msgstr "Laos"
 
 #. module: base
 #: selection:ir.actions.server,state:0
+#: model:ir.ui.menu,name:base.menu_mail_gateway
+#: field:res.config.users,user_email:0
+#: field:res.users,user_email:0
 msgid "Email"
 msgstr "Email"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_wizard_update_translations
-#: model:ir.ui.menu,name:base.menu_wizard_update_translations
-msgid "Resynchronise Terms"
-msgstr "Risincronizza i termini"
+#: field:res.config.users,action_id:0
+#: field:res.users,action_id:0
+msgid "Home Action"
+msgstr "Azione Home"
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_lunch_reporting
+#: model:ir.ui.menu,name:base.menu_project_report
+#: model:ir.ui.menu,name:base.menu_report_association
+#: model:ir.ui.menu,name:base.menu_report_marketing
+#: model:ir.ui.menu,name:base.menu_reporting
+#: model:ir.ui.menu,name:base.next_id_64
+#: model:ir.ui.menu,name:base.next_id_73
+#: model:ir.ui.menu,name:base.reporting_menu
+msgid "Reporting"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.tg
 msgid "Togo"
 msgstr "Togo"
 
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "Other Proprietary"
+msgstr ""
+
 #. module: base
 #: selection:workflow.activity,kind:0
 msgid "Stop All"
 msgstr "Ferma tutto"
 
+#. module: base
+#: view:ir.model.data:0
+msgid "Updatable"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "3.  %x ,%X         ==> 12/05/08, 18:25:20"
@@ -5772,16 +6571,9 @@ msgid "Cascade"
 msgstr "A Cascata"
 
 #. module: base
-#: code:addons/base/ir/ir_report_custom.py:0
-#, python-format
-msgid "Field %d should be a figure"
-msgstr "Il campo %d dovrebbe essere una figura"
-
-#. module: base
-#: model:ir.actions.act_window,name:base.action_inventory_form
-#: model:ir.ui.menu,name:base.menu_action_inventory_form
-msgid "Default Company per Object"
-msgstr "Azienda Predefinita per Oggetto"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -5803,6 +6595,18 @@ msgstr "Romania"
 msgid "STOCK_PREFERENCES"
 msgstr "STOCK_PREFERENCES"
 
+#. module: base
+#: help:ir.cron,doall:0
+msgid ""
+"Enable this if you want to execute missed occurences as soon as the server "
+"restarts."
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Start update"
+msgstr ""
+
 #. module: base
 #: field:res.country.state,name:0
 msgid "State Name"
@@ -5814,6 +6618,7 @@ msgid "Join Mode"
 msgstr "Modalità Unione"
 
 #. module: base
+#: field:res.config.users,context_tz:0
 #: field:res.users,context_tz:0
 msgid "Timezone"
 msgstr "Fuso orario"
@@ -5830,22 +6635,19 @@ msgid "ir.actions.report.xml"
 msgstr "ir.actions.report.xml"
 
 #. module: base
-#: view:wizard.module.lang.export:0
-msgid ""
-"To improve some terms of the official translations of OpenERP, you should "
-"modify the terms directly on the launchpad interface. If you made lots of "
-"translations for your own module, you can also publish all your translation "
-"at once."
+#: model:res.partner.title,shortcut:base.res_partner_title_miss
+msgid "Mss"
 msgstr ""
-"Al fine di perfezionare i termini delle traduzioni ufficiali di OpenERP, "
-"bisogna modificare i termini direttamente sull'interfaccia di Launchpad. Se "
-"sono state fatte molte  traduzioni per il proprio modulo, è anche possibile "
-"pubblicare tutte le traduzioni in una sola volta."
 
 #. module: base
-#: wizard_button:module.lang.install,init,start:0
-msgid "Start installation"
-msgstr "Inizia Installazione"
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
+#. module: base
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
 
 #. module: base
 #: help:res.lang,code:0
@@ -5857,6 +6659,16 @@ msgstr "Questo campo è usato per impostare/leggere fuso locale per utente"
 msgid "OpenERP Partners"
 msgstr "Partners OpenERP"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_hr_manager
+msgid "HR Manager Dashboard"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Search modules"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.by
 msgid "Belarus"
@@ -5868,6 +6680,7 @@ msgstr "Bielorussia"
 #: field:ir.actions.actions,name:0
 #: field:ir.actions.server,name:0
 #: field:ir.actions.url,name:0
+#: field:ir.filters,name:0
 msgid "Action Name"
 msgstr "Nome Azione"
 
@@ -5883,11 +6696,21 @@ msgid "Street2"
 msgstr "Indirizzo 2"
 
 #. module: base
+#: model:ir.actions.act_window,name:base.action_view_base_module_update
+msgid "Module Update"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
 #: field:ir.cron,user_id:0
+#: view:ir.filters:0
+#: field:ir.filters,user_id:0
 #: field:ir.ui.view.custom,user_id:0
 #: field:ir.values,user_id:0
+#: field:res.log,user_id:0
 #: field:res.partner.event,user_id:0
 #: view:res.users:0
+#: field:res.widget.user,user_id:0
 msgid "User"
 msgstr "Utente"
 
@@ -5913,12 +6736,21 @@ msgstr ""
 msgid "Open Window"
 msgstr "Apri Finestra"
 
+#. module: base
+#: field:ir.actions.act_window,auto_search:0
+msgid "Auto Search"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.act_window,filter:0
-#: field:ir.module.repository,filter:0
 msgid "Filter"
 msgstr "Filtro"
 
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_madam
+msgid "Ms."
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ch
 msgid "Switzerland"
@@ -5945,15 +6777,20 @@ msgid "Rounding factor"
 msgstr "Fattore di Arrotondamento"
 
 #. module: base
-#: model:ir.model,name:base.model_res_company
-msgid "res.company"
-msgstr "res.company"
+#: view:base.language.install:0
+msgid "Load"
+msgstr ""
 
 #. module: base
-#: wizard_view:module.upgrade,end:0
-#: wizard_view:module.upgrade,start:0
-msgid "System upgrade done"
-msgstr "Aggiornamento di Sistema Completato"
+#: help:res.config.users,name:0
+#: help:res.users,name:0
+msgid "The new user's real name, used for searching and most listings"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_request_history
+msgid "res.request.history"
+msgstr "res.request.history"
 
 #. module: base
 #: model:res.country,name:base.so
@@ -5961,9 +6798,9 @@ msgid "Somalia"
 msgstr "Somalia"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_config_simple_view_form
-msgid "Configure Simple View"
-msgstr "Configura Vista Semplice"
+#: model:ir.model,name:base.model_res_config
+msgid "res.config"
+msgstr ""
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_13
@@ -5971,56 +6808,51 @@ msgid "Important customers"
 msgstr "Clienti importanti"
 
 #. module: base
+#: view:res.lang:0
+msgid "Update Terms"
+msgstr ""
+
+#. module: base
+#: field:partner.sms.send,mobile_to:0
 #: field:res.request,act_to:0
 #: field:res.request.history,act_to:0
 msgid "To"
 msgstr "A"
 
 #. module: base
+#: view:ir.cron:0
 #: field:ir.cron,args:0
 msgid "Arguments"
 msgstr "Argomenti"
 
 #. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "sxw"
-msgstr "sxw"
+#: selection:ir.module.module,license:0
+msgid "GPL Version 2"
+msgstr ""
 
 #. module: base
-#: field:ir.actions.report.xml,auto:0
-msgid "Automatic XSL:RML"
-msgstr "XSL RML Automatico"
+#: selection:ir.module.module,license:0
+msgid "GPL Version 3"
+msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Manual domain setup"
-msgstr "Configurazione Manuale Dominio"
+#: view:partner.wizard.ean.check:0
+msgid "Correct EAN13"
+msgstr ""
 
 #. module: base
-#: field:res.partner,customer:0
-#: model:res.partner.category,name:base.res_partner_category_0
-#: selection:res.partner.event,partner_type:0
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: base
-#: field:ir.actions.report.custom,name:0
-#: field:ir.report.custom,name:0
-msgid "Report Name"
-msgstr "Nome Report"
+#: model:ir.ui.menu,name:base.menu_audit
+msgid "Audit"
+msgstr ""
 
 #. module: base
 #: field:ir.module.module,shortdesc:0
 msgid "Short Description"
 msgstr "Descrizione breve"
 
-#. module: base
-#: field:res.partner.event,partner_type:0
-msgid "Partner Relation"
-msgstr "Relazione Partner"
-
 #. module: base
 #: field:ir.actions.act_window,context:0
+#: field:ir.filters,context:0
 msgid "Context Value"
 msgstr "Valore Contesto"
 
@@ -6029,6 +6861,11 @@ msgstr "Valore Contesto"
 msgid "Hour 00->24: %(h24)s"
 msgstr "Formato Orario 00->24: %(h24)s"
 
+#. module: base
+#: field:ir.cron,nextcall:0
+msgid "Next Execution Date"
+msgstr ""
+
 #. module: base
 #: help:multi_company.default,field_id:0
 msgid "Select field property"
@@ -6048,12 +6885,15 @@ msgstr "Mese: %(month)s"
 #: field:ir.actions.act_window.view,sequence:0
 #: field:ir.actions.server,sequence:0
 #: field:ir.actions.todo,sequence:0
-#: field:ir.module.repository,sequence:0
-#: field:ir.report.custom.fields,sequence:0
+#: view:ir.cron:0
 #: view:ir.sequence:0
 #: field:ir.ui.menu,sequence:0
+#: view:ir.ui.view:0
+#: field:ir.ui.view,priority:0
 #: field:ir.ui.view_sc,sequence:0
+#: field:multi_company.default,sequence:0
 #: field:res.partner.bank,sequence:0
+#: field:res.widget.user,sequence:0
 #: field:wizard.ir.model.menu.create.line,sequence:0
 msgid "Sequence"
 msgstr "Sequenza"
@@ -6064,18 +6904,18 @@ msgid "Tunisia"
 msgstr "Tunisia"
 
 #. module: base
-#: field:ir.actions.wizard,name:0
-msgid "Wizard Info"
-msgstr "Informazioni procedura guidata"
+#: view:base.language.export:0
+#: model:ir.actions.act_window,name:base.action_wizard_lang_export
+#: model:ir.ui.menu,name:base.menu_wizard_lang_export
+msgid "Export Translation"
+msgstr ""
 
 #. module: base
-#: help:ir.cron,numbercall:0
-msgid ""
-"Number of time the function is called,\n"
-"a negative number indicates that the function will always be called"
-msgstr ""
-"Numero di volte che la funzione viene richiamata,\n"
-"un numero negativo indica che la funzione verrà richiamata sempre"
+#: model:ir.actions.act_window,name:base.action_server_action
+#: view:ir.actions.server:0
+#: model:ir.ui.menu,name:base.menu_server_action
+msgid "Server Actions"
+msgstr "Azioni Server"
 
 #. module: base
 #: view:ir.module.module:0
@@ -6088,15 +6928,9 @@ msgid "Legends for Date and Time Formats"
 msgstr "Legende per Formati Data e Ora"
 
 #. module: base
-#: selection:ir.report.custom,frequency:0
-msgid "Monthly"
-msgstr "Mensile"
-
-#. module: base
-#: model:ir.actions.act_window,name:base.res_partner_som-act
-#: model:ir.ui.menu,name:base.menu_res_partner_som-act
-msgid "States of mind"
-msgstr "Propensioni"
+#: selection:ir.actions.server,state:0
+msgid "Copy Object"
+msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country_state
@@ -6116,34 +6950,35 @@ msgid "Table Ref."
 msgstr "Rif. Tabella"
 
 #. module: base
-#: field:res.roles,parent_id:0
-msgid "Parent"
-msgstr "Superiore"
-
-#. module: base
-#: view:multi_company.default:0
-msgid "Returning"
-msgstr "Sto ritornando"
+#: view:res.config:0
+#: view:res.config.installer:0
+msgid "description"
+msgstr ""
 
 #. module: base
 #: field:ir.actions.act_window,res_model:0
-#: field:ir.actions.report.custom,model:0
 #: field:ir.actions.report.xml,model:0
 #: field:ir.actions.server,model_id:0
 #: field:ir.actions.wizard,model:0
 #: field:ir.cron,model:0
 #: field:ir.default,field_tbl:0
-#: view:ir.model:0
+#: field:ir.filters,model_id:0
 #: field:ir.model,model:0
+#: view:ir.model.access:0
 #: field:ir.model.access,model_id:0
+#: view:ir.model.data:0
 #: field:ir.model.data,model:0
-#: field:ir.model.grid,model:0
-#: field:ir.report.custom,model_id:0
+#: view:ir.model.fields:0
+#: view:ir.rule:0
+#: field:ir.rule,model_id:0
 #: selection:ir.translation,type:0
+#: view:ir.ui.view:0
 #: field:ir.ui.view,model:0
+#: view:ir.values:0
 #: field:ir.values,model_id:0
+#: field:multi_company.default,object_id:0
+#: field:res.log,res_model:0
 #: field:res.request.link,object:0
-#: field:wizard.ir.model.menu.create,model_id:0
 #: field:workflow.triggers,model:0
 msgid "Object"
 msgstr "Oggetto"
@@ -6159,9 +6994,16 @@ msgid "Minute: %(min)s"
 msgstr "Minuti: %(min)s"
 
 #. module: base
-#: selection:ir.ui.menu,icon:0
-msgid "STOCK_ZOOM_100"
-msgstr "STOCK_ZOOM_100"
+#: view:base.update.translations:0
+#: model:ir.actions.act_window,name:base.action_wizard_update_translations
+#: model:ir.ui.menu,name:base.menu_wizard_update_translations
+msgid "Synchronize Translations"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_10
+msgid "Scheduler"
+msgstr "Pianificatore"
 
 #. module: base
 #: view:res.lang:0
@@ -6169,18 +7011,30 @@ msgid "%w - Weekday as a decimal number [0(Sunday),6]."
 msgstr "%w - Numero di giorno come numero decimale [0(Domenica),6]."
 
 #. module: base
-#: view:wizard.module.lang.export:0
-msgid "Export translation file"
-msgstr "Esporta File Traduzione"
+#: help:ir.cron,numbercall:0
+msgid ""
+"Number of time the function is called,\n"
+"a negative number indicates no limit"
+msgstr ""
 
 #. module: base
 #: field:ir.ui.view_sc,user_id:0
 msgid "User Ref."
 msgstr "Rif. Utente"
 
+#. module: base
+#: code:addons/base/res/res_user.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config
 #: model:ir.ui.menu,name:base.menu_config
+#: model:ir.ui.menu,name:base.menu_event_config
+#: model:ir.ui.menu,name:base.menu_lunch_survey_root
+#: model:ir.ui.menu,name:base.menu_marketing_config_association
+#: model:ir.ui.menu,name:base.menu_marketing_config_root
 #: view:res.company:0
 msgid "Configuration"
 msgstr "Configurazione"
@@ -6191,19 +7045,9 @@ msgid "Loop Expression"
 msgstr "Espressione Ricorsiva"
 
 #. module: base
-#: selection:res.partner.event,partner_type:0
-msgid "Retailer"
-msgstr "Fornitore"
-
-#. module: base
-#: selection:ir.report.custom,type:0
-msgid "Tabular"
-msgstr "Tabulare"
-
-#. module: base
-#: field:ir.actions.todo,start_on:0
-msgid "Start On"
-msgstr "Inizio a"
+#: help:res.partner,website:0
+msgid "Website of Partner"
+msgstr ""
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_5
@@ -6213,11 +7057,11 @@ msgstr "Gold Partner"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: field:res.partner.address,partner_id:0
+#: view:res.partner.address:0
 #: field:res.partner.bank,partner_id:0
 #: field:res.partner.event,partner_id:0
 #: selection:res.partner.title,domain:0
-#: view:res.users:0
+#: model:res.request.link,name:base.req_link_partner
 msgid "Partner"
 msgstr "Partner"
 
@@ -6232,47 +7076,41 @@ msgid "Falkland Islands"
 msgstr "Isole Falkland/Malvine"
 
 #. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "odt"
-msgstr "odt"
+#: model:res.country,name:base.lb
+msgid "Lebanon"
+msgstr "Libano"
 
 #. module: base
-#: field:ir.actions.report.custom,type:0
-#: field:ir.actions.report.xml,type:0
-#: field:ir.report.custom,type:0
+#: view:ir.actions.report.xml:0
+#: field:ir.actions.report.xml,report_type:0
 msgid "Report Type"
 msgstr "Tipo Report"
 
 #. module: base
 #: field:ir.actions.todo,state:0
+#: view:ir.module.module:0
 #: field:ir.module.module,state:0
 #: field:ir.module.module.dependency,state:0
-#: field:ir.report.custom,state:0
 #: field:maintenance.contract,state:0
 #: field:res.bank,state:0
 #: view:res.country.state:0
 #: field:res.partner.bank,state_id:0
+#: view:res.request:0
 #: field:res.request,state:0
 #: field:workflow.instance,state:0
 #: field:workflow.workitem,state:0
 msgid "State"
 msgstr "Stato"
 
-#. module: base
-#: selection:ir.module.module,license:0
-msgid "Other proprietary"
-msgstr "Altro Titolare"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "terp-administration"
 msgstr "terp-administration"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_translation
-#: model:ir.ui.menu,name:base.menu_action_translation
-msgid "All terms"
-msgstr "Tutti i Termini"
+#: selection:base.language.install,lang:0
+msgid "Galician / Galego"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.no
@@ -6285,11 +7123,16 @@ msgid "4.  %b, %B         ==> Dec, December"
 msgstr "4. %b, %B ==>Dic, Dicembre"
 
 #. module: base
-#: model:ir.actions.wizard,name:base.wizard_lang_install
-#: model:ir.ui.menu,name:base.menu_wizard_lang_install
+#: view:base.language.install:0
+#: model:ir.ui.menu,name:base.menu_view_base_language_install
 msgid "Load an Official Translation"
 msgstr "Carica una Traduzione Ufficiale"
 
+#. module: base
+#: view:res.currency:0
+msgid "Miscelleanous"
+msgstr ""
+
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_10
 msgid "Open Source Service Company"
@@ -6301,25 +7144,25 @@ msgid "waiting"
 msgstr "in attesa"
 
 #. module: base
-#: field:ir.attachment,link:0
-msgid "Link"
-msgstr "Collegamento"
+#: field:ir.actions.report.xml,report_file:0
+msgid "Report file"
+msgstr ""
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_triggers
 msgid "workflow.triggers"
 msgstr "workflow.triggers"
 
-#. module: base
-#: field:ir.report.custom.fields,report_id:0
-msgid "Report Ref"
-msgstr "Rif. Report"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "terp-hr"
 msgstr "terp-hr"
 
+#. module: base
+#: view:ir.attachment:0
+msgid "Created"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.wizard,multi:0
 msgid ""
@@ -6329,6 +7172,11 @@ msgstr ""
 "Se impostato a vero, la procedura guidata non verrà visualizzata nella barra "
 "degli strumenti a destra nella vista: modulo."
 
+#. module: base
+#: view:base.language.import:0
+msgid "- type,name,res_id,src,value"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_DND"
@@ -6345,16 +7193,14 @@ msgid "View Ref."
 msgstr "Rif. Vista"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Dutch (Belgium) / Nederlands (Belgïe)"
 msgstr "Belgio"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_repository_tree
-#: view:ir.module.repository:0
-#: model:ir.ui.menu,name:base.menu_module_repository_tree
-msgid "Repository list"
-msgstr "Lista Repository"
+#: selection:ir.translation,type:0
+msgid "Selection"
+msgstr "Selezione"
 
 #. module: base
 #: field:res.company,rml_header1:0
@@ -6365,6 +7211,8 @@ msgstr "Report - Intestazione"
 #: field:ir.actions.act_window,type:0
 #: field:ir.actions.act_window_close,type:0
 #: field:ir.actions.actions,type:0
+#: field:ir.actions.report.xml,type:0
+#: view:ir.actions.server:0
 #: field:ir.actions.server,state:0
 #: field:ir.actions.server,type:0
 #: field:ir.actions.url,type:0
@@ -6372,16 +7220,31 @@ msgstr "Report - Intestazione"
 msgid "Action Type"
 msgstr "Tipo Azione"
 
+#. module: base
+#: view:base.language.import:0
+#: model:ir.actions.act_window,name:base.action_view_base_import_language
+#: model:ir.ui.menu,name:base.menu_view_base_import_language
+msgid "Import Translation"
+msgstr ""
+
 #. module: base
 #: field:res.partner.bank.type,field_ids:0
 msgid "Type fields"
 msgstr "Campi di Inserimento"
 
 #. module: base
+#: view:ir.module.module:0
 #: field:ir.module.module,category_id:0
 msgid "Category"
 msgstr "Categoria"
 
+#. module: base
+#: view:ir.attachment:0
+#: selection:ir.attachment,type:0
+#: selection:ir.property,type:0
+msgid "Binary"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_FLOPPY"
@@ -6404,17 +7267,16 @@ msgstr "Costa Rica"
 msgid "Your can't submit bug reports due to uncovered modules: %s"
 msgstr "Non puoi sottoporre report di errori dovuto a moduli non coperti: %s"
 
+#. module: base
+#: view:workflow.activity:0
+msgid "Conditions"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_other_form
 msgid "Other Partners"
 msgstr "Altri Partner"
 
-#. module: base
-#: view:ir.model:0
-#: view:res.request:0
-msgid "Status"
-msgstr "Stato"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_currency_form
 #: model:ir.ui.menu,name:base.menu_action_currency_form
@@ -6462,6 +7324,16 @@ msgstr "Signora"
 msgid "Estonia"
 msgstr "Estonia"
 
+#. module: base
+#: model:ir.ui.menu,name:base.dashboard
+msgid "Dashboards"
+msgstr ""
+
+#. module: base
+#: help:ir.attachment,type:0
+msgid "Binary File or external URL"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nl
 msgid "Netherlands"
@@ -6472,16 +7344,6 @@ msgstr "Olanda"
 msgid "Low Level Objects"
 msgstr "Oggetti di basso livello"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_report_custom
-msgid "ir.report.custom"
-msgstr "ir.report.custom"
-
-#. module: base
-#: selection:res.partner.event,type:0
-msgid "Purchase Offer"
-msgstr "Offerta d'Acquisto"
-
 #. module: base
 #: model:ir.model,name:base.model_ir_values
 msgid "ir.values"
@@ -6492,6 +7354,11 @@ msgstr "ir.values"
 msgid "STOCK_ZOOM_FIT"
 msgstr "STOCK_ZOOM_FIT"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_emails
+msgid "Emails"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.cd
 msgid "Congo, The Democratic Republic of the"
@@ -6515,21 +7382,11 @@ msgid "Number of Calls"
 msgstr "Numero di chiamate"
 
 #. module: base
-#: wizard_view:module.lang.install,start:0
-msgid "Language file loaded."
-msgstr "File Lingua Caricato"
-
-#. module: base
-#: wizard_view:module.upgrade,next:0
-#: wizard_field:module.upgrade,next,module_info:0
+#: view:base.module.upgrade:0
+#: field:base.module.upgrade,module_info:0
 msgid "Modules to update"
 msgstr "Moduli da Aggiornare"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.action2
-msgid "Company Architecture"
-msgstr "Struttura Azienda"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_GOTO_BOTTOM"
@@ -6560,7 +7417,7 @@ msgid "Trigger Date"
 msgstr "Data Avvio Automatico"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Croatian / hrvatski jezik"
 msgstr "Croatian / hrvatski jezik"
 
@@ -6569,15 +7426,20 @@ msgstr "Croatian / hrvatski jezik"
 msgid "STOCK_GO_FORWARD"
 msgstr "STOCK_GO_FORWARD"
 
+#. module: base
+#: field:base.language.install,overwrite:0
+msgid "Overwrite Existing Terms"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.server,code:0
 msgid "Python code to be executed"
 msgstr "Codice python da eseguire"
 
 #. module: base
-#: selection:ir.module.module.dependency,state:0
-msgid "Uninstallable"
-msgstr "Disinstallabile"
+#: model:ir.ui.menu,name:base.menu_project_management_time_tracking
+msgid "Time Tracking"
+msgstr ""
 
 #. module: base
 #: view:res.partner.category:0
@@ -6591,26 +7453,23 @@ msgid "Trigger"
 msgstr "Attivazione"
 
 #. module: base
+#: model:ir.model,name:base.model_base_module_update
+msgid "Update Module"
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
 #: field:ir.model.fields,translate:0
 msgid "Translate"
 msgstr "Traduci"
 
-#. module: base
-#: view:ir.actions.server:0
-msgid ""
-"Access all the fields related to the current object using expression in "
-"double brackets, i.e. [[ object.partner_id.name ]]"
-msgstr ""
-"Accedi a tutti i campi correlati all'elemento attuale utilizzando "
-"un'espressione tra doppie parentesi, vale a dire [[object.partner_id.name]]"
-
 #. module: base
 #: field:res.request.history,body:0
 msgid "Body"
 msgstr "Testo"
 
 #. module: base
-#: wizard_button:res.partner.spam_send,init,send:0
+#: view:partner.wizard.spam:0
 msgid "Send Email"
 msgstr "Invia Email"
 
@@ -6620,12 +7479,13 @@ msgid "STOCK_SELECT_FONT"
 msgstr "STOCK_SELECT_FONT"
 
 #. module: base
+#: field:res.config.users,menu_id:0
 #: field:res.users,menu_id:0
 msgid "Menu Action"
 msgstr "Azione Menu"
 
 #. module: base
-#: selection:wizard.module.lang.export,state:0
+#: selection:base.language.export,state:0
 msgid "choose"
 msgstr "Scegli"
 
@@ -6636,6 +7496,13 @@ msgstr "Scegli"
 msgid "Graph"
 msgstr "Grafico"
 
+#. module: base
+#: help:ir.model,osv_memory:0
+msgid ""
+"Indicates whether this object model lives in memory only, i.e. is not "
+"persisted (osv.osv_memory)"
+msgstr ""
+
 #. module: base
 #: field:res.partner,child_ids:0
 #: field:res.request,ref_partner_id:0
@@ -6643,14 +7510,11 @@ msgid "Partner Ref."
 msgstr "Rif. Partner"
 
 #. module: base
-#: field:ir.report.custom,print_format:0
-msgid "Print format"
-msgstr "Formato Stampa"
-
-#. module: base
-#: model:ir.ui.menu,name:base.menu_low_workflow
-msgid "Workflow Items"
-msgstr "Elementi di Flusso di lavoro"
+#: model:ir.actions.act_window,name:base.action_partner_supplier_form
+#: model:ir.ui.menu,name:base.menu_procurement_management_supplier_name
+#: view:res.partner:0
+msgid "Suppliers"
+msgstr "Fornitori"
 
 #. module: base
 #: field:res.request,ref_doc2:0
@@ -6674,6 +7538,7 @@ msgstr "ir.model.data"
 
 #. module: base
 #: view:ir.model:0
+#: view:ir.rule:0
 #: view:res.groups:0
 msgid "Access Rights"
 msgstr "Autorizzazioni Accesso"
@@ -6683,14 +7548,6 @@ msgstr "Autorizzazioni Accesso"
 msgid "Greenland"
 msgstr "Groenlandia"
 
-#. module: base
-#: help:ir.actions.report.xml,report_rml:0
-msgid ""
-"The .rml path of the file or NULL if the content is in report_rml_content"
-msgstr ""
-"Il percorso .rml del file oppure NULL se il contenuto si trova in "
-"report_rml_content"
-
 #. module: base
 #: field:res.partner.bank,acc_number:0
 msgid "Account Number"
@@ -6701,27 +7558,11 @@ msgstr "Numero conto"
 msgid "1.  %c              ==> Fri Dec  5 18:25:20 2008"
 msgstr "1. %c ==> Ven Dic 5 18:25:20 2008"
 
-#. module: base
-#: help:ir.ui.menu,groups_id:0
-msgid ""
-"If you have groups, the visibility of this menu will be based on these "
-"groups. If this field is empty, Open ERP will compute visibility based on "
-"the related object's read access."
-msgstr ""
-"Se esistono dei gruppi, la visibilità di questo menu si baserà su questi "
-"gruppi. Se il campo è vuoto, OpenERP calcolerà la visibilità sulla base dei "
-"permessi di lettura dell'oggetto associato."
-
 #. module: base
 #: model:res.country,name:base.nc
 msgid "New Caledonia (French)"
 msgstr "Nuova Caledonia (Francese)"
 
-#. module: base
-#: field:res.partner.function,name:0
-msgid "Function Name"
-msgstr "Nome funzione"
-
 #. module: base
 #: view:maintenance.contract.wizard:0
 msgid "_Cancel"
@@ -6732,9 +7573,17 @@ msgstr "_Annulla"
 msgid "Cyprus"
 msgstr "Cipro"
 
+#. module: base
+#: view:base.module.import:0
+msgid ""
+"This wizard helps you add a new language to you OpenERP system. After "
+"loading a new language it becomes available as default interface language "
+"for users and partners."
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,subject:0
-#: wizard_field:res.partner.spam_send,init,subject:0
+#: field:partner.wizard.spam,subject:0
 #: field:res.request,name:0
 msgid "Subject"
 msgstr "Oggetto"
@@ -6746,6 +7595,17 @@ msgid "From"
 msgstr "Da"
 
 #. module: base
+#: view:res.users:0
+msgid "Preferences"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_consumers0
+msgid "Consumers"
+msgstr ""
+
+#. module: base
+#: view:res.config:0
 #: wizard_button:server.action.create,init,step_1:0
 msgid "Next"
 msgstr "Successivo"
@@ -6756,27 +7616,35 @@ msgid "terp-report"
 msgstr "terp-report"
 
 #. module: base
-#: field:ir.actions.report.xml,report_rml_content:0
-#: field:ir.actions.report.xml,report_rml_content_data:0
-msgid "RML content"
-msgstr "Contenuto RML"
+#: help:ir.cron,function:0
+msgid ""
+"Name of the method to be called on the object when this scheduler is "
+"executed."
+msgstr ""
 
 #. module: base
-#: view:workflow.activity:0
-msgid "Incoming transitions"
-msgstr "Transizioni in Ingresso"
+#: model:res.company,overdue_msg:base.main_company
+msgid ""
+"Would your payment have been carried out after this mail was sent, please "
+"consider the present one as void. Do not hesitate to contact our accounting "
+"department"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,url:0
+msgid "Url"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.cn
 msgid "China"
 msgstr "Cina"
 
-#. module: base
-#: code:addons/base/ir/ir_model.py:0
-#, python-format
-msgid "Password empty !"
-msgstr "Manca la Password !"
-
 #. module: base
 #: model:res.country,name:base.eh
 msgid "Western Sahara"
@@ -6793,20 +7661,30 @@ msgid "Indonesia"
 msgstr "Indonesia"
 
 #. module: base
-#: selection:ir.actions.todo,start_on:0
-msgid "At Once"
-msgstr "In una sola volta"
+#: view:base.update.translations:0
+msgid ""
+"This wizard will detect new terms to translate in the application, so that "
+"you can then add translations manually or perform a complete export (as a "
+"template for a new language example)."
+msgstr ""
 
 #. module: base
-#: selection:ir.actions.server,state:0
-msgid "Write Object"
-msgstr "Scrivi Oggetto"
+#: help:multi_company.default,expression:0
+msgid ""
+"Expression, must be True to match\n"
+"use context.get or user (browse)"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.bg
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-folder-green"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ao
 msgid "Angola"
@@ -6817,15 +7695,6 @@ msgstr "Angola"
 msgid "French Southern Territories"
 msgstr "Territori Francesi Meridionali"
 
-#. module: base
-#: view:ir.actions.server:0
-msgid ""
-"Only one client action will be execute, last                                 "
-"clinent action will be consider in case of multiples clients actions"
-msgstr ""
-"Solo una azione di un client verrà eseguita, sarà considerata l'azione "
-"dell'ultimo client nel caso di azioni da molteplici client"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_HELP"
@@ -6833,7 +7702,6 @@ msgstr "STOCK_HELP"
 
 #. module: base
 #: model:ir.model,name:base.model_res_currency
-#: view:res.company:0
 #: field:res.company,currency_id:0
 #: field:res.company,currency_ids:0
 #: view:res.currency:0
@@ -6852,51 +7720,77 @@ msgstr "Nome Canale"
 msgid "5.  %y, %Y         ==> 08, 2008"
 msgstr "5. %y, %Y ==> 08, 2008"
 
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_ltd
+msgid "ltd"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model_id:0
 #: field:ir.values,res_id:0
+#: field:res.log,res_id:0
 msgid "Object ID"
 msgstr "ID oggetto"
 
 #. module: base
-#: selection:ir.report.custom,print_orientation:0
+#: view:res.company:0
 msgid "Landscape"
 msgstr "Orizzontale"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.action_partner_form
-#: model:ir.ui.menu,name:base.menu_base_config_partner
-#: model:ir.ui.menu,name:base.menu_base_partner
-#: model:ir.ui.menu,name:base.menu_partner_form
-#: view:res.partner:0
-#: view:res.partner.category:0
-#: field:res.partner.category,partner_ids:0
-msgid "Partners"
-msgstr "Partner"
-
 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration
 msgid "Administration"
 msgstr "Amministrazione"
 
 #. module: base
-#: selection:ir.rule,operator:0
-msgid "child_of"
-msgstr "child_of"
+#: view:base.module.update:0
+msgid "Click on Update below to start the process..."
+msgstr ""
 
 #. module: base
-#: view:res.users:0
-#: field:res.users,company_ids:0
-msgid "Accepted Companies"
-msgstr "Aziende accettate"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-go-today"
+msgstr ""
 
 #. module: base
-#: field:ir.report.custom.fields,operation:0
+#: model:res.country,name:base.ir
+msgid "Iran"
+msgstr "Iran"
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_widget_user_act_window
+#: model:ir.ui.menu,name:base.menu_res_widget_user_act_window
+msgid "Widgets per User"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Slovak / Slovenský jazyk"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
-#: field:wizard.module.lang.export,state:0
+#: field:res.widget.wizard,widget_id:0
 msgid "unknown"
 msgstr "Sconosciuto"
 
+#. module: base
+#: field:res.currency,symbol:0
+msgid "Symbol"
+msgstr ""
+
+#. module: base
+#: help:res.config.users,login:0
+#: help:res.users,login:0
+msgid "Used to log into the system"
+msgstr ""
+
+#. module: base
+#: view:base.update.translations:0
+msgid "Synchronize Translation"
+msgstr ""
+
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
 msgid "Resource Ref."
@@ -6912,16 +7806,22 @@ msgstr "Kiribati"
 msgid "Iraq"
 msgstr "Iraq"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_association
+msgid "Association"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.server:0
 msgid "Action to Launch"
 msgstr "Azione da lanciare"
 
 #. module: base
-#: wizard_view:base.module.import,import:0
-#: wizard_view:base.module.import,init:0
-msgid "Module import"
-msgstr "Importa Modulo"
+#: model:ir.ui.menu,name:base.menu_address_book
+#: model:ir.ui.menu,name:base.menu_config_address_book
+#: model:ir.ui.menu,name:base.menu_procurement_management_supplier
+msgid "Address Book"
+msgstr ""
 
 #. module: base
 #: model:ir.model,name:base.model_ir_sequence_type
@@ -6929,13 +7829,23 @@ msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
 #. module: base
-#: selection:wizard.module.lang.export,format:0
+#: selection:base.language.export,format:0
 msgid "CSV File"
 msgstr "File CSV"
 
+#. module: base
+#: field:res.company,account_no:0
+msgid "Account No."
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr "Il Linguaggio base 'en_US' non può essere eliminato !"
+
 #. module: base
 #: selection:ir.model,state:0
-#: selection:ir.model.grid,state:0
 msgid "Base Object"
 msgstr "Oggetto Base"
 
@@ -6950,15 +7860,7 @@ msgid "STOCK_STRIKETHROUGH"
 msgstr "STOCK_STRIKETHROUGH"
 
 #. module: base
-#: selection:ir.report.custom.fields,fc0_op:0
-#: selection:ir.report.custom.fields,fc1_op:0
-#: selection:ir.report.custom.fields,fc2_op:0
-#: selection:ir.report.custom.fields,fc3_op:0
-msgid "(year)="
-msgstr "(anno)="
-
-#. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "Dependencies :"
 msgstr "Dipendenze"
 
@@ -6988,21 +7890,11 @@ msgid "Antigua and Barbuda"
 msgstr "Antigua e Barbuda"
 
 #. module: base
-#: field:ir.actions.server,condition:0
-#: field:ir.report.custom.fields,fc0_condition:0
-#: field:ir.sequence,condition:0
-#: view:multi_company.default:0
-#: field:workflow.transition,condition:0
-msgid "Condition"
-msgstr "Condizione"
+#: model:res.country,name:base.gw
+msgid "Guinea Bissau"
+msgstr "Guinea Bissau"
 
 #. module: base
-#: model:res.country,name:base.zr
-msgid "Zaire"
-msgstr "Zaire"
-
-#. module: base
-#: field:ir.attachment,res_id:0
 #: field:ir.model.data,res_id:0
 #: field:ir.translation,res_id:0
 #: field:workflow.instance,res_id:0
@@ -7013,34 +7905,25 @@ msgstr "ID Risorsa"
 #. module: base
 #: view:ir.cron:0
 #: field:ir.model,info:0
-#: field:ir.model.grid,info:0
-#: view:maintenance.contract:0
 msgid "Information"
 msgstr "Informazioni"
 
 #. module: base
-#: view:wizard.module.lang.export:0
-msgid ""
-"The official translations pack of all OpenERP/OpenObjects module are managed "
-"through launchpad. We use their online interface to synchronize all "
-"translations efforts."
+#: selection:ir.ui.menu,icon:0
+msgid "terp-call-start"
 msgstr ""
-"Il pacchetto delle traduzioni ufficiali di OpenErp/OpenObjects sono gestite "
-"tramite launchpad. Utilizziamo la loro interfaccia online per sincronizzare "
-"tutte le traduzioni"
 
 #. module: base
-#: field:ir.actions.report.xml,report_rml:0
-msgid "RML path"
-msgstr "Percorso RML"
+#: view:res.widget.user:0
+msgid "User Widgets"
+msgstr ""
 
 #. module: base
-#: field:ir.actions.configuration.wizard,item_id:0
-msgid "Next Configuration Wizard"
-msgstr "Successiva Procedura di Configurazione"
+#: view:base.module.update:0
+msgid "Update Module List"
+msgstr ""
 
 #. module: base
-#: selection:ir.actions.todo,type:0
 #: selection:res.partner.address,type:0
 msgid "Other"
 msgstr "Altro"
@@ -7051,21 +7934,10 @@ msgid "Reply"
 msgstr "Rispondi"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Turkish / Türkçe"
 msgstr "Turkish / Türkçe"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.action_translation_untrans
-#: model:ir.ui.menu,name:base.menu_action_translation_untrans
-msgid "Untranslated terms"
-msgstr "Termini non tradotti"
-
-#. module: base
-#: wizard_view:module.lang.import,init:0
-msgid "Import New Language"
-msgstr "Importa nuova lingua"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_activity_form
 #: model:ir.ui.menu,name:base.menu_workflow_activity
@@ -7080,31 +7952,48 @@ msgid "Auto-Refresh"
 msgstr "Auto-Aggiornamento"
 
 #. module: base
-#: selection:ir.report.custom.fields,fc0_op:0
-#: selection:ir.report.custom.fields,fc1_op:0
-#: selection:ir.report.custom.fields,fc2_op:0
-#: selection:ir.report.custom.fields,fc3_op:0
-#: selection:ir.rule,operator:0
-msgid "="
-msgstr "="
+#: selection:ir.ui.view,type:0
+msgid "Diagram"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_report_custom.py:0
-#, python-format
-msgid "Second field should be figures"
-msgstr "Il secondo campo dovrebbe contenere figure"
+#: help:multi_company.default,name:0
+msgid "Name it to easily find a record"
+msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_model_grid_security
-#: model:ir.ui.menu,name:base.menu_ir_access_grid
-msgid "Access Controls Grid"
-msgstr "Griglia Controlli d'Accesso"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-locked"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.grant_menu_access
+#: model:ir.ui.menu,name:base.menu_grant_menu_access
+msgid "Menu Items"
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-personal"
+msgstr ""
+
+#. module: base
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_event_association
+#: model:ir.ui.menu,name:base.menu_event_main
+msgid "Events Organisation"
+msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_actions
 #: model:ir.ui.menu,name:base.menu_custom_action
 #: model:ir.ui.menu,name:base.menu_ir_sequence_actions
 #: model:ir.ui.menu,name:base.next_id_6
+#: view:workflow.activity:0
 msgid "Actions"
 msgstr "Azioni"
 
@@ -7139,9 +8028,9 @@ msgid "Add or not the coporate RML header"
 msgstr "Aggiungi o meno l'intestazione aziendale RML"
 
 #. module: base
-#: field:res.partner.event,document:0
-msgid "Document"
-msgstr "Documento"
+#: help:workflow.transition,act_to:0
+msgid "The destination activity."
+msgstr ""
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7154,7 +8043,8 @@ msgid "STOCK_STOP"
 msgstr "STOCK_STOP"
 
 #. module: base
-#: view:wizard.module.update_translations:0
+#: view:base.module.update:0
+#: view:base.update.translations:0
 msgid "Update"
 msgstr "Aggiorna"
 
@@ -7174,7 +8064,7 @@ msgid "Tanzania"
 msgstr "Tanzania"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Danish / Dansk"
 msgstr "Danese / Danimarca"
 
@@ -7189,38 +8079,76 @@ msgid "Other Actions Configuration"
 msgstr "Configurazione Altre Azioni"
 
 #. module: base
-#: selection:ir.ui.menu,icon:0
-msgid "STOCK_EXECUTE"
-msgstr "STOCK_EXECUTE"
+#: view:res.lang:0
+msgid "%c - Appropriate date and time representation."
+msgstr "%c - Rappresentazione appropriata della data e dell'ora."
+
+#. module: base
+#: view:res.config.installer:0
+msgid "Install Modules"
+msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_partner_canal-act
 #: model:ir.model,name:base.model_res_partner_canal
 #: model:ir.ui.menu,name:base.menu_res_partner_canal-act
+#: view:res.partner.canal:0
 msgid "Channels"
 msgstr "Canali"
 
+#. module: base
+#: view:ir.ui.view:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_values_form_action
+#: model:ir.ui.menu,name:base.menu_values_form_action
+msgid "Client Events"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Schedule for Installation"
 msgstr "Pianifica per Installazione"
 
 #. module: base
-#: selection:ir.model.fields,select_level:0
-msgid "Advanced Search"
-msgstr "Ricerca Avanzata"
+#: model:ir.model,name:base.model_partner_wizard_ean_check
+msgid "Ean Check"
+msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_res_partner_bank
-#: view:res.partner.bank:0
-msgid "Bank Accounts"
-msgstr "Conti Bancari"
+#: code:addons/base/res/res_user.py:0
+#, python-format
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_user.py:0
+#, python-format
+msgid ""
+"Please keep in mind that data currently displayed may not be relevant after "
+"switching to another company. If you have unsaved changes, please make sure "
+"to save and close the forms before switching to a different company (you can "
+"click on Cancel now)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_multi_company_default
+msgid "Default multi company"
+msgstr ""
 
 #. module: base
 #: view:res.request:0
 msgid "Send"
 msgstr "Invia"
 
+#. module: base
+#: field:res.config.users,menu_tips:0
+#: field:res.users,menu_tips:0
+msgid "Menu Tips"
+msgstr ""
+
 #. module: base
 #: field:ir.translation,src:0
 msgid "Source"
@@ -7242,7 +8170,7 @@ msgid "Internal Header/Footer"
 msgstr "Intestazione/Piè di Pagina Interni"
 
 #. module: base
-#: code:addons/base/module/wizard/wizard_export_lang.py:0
+#: code:addons/base/module/wizard/base_export_language.py:0
 #, python-format
 msgid ""
 "Save this document to a .tgz file. This archive containt UTF-8 %s files and "
@@ -7252,13 +8180,24 @@ msgstr ""
 "8 e può essere inviato a Launchpad."
 
 #. module: base
-#: wizard_button:module.upgrade,end,config:0
-#: wizard_button:module.upgrade,start,config:0
+#: view:base.module.upgrade:0
 msgid "Start configuration"
 msgstr "Avvia Configurazione"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: view:base.language.export:0
+msgid "_Export"
+msgstr ""
+
+#. module: base
+#: field:base.language.install,state:0
+#: field:base.module.import,state:0
+#: field:base.module.update,state:0
+msgid "state"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
 msgid "Catalan / Català"
 msgstr "Catalan / Català"
 
@@ -7277,12 +8216,6 @@ msgstr "STOCK_COLOR_PICKER"
 msgid "Saudi Arabia"
 msgstr "Arabia Saudita"
 
-#. module: base
-#: code:addons/base/ir/ir_report_custom.py:0
-#, python-format
-msgid "Bar charts need at least two fields"
-msgstr "I Grafici a Barre necessitano di almeno due campi"
-
 #. module: base
 #: help:res.partner,supplier:0
 msgid ""
@@ -7298,31 +8231,48 @@ msgstr ""
 msgid "Relation Field"
 msgstr "Campo di relazione"
 
+#. module: base
+#: view:res.partner.event:0
+msgid "Event Logs"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_configuration.py:0
+#, python-format
+msgid "System Configuration done"
+msgstr ""
+
 #. module: base
 #: field:workflow.triggers,instance_id:0
 msgid "Destination Instance"
 msgstr "Istanza Destinazione"
 
 #. module: base
+#: field:ir.actions.act_window,multi:0
 #: field:ir.actions.wizard,multi:0
 msgid "Action on Multiple Doc."
 msgstr "Azione su doc. multipli"
 
 #. module: base
-#: view:wizard.module.lang.export:0
+#: view:base.language.export:0
 msgid "https://translations.launchpad.net/openobject"
 msgstr "https://translations.launchpad.net/openobject"
 
-#. module: base
-#: field:ir.actions.todo,start_date:0
-msgid "Start Date"
-msgstr "Data di inizio"
-
 #. module: base
 #: field:ir.actions.report.xml,report_xml:0
 msgid "XML path"
 msgstr "Percorso XML"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-go-year"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,restart:0
+msgid "On Skip"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.gn
 msgid "Guinea"
@@ -7334,27 +8284,26 @@ msgid "Luxembourg"
 msgstr "Lussemburgo"
 
 #. module: base
-#: model:ir.actions.todo,note:base.config_wizard_step_user
-msgid ""
-"Create your users.\n"
-"You will be able to assign groups to users. Groups define the access rights "
-"of each users on the different objects of the system.\n"
-"            "
+#: view:base.module.upgrade:0
+msgid "The selected modules have been updated / installed !"
 msgstr ""
-"Creazione gli utenti.\n"
-"Si possono assegnare gruppi agli utenti. I gruppi definiscono i diritti di "
-"accesso per ogni utente sui differenti oggetti del sistema.\n"
-"            "
 
 #. module: base
-#: selection:res.request,priority:0
-msgid "Low"
-msgstr "Bassa"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
 
 #. module: base
-#: view:ir.values:0
-msgid "tree_but_action, client_print_multi"
-msgstr "tree_but_action, client_print_multi"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gtk-jump-to-rtl"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"3. If user belongs to several groups, the results from step 2 are combined "
+"with logical OR operator"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.sv
@@ -7363,10 +8312,21 @@ msgstr "El Salvador"
 
 #. module: base
 #: field:res.bank,phone:0
+#: field:res.partner,phone:0
 #: field:res.partner.address,phone:0
 msgid "Phone"
 msgstr "Telefono"
 
+#. module: base
+#: help:ir.actions.report.xml,attachment_use:0
+msgid ""
+"If you check this, then the second time the user prints with same attachment "
+"name, it returns the previous report."
+msgstr ""
+"Se selezionate questo campo, la seconda volta che un utente stamperà "
+"utilizzando lo stesso nome per l'allegato, verrà restituito il report "
+"precedente."
+
 #. module: base
 #: field:res.groups,menu_access:0
 msgid "Access Menu"
@@ -7378,22 +8338,9 @@ msgid "Thailand"
 msgstr "Thailandia"
 
 #. module: base
-#: selection:ir.report.custom.fields,fc0_op:0
-#: selection:ir.report.custom.fields,fc1_op:0
-#: selection:ir.report.custom.fields,fc2_op:0
-#: selection:ir.report.custom.fields,fc3_op:0
-msgid ">"
-msgstr ">"
-
-#. module: base
-#: field:ir.model.access,perm_unlink:0
-msgid "Delete Permission"
-msgstr "Permesso di cancellazione"
-
-#. module: base
-#: model:ir.model,name:base.model_multi_company_default
-msgid "multi_company.default"
-msgstr "multi_company.default"
+#: model:ir.ui.menu,name:base.menu_crm_config_lead
+msgid "Leads & Opportunities"
+msgstr ""
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
@@ -7412,12 +8359,10 @@ msgid "STOCK_PRINT"
 msgstr "STOCK_PRINT"
 
 #. module: base
-#: selection:ir.report.custom.fields,fc0_op:0
-#: selection:ir.report.custom.fields,fc1_op:0
-#: selection:ir.report.custom.fields,fc2_op:0
-#: selection:ir.report.custom.fields,fc3_op:0
-msgid "<"
-msgstr "<"
+#: view:ir.rule:0
+#: view:res.partner:0
+msgid "General"
+msgstr "Generale"
 
 #. module: base
 #: model:res.country,name:base.uz
@@ -7430,6 +8375,11 @@ msgstr "Uzbekistan"
 msgid "ir.actions.act_window"
 msgstr "ir.actions.act_window"
 
+#. module: base
+#: field:ir.rule,perm_create:0
+msgid "Apply For Create"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.vi
 msgid "Virgin Islands (USA)"
@@ -7441,14 +8391,11 @@ msgid "Taiwan"
 msgstr "Taiwan"
 
 #. module: base
-#: view:ir.rule:0
-msgid "If you don't force the domain, it will use the simple domain setup"
-msgstr ""
-"Se non forzi il dominio, verrà utilizzata la configurazione di dominio "
-"semplice"
+#: model:ir.model,name:base.model_res_currency_rate
+msgid "Currency Rate"
+msgstr "Valore Valuta"
 
 #. module: base
-#: field:ir.report.custom,field_parent:0
 #: field:ir.ui.view,field_parent:0
 msgid "Child Field"
 msgstr "CampoCollegato"
@@ -7457,7 +8404,6 @@ msgstr "CampoCollegato"
 #: field:ir.actions.act_window,usage:0
 #: field:ir.actions.act_window_close,usage:0
 #: field:ir.actions.actions,usage:0
-#: field:ir.actions.report.custom,usage:0
 #: field:ir.actions.report.xml,usage:0
 #: field:ir.actions.server,usage:0
 #: field:ir.actions.wizard,usage:0
@@ -7475,7 +8421,7 @@ msgid "Not Installable"
 msgstr "Non Installabile"
 
 #. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "View :"
 msgstr "Vista :"
 
@@ -7485,10 +8431,10 @@ msgid "View Auto-Load"
 msgstr "Visualizza Auto-Caricamento"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_partner_supplier_form
-#: view:res.partner:0
-msgid "Suppliers"
-msgstr "Fornitori"
+#: code:addons/base/ir/ir_model.py:0
+#, python-format
+msgid "You cannot remove the field '%s' !"
+msgstr ""
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7496,12 +8442,13 @@ msgid "STOCK_JUMP_TO"
 msgstr "STOCK_JUMP_TO"
 
 #. module: base
-#: field:ir.actions.todo,end_date:0
-msgid "End Date"
-msgstr "Data finale"
+#: selection:base.language.install,lang:0
+msgid "Gujarati / India"
+msgstr ""
 
 #. module: base
 #: field:ir.exports,resource:0
+#: view:ir.property:0
 #: field:ir.property,res_id:0
 msgid "Resource"
 msgstr "Risorse"
@@ -7513,9 +8460,21 @@ msgid "Contract ID"
 msgstr "ID Contratto"
 
 #. module: base
-#: selection:ir.report.custom.fields,alignment:0
-msgid "center"
-msgstr "centra"
+#: selection:base.language.install,lang:0
+msgid "Persian / فارس"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "View Ordering"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid ""
+"Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
+"Portable Objects)"
+msgstr ""
 
 #. module: base
 #: field:maintenance.contract.wizard,state:0
@@ -7523,24 +8482,19 @@ msgid "States"
 msgstr "Stati"
 
 #. module: base
-#: view:multi_company.default:0
-msgid "Matching"
-msgstr "Confronto"
-
-#. module: base
-#: field:ir.actions.configuration.wizard,name:0
-msgid "Next Wizard"
-msgstr "Prossima Procedura"
+#: model:ir.model,name:base.model_base_module_configuration
+msgid "base.module.configuration"
+msgstr ""
 
 #. module: base
+#: field:base.language.export,name:0
 #: field:ir.attachment,datas_fname:0
-#: field:wizard.module.lang.export,name:0
 msgid "Filename"
 msgstr "Nome File"
 
 #. module: base
 #: field:ir.model,access_ids:0
-#: field:ir.model.grid,access_ids:0
+#: view:ir.model.access:0
 msgid "Access"
 msgstr "Accesso"
 
@@ -7555,9 +8509,9 @@ msgid "Aruba"
 msgstr "Aruba"
 
 #. module: base
-#: selection:ir.cron,interval_type:0
-msgid "Weeks"
-msgstr "Settimane"
+#: model:res.country,name:base.ar
+msgid "Argentina"
+msgstr "Argentina"
 
 #. module: base
 #: field:res.groups,name:0
@@ -7579,6 +8533,16 @@ msgstr "Segmentazione"
 msgid "STOCK_FIND"
 msgstr "STOCK_FIND"
 
+#. module: base
+#: view:res.users:0
+msgid "Email & Signature"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_aftersale
+msgid "After-Sale Services"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.action_maintenance_contract_add_wizard
 #: model:ir.ui.menu,name:base.menu_maintenance_contract_add
@@ -7587,13 +8551,17 @@ msgid "Add Maintenance Contract"
 msgstr "Aggiungere il contratto di manutenzione"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: view:ir.actions.todo:0
+msgid "Launch"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
 msgid "Vietnam / Cộng hòa xã hội chủ nghĩa Việt Nam"
 msgstr "Vietnam / Cộng hòa xã hội chủ nghĩa Việt Nam"
 
 #. module: base
 #: field:ir.actions.act_window,limit:0
-#: field:ir.report.custom,limitt:0
 msgid "Limit"
 msgstr "Limite"
 
@@ -7607,6 +8575,11 @@ msgstr "Flusso di lavoro da eseguire su questo modello."
 msgid "Jamaica"
 msgstr "Giamaica"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_mrp_root
+msgid "Manufacturing"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.az
 msgid "Azerbaijan"
@@ -7619,15 +8592,10 @@ msgid "Warning"
 msgstr "Avviso"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Arabic / الْعَرَبيّة"
 msgstr "Arabic / الْعَرَبيّة"
 
-#. module: base
-#: model:res.country,name:base.gi
-msgid "Gibraltar"
-msgstr "Gibilterra"
-
 #. module: base
 #: model:res.country,name:base.vg
 msgid "Virgin Islands (British)"
@@ -7639,7 +8607,13 @@ msgid "STOCK_MEDIA_PREVIOUS"
 msgstr "STOCK_MEDIA_PREVIOUS"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: view:ir.property:0
+#: model:ir.ui.menu,name:base.next_id_15
+msgid "Parameters"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
 msgstr "Czech / Čeština"
 
@@ -7648,21 +8622,16 @@ msgstr "Czech / Čeština"
 msgid "Wallis and Futuna Islands"
 msgstr "Wallis e Fortuna"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_wizard_screen
+msgid "ir.wizard.screen"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.rw
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#. module: base
-#: constraint:res.partner:0
-msgid "The VAT doesn't seem to be correct."
-msgstr "La P.IVA non sembra essere corretta"
-
-#. module: base
-#: selection:ir.report.custom.fields,operation:0
-msgid "Calculate Sum"
-msgstr "Calcola Somma"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day of the week (0:Monday): %(weekday)s"
@@ -7673,24 +8642,13 @@ msgstr "Giorno della settimana (0:Lunedì): %(weekday)"
 msgid "Cook Islands"
 msgstr "Isole Cook"
 
-#. module: base
-#: help:ir.actions.server,mobile:0
-msgid ""
-"Provides fields that be used to fetch the mobile number, e.g. you select the "
-"invoice, then `object.invoice_address_id.mobile` is the field which gives "
-"the correct mobile number"
-msgstr ""
-"Fornisce campi che possono essere usati per reperire il numero di celluare, "
-"ad esempio: seleziona la fattura, poi 'object.invoice_address_id.mobile' è "
-"il campo che da il corretto numero di cellulare"
-
 #. module: base
 #: field:ir.model.data,noupdate:0
 msgid "Non Updatable"
 msgstr "Non Aggiornabile"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Klingon"
 msgstr "Klingon"
 
@@ -7720,47 +8678,60 @@ msgstr "STOCK_NETWORK"
 #: view:res.country:0
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
+#: view:res.partner.address:0
 #: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Nazione"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Telugu / India"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,complete_name:0
 #: field:ir.ui.menu,complete_name:0
 msgid "Complete Name"
 msgstr "Nome Completo"
 
-#. module: base
-#: view:ir.report.custom:0
-msgid "Subscribe Report"
-msgstr "Sottoscrivi Report"
-
 #. module: base
 #: field:ir.values,object:0
 msgid "Is Object"
 msgstr "è Oggetto"
 
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"1. Global rules are combined together with a logical AND operator, and with "
+"the result of the following steps"
+msgstr ""
+
 #. module: base
 #: field:res.partner.category,name:0
 msgid "Category Name"
 msgstr "Nome Categoria"
 
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_15
+msgid "IT sector"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "Select Groups"
 msgstr "Seleziona gruppi"
 
-#. module: base
-#: field:ir.sequence,weight:0
-msgid "Weight"
-msgstr "Peso"
-
 #. module: base
 #: view:res.lang:0
 msgid "%X - Appropriate time representation."
 msgstr "%X - Appropriata rappresentazione del tempo."
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-mail_delete"
+msgstr ""
+
 #. module: base
 #: view:res.company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
@@ -7781,12 +8752,12 @@ msgstr ""
 "in ciascun caso."
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_partner_customer_form_new
-msgid "New Partner"
-msgstr "Nuovo Partner"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-go-month"
+msgstr ""
 
 #. module: base
-#: selection:ir.report.custom,print_orientation:0
+#: view:res.company:0
 msgid "Portrait"
 msgstr "Verticale"
 
@@ -7795,38 +8766,34 @@ msgstr "Verticale"
 msgid "Wizard Button"
 msgstr "Pulsante Procedura"
 
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Report/Template"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_DIRECTORY"
 msgstr "STOCK_DIRECTORY"
 
-#. module: base
-#: field:ir.module.module,installed_version:0
-msgid "Latest version"
-msgstr "La versione più recente"
-
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_server
+#: selection:ir.ui.menu,action:0
 msgid "ir.actions.server"
 msgstr "ir.actions.server"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.action_rule
-#: model:ir.ui.menu,name:base.menu_action_rule
-msgid "Record Rules"
-msgstr "Registra Regole"
-
-#. module: base
-#: view:ir.actions.report.custom:0
-msgid "Report custom"
-msgstr "Report Personalizzato"
-
 #. module: base
 #: field:ir.actions.configuration.wizard,progress:0
+#: field:res.config,progress:0
+#: field:res.config.installer,progress:0
+#: field:res.config.users,progress:0
+#: field:res.config.view,progress:0
 msgid "Configuration Progress"
 msgstr "Avanzamento Configurazione"
 
 #. module: base
+#: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
+#: model:ir.ui.menu,name:base.menu_ir_actions_todo_form
 #: model:ir.ui.menu,name:base.next_id_11
 msgid "Configuration Wizards"
 msgstr "Procedure di Configurazione"
@@ -7841,16 +8808,16 @@ msgstr "Codice Locale"
 msgid "Split Mode"
 msgstr "Modalità Dividi"
 
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Note that this operation might take a few minutes."
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_localisation
 msgid "Localisation"
 msgstr "Localizzazione"
 
-#. module: base
-#: selection:res.config.view,view:0
-msgid "Simplified Interface"
-msgstr "Interfaccia Semplice"
-
 #. module: base
 #: model:res.country,name:base.cl
 msgid "Chile"
@@ -7862,10 +8829,15 @@ msgid "STOCK_REVERT_TO_SAVED"
 msgstr "STOCK_REVERT_TO_SAVED"
 
 #. module: base
-#: model:ir.actions.wizard,name:base.wizard_lang_import
-#: model:ir.ui.menu,name:base.menu_wizard_lang_import
-msgid "Import a Translation File"
-msgstr "Importa File di Traduzione"
+#: view:ir.cron:0
+msgid "Execution"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,condition:0
+#: field:workflow.transition,condition:0
+msgid "Condition"
+msgstr "Condizione"
 
 #. module: base
 #: help:ir.values,model_id:0
@@ -7880,7 +8852,7 @@ msgid "View Name"
 msgstr "Nome Vista"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Italian / Italiano"
 msgstr "Italian / Italiano"
 
@@ -7889,6 +8861,13 @@ msgstr "Italian / Italiano"
 msgid "Save As Attachment Prefix"
 msgstr "Salva come Prefisso Allegato"
 
+#. module: base
+#: view:ir.actions.server:0
+msgid ""
+"Only one client action will be executed, last client action will be "
+"considered in case of multiple client actions."
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.hr
 msgid "Croatia"
@@ -7909,21 +8888,26 @@ msgid "Partner Categories"
 msgstr "Categorie Partner"
 
 #. module: base
-#: field:ir.sequence,code:0
-#: field:ir.sequence.type,code:0
-msgid "Sequence Code"
-msgstr "Codice Sequenza"
+#: view:base.module.upgrade:0
+msgid "System Update"
+msgstr ""
 
 #. module: base
-#: selection:ir.report.custom,print_format:0
-msgid "a5"
-msgstr "a5"
+#: help:ir.sequence,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.sc
 msgid "Seychelles"
 msgstr "Seychelles"
 
+#. module: base
+#: model:ir.model,name:base.model_res_partner_bank
+#: view:res.partner.bank:0
+msgid "Bank Accounts"
+msgstr "Conti Bancari"
+
 #. module: base
 #: model:res.country,name:base.sl
 msgid "Sierra Leone"
@@ -7951,12 +8935,21 @@ msgid "Account Owner"
 msgstr "Titolare Conto"
 
 #. module: base
-#: field:ir.attachment,res_model:0
+#: selection:ir.ui.menu,icon:0
+msgid "terp-mail-message-new"
+msgstr ""
+
+#. module: base
 #: field:workflow,osv:0
 #: field:workflow.instance,res_type:0
 msgid "Resource Object"
 msgstr "Oggetto Risorsa"
 
+#. module: base
+#: help:ir.sequence,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,function:0
 #: field:res.partner.address,function:0
@@ -7964,25 +8957,31 @@ msgstr "Oggetto Risorsa"
 msgid "Function"
 msgstr "Funzione"
 
+#. module: base
+#: view:res.widget:0
+msgid "Search Widget"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,restart:0
+msgid "Never"
+msgstr ""
+
 #. module: base
 #: selection:res.partner.address,type:0
 msgid "Delivery"
 msgstr "Consegna"
 
-#. module: base
-#: field:ir.attachment,preview:0
-msgid "Image Preview"
-msgstr "Anteprima immagine"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
+#: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
 msgid "Corp."
 msgstr "Corp."
 
 #. module: base
-#: model:res.country,name:base.gw
-msgid "Guinea Bissau"
-msgstr "Guinea Bissau"
+#: selection:base.language.install,lang:0
+msgid "Korean / Korea, Republic of"
+msgstr ""
 
 #. module: base
 #: view:workflow.instance:0
@@ -8000,16 +8999,17 @@ msgstr "Partners: "
 msgid "North Korea"
 msgstr "Corea del Nord"
 
-#. module: base
-#: view:ir.report.custom:0
-msgid "Unsubscribe Report"
-msgstr "Annula Sottoscrizione Report"
-
 #. module: base
 #: selection:ir.actions.server,state:0
 msgid "Create Object"
 msgstr "Crea Oggetto"
 
+#. module: base
+#: view:ir.filters:0
+#: field:res.log,context:0
+msgid "Context"
+msgstr ""
+
 #. module: base
 #: field:res.bank,bic:0
 msgid "BIC/Swift code"
@@ -8021,7 +9021,7 @@ msgid "Prospect"
 msgstr "Prospettiva"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Polish / Język polski"
 msgstr "Polish / Język polski"
 
@@ -8039,193 +9039,763 @@ msgstr ""
 "Utilizzato per selezionare automaticamente l'indirizzo corretto in base al "
 "contesto nei documenti vendite e acquisti."
 
-#. module: base
-#: wizard_view:module.lang.install,init:0
-msgid "Choose a language to install:"
-msgstr "Scegli una lingua da installare"
-
 #. module: base
 #: model:res.country,name:base.lk
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Russian / русский язык"
 msgstr "Russian / русский язык"
 
-#. module: base
-#: sql_constraint:res.user:0
-msgid "You cannot have two users with the same login !"
-msgstr "Non puoi avere due utenti con lo stesso nome di accesso!"
+#~ msgid "Outgoing transitions"
+#~ msgstr "Transizioni in Uscita"
 
-#. module: base
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "La dimensione del campo non può mai essere minore a 1 !"
+#~ msgid "Yearly"
+#~ msgstr "Annuale"
 
-#. module: base
-#: sql_constraint:ir.ui.view_sc:0
-msgid "Shortcut for this menu already exists!"
-msgstr "Il collegamento per questo menù esiste già!"
+#~ msgid ""
+#~ "Choose between the \"Simplified Interface\" or the extended one.\n"
+#~ "If you are testing or using OpenERP for the first time, we suggest you to "
+#~ "use\n"
+#~ "the simplified interface, which has less options and fields but is easier "
+#~ "to\n"
+#~ "understand. You will be able to switch to the extended view later.\n"
+#~ "            "
+#~ msgstr ""
+#~ "Scegliere tra \"Interfaccia Semplificata\" o \"Interfaccia Estesa\".\n"
+#~ "Se si sta testando OpenERP per la prima volta, vi consigliamo di usare\n"
+#~ "l'interfaccia semplificata, che ha meno opzioni e campi ed è più semplice da "
+#~ "\n"
+#~ "comprendere. Si potrà cambiare tipo di interfaccia in seguito.\n"
+#~ "            "
 
-#. module: base
-#: sql_constraint:ir.model.data:0
-msgid ""
-"You cannot have multiple records with the same id for the same module !"
-msgstr ""
-"Non puoi avere record multipli con lo stesso ID per lo stesso modulo!"
+#~ msgid "Operand"
+#~ msgstr "Operando"
 
-#. module: base
-#: sql_constraint:maintenance.contract:0
-msgid "Your maintenance contract is already subscribed in the system !"
-msgstr "Il tuo contratto di manutenzione è già sottoscritto nel sistema!"
+#~ msgid "ir.actions.report.custom"
+#~ msgstr "ir.actions.report.custom"
 
-#. module: base
-#: sql_constraint:ir.module.module:0
-#: sql_constraint:ir.module.web:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere unico!"
+#~ msgid "Sorted By"
+#~ msgstr "Ordinato per"
 
-#. module: base
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "L'ID del certificato del modulo deve essere unico!"
+#~ msgid "ir.report.custom.fields"
+#~ msgstr "ir.report.custom.fields"
 
-#. module: base
-#: sql_constraint:res.partner.function:0
-msgid "The Code of the Partner Function must be unique !"
-msgstr "Il codice della funzione Partner deve essere unica!"
+#~ msgid "Get Max"
+#~ msgstr "Visualizza Massimo"
 
-#. module: base
-#: sql_constraint:res.partner:0
-msgid "The name of the Partner must be unique !"
-msgstr "Il nome del Partner deve esser unico!"
+#~ msgid "To browse official translations, you can visit this link: "
+#~ msgstr "Per visualizzare le traduzioni ufficiali, visita questo link: "
 
-#. module: base
-#: sql_constraint:res.country:0
-msgid "The name of the country must be unique !"
-msgstr "Il nome della nazione deve essere unico!"
+#~ msgid "Uninstalled modules"
+#~ msgstr "Moduli non Installati"
 
-#. module: base
-#: sql_constraint:res.country:0
-msgid "The code of the country must be unique !"
-msgstr "Il codice della Nazione deve essere unico!"
+#~ msgid "Configure"
+#~ msgstr "Configurare"
 
-#. module: base
-#: sql_constraint:res.lang:0
-msgid "The name of the language must be unique !"
-msgstr "Il nome della lingua deve essere unico!"
+#~ msgid "Extended Interface"
+#~ msgstr "Interfaccia Estesa"
 
-#. module: base
-#: sql_constraint:res.lang:0
-msgid "The code of the language must be unique !"
-msgstr "Il codice della lingua deve essere unico!"
+#~ msgid "Configure simple view"
+#~ msgstr "Configura Vista Semplice"
 
-#. module: base
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Il nome del gruppo deve essere unico!"
+#~ msgid "Bar Chart"
+#~ msgstr "Grafico a barre"
 
-#. module: base
-#: code:addons/osv/osv.py:0
-#, python-format
-msgid "Constraint Error"
-msgstr "Errore nei Vincoli"
+#~ msgid "You may have to reinstall some language pack."
+#~ msgstr "Potrebbe essere necessario reinstallare alcuni file di lingua"
 
-#. module: base
-#: code:addons/osv/osv.py:0
-#, python-format
-msgid ""
-"The operation cannot be completed, probably due to the following:\n"
-"- deletion: you may be trying to delete a record while other records still "
-"reference it\n"
-"- creation/update: a mandatory field is not correctly set"
-msgstr ""
-"L'operazione non può essere completata, probabilmente in seguito a:\n"
-"- cancellazione: stai cercando di cancellare un record mentra altri record "
-"sono referenziati a esso\n"
-"- creazione/aggiornamento: un campo obbligatorio deve essere correttamente "
-"impostato"
+#~ msgid "Factor"
+#~ msgstr "Fattore"
 
-#. module: base
-#: code:addons/osv/osv.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"[object with reference: %s - %s]"
-msgstr ""
-"\n"
-"\n"
-"[oggetto con referenza: %s - %s]"
+#~ msgid "Objects Security Grid"
+#~ msgstr "Griglia di Sicurezza degli Oggetti"
 
-#. module: base
-#: code:addons/osv/osv.py:0
-#, python-format
-msgid "Integrity Error"
-msgstr "Errore di integrità"
+#~ msgid "Sequence Name"
+#~ msgstr "Nome Sequenza"
 
-#. module: base
-#: code:addons/base/res/res_lang.py:0
-#, python-format
-msgid "User Error"
-msgstr "Errore dell'Utente"
+#~ msgid "Alignment"
+#~ msgstr "Allineamento"
 
-#. module: base
-#: code:addons/base/res/res_lang.py:0
-#, python-format
-msgid "Base Language 'en_US' can not be deleted !"
-msgstr "Il Linguaggio base 'en_US' non può essere eliminato !"
+#~ msgid ">="
+#~ msgstr ">="
 
-#. module: base
-#: code:addons/base/res/res_lang.py:0
-#, python-format
-msgid "You cannot delete the language which is User's Preferred Language !"
-msgstr ""
-"Impossibile eliminare il linguaggio che corrisponde al Linguaggio Preferito "
-"dell'Utente"
+#~ msgid "Planned Cost"
+#~ msgstr "Costo Pianificato"
 
-#. module: base
-#: code:addons/base/res/res_lang.py:0
-#, python-format
-msgid ""
-"You cannot delete the language which is Active !\n"
-"Please de-activate the language first."
-msgstr ""
-"Impossibile eliminare un linguaggio Attivo !\n"
-"Disattiva il linguaggio prima di eliminarlo."
+#~ msgid "ir.model.config"
+#~ msgstr "ir.model.config"
 
-#~ msgid "Attached ID"
-#~ msgstr "ID Allegato"
+#~ msgid "Repository"
+#~ msgstr "Repository"
 
-#~ msgid "Attached Model"
-#~ msgstr "Modello di Allegato"
+#~ msgid "RML"
+#~ msgstr "RML"
+
+#~ msgid "Partners by Categories"
+#~ msgstr "Partner per Categoria"
+
+#~ msgid "Frequency"
+#~ msgstr "Frequenza"
+
+#~ msgid "Relation"
+#~ msgstr "Relazione"
+
+#~ msgid "Define New Users"
+#~ msgstr "Definire Nuovi Utenti"
+
+#~ msgid "raw"
+#~ msgstr "grezzo"
+
+#~ msgid "Role Name"
+#~ msgstr "Nome Ruolo"
+
+#~ msgid "Dedicated Salesman"
+#~ msgstr "Venditore Dedicato"
+
+#~ msgid "Please give your module .ZIP file to import."
+#~ msgstr "Definisci il file .ZIP del modulo da importare."
+
+#~ msgid "Check new modules"
+#~ msgstr "Cerca Nuovi Moduli"
+
+#~ msgid "Simple domain setup"
+#~ msgstr "Configurazione Dominio Semplice"
+
+#~ msgid "Fixed Width"
+#~ msgstr "Larghezza Fissa"
+
+#~ msgid "Report Custom"
+#~ msgstr "Report Personalizzato"
+
+#~ msgid "Auto"
+#~ msgstr "Automatico"
+
+#~ msgid "End of Request"
+#~ msgstr "Fine Richiesta"
+
+#~ msgid "Note that this operation may take a few minutes."
+#~ msgstr "Questa operazione potrebbe richiedere alcuni minuti"
+
+#~ msgid "Commercial Prospect"
+#~ msgstr "Potenziale Cliente Commerciale"
+
+#~ msgid "Year without century: %(y)s"
+#~ msgstr "Anno senza secolo: %(y)s"
+
+#~ msgid ""
+#~ "This wizard will detect new terms in the application so that you can update "
+#~ "them manually."
+#~ msgstr ""
+#~ "Questa procedura rileverà nuovi termini nell'applicazione in modo da poterli "
+#~ "aggiornare manualmente"
+
+#~ msgid "Configure User"
+#~ msgstr "Configura Utente"
+
+#~ msgid "left"
+#~ msgstr "sinistra"
+
+#~ msgid "Operator"
+#~ msgstr "Operatore"
+
+#~ msgid "right"
+#~ msgstr "destra"
 
 #~ msgid "Others Partners"
 #~ msgstr "Altri Partner"
 
-#~ msgid "Main Company"
-#~ msgstr "Azienda Principale"
+#~ msgid "Year with century: %(year)s"
+#~ msgstr "Anno del secolo: %(year)"
+
+#~ msgid "Daily"
+#~ msgstr "Quotidiano"
+
+#~ msgid "Choose Your Mode"
+#~ msgstr "Scegli la tua Modalità"
+
+#~ msgid "Background Color"
+#~ msgstr "Colore di Sfondo"
+
+#~ msgid "res.partner.som"
+#~ msgstr "res.partner.som"
+
+#~ msgid "Document Link"
+#~ msgstr "Collegamento Documento"
+
+#~ msgid "Start Upgrade"
+#~ msgstr "Inizia Aggiornamento"
+
+#~ msgid "Export language"
+#~ msgstr "Esporta Lingua"
+
+#~ msgid "You can also import .po files."
+#~ msgstr "Possibile importare anche .po files"
+
+#~ msgid "Function of the contact"
+#~ msgstr "Funzione del Contatto"
+
+#~ msgid "Modules to be installed, upgraded or removed"
+#~ msgstr "Moduli da installare, aggiornare o rimuovere"
+
+#~ msgid "Report Footer"
+#~ msgstr "Piè di pagina del Report"
+
+#~ msgid "Import language"
+#~ msgstr "Importa Lingua"
+
+#~ msgid "Categories of Modules"
+#~ msgstr "Categorie di Moduli"
+
+#~ msgid "Not Started"
+#~ msgstr "Non Avviato"
+
+#~ msgid "Roles"
+#~ msgstr "Ruoli"
+
+#~ msgid "Connect Actions To Client Events"
+#~ msgstr "Collega Azioni a Eventi per clienti"
+
+#~ msgid "Prospect Contact"
+#~ msgstr "Contatto Possibile Cliente"
+
+#~ msgid "Repositories"
+#~ msgstr "Repositories"
+
+#~ msgid "Report Ref."
+#~ msgstr "Rif. Report"
+
+#~ msgid "Language name"
+#~ msgstr "Nome lingua"
+
+#~ msgid "Subscribed"
+#~ msgstr "Iscritto"
+
+#~ msgid "System Upgrade"
+#~ msgstr "Aggiornamento Sistema"
+
+#~ msgid "Partner Address"
+#~ msgstr "Indirizzo Partner"
+
+#~ msgid "wizard.module.update_translations"
+#~ msgstr "wizard.module.update_translations"
+
+#~ msgid "Configuration Wizard"
+#~ msgstr "Procedura Configurazione"
+
+#~ msgid "res.roles"
+#~ msgstr "res.roles"
+
+#~ msgid "Accepted Links in Requests"
+#~ msgstr "Link Accettati nella Richiesta"
 
 #~ msgid "Grant Access To Menus"
 #~ msgstr "Concedere l'accesso ai Menu"
 
+#~ msgid ""
+#~ "Choose the simplified interface if you are testing OpenERP for the first "
+#~ "time. Less used options or fields are automatically hidden. You will be able "
+#~ "to change this, later, through the Administration menu."
+#~ msgstr ""
+#~ "Scegli l'interfaccia semplificata se stai testando OpenERP per la prima "
+#~ "volta. Le funzioni e le opzioni utilizzate meno spesso vengono nascoste "
+#~ "automaticamente. Potrai tornare all'interfaccia completa dal Menu di "
+#~ "Amministrazione"
+
+#~ msgid "Key"
+#~ msgstr "Chiave"
+
+#~ msgid "Scan for new modules"
+#~ msgstr "Cerca nuovi Moduli"
+
+#~ msgid "wizard.module.lang.export"
+#~ msgstr "wizard.module.lang.export"
+
+#~ msgid "Groups are used to defined access rights on each screen and menu."
+#~ msgstr ""
+#~ "I gruppi sono utilizzati per definire i diritti di accesso su ciascuna "
+#~ "schermata e menu"
+
+#~ msgid "Sale Opportunity"
+#~ msgstr "Opportunità di Vendita"
+
+#~ msgid "Report Xml"
+#~ msgstr "Report XML"
+
+#~ msgid "Calculate Average"
+#~ msgstr "Calcola Media"
+
+#~ msgid "Planned Revenue"
+#~ msgstr "Entrata Pianificata"
+
+#~ msgid ""
+#~ "You have to import a .CSV file wich is encoded in UTF-8.  Please check that "
+#~ "the first line of your file is one of the following:"
+#~ msgstr ""
+#~ "Devi importare un file .CSV codificato in UTF-8. Per favore controlla che la "
+#~ "prima riga del tuo file sia una delle seguenti:"
+
+#~ msgid "Role"
+#~ msgstr "Ruolo"
+
+#~ msgid "Test"
+#~ msgstr "Test"
+
+#~ msgid "We suggest you to reload the menu tab (Ctrl+t Ctrl+r)."
+#~ msgstr "Suggerimento: ricarica la scheda Menu (Ctrl+t Ctrl+r)"
+
+#~ msgid "Security on Groups"
+#~ msgstr "Sicurezza Gruppi"
+
+#~ msgid "Font color"
+#~ msgstr "Colore Carattere"
+
+#~ msgid "Roles Structure"
+#~ msgstr "Struttura Ruoli"
+
+#~ msgid "Role Required"
+#~ msgstr "Ruolo Richiesto"
+
+#~ msgid "Export Data"
+#~ msgstr "Esporta Dati"
+
+#~ msgid "Your system will be upgraded."
+#~ msgstr "Il sistema verrà aggiornato"
+
+#~ msgid "in"
+#~ msgstr "in"
+
+#~ msgid "Create / Write"
+#~ msgstr "Crea / Scrivi"
+
+#~ msgid "Service"
+#~ msgstr "Servizio"
+
+#~ msgid "Modules to download"
+#~ msgstr "Moduli da Scaricare"
+
+#~ msgid "Installed modules"
+#~ msgstr "Moduli Installati"
+
+#~ msgid "Calculate Count"
+#~ msgstr "Esegui Conteggio"
+
+#~ msgid "Partner State of Mind"
+#~ msgstr "Propensione Partner"
+
+#~ msgid "a4"
+#~ msgstr "a4"
+
+#~ msgid "Note that this operation my take a few minutes."
+#~ msgstr "Questa operazione potrebbe richiedere alcuni minuti"
+
+#~ msgid "Internal Name"
+#~ msgstr "Nome Interno"
+
+#~ msgid "User ID"
+#~ msgstr "ID utente"
+
+#~ msgid ""
+#~ "Access all the fields related to the current object using expression in "
+#~ "double brackets, i.e.[[ object.partner_id.name ]]"
+#~ msgstr ""
+#~ "Accedere a tutti i campi correlati all'oggetto corrente utilizzando "
+#~ "espressioni in doppie parentesi quadre, cioè [[ object.partner_id.name ]]"
+
+#~ msgid "type,name,res_id,src,value"
+#~ msgstr "type,name,res_id,src,value"
+
+#~ msgid "condition"
+#~ msgstr "Condizione"
+
+#~ msgid "Report Fields"
+#~ msgstr "Campo Rapporto"
+
+#~ msgid ""
+#~ "The selected language has been successfully installed. You must change the "
+#~ "preferences of the user and open a new menu to view changes."
+#~ msgstr ""
+#~ "La lingua selezionata è stata correttamente installata. Devi ora modificare "
+#~ "le preferenze dell'utente e aprire una nuova scheda menu per vedere i "
+#~ "cambiamenti"
+
+#~ msgid "Partner Events"
+#~ msgstr "Eventi Partner"
+
+#~ msgid "iCal id"
+#~ msgstr "ID iCal"
+
+#~ msgid "Pie Chart"
+#~ msgstr "Grafico a Torta"
+
+#~ msgid "Update Modules List"
+#~ msgstr "Aggiorna Lista Moduli"
+
+#~ msgid "Print orientation"
+#~ msgstr "Orientamento Stampa"
+
+#~ msgid "Export a Translation File"
+#~ msgstr "Esporta File Traduzione"
+
+#~ msgid "Add User"
+#~ msgstr "Aggiungi Utente"
+
+#~ msgid "html"
+#~ msgstr "html"
+
+#~ msgid "None"
+#~ msgstr "Nessuno"
+
 #~ msgid "Partner Functions"
 #~ msgstr "Funzioni Partner"
 
+#~ msgid "Get file"
+#~ msgstr "Ricevi File"
+
+#~ msgid ""
+#~ "This function will check for new modules in the 'addons' path and on module "
+#~ "repositories:"
+#~ msgstr ""
+#~ "Questa funzione cercherà nuovi moduli nel percorso 'addons' e nei repository"
+
 #~ msgid "Customers Partners"
 #~ msgstr "Partner Clienti"
 
-#~ msgid "File Content"
-#~ msgstr "Contenuto del file"
+#~ msgid "Roles are used to defined available actions, provided by workflows."
+#~ msgstr ""
+#~ "Ruoli utilizzati per definire le azioni disponibili, fornite dai workflow."
+
+#~ msgid "Your Maintenance Contracts"
+#~ msgstr "I vostri contratti di assistenza"
+
+#~ msgid ""
+#~ "Please note that you will have to logout and relog if you change your "
+#~ "password."
+#~ msgstr "Ricorda di uscire e rientrare se hai cambiato la password"
+
+#~ msgid "GPL-3"
+#~ msgstr "GPL-3"
+
+#~ msgid "GPL-2"
+#~ msgstr "GPL-2"
+
+#~ msgid "Type of Event"
+#~ msgstr "Tipo Evento"
+
+#~ msgid "Sequence Types"
+#~ msgstr "Tipi Sequenza"
+
+#~ msgid "Update Translations"
+#~ msgstr "Aggiorna Traduzioni"
+
+#~ msgid "The modules have been upgraded / installed !"
+#~ msgstr "I moduli sono stati aggiornati / installati !"
+
+#~ msgid "Manual"
+#~ msgstr "Manuale"
+
+#~ msgid "Line Plot"
+#~ msgstr "Trama"
+
+#~ msgid "pdf"
+#~ msgstr "pdf"
+
+#~ msgid "Preview"
+#~ msgstr "Anteprima"
+
+#~ msgid "Skip Step"
+#~ msgstr "Salta Passaggio"
+
+#~ msgid "Active Partner Events"
+#~ msgstr "Eventi Partner Attivi"
+
+#~ msgid "Force Domain"
+#~ msgstr "Forza Dominio"
+
+#~ msgid "<>"
+#~ msgstr "<>"
+
+#~ msgid "<="
+#~ msgstr "<="
+
+#~ msgid "Probability (0.50)"
+#~ msgstr "Probabilità (0.50)"
+
+#~ msgid "Repeat Header"
+#~ msgstr "Ripeti Intestazione"
+
+#~ msgid "Workflow Definitions"
+#~ msgstr "Definizione di flusso di lavoro"
+
+#~ msgid "All Properties"
+#~ msgstr "Tutte le Proprietà"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Resynchronise Terms"
+#~ msgstr "Risincronizza i termini"
+
+#~ msgid ""
+#~ "To improve some terms of the official translations of OpenERP, you should "
+#~ "modify the terms directly on the launchpad interface. If you made lots of "
+#~ "translations for your own module, you can also publish all your translation "
+#~ "at once."
+#~ msgstr ""
+#~ "Al fine di perfezionare i termini delle traduzioni ufficiali di OpenERP, "
+#~ "bisogna modificare i termini direttamente sull'interfaccia di Launchpad. Se "
+#~ "sono state fatte molte  traduzioni per il proprio modulo, è anche possibile "
+#~ "pubblicare tutte le traduzioni in una sola volta."
+
+#~ msgid "Start installation"
+#~ msgstr "Inizia Installazione"
+
+#~ msgid "New modules"
+#~ msgstr "Nuovi Moduli"
+
+#~ msgid "res.company"
+#~ msgstr "res.company"
+
+#~ msgid "System upgrade done"
+#~ msgstr "Aggiornamento di Sistema Completato"
+
+#~ msgid "Configure Simple View"
+#~ msgstr "Configura Vista Semplice"
+
+#~ msgid "Custom Report"
+#~ msgstr "Report Personalizzato"
+
+#~ msgid "sxw"
+#~ msgstr "sxw"
+
+#~ msgid "Automatic XSL:RML"
+#~ msgstr "XSL RML Automatico"
+
+#~ msgid "Manual domain setup"
+#~ msgstr "Configurazione Manuale Dominio"
+
+#~ msgid "Report Name"
+#~ msgstr "Nome Report"
+
+#~ msgid "Partner Relation"
+#~ msgstr "Relazione Partner"
+
+#~ msgid ""
+#~ "Number of time the function is called,\n"
+#~ "a negative number indicates that the function will always be called"
+#~ msgstr ""
+#~ "Numero di volte che la funzione viene richiamata,\n"
+#~ "un numero negativo indica che la funzione verrà richiamata sempre"
+
+#~ msgid "Monthly"
+#~ msgstr "Mensile"
+
+#~ msgid "States of mind"
+#~ msgstr "Propensioni"
+
+#~ msgid "Parent"
+#~ msgstr "Superiore"
+
+#~ msgid "Export translation file"
+#~ msgstr "Esporta File Traduzione"
+
+#~ msgid "Retailer"
+#~ msgstr "Fornitore"
+
+#~ msgid "Tabular"
+#~ msgstr "Tabulare"
+
+#~ msgid "odt"
+#~ msgstr "odt"
+
+#~ msgid "Other proprietary"
+#~ msgstr "Altro Titolare"
+
+#~ msgid "All terms"
+#~ msgstr "Tutti i Termini"
+
+#~ msgid "Link"
+#~ msgstr "Collegamento"
+
+#~ msgid "Report Ref"
+#~ msgstr "Rif. Report"
+
+#~ msgid "Repository list"
+#~ msgstr "Lista Repository"
+
+#~ msgid "Status"
+#~ msgstr "Stato"
+
+#~ msgid "ir.report.custom"
+#~ msgstr "ir.report.custom"
+
+#~ msgid "Purchase Offer"
+#~ msgstr "Offerta d'Acquisto"
+
+#~ msgid "Language file loaded."
+#~ msgstr "File Lingua Caricato"
+
+#~ msgid "Company Architecture"
+#~ msgstr "Struttura Azienda"
+
+#~ msgid ""
+#~ "Access all the fields related to the current object using expression in "
+#~ "double brackets, i.e. [[ object.partner_id.name ]]"
+#~ msgstr ""
+#~ "Accedi a tutti i campi correlati all'elemento attuale utilizzando "
+#~ "un'espressione tra doppie parentesi, vale a dire [[object.partner_id.name]]"
+
+#~ msgid "Workflow Items"
+#~ msgstr "Elementi di Flusso di lavoro"
+
+#~ msgid ""
+#~ "The .rml path of the file or NULL if the content is in report_rml_content"
+#~ msgstr ""
+#~ "Il percorso .rml del file oppure NULL se il contenuto si trova in "
+#~ "report_rml_content"
+
+#~ msgid "Incoming transitions"
+#~ msgstr "Transizioni in Ingresso"
+
+#~ msgid "Set"
+#~ msgstr "Imposta"
+
+#~ msgid "At Once"
+#~ msgstr "In una sola volta"
+
+#~ msgid ""
+#~ "Only one client action will be execute, last                                 "
+#~ "clinent action will be consider in case of multiples clients actions"
+#~ msgstr ""
+#~ "Solo una azione di un client verrà eseguita, sarà considerata l'azione "
+#~ "dell'ultimo client nel caso di azioni da molteplici client"
+
+#~ msgid "module,type,name,res_id,src,value"
+#~ msgstr "module,type,name,res_id,src,value"
+
+#~ msgid "child_of"
+#~ msgstr "child_of"
+
+#~ msgid "Module import"
+#~ msgstr "Importa Modulo"
 
 #~ msgid "Suppliers Partners"
 #~ msgstr "Partner Fornitori"
 
+#~ msgid "(year)="
+#~ msgstr "(anno)="
+
+#~ msgid "Modules Management"
+#~ msgstr "Gestione Moduli"
+
+#~ msgid ""
+#~ "The official translations pack of all OpenERP/OpenObjects module are managed "
+#~ "through launchpad. We use their online interface to synchronize all "
+#~ "translations efforts."
+#~ msgstr ""
+#~ "Il pacchetto delle traduzioni ufficiali di OpenErp/OpenObjects sono gestite "
+#~ "tramite launchpad. Utilizziamo la loro interfaccia online per sincronizzare "
+#~ "tutte le traduzioni"
+
+#~ msgid "RML path"
+#~ msgstr "Percorso RML"
+
+#~ msgid "Next Configuration Wizard"
+#~ msgstr "Successiva Procedura di Configurazione"
+
+#~ msgid "Untranslated terms"
+#~ msgstr "Termini non tradotti"
+
+#~ msgid "="
+#~ msgstr "="
+
+#~ msgid "Access Controls Grid"
+#~ msgstr "Griglia Controlli d'Accesso"
+
+#~ msgid "Document"
+#~ msgstr "Documento"
+
 #~ msgid "Titles"
 #~ msgstr "Qualifiche"
 
+#~ msgid "Start Date"
+#~ msgstr "Data di inizio"
+
+#~ msgid ""
+#~ "Create your users.\n"
+#~ "You will be able to assign groups to users. Groups define the access rights "
+#~ "of each users on the different objects of the system.\n"
+#~ "            "
+#~ msgstr ""
+#~ "Creazione gli utenti.\n"
+#~ "Si possono assegnare gruppi agli utenti. I gruppi definiscono i diritti di "
+#~ "accesso per ogni utente sui differenti oggetti del sistema.\n"
+#~ "            "
+
+#~ msgid ">"
+#~ msgstr ">"
+
+#~ msgid "<"
+#~ msgstr "<"
+
+#~ msgid "If you don't force the domain, it will use the simple domain setup"
+#~ msgstr ""
+#~ "Se non forzi il dominio, verrà utilizzata la configurazione di dominio "
+#~ "semplice"
+
+#~ msgid "Print format"
+#~ msgstr "Formato Stampa"
+
+#~ msgid "End Date"
+#~ msgstr "Data finale"
+
+#~ msgid "center"
+#~ msgstr "centra"
+
+#~ msgid "Unsubscribed"
+#~ msgstr "Disiscritto"
+
+#~ msgid "Calculate Sum"
+#~ msgstr "Calcola Somma"
+
+#~ msgid "Module successfully imported !"
+#~ msgstr "Modulo importato con successo"
+
+#~ msgid "Subscribe Report"
+#~ msgstr "Sottoscrivi Report"
+
+#~ msgid "Unsubscribe Report"
+#~ msgstr "Annula Sottoscrizione Report"
+
+#~ msgid "New Partner"
+#~ msgstr "Nuovo Partner"
+
+#~ msgid "Report custom"
+#~ msgstr "Report Personalizzato"
+
+#~ msgid "Simplified Interface"
+#~ msgstr "Interfaccia Semplice"
+
+#~ msgid "Import a Translation File"
+#~ msgstr "Importa File di Traduzione"
+
+#~ msgid "Sequence Code"
+#~ msgstr "Codice Sequenza"
+
+#~ msgid "a5"
+#~ msgstr "a5"
+
+#~ msgid "State of Mind"
+#~ msgstr "Impressione"
+
+#~ msgid "Image Preview"
+#~ msgstr "Anteprima immagine"
+
+#~ msgid "Choose a language to install:"
+#~ msgstr "Scegli una lingua da installare"
+
 #~ msgid "Macedonia"
 #~ msgstr "Macedonia"
 
@@ -8236,6 +9806,287 @@ msgstr ""
 #~ msgid "Html from html"
 #~ msgstr "Html da html"
 
+#~ msgid ""
+#~ "If you have groups, the visibility of this menu will be based on these "
+#~ "groups. If this field is empty, Open ERP will compute visibility based on "
+#~ "the related object's read access."
+#~ msgstr ""
+#~ "Se esistono dei gruppi, la visibilità di questo menu si baserà su questi "
+#~ "gruppi. Se il campo è vuoto, OpenERP calcolerà la visibilità sulla base dei "
+#~ "permessi di lettura dell'oggetto associato."
+
+#, python-format
+#~ msgid "Password mismatch !"
+#~ msgstr "Le password non corrispondono !"
+
 #, python-format
 #~ msgid "The read method is not implemented on this object !"
 #~ msgstr "Il metodo 'Lettura' non è implementato per questo oggetto."
+
+#~ msgid "txt"
+#~ msgstr "txt"
+
+#, python-format
+#~ msgid "This url '%s' must provide an html file with links to zip modules"
+#~ msgstr ""
+#~ "Questo indirizzo URL '%s' deve condurre ad un file html contenente "
+#~ "collegamenti a diversi moduli in formato .zip."
+
+#~ msgid "My Requests"
+#~ msgstr "Le Mie Richieste"
+
+#, python-format
+#~ msgid "Pie charts need exactly two fields"
+#~ msgstr "I Grafici a Torta necessitano di due campi"
+
+#~ msgid "The company this user is currently working on."
+#~ msgstr "L'azienda per la quale lavora attualmente l'utente."
+
+#, python-format
+#~ msgid "Model %s Does not Exist !"
+#~ msgstr "Il modello %s non esiste!"
+
+#~ msgid ""
+#~ "If set, sequence will only be used in case this python expression matches, "
+#~ "and will precede other sequences."
+#~ msgstr ""
+#~ "Se impostata, la sequenza verrà utilizzata solo nel caso in cui questa "
+#~ "espressione python si verifica, e precederà le altre sequenze."
+
+#~ msgid "This user can not connect using this company !"
+#~ msgstr "Questo utente non può connettersi a questa azienda!"
+
+#~ msgid "Confirmation"
+#~ msgstr "Conferma"
+
+#, python-format
+#~ msgid "Enter at least one field !"
+#~ msgstr "Inserisci almeno un campo !"
+
+#~ msgid "Installation Done"
+#~ msgstr "Installazione Completata"
+
+#~ msgid "My Closed Requests"
+#~ msgstr "Mie richieste chiuse"
+
+#~ msgid "Bank List"
+#~ msgstr "Lista Banche"
+
+#~ msgid ""
+#~ "Regexp to search module on the repository webpage:\n"
+#~ "- The first parenthesis must match the name of the module.\n"
+#~ "- The second parenthesis must match the whole version number.\n"
+#~ "- The last parenthesis must match the extension of the module."
+#~ msgstr ""
+#~ "Espressioni regolari per cercare un modulo nella pagina web del repository\n"
+#~ "-La prima parentesi deve combaciare con il nome del modulo\n"
+#~ "-La seconda parentesi deve combaciare con l'intero numero di versione\n"
+#~ "-L'ultima parentesi deve combaciare con l'estensione del modulo"
+
+#, python-format
+#~ msgid "Invalid operation"
+#~ msgstr "Operazione non valida"
+
+#~ msgid "Children"
+#~ msgstr "Bambini"
+
+#, python-format
+#~ msgid "You can not remove the field '%s' !"
+#~ msgstr "Non puoi rimuovere il campo '%s' !"
+
+#~ msgid "Next Call Date"
+#~ msgstr "Data della prossima chiamata"
+
+#, python-format
+#~ msgid "Using a relation field which uses an unknown object"
+#~ msgstr ""
+#~ "Utilizzo di un campo di relazione, che si avvale di un oggetto sconosciuto"
+
+#~ msgid "Field child2"
+#~ msgstr "Campo figlio2"
+
+#~ msgid "Multi company"
+#~ msgstr "Multi azienda"
+
+#~ msgid "Field child3"
+#~ msgstr "Campo figlio3"
+
+#~ msgid "Field child0"
+#~ msgstr "Campo figlio0"
+
+#~ msgid "Field child1"
+#~ msgstr "Campo figlio1"
+
+#~ msgid "Report Title"
+#~ msgstr "Titolo del report"
+
+#~ msgid "Manually Created"
+#~ msgstr "Creato manualmente"
+
+#~ msgid "Manage Menus"
+#~ msgstr "Gestisci i menu"
+
+#~ msgid "Accumulate"
+#~ msgstr "Accumula"
+
+#, python-format
+#~ msgid "Tree can only be used in tabular reports"
+#~ msgstr ""
+#~ "La struttura ad albero può essere utilizzata esclusivamente nei report "
+#~ "tabellari"
+
+#~ msgid "Matching"
+#~ msgstr "Confronto"
+
+#~ msgid "Weight"
+#~ msgstr "Peso"
+
+#~ msgid "HTML from HTML"
+#~ msgstr "HTML da HTML"
+
+#~ msgid "The VAT doesn't seem to be correct."
+#~ msgstr "La P.IVA non sembra essere corretta"
+
+#~ msgid "Delete Permission"
+#~ msgstr "Permesso di cancellazione"
+
+#~ msgid ""
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "consider the present one as void. Do not hesitate to contact our accounting "
+#~ "department at (+32).81.81.37.00."
+#~ msgstr ""
+#~ "Se il vostro pagamento è stato effettuato prima del ricevimento di questa "
+#~ "mail, prego considerate nullo questo avvertimento. Non esitate a contattare "
+#~ "la nostra amministrazione al (+32).81.81.37.00."
+
+#~ msgid "Default Properties"
+#~ msgstr "Proprietà predefinite"
+
+#, python-format
+#~ msgid "Please specify server option --smtp-from !"
+#~ msgstr "Per favore specificare l'opzione server --smtp-from !"
+
+#~ msgid "If two sequences match, the highest weight will be used."
+#~ msgstr ""
+#~ "se due sequenze soddisfano, quella col peso maggiore sarà utilizzata."
+
+#~ msgid "Multi Company"
+#~ msgstr "Multi Azienda"
+
+#~ msgid "Contact Functions"
+#~ msgstr "Funzioni Contatto"
+
+#~ msgid "HTML from HTML(Mako)"
+#~ msgstr "HTML da HTML (MAKO)"
+
+#~ msgid "Default Company per Object"
+#~ msgstr "Azienda Predefinita per Oggetto"
+
+#, python-format
+#~ msgid "Field %d should be a figure"
+#~ msgstr "Il campo %d dovrebbe essere una figura"
+
+#~ msgid "Start On"
+#~ msgstr "Inizio a"
+
+#~ msgid "Function Name"
+#~ msgstr "Nome funzione"
+
+#, python-format
+#~ msgid "Password empty !"
+#~ msgstr "Manca la Password !"
+
+#~ msgid "Accepted Companies"
+#~ msgstr "Aziende accettate"
+
+#, python-format
+#~ msgid "Second field should be figures"
+#~ msgstr "Il secondo campo dovrebbe contenere figure"
+
+#~ msgid "Import New Language"
+#~ msgstr "Importa nuova lingua"
+
+#, python-format
+#~ msgid "Bar charts need at least two fields"
+#~ msgstr "I Grafici a Barre necessitano di almeno due campi"
+
+#~ msgid "multi_company.default"
+#~ msgstr "multi_company.default"
+
+#~ msgid ""
+#~ "You cannot have multiple records with the same id for the same module !"
+#~ msgstr ""
+#~ "Non puoi avere record multipli con lo stesso ID per lo stesso modulo!"
+
+#~ msgid "The Code of the Partner Function must be unique !"
+#~ msgstr "Il codice della funzione Partner deve essere unica!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "La dimensione del campo non può mai essere minore a 1 !"
+
+#~ msgid "Shortcut for this menu already exists!"
+#~ msgstr "Il collegamento per questo menù esiste già!"
+
+#~ msgid "You cannot have two users with the same login !"
+#~ msgstr "Non puoi avere due utenti con lo stesso nome di accesso!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "L'ID del certificato del modulo deve essere unico!"
+
+#~ msgid "Your maintenance contract is already subscribed in the system !"
+#~ msgstr "Il tuo contratto di manutenzione è già sottoscritto nel sistema!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Il nome del modulo deve essere unico!"
+
+#~ msgid "The name of the Partner must be unique !"
+#~ msgstr "Il nome del Partner deve esser unico!"
+
+#~ msgid "The name of the country must be unique !"
+#~ msgstr "Il nome della nazione deve essere unico!"
+
+#~ msgid "Returning"
+#~ msgstr "Sto ritornando"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "[object with reference: %s - %s]"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "[oggetto con referenza: %s - %s]"
+
+#, python-format
+#~ msgid "Integrity Error"
+#~ msgstr "Errore di integrità"
+
+#~ msgid "The code of the country must be unique !"
+#~ msgstr "Il codice della Nazione deve essere unico!"
+
+#~ msgid "The code of the language must be unique !"
+#~ msgstr "Il codice della lingua deve essere unico!"
+
+#~ msgid "The name of the language must be unique !"
+#~ msgstr "Il nome della lingua deve essere unico!"
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "Il nome del gruppo deve essere unico!"
+
+#, python-format
+#~ msgid ""
+#~ "The operation cannot be completed, probably due to the following:\n"
+#~ "- deletion: you may be trying to delete a record while other records still "
+#~ "reference it\n"
+#~ "- creation/update: a mandatory field is not correctly set"
+#~ msgstr ""
+#~ "L'operazione non può essere completata, probabilmente in seguito a:\n"
+#~ "- cancellazione: stai cercando di cancellare un record mentra altri record "
+#~ "sono referenziati a esso\n"
+#~ "- creazione/aggiornamento: un campo obbligatorio deve essere correttamente "
+#~ "impostato"
+
+#, python-format
+#~ msgid "Constraint Error"
+#~ msgstr "Errore nei Vincoli"
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index 90c7aebf8cc..f360ab89ab4 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -6,25 +6,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-10-12 07:48+0000\n"
-"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-25 14:39+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: 2010-10-13 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: base
+#: view:ir.filters:0
+#: field:ir.model.fields,domain:0
+#: field:ir.rule,domain:0
+#: field:ir.rule,domain_force:0
+#: field:res.partner.title,domain:0
+msgid "Domain"
+msgstr "Domínio"
+
 #. module: base
 #: model:res.country,name:base.sh
 msgid "Saint Helena"
 msgstr "Santa Helena"
 
 #. module: base
-#: wizard_view:res.partner.sms_send,init:0
-msgid "SMS - Gateway: clickatell"
-msgstr "SMS - Gateway: clickatell"
+#: view:ir.actions.report.xml:0
+msgid "Other Configuration"
+msgstr "Outras configurações"
 
 #. module: base
 #: view:res.lang:0
@@ -32,6 +41,12 @@ msgid "%j - Day of the year as a decimal number [001,366]."
 msgstr "%j - Dia do ano[001,366]."
 
 #. module: base
+#: selection:ir.property,type:0
+msgid "DateTime"
+msgstr "Data/Hora"
+
+#. module: base
+#: view:ir.values:0
 #: field:ir.values,meta_unpickle:0
 msgid "Metadata"
 msgstr "Metadados"
@@ -49,24 +64,27 @@ msgid "You can not create this kind of document! (%s)"
 msgstr "Você não pode criar este tipo de documento! (%s)"
 
 #. module: base
-#: wizard_field:module.lang.import,init,code:0
+#: field:base.language.import,code:0
 msgid "Code (eg:en__US)"
 msgstr "Code (eg:en__US)"
 
 #. module: base
 #: view:workflow:0
+#: view:workflow.activity:0
 #: field:workflow.activity,wkf_id:0
 #: field:workflow.instance,wkf_id:0
+#: field:workflow.transition,wkf_id:0
+#: field:workflow.workitem,wkf_id:0
 msgid "Workflow"
 msgstr "Workflow"
 
 #. module: base
-#: view:wizard.module.lang.export:0
-msgid "To browse official translations, you can visit this link: "
-msgstr "Para ver traduções oficiais, você pode visitar este link: "
+#: view:partner.sms.send:0
+msgid "SMS - Gateway: clickatell"
+msgstr "SMS - Gateway: clickatell"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Hungarian / Magyar"
 msgstr "Hungarian / Magyar"
 
@@ -75,50 +93,31 @@ msgstr "Hungarian / Magyar"
 msgid "Workflow On"
 msgstr "Workflow Em"
 
+#. module: base
+#: field:ir.actions.act_window,display_menu_tip:0
+msgid "Display Menu Tips"
+msgstr "Exibir dicas"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Views"
 msgstr "Views Criadas"
 
 #. module: base
-#: view:workflow.activity:0
-msgid "Outgoing transitions"
-msgstr "Transições de saída"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-emblem-important"
+msgstr ""
 
 #. module: base
-#: selection:ir.report.custom,frequency:0
-msgid "Yearly"
-msgstr "Anualmente"
+#: field:res.partner,ref:0
+msgid "Reference"
+msgstr "Código"
 
 #. module: base
 #: field:ir.actions.act_window,target:0
 msgid "Target Window"
 msgstr "Janela de destino"
 
-#. module: base
-#: model:ir.actions.todo,note:base.config_wizard_simple_view
-msgid ""
-"Choose between the \"Simplified Interface\" or the extended one.\n"
-"If you are testing or using OpenERP for the first time, we suggest you to "
-"use\n"
-"the simplified interface, which has less options and fields but is easier "
-"to\n"
-"understand. You will be able to switch to the extended view later.\n"
-"            "
-msgstr ""
-"Escolha entre a 'Interface simplificada' ou a estendida.\n"
-"Se você está testando ou usando o OpenERP pela primeira vez, nós sugerimos "
-"que use\n"
-"a interface simplificada, por ter menos opções e os campos poder ser "
-"facilmente\n"
-"entendidos. Você pode alternar para interface estendida  mais tarde.\n"
-"            "
-
-#. module: base
-#: field:ir.rule,operand:0
-msgid "Operand"
-msgstr "Operando"
-
 #. module: base
 #: model:res.country,name:base.kr
 msgid "South Korea"
@@ -141,21 +140,15 @@ msgstr "ir.ui.view.custom"
 msgid "Swaziland"
 msgstr "Suíça"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_custom
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.custom"
-msgstr "ir.actions.report.custom"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CANCEL"
 msgstr "STOCK_CANCEL"
 
 #. module: base
-#: field:ir.report.custom,sortby:0
-msgid "Sorted By"
-msgstr "Ordenado Por"
+#: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
+msgid "Wood Suppliers"
+msgstr "Fornecedores de madeira"
 
 #. module: base
 #: field:ir.sequence,number_increment:0
@@ -168,18 +161,20 @@ msgstr "Incremento Numérico"
 msgid "Company's Structure"
 msgstr "Estrutura da Empresa"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_report_custom_fields
-msgid "ir.report.custom.fields"
-msgstr "ir.report.custom.fields"
-
 #. module: base
 #: view:res.partner:0
 msgid "Search Partner"
 msgstr "Buscar Parceiro"
 
 #. module: base
-#: code:addons/base/module/wizard/wizard_export_lang.py:0
+#: code:addons/base/res/res_user.py:0
+#, python-format
+msgid "\"smtp_server\" needs to be set to send mails to users"
+msgstr ""
+"\"smtp_server\" necessita enviar configuração de emails para os usuários"
+
+#. module: base
+#: code:addons/base/module/wizard/base_export_language.py:0
 #, python-format
 msgid "new"
 msgstr "novo"
@@ -190,7 +185,6 @@ msgid "STOCK_GOTO_TOP"
 msgstr "STOCK_GOTO_TOP"
 
 #. module: base
-#: field:ir.actions.report.custom,multi:0
 #: field:ir.actions.report.xml,multi:0
 msgid "On multiple doc."
 msgstr "Em múltiplos documentos"
@@ -200,6 +194,11 @@ msgstr "Em múltiplos documentos"
 msgid "Number of Modules"
 msgstr "Número de módulos"
 
+#. module: base
+#: help:multi_company.default,company_dest_id:0
+msgid "Company to store the current record"
+msgstr "Empresa para guardar o registro atual"
+
 #. module: base
 #: field:res.partner.bank.type.field,size:0
 msgid "Max. Size"
@@ -211,7 +210,7 @@ msgid "Contact Name"
 msgstr "Nome do Contato"
 
 #. module: base
-#: code:addons/base/module/wizard/wizard_export_lang.py:0
+#: code:addons/base/module/wizard/base_export_language.py:0
 #, python-format
 msgid ""
 "Save this document to a %s file and edit it with a specific software or a "
@@ -225,19 +224,6 @@ msgstr ""
 msgid "STOCK_DELETE"
 msgstr "STOCK_DELETE"
 
-#. module: base
-#: code:addons/base/ir/ir_model.py:0
-#, python-format
-msgid "Password mismatch !"
-msgstr "Senha incorreta !"
-
-#. module: base
-#: code:addons/base/module/module.py:0
-#, python-format
-msgid "This url '%s' must provide an html file with links to zip modules"
-msgstr ""
-"Esta url %s providenciará um arquivo html com links para os módulos zip"
-
 #. module: base
 #: selection:res.request,state:0
 msgid "active"
@@ -254,34 +240,32 @@ msgid "%y - Year without century as a decimal number [00,99]."
 msgstr "%y - Ano com 2 decimais [00,99]."
 
 #. module: base
-#: selection:ir.ui.menu,icon:0
-msgid "STOCK_GOTO_FIRST"
-msgstr "STOCK_GOTO_FIRST"
+#: selection:maintenance.contract.wizard,state:0
+msgid "Validated"
+msgstr "Validado"
 
 #. module: base
-#: selection:ir.report.custom.fields,operation:0
-msgid "Get Max"
-msgstr "Pegar o máximo"
-
-#. module: base
-#: help:ir.actions.act_window,limit:0
-msgid "Default limit for the list view"
-msgstr "Limite padrão para a lista"
+#: field:res.partner,credit_limit:0
+msgid "Credit Limit"
+msgstr "Limite de Crédito"
 
 #. module: base
 #: field:ir.model.data,date_update:0
 msgid "Update Date"
 msgstr "Data de atualização"
 
+#. module: base
+#: view:ir.attachment:0
+msgid "Owner"
+msgstr "Dono"
+
 #. module: base
 #: field:ir.actions.act_window,src_model:0
 msgid "Source Object"
 msgstr "Objeto fonte"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: view:ir.actions.todo:0
-#: model:ir.ui.menu,name:base.menu_ir_actions_todo_form
 msgid "Config Wizard Steps"
 msgstr "Etapas do assistente de configuração"
 
@@ -291,8 +275,14 @@ msgid "ir.ui.view_sc"
 msgstr "ir.ui.view_sc"
 
 #. module: base
+#: field:res.widget.user,widget_id:0
+msgid "Widget"
+msgstr "Widget"
+
+#. module: base
+#: view:ir.model.access:0
 #: field:ir.model.access,group_id:0
-#: field:ir.rule,rule_group:0
+#: view:res.config.users:0
 msgid "Group"
 msgstr "Grupo"
 
@@ -303,36 +293,19 @@ msgstr "Grupo"
 msgid "Field Name"
 msgstr "Nome do Campo"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree_uninstall
-#: model:ir.ui.menu,name:base.menu_module_tree_uninstall
-msgid "Uninstalled modules"
-msgstr "Módulos não instalados"
-
-#. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "txt"
-msgstr "txt"
-
 #. module: base
 #: wizard_view:server.action.create,init:0
 #: wizard_field:server.action.create,init,type:0
 msgid "Select Action Type"
 msgstr "Selecionar Tipo de Ação"
 
-#. module: base
-#: selection:ir.actions.todo,type:0
-msgid "Configure"
-msgstr "Configurar"
-
 #. module: base
 #: model:res.country,name:base.tv
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #. module: base
 #: selection:ir.model,state:0
-#: selection:ir.model.grid,state:0
 msgid "Custom Object"
 msgstr "Configurar Objeto"
 
@@ -369,23 +342,19 @@ msgid "French Guyana"
 msgstr "Guiana Francesa"
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Visualização Original"
+#: selection:base.language.install,lang:0
+msgid "Greek / Ελληνικά"
+msgstr "Grego / Ελληνικά"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Bosnian / bosanski jezik"
 msgstr "Bósnia"
 
 #. module: base
-#: help:ir.actions.report.xml,attachment_use:0
-msgid ""
-"If you check this, then the second time the user prints with same attachment "
-"name, it returns the previous report."
+#: selection:base.language.install,lang:0
+msgid "Serbian / Serbia"
 msgstr ""
-"Se marcar esta opção, na segunda vez que usar a impressora com o mesmo "
-"anexo, usará a impressora anterior"
 
 #. module: base
 #: help:res.lang,iso_code:0
@@ -399,6 +368,7 @@ msgstr "STOCK_MEDIA_REWIND"
 
 #. module: base
 #: field:ir.actions.todo,note:0
+#: selection:ir.property,type:0
 msgid "Text"
 msgstr "Texto"
 
@@ -408,7 +378,7 @@ msgid "Country Name"
 msgstr "Nome do País"
 
 #. module: base
-#: model:res.country,name:base.coreturn
+#: model:res.country,name:base.co
 msgid "Colombia"
 msgstr "Colômbia"
 
@@ -418,9 +388,9 @@ msgid "Schedule Upgrade"
 msgstr "Agendar Atualização"
 
 #. module: base
-#: field:ir.actions.report.custom,report_id:0
-msgid "Report Ref."
-msgstr "Ref. do Relatório"
+#: selection:base.language.install,lang:0
+msgid "Mongolian / Mongolia"
+msgstr "Mongol / Mongolia"
 
 #. module: base
 #: help:res.country,code:0
@@ -432,10 +402,14 @@ msgstr ""
 "Voce pode usar este campo para pesquisa rápida."
 
 #. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
+#: model:res.country,name:base.pw
+msgid "Palau"
+msgstr "Palau"
+
+#. module: base
+#: view:ir.values:0
+msgid "Action To Launch"
+msgstr "Ação para Executar"
 
 #. module: base
 #: view:res.partner:0
@@ -443,10 +417,16 @@ msgid "Sales & Purchases"
 msgstr "Compras & Vendas"
 
 #. module: base
-#: view:ir.actions.wizard:0
-#: field:wizard.ir.model.menu.create.line,wizard_id:0
-msgid "Wizard"
-msgstr "Assistente"
+#: view:ir.translation:0
+msgid "Untranslated"
+msgstr "Não Traduzido"
+
+#. module: base
+#: help:ir.actions.act_window,context:0
+msgid ""
+"Context dictionary as Python expression, empty by default (Default: {})"
+msgstr ""
+"Dicionário de contexto como expressão Python, vazio por default(Default: { })"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -461,9 +441,9 @@ msgid "Wizards"
 msgstr "Assistentes"
 
 #. module: base
-#: selection:res.config.view,view:0
-msgid "Extended Interface"
-msgstr "Interface extendida"
+#: model:res.partner.category,name:base.res_partner_category_miscellaneoussuppliers0
+msgid "Miscellaneous Suppliers"
+msgstr "Fornecedores diversos"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
@@ -477,7 +457,12 @@ msgid "Select the Action Window, Report, Wizard to be executed."
 msgstr "Selecione a janela de ação, relatório ou assistente a ser executado."
 
 #. module: base
-#: view:wizard.module.lang.export:0
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gtk-jump-to-ltr"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
 msgid "Export done"
 msgstr "Exportação concluída"
 
@@ -486,21 +471,32 @@ msgstr "Exportação concluída"
 msgid "Model Description"
 msgstr "Descrição de Modelo"
 
+#. module: base
+#: help:ir.actions.act_window,src_model:0
+msgid ""
+"Optional model name of the objects on which this action should be visible"
+msgstr ""
+"nome do modelo opcional dos objetos nos quais esta ação deve ser visível"
+
 #. module: base
 #: field:workflow.transition,trigger_expr_id:0
 msgid "Trigger Expression"
 msgstr "Acionar expressões"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Korean / Korea, Democratic Peoples Republic of"
+msgstr "Coreano / Korea, Democratic Peoples Republic of"
+
 #. module: base
 #: model:res.country,name:base.jo
 msgid "Jordan"
 msgstr "Jordânia"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:0
-#, python-format
-msgid "You can not remove the model '%s' !"
-msgstr "Você não pode remover este modelo '%s' !"
+#: view:ir.module.module:0
+msgid "Certified"
+msgstr "Certificado"
 
 #. module: base
 #: model:res.country,name:base.er
@@ -508,36 +504,51 @@ msgid "Eritrea"
 msgstr "Eritréia"
 
 #. module: base
-#: view:res.config.view:0
-msgid "Configure simple view"
-msgstr "Configurar uma view simples"
-
-#. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Bulgarian / български"
 msgstr "Búlgaro / български"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_base_action_rule
+msgid "Automated Actions"
+msgstr "Ações automatizadas"
+
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_actions
 msgid "ir.actions.actions"
 msgstr "ir.actions.actions"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_report_custom
-#: view:ir.report.custom:0
-msgid "Custom Report"
-msgstr "Configurar relatório"
+#: view:partner.wizard.ean.check:0
+msgid "Want to check Ean ? "
+msgstr "Quer verificar Ean ? "
 
 #. module: base
-#: selection:ir.report.custom,type:0
-msgid "Bar Chart"
-msgstr "Gráfico de Barras"
+#: field:ir.values,key2:0
+msgid "Event Type"
+msgstr "Tipo de evento"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_DIALOG_ERROR"
 msgstr "STOCK_DIALOG_ERROR"
 
+#. module: base
+#: view:base.language.export:0
+msgid ""
+"OpenERP translations (core, modules, clients) are managed through "
+"Launchpad.net, our open source project management facility. We use their "
+"online interface to synchronize all translations efforts."
+msgstr ""
+"Traduções OpenERP (Server, módulos, clients) são gerenciados através "
+"Launchpad.net, nosso gerenciamento de projetos Open Source. Nós usamos sua "
+"interface online para sincronizar todos os esforços de tradução."
+
+#. module: base
+#: field:res.partner,title:0
+msgid "Partner Form"
+msgstr "Formulário do Parceiro"
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_INDEX"
@@ -566,6 +577,21 @@ msgstr "Camboja, Reino de"
 msgid "Sequences"
 msgstr "Seqüências"
 
+#. module: base
+#: model:ir.model,name:base.model_base_language_import
+msgid "Language Import"
+msgstr "Importar idioma"
+
+#. module: base
+#: model:ir.model,name:base.model_res_config_users
+msgid "res.config.users"
+msgstr "res.config.users"
+
+#. module: base
+#: model:ir.model,name:base.model_base_language_export
+msgid "base.language.export"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_DIALOG_QUESTION"
@@ -576,13 +602,24 @@ msgstr "STOCK_DIALOG_QUESTION"
 msgid "Papua New Guinea"
 msgstr "Papua Nova Guiné"
 
+#. module: base
+#: help:ir.actions.report.xml,report_type:0
+msgid "Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."
+msgstr ""
+"Tipo de relatório, ex.: pdf, html, raw, sxw, odt, html2html, mako2html, ..."
+
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-folder-yellow"
+msgstr ""
+
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
 msgid "Basic Partner"
 msgstr "Parceiro básico"
 
 #. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid ","
 msgstr ","
 
@@ -591,18 +628,45 @@ msgstr ","
 msgid "My Partners"
 msgstr "Meus parceiros"
 
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "XML Report"
+msgstr "Relatório XML"
+
 #. module: base
 #: model:res.country,name:base.es
 msgid "Spain"
 msgstr "Espanha"
 
 #. module: base
-#: wizard_view:module.upgrade,end:0
-#: wizard_view:module.upgrade,start:0
-msgid "You may have to reinstall some language pack."
-msgstr "Voce pode ter que reinstalar alguns pacotes de idioma."
+#: model:ir.ui.menu,name:base.menu_translation_export
+msgid "Import / Export"
+msgstr "Importar / Exportar"
 
 #. module: base
+#: help:ir.actions.act_window,domain:0
+msgid ""
+"Optional domain filtering of the destination data, as a Python expression"
+msgstr ""
+"Domínio opcional filtrando os dados do destinatário como uma expressão Python"
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
+#: model:ir.model,name:base.model_base_module_upgrade
+msgid "Module Upgrade"
+msgstr "Atualizar múdlos"
+
+#. module: base
+#: view:res.config.users:0
+msgid ""
+"Groups are used to define access rights on objects and the visibility of "
+"screens and menus"
+msgstr ""
+"Grupos são usados para definir direitos de acesso a objetos e permitir "
+"visualizar telas e menus"
+
+#. module: base
+#: field:res.partner,mobile:0
 #: field:res.partner.address,mobile:0
 msgid "Mobile"
 msgstr "Celular"
@@ -618,6 +682,18 @@ msgstr "Omã"
 msgid "Payment term"
 msgstr "Termo de Pagamento"
 
+#. module: base
+#: code:addons/base/res/res_config.py:0
+#, python-format
+msgid ""
+"\n"
+"\n"
+"This addon is already installed on your system"
+msgstr ""
+"\n"
+"\n"
+"Este addon já está instalado em seu sistema"
+
 #. module: base
 #: model:res.country,name:base.nu
 msgid "Niue"
@@ -629,10 +705,19 @@ msgid "Work Days"
 msgstr "Dias de trabalho"
 
 #. module: base
-#: help:ir.values,action_id:0
-msgid "This field is not used, it only helps you to select the right action."
+#: selection:ir.module.module,license:0
+msgid "Other OSI Approved Licence"
+msgstr "Outra licença OSI aprovada"
+
+#. module: base
+#: help:res.config.users,context_lang:0
+#: help:res.users,context_lang:0
+msgid ""
+"Sets the language for the user's user interface, when UI translations are "
+"available"
 msgstr ""
-"Este campo não é usado, ele somente te ajuda para selecionar a ação correta."
+"Configura o idioma para a interface do usuário, quando a tradução para a "
+"interface estiver disponível"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
@@ -650,6 +735,12 @@ msgstr "Índia"
 msgid "maintenance contract modules"
 msgstr "Módulo de contratos de manutenção"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.res_request_link-act
+#: model:ir.ui.menu,name:base.menu_res_request_link_act
+msgid "Request Reference Types"
+msgstr "Tipos de Solicitação de Referência"
+
 #. module: base
 #: view:ir.values:0
 msgid "client_action_multi, client_action_relate"
@@ -667,27 +758,28 @@ msgid "Child Categories"
 msgstr "Categorias Filha"
 
 #. module: base
-#: selection:wizard.module.lang.export,format:0
+#: selection:base.language.export,format:0
 msgid "TGZ Archive"
 msgstr "arquivo TGZ"
 
-#. module: base
-#: field:res.partner.som,factor:0
-msgid "Factor"
-msgstr "Fator"
-
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
 msgstr "%B - Nome do mes completo"
 
 #. module: base
-#: field:ir.actions.report.xml,report_type:0
-#: field:ir.actions.todo,type:0
+#: view:ir.attachment:0
+#: field:ir.attachment,type:0
+#: field:ir.model,state:0
+#: field:ir.model.fields,state:0
+#: field:ir.property,type:0
 #: field:ir.server.object.lines,type:0
 #: field:ir.translation,type:0
+#: view:ir.ui.view:0
+#: view:ir.values:0
 #: field:ir.values,key:0
 #: view:res.partner:0
+#: view:res.partner.address:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -702,9 +794,14 @@ msgid "Guam (USA)"
 msgstr "Guam (USA)"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_model_grid
-msgid "Objects Security Grid"
-msgstr "Grid de segurança de objetos"
+#: selection:ir.ui.menu,icon:0
+msgid "STOCK_EDIT"
+msgstr "STOCK_EDIT"
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_hr_project
+msgid "Human Resources Dashboard"
+msgstr "Painel de Recursos Humanps"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -733,29 +830,17 @@ msgid "Cayman Islands"
 msgstr "Ilhas Cayman"
 
 #. module: base
-#: model:res.country,name:base.ir
-msgid "Iran"
-msgstr "Irã"
+#: field:ir.module.module,contributors:0
+msgid "Contributors"
+msgstr "Contribuidores"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.res_request-act
-#: model:ir.ui.menu,name:base.menu_res_request_act
-msgid "My Requests"
-msgstr "Minhas Mensagens"
+#: selection:ir.property,type:0
+msgid "Char"
+msgstr "Caractere"
 
 #. module: base
-#: field:ir.sequence,name:0
-#: field:ir.sequence.type,name:0
-msgid "Sequence Name"
-msgstr "Nome da Sequencia"
-
-#. module: base
-#: model:res.country,name:base.td
-msgid "Chad"
-msgstr "Chad"
-
-#. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Spanish (AR) / Español (AR)"
 msgstr "Spanish (AR) / Español (AR)"
 
@@ -764,25 +849,36 @@ msgstr "Spanish (AR) / Español (AR)"
 msgid "Uganda"
 msgstr "Uganda"
 
+#. module: base
+#: field:ir.model.access,perm_unlink:0
+msgid "Delete Access"
+msgstr "Acesso deletado"
+
 #. module: base
 #: model:res.country,name:base.ne
 msgid "Niger"
 msgstr "Nigéria"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Chinese (HK)"
+msgstr "Chinês (HK)"
+
 #. module: base
 #: model:res.country,name:base.ba
 msgid "Bosnia-Herzegovina"
 msgstr "Bósnia-Herzegovina"
 
 #. module: base
-#: field:ir.report.custom.fields,alignment:0
-msgid "Alignment"
-msgstr "Alinhamento"
-
-#. module: base
-#: selection:ir.rule,operator:0
-msgid ">="
-msgstr ">="
+#: view:base.language.export:0
+msgid ""
+"To improve or expand the official translations, you should use directly "
+"Lauchpad's web interface (Rosetta). If you need to perform mass translation, "
+"Launchpad also allows uploading full .po files at once"
+msgstr ""
+"Para implementar ou expander tracuções oficiais, voce precisa usar "
+"diretamente a interface web do lauchpad(Rosetta). Se voce necessita traduzir "
+"um grande volume de dados, o Lauchpad permite fazer upload de arquivos .po"
 
 #. module: base
 #: view:res.lang:0
@@ -795,27 +891,12 @@ msgstr ""
 "decimais [00,53]. Todos os dias, em um novo ano que antecede a primeira "
 "segunda-feira são considerados na semana 0."
 
-#. module: base
-#: field:res.partner.event,planned_cost:0
-msgid "Planned Cost"
-msgstr "Custo Planejado"
-
-#. module: base
-#: model:ir.model,name:base.model_ir_model_config
-msgid "ir.model.config"
-msgstr "ir.model.config"
-
 #. module: base
 #: field:ir.module.module,website:0
 #: field:res.partner,website:0
 msgid "Website"
 msgstr "Página da Web"
 
-#. module: base
-#: view:ir.module.repository:0
-msgid "Repository"
-msgstr "Repositório"
-
 #. module: base
 #: model:res.country,name:base.gs
 msgid "S. Georgia & S. Sandwich Isls."
@@ -826,6 +907,11 @@ msgstr "S. Georgia & S. Sandwich Isls."
 msgid "Action URL"
 msgstr "URL de ação"
 
+#. module: base
+#: field:base.module.import,module_name:0
+msgid "Module Name"
+msgstr "Nome do Módulo"
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_JUSTIFY_FILL"
@@ -842,26 +928,37 @@ msgid "Haiti"
 msgstr "Haití"
 
 #. module: base
-#: selection:ir.translation,type:0
-msgid "RML"
-msgstr "RML"
-
-#. module: base
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Search"
 msgstr "Pesquisar"
 
 #. module: base
-#: code:addons/base/ir/ir_report_custom.py:0
-#, python-format
-msgid "Pie charts need exactly two fields"
-msgstr "Gráfico de pizza necessita de dois campos"
+#: view:ir.rule:0
+msgid ""
+"2. Group-specific rules are combined together with a logical AND operator"
+msgstr ""
 
 #. module: base
-#: help:wizard.module.lang.export,lang:0
+#: help:base.language.export,lang:0
 msgid "To export a new language, do not select a language."
 msgstr "Para exportar um novo idioma, não selecione um idioma."
 
+#. module: base
+#: view:res.request:0
+msgid "Request Date"
+msgstr "Data de Requisição"
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_hr_dasboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_purchase_root
+msgid "Purchases"
+msgstr "Compras"
+
 #. module: base
 #: model:res.country,name:base.md
 msgid "Moldavia"
@@ -873,20 +970,16 @@ msgid "Features"
 msgstr "Recursos"
 
 #. module: base
-#: field:ir.report.custom,frequency:0
-msgid "Frequency"
-msgstr "Frequência"
-
-#. module: base
-#: field:ir.report.custom.fields,fc0_op:0
-#: field:ir.report.custom.fields,fc1_op:0
-#: field:ir.report.custom.fields,fc2_op:0
-#: field:ir.report.custom.fields,fc3_op:0
-msgid "Relation"
-msgstr "Relação"
+#: view:ir.module.module:0
+#: report:ir.module.reference.graph:0
+#: field:maintenance.contract.module,version:0
+msgid "Version"
+msgstr "Versão"
 
 #. module: base
+#: view:ir.model.access:0
 #: field:ir.model.access,perm_read:0
+#: view:ir.rule:0
 msgid "Read Access"
 msgstr "Acesso de leitura"
 
@@ -900,20 +993,16 @@ msgstr "ir.exports"
 msgid "STOCK_MISSING_IMAGE"
 msgstr "STOCK_MISSING_IMAGE"
 
-#. module: base
-#: view:res.users:0
-msgid "Define New Users"
-msgstr "Definir novos usuários"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_REMOVE"
 msgstr "STOCK_REMOVE"
 
 #. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "raw"
-msgstr "não processado"
+#: code:addons/base/module/wizard/base_update_translations.py:0
+#, python-format
+msgid "No language with code \"%s\" exists"
+msgstr ""
 
 #. module: base
 #: help:ir.actions.server,email:0
@@ -928,20 +1017,15 @@ msgstr ""
 "correto"
 
 #. module: base
-#: field:res.roles,name:0
-msgid "Role Name"
-msgstr "Nome da Regra"
-
-#. module: base
-#: field:res.partner,user_id:0
-msgid "Dedicated Salesman"
-msgstr "Vendedor"
-
-#. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "-"
 msgstr "-"
 
+#. module: base
+#: view:wizard.ir.model.menu.create:0
+msgid "Create _Menu"
+msgstr ""
+
 #. module: base
 #: field:res.payterm,name:0
 msgid "Payment Term (short name)"
@@ -955,12 +1039,26 @@ msgid "Bank"
 msgstr "Banco"
 
 #. module: base
-#: view:res.lang:0
-msgid "Examples"
-msgstr "Exemplos"
+#: model:ir.model,name:base.model_ir_exports_line
+msgid "ir.exports.line"
+msgstr "ir.exports.line"
 
 #. module: base
+#: help:base.language.install,overwrite:0
+msgid ""
+"If you check this box, your customized translations will be overwritten and "
+"replaced by the official ones."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_rml:0
+msgid "Main report file path"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_action_report_xml
 #: field:ir.module.module,reports_by_module:0
+#: model:ir.ui.menu,name:base.menu_ir_action_report_xml
 msgid "Reports"
 msgstr "Relatórios"
 
@@ -970,9 +1068,15 @@ msgid "On Create"
 msgstr "Na Criação"
 
 #. module: base
-#: wizard_view:base.module.import,init:0
-msgid "Please give your module .ZIP file to import."
-msgstr "Por favor, peque seu arquivo de módulo .ZIP para importar"
+#: code:addons/base/ir/ir_model.py:0
+#, python-format
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+"'%s' contem muitos pontos. Identificações XML não devem conter ponto final! "
+"Estes devem ser utilizados para referência a dados de outros módulos como "
+"em: module.reference_id"
 
 #. module: base
 #: field:ir.default,value:0
@@ -980,28 +1084,40 @@ msgid "Default Value"
 msgstr "Valor Padrão"
 
 #. module: base
-#: wizard_field:res.partner.sms_send,init,user:0
+#: field:partner.sms.send,user:0
+#: field:res.config.users,login:0
 #: field:res.users,login:0
 msgid "Login"
 msgstr "Login"
 
+#. module: base
+#: view:ir.actions.server:0
+msgid ""
+"Access all the fields related to the current object using expressions, i.e. "
+"object.partner_id.name "
+msgstr ""
+
 #. module: base
 #: view:maintenance.contract:0
 #: field:maintenance.contract,module_ids:0
 msgid "Covered Modules"
 msgstr "Módulos cobertos"
 
+#. module: base
+#: model:ir.model,name:base.model_res_country_state
+msgid "Country state"
+msgstr "Estado do país"
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Float"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_COPY"
 msgstr "STOCK_COPY"
 
-#. module: base
-#: code:addons/base/ir/ir_model.py:0
-#, python-format
-msgid "Model %s Does not Exist !"
-msgstr "Modelo %s não existe !"
-
 #. module: base
 #: code:addons/base/module/module.py:0
 #, python-format
@@ -1018,9 +1134,9 @@ msgid "res.request.link"
 msgstr "res.request.link"
 
 #. module: base
-#: wizard_button:module.module.update,init,update:0
-msgid "Check new modules"
-msgstr "Pesquisar novos módulos"
+#: field:ir.actions.wizard,name:0
+msgid "Wizard Info"
+msgstr "Info. do Assistente"
 
 #. module: base
 #: model:res.country,name:base.km
@@ -1028,11 +1144,11 @@ msgid "Comoros"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_server_action
-#: view:ir.actions.server:0
-#: model:ir.ui.menu,name:base.menu_server_action
-msgid "Server Actions"
-msgstr "Ações do Servidor"
+#: help:res.log,secondary:0
+msgid ""
+"Do not display this log if it belongs to the same object the user is working "
+"on"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.tp
@@ -1040,9 +1156,22 @@ msgid "East Timor"
 msgstr "Timor Leste"
 
 #. module: base
-#: view:ir.rule:0
-msgid "Simple domain setup"
-msgstr "Comfiguração simples de domínio"
+#: model:res.company,follow_up_msg:base.main_company
+msgid ""
+"Date : %(date)s\n"
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Please find in attachment a reminder of all your unpaid invoices, for a "
+"total amount due of:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s"
+msgstr ""
 
 #. module: base
 #: field:res.currency,accuracy:0
@@ -1059,6 +1188,11 @@ msgstr "República do Quirguizistão"
 msgid "wizard.ir.model.menu.create.line"
 msgstr "wizard.ir.model.menu.create.line"
 
+#. module: base
+#: field:ir.attachment,res_id:0
+msgid "Attached ID"
+msgstr ""
+
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1095,22 +1229,6 @@ msgstr "ir.rule"
 msgid "Days"
 msgstr "Dias"
 
-#. module: base
-#: field:ir.report.custom.fields,width:0
-msgid "Fixed Width"
-msgstr "Largura Fixa"
-
-#. module: base
-#: model:res.company,overdue_msg:base.main_company
-msgid ""
-"Would your payment have been carried out after this mail was sent, please "
-"consider the present one as void. Do not hesitate to contact our accounting "
-"department at (+32).81.81.37.00."
-msgstr ""
-"Por favor desconsidere este aviso caso o pagamento já tenha sido efetuado. "
-"Qualquer dúvida entre em contato com nosso setor de cobrança através do "
-"telefone (+55) 11 3333-4444"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "terp-calendar"
@@ -1122,33 +1240,37 @@ msgid "STOCK_YES"
 msgstr "STOCK_YES"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_report_custom
-#: model:ir.ui.menu,name:base.menu_ir_action_report_custom
-msgid "Report Custom"
-msgstr "Customizar relatório"
+#: help:ir.actions.server,condition:0
+msgid ""
+"Condition that is to be tested before action is executed, e.g. "
+"object.list_price > object.cost_price"
+msgstr ""
+"Condição a ser testada antes da ação ser executada. Ex.: object.list_price > "
+"object.cost_price"
 
 #. module: base
-#: code:addons/base/res/partner/partner.py:0
 #: code:addons/base/res/res_company.py:0
-#: code:addons/base/res/res_user.py:0
 #, python-format
 msgid " (copy)"
 msgstr " (cópia)"
 
-#. module: base
-#: view:ir.sequence:0
-msgid "Year without century: %(y)s"
-msgstr "Ano com 2 dígitos: %(y)s"
-
 #. module: base
 #: view:res.lang:0
 msgid "7.  %H:%M:%S      ==> 18:25:20"
 msgstr "7.  %H:%M:%S      ==> 18:25:20"
 
 #. module: base
-#: help:res.users,company_id:0
-msgid "The company this user is currently working on."
-msgstr "Companhia para a qual este usuário está trabalhando"
+#: view:res.partner:0
+#: view:res.partner.category:0
+#: field:res.partner.category,partner_ids:0
+msgid "Partners"
+msgstr "Parceiros"
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_widget_act_window
+#: model:ir.ui.menu,name:base.menu_res_widget_act_window
+msgid "Homepage Widgets"
+msgstr ""
 
 #. module: base
 #: help:ir.actions.server,message:0
@@ -1159,6 +1281,16 @@ msgstr ""
 "Especifique a mensagem. Voce pode usar o campo do objeto. Ex.: `Caro [[ "
 "object.partner_id.name ]]`"
 
+#. module: base
+#: field:ir.attachment,res_model:0
+msgid "Attached Model"
+msgstr "Modelo anexado"
+
+#. module: base
+#: view:ir.rule:0
+msgid "Domain Setup"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,trigger_name:0
 msgid "Trigger Name"
@@ -1171,7 +1303,6 @@ msgstr "ir.model.access"
 
 #. module: base
 #: field:ir.cron,priority:0
-#: field:ir.ui.view,priority:0
 #: field:res.request,priority:0
 #: field:res.request.link,priority:0
 msgid "Priority"
@@ -1208,20 +1339,21 @@ msgstr "STOCK_JUSTIFY_LEFT"
 msgid "Malawi"
 msgstr "Malawi"
 
+#. module: base
+#: code:addons/base/res/res_user.py:0
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
 #. module: base
 #: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Tipo de endereço"
 
 #. module: base
-#: selection:ir.actions.todo,start_on:0
-msgid "Auto"
-msgstr "Automático"
-
-#. module: base
-#: view:res.request:0
-msgid "End of Request"
-msgstr "Fim da mensagem"
+#: view:ir.ui.menu:0
+msgid "Full Path"
+msgstr ""
 
 #. module: base
 #: view:res.request:0
@@ -1240,22 +1372,35 @@ msgstr ""
 "domingo são considerados na semana 0."
 
 #. module: base
-#: wizard_view:module.lang.install,init:0
-msgid "Note that this operation may take a few minutes."
-msgstr "Esta operação pode demorar alguns minutos."
+#: code:addons/base/ir/ir_model.py:0
+#, python-format
+msgid ""
+"Model %s Does not Exist !\" % vals['relation']))\n"
+"\n"
+"            if self.pool.get(vals['model']):\n"
+"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
+"                #Added context to _auto_init for special treatment to custom "
+"field for select_level\n"
+"                ctx = context.copy()\n"
+"                "
+"ctx.update({'field_name':vals['name'],'field_state':'manual','select':vals.ge"
+"t('select_level','0"
+msgstr ""
 
 #. module: base
-#: help:ir.sequence,condition:0
-msgid ""
-"If set, sequence will only be used in case this python expression matches, "
-"and will precede other sequences."
-msgstr ""
-"Se marcado, sequencia somente será usada em caso de coincidência das "
-"expressões python, e precederá outras sequencias."
+#: view:ir.ui.view:0
+msgid "Advanced"
+msgstr "Avançado"
+
+#. module: base
+#: model:res.country,name:base.fi
+msgid "Finland"
+msgstr "Finlândia"
 
 #. module: base
 #: selection:ir.actions.act_window,view_type:0
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Tree"
@@ -1272,22 +1417,53 @@ msgid "STOCK_CLEAR"
 msgstr "STOCK_CLEAR"
 
 #. module: base
+#: help:res.config.users,password:0
 #: help:res.users,password:0
 msgid ""
 "Keep empty if you don't want the user to be able to connect on the system."
 msgstr "Deixe vazio se voce não quer que o usuário conecte no sistema."
 
+#. module: base
+#: view:ir.actions.server:0
+msgid "Create / Write / Copy"
+msgstr "Criar / Escrever / Copiar"
+
+#. module: base
+#: view:base.language.export:0
+msgid "https://help.launchpad.net/Translations"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.act_window,view_mode:0
-#: field:res.config.view,view:0
 msgid "View Mode"
 msgstr "Modo de visão"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: view:base.language.import:0
+msgid ""
+"When using CSV format, please also check that the first line of your file is "
+"one of the following:"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_log_act_window
+#: model:ir.ui.menu,name:base.menu_res_log_act_window
+#: view:res.log:0
+msgid "Logs"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
 msgid "Spanish / Español"
 msgstr "Espanhol / Español"
 
+#. module: base
+#: view:base.module.update:0
+msgid ""
+"This wizard will scan all module repositories on the server side to detect "
+"newly added modules as well as any change to existing modules."
+msgstr ""
+
 #. module: base
 #: field:res.company,logo:0
 msgid "Logo"
@@ -1319,11 +1495,6 @@ msgstr "Nova Janela"
 msgid "Bahamas"
 msgstr "Barramas"
 
-#. module: base
-#: selection:res.partner.event,partner_type:0
-msgid "Commercial Prospect"
-msgstr "Prospecção Comercial"
-
 #. module: base
 #: code:addons/base/res/partner/partner.py:0
 #, python-format
@@ -1343,30 +1514,48 @@ msgid "Ireland"
 msgstr "Irlanda"
 
 #. module: base
-#: wizard_field:module.module.update,update,update:0
+#: field:base.module.update,update:0
 msgid "Number of modules updated"
 msgstr "Número de módulos atualizados"
 
+#. module: base
+#: view:workflow.activity:0
+msgid "Workflow Activity"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"Example: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 AND "
+"GROUP_A_RULE_2) OR (GROUP_B_RULE_1 AND GROUP_B_RULE_2) )"
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-stock_align_left_24"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.act_window,groups_id:0
 #: model:ir.actions.act_window,name:base.action_res_groups
+#: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,groups_id:0
+#: view:ir.actions.todo:0
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
+#: view:ir.model:0
 #: field:ir.model.fields,groups:0
+#: field:ir.rule,groups:0
+#: view:ir.ui.menu:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
+#: field:res.config.users,groups_id:0
 #: view:res.groups:0
 #: view:res.users:0
 #: field:res.users,groups_id:0
 msgid "Groups"
 msgstr "Grupos"
 
-#. module: base
-#: constraint:res.users:0
-msgid "This user can not connect using this company !"
-msgstr "Compnanhia inválida para este usuário"
-
 #. module: base
 #: model:res.country,name:base.bz
 msgid "Belize"
@@ -1382,6 +1571,18 @@ msgstr "Geórgia"
 msgid "Poland"
 msgstr "Polônia"
 
+#. module: base
+#: help:ir.actions.act_window,view_mode:0
+msgid ""
+"Comma-separated list of allowed view modes, such as 'form', 'tree', "
+"'calendar', etc. (Default: tree,form)"
+msgstr ""
+
+#. module: base
+#: view:workflow:0
+msgid "Workflow Editor"
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
@@ -1389,18 +1590,14 @@ msgid "To be removed"
 msgstr "Para ser removido"
 
 #. module: base
-#: field:ir.values,meta:0
-msgid "Meta Datas"
-msgstr "Meta-dados"
+#: view:maintenance.contract.wizard:0
+msgid "Maintenance contract added !"
+msgstr "Contrato de manutenção adicionado !"
 
 #. module: base
-#: view:wizard.module.update_translations:0
-msgid ""
-"This wizard will detect new terms in the application so that you can update "
-"them manually."
-msgstr ""
-"Este assistente detectou novos termos na aplicação, assim voce pode atualizá-"
-"los manualmente."
+#: model:ir.model,name:base.model_ir_sequence
+msgid "ir.sequence"
+msgstr "ir.sequence"
 
 #. module: base
 #: help:ir.actions.server,expression:0
@@ -1418,6 +1615,11 @@ msgstr ""
 msgid "Wizard Field"
 msgstr "Campo do Assistente"
 
+#. module: base
+#: view:ir.rule:0
+msgid "Groups (no group = global)"
+msgstr "Grupos (Sem grupo = global)"
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_SELECT_COLOR"
@@ -1428,6 +1630,13 @@ msgstr "STOCK_SELECT_COLOR"
 msgid "STOCK_NO"
 msgstr "STOCK_NO"
 
+#. module: base
+#: selection:res.config.users,view:0
+#: selection:res.config.view,view:0
+#: selection:res.users,view:0
+msgid "Simplified"
+msgstr "Simplificada"
+
 #. module: base
 #: model:res.country,name:base.st
 msgid "Saint Tome (Sao Tome) and Principe"
@@ -1438,11 +1647,6 @@ msgstr "São Tomé e Principe"
 msgid "Invoice"
 msgstr "Fatura"
 
-#. module: base
-#: selection:ir.ui.menu,icon:0
-msgid "STOCK_REDO"
-msgstr "STOCK_REDO"
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -1461,9 +1665,13 @@ msgstr ""
 "O nome do Objeto deve começar com x_ e não deve conter nenhum caracter "
 "especial!"
 
+#. module: base
+#: field:ir.actions.configuration.wizard,note:0
+msgid "Next Wizard"
+msgstr "Próximo assistente"
+
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
-#: field:ir.report.custom,menu_id:0
 #: view:ir.ui.menu:0
 #: field:ir.ui.menu,name:0
 msgid "Menu"
@@ -1475,23 +1683,20 @@ msgid "Current Rate"
 msgstr "Taxa atual"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
-msgid "Greek / Ελληνικά"
-msgstr "Grego / Ελληνικά"
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Visualização Original"
 
 #. module: base
-#: view:ir.values:0
-msgid "Action To Launch"
-msgstr "Ação para Executar"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-camera_test"
+msgstr ""
 
 #. module: base
-#: selection:ir.report.custom.fields,fc0_op:0
-#: selection:ir.report.custom.fields,fc1_op:0
-#: selection:ir.report.custom.fields,fc2_op:0
-#: selection:ir.report.custom.fields,fc3_op:0
-#: selection:ir.rule,operator:0
-msgid "in"
-msgstr "em"
+#: code:addons/base/res/res_user.py:0
+#, python-format
+msgid "Make sure you have no users linked with the group(s)!"
+msgstr ""
 
 #. module: base
 #: field:ir.actions.url,target:0
@@ -1503,26 +1708,15 @@ msgstr "Ação alvo"
 msgid "Anguilla"
 msgstr ""
 
-#. module: base
-#: field:ir.model.config,password_check:0
-msgid "Confirmation"
-msgstr "Confirmação"
-
-#. module: base
-#: code:addons/base/ir/ir_report_custom.py:0
-#, python-format
-msgid "Enter at least one field !"
-msgstr "Digite pelo menos um campo !"
-
 #. module: base
 #: field:ir.ui.view_sc,name:0
 msgid "Shortcut Name"
 msgstr "Nome do atalho"
 
 #. module: base
-#: field:res.partner,credit_limit:0
-msgid "Credit Limit"
-msgstr "Limite de Crédito"
+#: help:ir.actions.act_window,limit:0
+msgid "Default limit for the list view"
+msgstr "Limite padrão para a lista"
 
 #. module: base
 #: help:ir.actions.server,write_id:0
@@ -1539,15 +1733,15 @@ msgid "Zimbabwe"
 msgstr "Zimbábue"
 
 #. module: base
-#: model:ir.ui.menu,name:base.menu_translation_export
-msgid "Import / Export"
-msgstr "Importar / Exportar"
+#: view:base.module.update:0
+msgid "Please be patient, as this operation may take a few seconds..."
+msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_config_user_form
-#: view:res.users:0
-msgid "Configure User"
-msgstr "Configurar usuário"
+#: help:ir.values,action_id:0
+msgid "This field is not used, it only helps you to select the right action."
+msgstr ""
+"Este campo não é usado, ele somente te ajuda para selecionar a ação correta."
 
 #. module: base
 #: field:ir.actions.server,email:0
@@ -1555,7 +1749,7 @@ msgid "Email Address"
 msgstr "Endereço de E-mail"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "French (BE) / Français (BE)"
 msgstr "Frances(BE) / Frances(BE)"
 
@@ -1592,10 +1786,9 @@ msgid "Field Mappings"
 msgstr "Mapeando campos"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.res_request-closed
-#: model:ir.ui.menu,name:base.next_id_12_close
-msgid "My Closed Requests"
-msgstr "Minhas mensagens encerradas"
+#: view:base.language.export:0
+msgid "Export Translations"
+msgstr ""
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
@@ -1607,11 +1800,6 @@ msgstr "Customização"
 msgid "Paraguay"
 msgstr "Paraguai"
 
-#. module: base
-#: selection:ir.report.custom.fields,alignment:0
-msgid "left"
-msgstr "esquerda"
-
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_close
 msgid "ir.actions.act_window_close"
@@ -1627,6 +1815,28 @@ msgstr "Destino"
 msgid "Lithuania"
 msgstr "Lituânia"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_view_partner_clear_ids
+#: model:ir.model,name:base.model_partner_clear_ids
+#: view:partner.clear.ids:0
+msgid "Clear IDs"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,model:0
+msgid ""
+"Name of object whose function will be called when this scheduler will run. "
+"e.g. 'res.partener'"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:0
+#, python-format
+msgid ""
+"You Can Not Load Translation For language Due To Invalid Language/Country "
+"Code"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_PRINT_PREVIEW"
@@ -1638,10 +1848,9 @@ msgid "Slovenia"
 msgstr "Eslovênia"
 
 #. module: base
-#: view:res.partner.canal:0
-#: field:res.partner.event,canal_id:0
-msgid "Channel"
-msgstr "Canal"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-stock_format-default"
+msgstr ""
 
 #. module: base
 #: view:res.lang:0
@@ -1653,6 +1862,11 @@ msgstr "%p - Equivalente de cada uma das AM ou PM."
 msgid "Iteration Actions"
 msgstr "Ações de repetição"
 
+#. module: base
+#: help:multi_company.default,company_id:0
+msgid "Company where the user is connected"
+msgstr ""
+
 #. module: base
 #: field:maintenance.contract,date_stop:0
 msgid "Ending Date"
@@ -1678,16 +1892,6 @@ msgstr "Ilhas Norfolk"
 msgid "STOCK_MEDIA_PLAY"
 msgstr "STOCK_MEDIA_PLAY"
 
-#. module: base
-#: field:ir.rule,operator:0
-msgid "Operator"
-msgstr "Operador"
-
-#. module: base
-#: wizard_view:module.lang.install,start:0
-msgid "Installation Done"
-msgstr "Instalação concluída"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_OPEN"
@@ -1699,11 +1903,6 @@ msgstr "STOCK_OPEN"
 msgid "Client Action"
 msgstr "Ação de cliente"
 
-#. module: base
-#: selection:ir.report.custom.fields,alignment:0
-msgid "right"
-msgstr "direita"
-
 #. module: base
 #: model:res.country,name:base.bd
 msgid "Bangladesh"
@@ -1714,6 +1913,11 @@ msgstr "Bangladesh"
 msgid "Error! You can not create recursive companies."
 msgstr "Erro! Voce não pode criar empresas recursivas"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-go-home"
+msgstr ""
+
 #. module: base
 #: selection:maintenance.contract,state:0
 msgid "Valid"
@@ -1752,20 +1956,21 @@ msgid "Armenia"
 msgstr "Armênia"
 
 #. module: base
-#: view:ir.sequence:0
-msgid "Year with century: %(year)s"
-msgstr "Ano com 4 digitos: %(year)s"
-
-#. module: base
-#: selection:ir.report.custom,frequency:0
-msgid "Daily"
-msgstr "Diariamente"
+#: model:ir.actions.act_window,name:base.ir_property_form
+#: model:ir.ui.menu,name:base.menu_ir_property_form_all
+msgid "Configuration Parameters"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
 msgstr "Suécia"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-document-new"
+msgstr ""
+
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
 #: selection:ir.ui.view,type:0
@@ -1789,6 +1994,32 @@ msgstr "Tipo de Conta Bancaria"
 msgid "terp-project"
 msgstr "terp-project"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-personal+"
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-personal-"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,config_logo:0
+#: field:base.language.import,config_logo:0
+#: field:base.language.install,config_logo:0
+#: field:base.module.import,config_logo:0
+#: field:base.module.update,config_logo:0
+#: field:base.update.translations,config_logo:0
+#: field:ir.actions.configuration.wizard,config_logo:0
+#: field:ir.wizard.screen,config_logo:0
+#: field:res.config,config_logo:0
+#: field:res.config.installer,config_logo:0
+#: field:res.config.users,config_logo:0
+#: field:res.config.view,config_logo:0
+msgid "Image"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.server:0
 msgid "Iteration Action Configuration"
@@ -1799,18 +2030,36 @@ msgstr "Configuração da ação de iteração"
 msgid "Austria"
 msgstr "Austria"
 
+#. module: base
+#: selection:base.language.install,state:0
+#: selection:base.module.import,state:0
+#: selection:base.module.update,state:0
+msgid "done"
+msgstr ""
+
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: model:ir.ui.menu,name:base.menu_calendar_configuration
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Calendar"
 msgstr "Calendário"
 
+#. module: base
+#: field:res.partner.address,partner_id:0
+msgid "Partner Name"
+msgstr "Nome do Parceiro"
+
 #. module: base
 #: field:workflow.activity,signal_send:0
 msgid "Signal (subflow.*)"
 msgstr "Sinal (subfluxo.*)"
 
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_17
+msgid "HR sector"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
 msgid "Module dependency"
@@ -1827,9 +2076,11 @@ msgid "STOCK_JUSTIFY_CENTER"
 msgstr "STOCK_JUSTIFY_CENTER"
 
 #. module: base
-#: view:res.config.view:0
-msgid "Choose Your Mode"
-msgstr "Escolha seu modo"
+#: selection:res.config.users,view:0
+#: selection:res.config.view,view:0
+#: selection:res.users,view:0
+msgid "Extended"
+msgstr "Extendida"
 
 #. module: base
 #: field:res.company,rml_footer1:0
@@ -1843,7 +2094,6 @@ msgstr "Rodapé 2 do relatório"
 
 #. module: base
 #: view:ir.model.access:0
-#: model:ir.ui.menu,name:base.menu_security_access
 #: view:res.groups:0
 #: field:res.groups,model_access:0
 msgid "Access Controls"
@@ -1856,9 +2106,9 @@ msgid "Dependencies"
 msgstr "Dependências"
 
 #. module: base
-#: field:ir.report.custom.fields,bgcolor:0
-msgid "Background Color"
-msgstr "Cor de fundo"
+#: field:multi_company.default,company_id:0
+msgid "Main Company"
+msgstr "Empresa Principal"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -1881,9 +2131,11 @@ msgid "Contact Titles"
 msgstr "Tratamento para o contato"
 
 #. module: base
-#: model:ir.model,name:base.model_res_partner_som
-msgid "res.partner.som"
-msgstr "res.partner.som"
+#: view:base.language.import:0
+msgid ""
+"Please double-check that the file encoding is set to UTF-8 (sometimes called "
+"Unicode) when the translator exports it."
+msgstr ""
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_activity
@@ -1901,14 +2153,9 @@ msgid "Uruguay"
 msgstr "Uruguai"
 
 #. module: base
-#: view:res.partner.event:0
-msgid "Document Link"
-msgstr "Link do documento"
-
-#. module: base
-#: model:ir.model,name:base.model_res_partner_title
-msgid "res.partner.title"
-msgstr "res.partner.title"
+#: field:ir.rule,perm_write:0
+msgid "Apply For Write"
+msgstr "Aplicar para Leitura"
 
 #. module: base
 #: field:ir.sequence,prefix:0
@@ -1921,7 +2168,7 @@ msgid "Loop Action"
 msgstr "Ação de repetição"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "German / Deutsch"
 msgstr "Alemanha / Deutsch"
 
@@ -1941,9 +2188,9 @@ msgid "Sir"
 msgstr "Sr."
 
 #. module: base
-#: wizard_button:module.upgrade,next,start:0
-msgid "Start Upgrade"
-msgstr "Iniciar atualização"
+#: view:base.module.import:0
+msgid "Select module package to import (.zip file):"
+msgstr ""
 
 #. module: base
 #: field:ir.default,ref_id:0
@@ -1951,7 +2198,7 @@ msgid "ID Ref."
 msgstr "Ref. de ID"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "French / Français"
 msgstr "Francês / Français"
 
@@ -1967,23 +2214,18 @@ msgstr "Mapeamento de campos."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module
+#: view:ir.model.data:0
 #: field:ir.model.data,module:0
 #: view:ir.module.module:0
 #: field:ir.module.module.dependency,module_id:0
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "Module"
 msgstr "Módulo"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.action_res_bank_form
-#: model:ir.ui.menu,name:base.menu_action_res_bank_form
-msgid "Bank List"
-msgstr "Lista de Bancos"
-
 #. module: base
 #: field:ir.attachment,description:0
+#: view:ir.module.module:0
 #: field:ir.module.module,description:0
-#: view:res.partner:0
 #: field:res.partner.bank,name:0
 #: view:res.partner.event:0
 #: field:res.partner.event,description:0
@@ -1998,25 +2240,30 @@ msgid "Instances"
 msgstr "Instâncias"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_attachment
-msgid "ir.attachment"
-msgstr "ir.attachment"
+#: help:res.partner,employee:0
+msgid "Check this box if the partner is an Employee."
+msgstr ""
 
 #. module: base
-#: field:res.users,action_id:0
-msgid "Home Action"
-msgstr "Ação Inicial"
+#: field:ir.actions.report.xml,auto:0
+msgid "Custom python parser"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: base
+#: view:res.partner.canal:0
+msgid "Channel"
+msgstr "Canal"
 
 #. module: base
 #: field:res.lang,grouping:0
 msgid "Separator Format"
 msgstr "Formato do separador"
 
-#. module: base
-#: view:wizard.module.lang.export:0
-msgid "Export language"
-msgstr "Exportar idioma"
-
 #. module: base
 #: selection:maintenance.contract.wizard,state:0
 msgid "Unvalidated"
@@ -2028,8 +2275,9 @@ msgid "Database Structure"
 msgstr "Estrutura de Dados"
 
 #. module: base
-#: model:ir.actions.wizard,name:base.res_partner_mass_mailing_wizard
-#: wizard_view:res.partner.spam_send,init:0
+#: model:ir.actions.act_window,name:base.action_partner_mass_mail
+#: model:ir.model,name:base.model_partner_wizard_spam
+#: view:partner.wizard.spam:0
 msgid "Mass Mailing"
 msgstr "Email em Massa"
 
@@ -2038,11 +2286,6 @@ msgstr "Email em Massa"
 msgid "Mayotte"
 msgstr ""
 
-#. module: base
-#: wizard_view:module.lang.import,init:0
-msgid "You can also import .po files."
-msgstr "Voce tambem pode importar arquivos .po ."
-
 #. module: base
 #: code:addons/base/maintenance/maintenance.py:0
 #, python-format
@@ -2060,36 +2303,24 @@ msgstr "Especifique uma ação a ser disparada !"
 msgid "STOCK_JUSTIFY_RIGHT"
 msgstr "STOCK_JUSTIFY_RIGHT"
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_function
-msgid "Function of the contact"
-msgstr "Função para o contato"
-
-#. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree_upgrade
-#: model:ir.ui.menu,name:base.menu_module_tree_upgrade
-msgid "Modules to be installed, upgraded or removed"
-msgstr "Módulos a serem instalados, atualizados ou removidos"
-
 #. module: base
 #: view:res.payterm:0
 msgid "Payment Term"
 msgstr "Condições de Pagamento"
 
-#. module: base
-#: field:ir.report.custom,footer:0
-msgid "Report Footer"
-msgstr "Rodapé do relatório"
-
 #. module: base
 #: selection:res.lang,direction:0
 msgid "Right-to-Left"
 msgstr "Direita-para-esquerda"
 
 #. module: base
-#: wizard_view:module.lang.import,init:0
-msgid "Import language"
-msgstr "Importar idioma"
+#: view:ir.actions.act_window:0
+#: model:ir.actions.act_window,name:base.actions_ir_filters_view
+#: view:ir.filters:0
+#: model:ir.model,name:base.model_ir_filters
+#: model:ir.ui.menu,name:base.menu_ir_filters
+msgid "Filters"
+msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_cron_act
@@ -2099,12 +2330,17 @@ msgid "Scheduled Actions"
 msgstr "Ações Agendadas"
 
 #. module: base
-#: field:res.partner,title:0
 #: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
+#: field:res.widget,title:0
 msgid "Title"
 msgstr "Título"
 
+#. module: base
+#: help:ir.property,res_id:0
+msgid "If not set, acts as a default value for new resources"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_SAVE"
@@ -2121,6 +2357,14 @@ msgstr "terp-account"
 msgid "Recursion error in modules dependencies !"
 msgstr "Erro de recursão nas dependências dos módulos !"
 
+#. module: base
+#: view:base.language.install:0
+msgid ""
+"This wizard helps you add a new language to your OpenERP system. After "
+"loading a new language it becomes available as default interface language "
+"for users and partners."
+msgstr ""
+
 #. module: base
 #: view:ir.model:0
 msgid "Create a Menu"
@@ -2136,21 +2380,10 @@ msgstr ""
 "imposto. Usado para impostos oficiais."
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_module_category_tree
-#: model:ir.ui.menu,name:base.menu_action_module_category_tree
-msgid "Categories of Modules"
-msgstr "Categorias de Módulos"
-
-#. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Ukrainian / украї́нська мо́ва"
 msgstr "Ucrânia"
 
-#. module: base
-#: selection:ir.actions.todo,state:0
-msgid "Not Started"
-msgstr "Não Iniciado"
-
 #. module: base
 #: model:res.country,name:base.ru
 msgid "Russian Federation"
@@ -2161,21 +2394,38 @@ msgstr "Rússia"
 msgid "Company Name"
 msgstr "Nome da Empresa"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.action_res_roles_form
-#: model:ir.ui.menu,name:base.menu_action_res_roles_form
-#: view:res.roles:0
-#: view:res.users:0
-#: field:res.users,roles_id:0
-msgid "Roles"
-msgstr "Papéis"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country
 #: model:ir.ui.menu,name:base.menu_country_partner
 msgid "Countries"
 msgstr "Países"
 
+#. module: base
+#: selection:ir.translation,type:0
+msgid "RML  (deprecated - use Report)"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Registro de Regras"
+
+#. module: base
+#: view:ir.property:0
+msgid "Field Information"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Search Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_view_partner_wizard_ean_check
+#: view:partner.wizard.ean.check:0
+msgid "Ean check"
+msgstr ""
+
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2196,44 +2446,20 @@ msgstr "Erro ! voce não pode criar categorias recursivas."
 msgid "%x - Appropriate date representation."
 msgstr "%x - Representação apropriada para data."
 
-#. module: base
-#: help:ir.module.repository,filter:0
-msgid ""
-"Regexp to search module on the repository webpage:\n"
-"- The first parenthesis must match the name of the module.\n"
-"- The second parenthesis must match the whole version number.\n"
-"- The last parenthesis must match the extension of the module."
-msgstr ""
-"Expressão regular para pesquisar módulos no repositório:\n"
-"- O primeiro parenteses deve conter o nome do módulo.\n"
-"- O segundo parenteses deve conter um inteiro com o número da versão.\n"
-"- O último parenteses deve conter a extensão do módulo."
-
-#. module: base
-#: view:res.lang:0
-msgid "%M - Minute as a decimal number [00,59]."
-msgstr "%M - Minuto com dois decimais [00,59]."
-
 #. module: base
 #: model:res.country,name:base.tj
 msgid "Tajikistan"
 msgstr "Tajiquistão"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.act_values_form_action
-#: model:ir.ui.menu,name:base.menu_values_form_action
-msgid "Connect Actions To Client Events"
-msgstr "Conectar ações a eventos de clientes"
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-2 or later version"
 msgstr "GPL-2 ou versão superior"
 
 #. module: base
-#: selection:res.partner.event,type:0
-msgid "Prospect Contact"
-msgstr "Contato"
+#: model:res.partner.title,shortcut:base.res_partner_title_sir
+msgid "M."
+msgstr ""
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_wizard
@@ -2241,6 +2467,11 @@ msgstr "Contato"
 msgid "ir.actions.wizard"
 msgstr "ir.actions.wizard"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-mail-forward"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nr
 msgid "Nauru"
@@ -2254,6 +2485,7 @@ msgstr "ir.property"
 #. module: base
 #: selection:ir.actions.act_window,view_type:0
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Form"
@@ -2281,12 +2513,7 @@ msgid "Categories"
 msgstr "Categorias"
 
 #. module: base
-#: model:ir.actions.wizard,name:base.res_partner_send_sms_wizard
-#: wizard_button:res.partner.sms_send,init,send:0
-msgid "Send SMS"
-msgstr "Enviar SMS"
-
-#. module: base
+#: view:ir.module.module:0
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "To be upgraded"
@@ -2303,9 +2530,9 @@ msgid "terp-purchase"
 msgstr "terp-purchase"
 
 #. module: base
-#: wizard_field:module.module.update,init,repositories:0
-msgid "Repositories"
-msgstr "Repositórios"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-stock_effects-object-colorize"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.cf
@@ -2318,9 +2545,20 @@ msgid "Liechtenstein"
 msgstr "Suíça"
 
 #. module: base
-#: model:res.partner.title,name:base.res_partner_title_ltd
-msgid "Ltd"
-msgstr "Ltd"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-dolar_ok!"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_partner_sms_send
+#: view:partner.sms.send:0
+msgid "Send SMS"
+msgstr "Enviar SMS"
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Hindi / India"
+msgstr ""
 
 #. module: base
 #: field:res.partner,ean13:0
@@ -2347,6 +2585,17 @@ msgstr "Certificado de qualidade"
 msgid "6.  %d, %m         ==> 05, 12"
 msgstr "6.  %d, %m         ==> 05, 12"
 
+#. module: base
+#: field:res.config.users,date:0
+#: field:res.users,date:0
+msgid "Last Connection"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,help:0
+msgid "Action description"
+msgstr ""
+
 #. module: base
 #: help:res.partner,customer:0
 msgid "Check this box if the partner is a customer."
@@ -2361,9 +2610,10 @@ msgid "Languages"
 msgstr "Idiomas"
 
 #. module: base
-#: model:res.country,name:base.pw
-msgid "Palau"
-msgstr "Palau"
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:res.country,name:base.ec
@@ -2371,7 +2621,7 @@ msgid "Ecuador"
 msgstr "Equador"
 
 #. module: base
-#: code:addons/base/module/wizard/wizard_export_lang.py:0
+#: code:addons/base/module/wizard/base_export_language.py:0
 #, python-format
 msgid ""
 "Save this document to a .CSV file and open it with your favourite "
@@ -2384,6 +2634,8 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form
+#: model:ir.actions.act_window,name:base.action_partner_form
+#: model:ir.ui.menu,name:base.menu_partner_form
 #: view:res.partner:0
 msgid "Customers"
 msgstr "Clientes"
@@ -2403,7 +2655,7 @@ msgstr ""
 "serão impressos neste idioma. Se não, serão impressos em inglês."
 
 #. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "Menu :"
 msgstr "Menu :"
 
@@ -2413,9 +2665,9 @@ msgid "Base Field"
 msgstr "Campo Base"
 
 #. module: base
-#: wizard_view:module.module.update,update:0
-msgid "New modules"
-msgstr "Novos módulos"
+#: field:ir.actions.todo,restart:0
+msgid "Restart"
+msgstr ""
 
 #. module: base
 #: field:ir.actions.report.xml,report_sxw_content:0
@@ -2423,16 +2675,18 @@ msgstr "Novos módulos"
 msgid "SXW content"
 msgstr "Conteúdo SXW"
 
+#. module: base
+#: view:ir.actions.wizard:0
+#: field:wizard.ir.model.menu.create.line,wizard_id:0
+msgid "Wizard"
+msgstr "Assistente"
+
 #. module: base
 #: view:ir.cron:0
 msgid "Action to Trigger"
 msgstr "Ação a Disparar"
 
 #. module: base
-#: field:ir.report.custom.fields,fc0_operande:0
-#: field:ir.report.custom.fields,fc1_operande:0
-#: field:ir.report.custom.fields,fc2_operande:0
-#: field:ir.report.custom.fields,fc3_operande:0
 #: selection:ir.translation,type:0
 msgid "Constraint"
 msgstr "Restringir"
@@ -2444,23 +2698,32 @@ msgid "Default"
 msgstr "Padrão"
 
 #. module: base
+#: view:ir.model.fields:0
 #: field:ir.model.fields,required:0
 #: field:res.partner.bank.type.field,required:0
 msgid "Required"
 msgstr "Obrigatório"
 
 #. module: base
-#: field:ir.model.fields,domain:0
-#: field:ir.rule,domain:0
-#: field:res.partner.title,domain:0
-msgid "Domain"
-msgstr "Domínio"
+#: view:res.users:0
+msgid "Default Filters"
+msgstr ""
 
 #. module: base
 #: field:res.request.history,name:0
 msgid "Summary"
 msgstr "Sumário"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-mail-replied"
+msgstr ""
+
+#. module: base
+#: field:multi_company.default,expression:0
+msgid "Expression"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.server,subject:0
 msgid ""
@@ -2476,14 +2739,11 @@ msgid "Header/Footer"
 msgstr "Cabeçalho/Rodapé"
 
 #. module: base
-#: model:res.country,name:base.lb
-msgid "Lebanon"
-msgstr "Líbano"
-
-#. module: base
-#: wizard_field:module.lang.import,init,name:0
-msgid "Language name"
-msgstr "Nome do Idioma"
+#: help:ir.actions.act_window,help:0
+msgid ""
+"Optional help text for the users with a description of the target view, such "
+"as its usage and purpose."
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.va
@@ -2491,23 +2751,19 @@ msgid "Holy See (Vatican City State)"
 msgstr "Santa Sé (Vaticano)"
 
 #. module: base
-#: help:ir.actions.server,condition:0
-msgid ""
-"Condition that is to be tested before action is executed, e.g. "
-"object.list_price > object.cost_price"
-msgstr ""
-"Condição a ser testada antes da ação ser executada. Ex.: object.list_price > "
-"object.cost_price"
-
-#. module: base
-#: wizard_field:base.module.import,init,module_file:0
+#: field:base.module.import,module_file:0
 msgid "Module .ZIP file"
 msgstr "Arquivo de módulo .ZIP"
 
 #. module: base
-#: field:res.roles,child_id:0
-msgid "Children"
-msgstr "Filhos"
+#: field:ir.ui.view,xml_id:0
+msgid "XML ID"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_16
+msgid "Telecom sector"
+msgstr ""
 
 #. module: base
 #: field:workflow.transition,trigger_model:0
@@ -2515,17 +2771,12 @@ msgid "Trigger Object"
 msgstr "Objeto a disparar"
 
 #. module: base
-#: selection:ir.report.custom,state:0
-msgid "Subscribed"
-msgstr "Inscrito"
-
-#. module: base
-#: wizard_view:module.lang.install,init:0
-#: wizard_view:module.upgrade,next:0
-msgid "System Upgrade"
-msgstr "Atualização de Sistema"
+#: view:res.users:0
+msgid "Current Activity"
+msgstr ""
 
 #. module: base
+#: view:workflow.activity:0
 #: field:workflow.activity,in_transitions:0
 msgid "Incoming Transitions"
 msgstr "Transições de Entrada"
@@ -2536,11 +2787,9 @@ msgid "Suriname"
 msgstr "Suriname"
 
 #. module: base
-#: field:ir.values,key2:0
-#: view:res.partner.event.type:0
-#: field:res.partner.event.type,name:0
-msgid "Event Type"
-msgstr "Tipo de evento"
+#: model:ir.ui.menu,name:base.marketing_menu
+msgid "Marketing"
+msgstr ""
 
 #. module: base
 #: view:res.partner.bank:0
@@ -2563,27 +2812,21 @@ msgstr ""
 "Voce tenta atualizar um módulo que depende do módulo: %s. \n"
 "Mas este módulo não está disponível em seu sistema."
 
-#. module: base
-#: view:res.partner.address:0
-msgid "Partner Address"
-msgstr "Endereço do parceiro"
-
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
 msgstr "Licença"
 
-#. module: base
-#: code:addons/base/ir/ir_report_custom.py:0
-#, python-format
-msgid "Invalid operation"
-msgstr "Operação inválida"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_SAVE_AS"
 msgstr "STOCK_SAVE_AS"
 
+#. module: base
+#: selection:ir.actions.todo,restart:0
+msgid "Always"
+msgstr ""
+
 #. module: base
 #: selection:ir.translation,type:0
 msgid "SQL Constraint"
@@ -2594,6 +2837,13 @@ msgstr "Restrição de SQL"
 msgid "Model"
 msgstr "Modelo"
 
+#. module: base
+#: view:base.language.install:0
+msgid ""
+"The selected language has been successfully installed. You must change the "
+"preferences of the user and open a new menu to view the changes."
+msgstr ""
+
 #. module: base
 #: field:ir.actions.act_window.view,view_id:0
 #: field:ir.default,page:0
@@ -2613,15 +2863,20 @@ msgid "Equatorial Guinea"
 msgstr "Guiné Equatorial"
 
 #. module: base
-#: wizard_view:base.module.import,init:0
-msgid "Module Import"
-msgstr "Importar módulo"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-stage"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:0
-#, python-format
-msgid "You can not remove the field '%s' !"
-msgstr "Voce não pode remover o campo '%s' !"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gdu-smart-failing"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+#: model:ir.actions.act_window,name:base.action_view_base_module_import
+msgid "Module Import"
+msgstr "Importar módulo"
 
 #. module: base
 #: field:res.bank,zip:0
@@ -2631,6 +2886,7 @@ msgid "Zip"
 msgstr "CEP"
 
 #. module: base
+#: view:ir.module.module:0
 #: field:ir.module.module,author:0
 msgid "Author"
 msgstr "Autor"
@@ -2646,12 +2902,12 @@ msgid "STOCK_UNDELETE"
 msgstr "STOCK_UNDELETE"
 
 #. module: base
-#: view:res.lang:0
-msgid "%c - Appropriate date and time representation."
-msgstr "%c - representação adequada para Data e hora."
+#: selection:ir.ui.menu,icon:0
+msgid "STOCK_EXECUTE"
+msgstr "STOCK_EXECUTE"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Finland / Suomi"
 msgstr "Finlândia"
 
@@ -2660,6 +2916,11 @@ msgstr "Finlândia"
 msgid "Bolivia"
 msgstr "Bolívia"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-folder-orange"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.gh
 msgid "Ghana"
@@ -2671,9 +2932,9 @@ msgid "Direction"
 msgstr "Direção"
 
 #. module: base
-#: model:ir.model,name:base.model_wizard_module_update_translations
-msgid "wizard.module.update_translations"
-msgstr "wizard.module.update_translations"
+#: selection:base.language.install,lang:0
+msgid "Latvian / Latvia"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -2683,18 +2944,20 @@ msgstr "wizard.module.update_translations"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
-#: view:wizard.ir.model.menu.create:0
-#: field:wizard.ir.model.menu.create,view_ids:0
 msgid "Views"
 msgstr "Views"
 
 #. module: base
 #: view:res.groups:0
 #: field:res.groups,rule_groups:0
-#: field:res.users,rules_id:0
 msgid "Rules"
 msgstr "Regras"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Urdu / Pakistan"
+msgstr ""
+
 #. module: base
 #: code:addons/base/module/module.py:0
 #, python-format
@@ -2720,20 +2983,26 @@ msgstr "Guatemala"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_form
+#: model:ir.ui.menu,name:base.menu_low_workflow
 #: model:ir.ui.menu,name:base.menu_workflow
+#: model:ir.ui.menu,name:base.menu_workflow_root
 msgid "Workflows"
 msgstr "Workflows"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_config_wizard_form
-#: model:ir.ui.menu,name:base.menu_config_module
-msgid "Configuration Wizard"
-msgstr "Assistente de Configuração"
+#: model:ir.actions.act_window,name:base.action_config_user_form
+msgid "Create Users"
+msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_res_roles
-msgid "res.roles"
-msgstr "res.roles"
+#: view:ir.values:0
+msgid "tree_but_action, client_print_multi"
+msgstr "tree_but_action, client_print_multi"
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_retailers0
+msgid "Retailers"
+msgstr ""
 
 #. module: base
 #: help:ir.cron,priority:0
@@ -2745,36 +3014,46 @@ msgstr ""
 "10=Sem urgência"
 
 #. module: base
-#: view:res.users:0
+#: view:res.config:0
+#: view:res.config.installer:0
 msgid "Skip"
 msgstr "Saltar"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.res_request_link-act
-#: model:ir.ui.menu,name:base.menu_res_request_link_act
-msgid "Accepted Links in Requests"
-msgstr "Links aceitos nas mensagens"
-
 #. module: base
 #: model:res.country,name:base.ls
 msgid "Lesotho"
 msgstr "Lesoto"
 
+#. module: base
+#: code:addons/base/ir/ir_model.py:0
+#, python-format
+msgid "You can not remove the model '%s' !"
+msgstr "Você não pode remover este modelo '%s' !"
+
 #. module: base
 #: model:res.country,name:base.ke
 msgid "Kenya"
 msgstr "Quênia"
 
 #. module: base
-#: view:res.config.view:0
-msgid ""
-"Choose the simplified interface if you are testing OpenERP for the first "
-"time. Less used options or fields are automatically hidden. You will be able "
-"to change this, later, through the Administration menu."
+#: view:res.partner.event:0
+msgid "Event"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_custom_reports
+msgid "Custom Reports"
+msgstr ""
+
+#. module: base
+#: view:base.module.configuration:0
+msgid "System Configuration Done"
+msgstr ""
+
+#. module: base
+#: view:ir.property:0
+msgid "Generic"
 msgstr ""
-"Escolha a interface simplificada se voce esta testando o OpenERP pela "
-"primeira vez. Opções ou campos menos usados são automaticamente escondidos. "
-"Voce pode alterar isto mais tarde no menu Administração"
 
 #. module: base
 #: model:res.country,name:base.sm
@@ -2796,17 +3075,16 @@ msgstr "Perú"
 msgid "Set NULL"
 msgstr "Definir como NULL"
 
-#. module: base
-#: field:res.partner.event,som:0
-#: field:res.partner.som,name:0
-msgid "State of Mind"
-msgstr "Estado emocional"
-
 #. module: base
 #: model:res.country,name:base.bj
 msgid "Benin"
 msgstr ""
 
+#. module: base
+#: help:ir.sequence,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -2817,23 +3095,47 @@ msgstr "STOCK_CONNECT"
 msgid "Not Searchable"
 msgstr "Não pesquisável"
 
-#. module: base
-#: field:res.partner.event.type,key:0
-msgid "Key"
-msgstr "Chave"
-
-#. module: base
-#: field:ir.cron,nextcall:0
-msgid "Next Call Date"
-msgstr "Data da próxima chamada"
-
 #. module: base
 #: field:res.company,rml_header:0
 msgid "RML Header"
 msgstr "Cabeçalho RML"
 
 #. module: base
-#: wizard_field:res.partner.sms_send,init,app_id:0
+#: code:addons/base/module/module.py:0
+#, python-format
+msgid ""
+"Unable %s the module \"%s\" because an external dependencie is not met: %s' "
+"% (newstate, module.name, e.args[0])))\n"
+"            if not module.dependencies_id:\n"
+"                mdemo = module.demo\n"
+"            if module.state in states_to_update:\n"
+"                self.write(cr, uid, [module.id], {'state': newstate, "
+"'demo':mdemo})\n"
+"            demo = demo or mdemo\n"
+"        return demo\n"
+"\n"
+"    def button_install(self, cr, uid, ids, context={}):\n"
+"        return self.state_update(cr, uid, ids, 'to install', "
+"['uninstalled'], context)\n"
+"\n"
+"    def button_install_cancel(self, cr, uid, ids, context={}):\n"
+"        self.write(cr, uid, ids, {'state': 'uninstalled', 'demo':False})\n"
+"        return True\n"
+"\n"
+"    def button_uninstall(self, cr, uid, ids, context={}):\n"
+"        for module in self.browse(cr, uid, ids):\n"
+"            cr.execute('''select m.state,m.name\n"
+"                from\n"
+"                    ir_module_module_dependency d\n"
+"                join\n"
+"                    ir_module_module m on (d.module_id=m.id)\n"
+"                where\n"
+"                    d.name=%s and\n"
+"                    m.state not in ('uninstalled','uninstallable','to remove"
+msgstr ""
+
+#. module: base
+#: field:partner.sms.send,app_id:0
 msgid "API ID"
 msgstr "API ID"
 
@@ -2843,21 +3145,24 @@ msgid "Mauritius"
 msgstr ""
 
 #. module: base
-#: wizard_view:module.module.update,init:0
-msgid "Scan for new modules"
-msgstr "Procurando por novos módulos"
+#: view:ir.model.access:0
+#: view:ir.rule:0
+msgid "Full Access"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
+#: view:ir.actions.report.xml:0
+#: view:ir.actions.wizard:0
+#: view:ir.model.fields:0
 #: model:ir.ui.menu,name:base.menu_security
 msgid "Security"
 msgstr "Segurança"
 
 #. module: base
-#: code:addons/base/ir/ir_report_custom.py:0
-#, python-format
-msgid "Using a relation field which uses an unknown object"
-msgstr "Usando uma relação que usa um objeto desconhecido"
+#: model:res.widget,title:base.openerp_twitter_favorites
+msgid "OpenERP Favorites"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.za
@@ -2865,16 +3170,18 @@ msgid "South Africa"
 msgstr "África do Sul"
 
 #. module: base
-#: model:ir.model,name:base.model_wizard_module_lang_export
-msgid "wizard.module.lang.export"
-msgstr "wizard.module.lang.export"
-
-#. module: base
+#: view:ir.module.module:0
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "Installed"
 msgstr "Instalado"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_translation
+#: model:ir.ui.menu,name:base.menu_action_translation
+msgid "Translation Terms"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.sn
 msgid "Senegal"
@@ -2895,11 +3202,26 @@ msgstr "res.groups"
 msgid "Brazil"
 msgstr "Brasil"
 
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "Affero GPL-3"
+msgstr ""
+
 #. module: base
 #: field:ir.sequence,number_next:0
 msgid "Next Number"
 msgstr "Próximo numero"
 
+#. module: base
+#: help:workflow.transition,condition:0
+msgid "Expression to be satisfied if we want the transition done."
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gtk-media-pause"
+msgstr ""
+
 #. module: base
 #: view:res.currency:0
 #: field:res.currency,rate_ids:0
@@ -2907,7 +3229,7 @@ msgid "Rates"
 msgstr "Preços"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Albanian / Shqipëri"
 msgstr "Albânia"
 
@@ -2922,24 +3244,20 @@ msgid "======================================================"
 msgstr "======================================================"
 
 #. module: base
-#: field:ir.report.custom.fields,field_child2:0
-msgid "Field child2"
-msgstr "Campo filho2"
+#: help:ir.actions.server,mobile:0
+msgid ""
+"Provides fields that be used to fetch the mobile number, e.g. you select the "
+"invoice, then `object.invoice_address_id.mobile` is the field which gives "
+"the correct mobile number"
+msgstr ""
+"Define os campos que serão usados para capturar o número do celular, por "
+"exemplo: quando você seleciona a fatura, o campo que irá conter o número do "
+"celular é: 'object.invoice_address_id.mobile'"
 
 #. module: base
-#: field:ir.report.custom.fields,field_child3:0
-msgid "Field child3"
-msgstr "Campo filho3"
-
-#. module: base
-#: field:ir.report.custom.fields,field_child0:0
-msgid "Field child0"
-msgstr "Campo filho0"
-
-#. module: base
-#: field:ir.report.custom.fields,field_child1:0
-msgid "Field child1"
-msgstr "Campo filho 1"
+#: view:base.module.upgrade:0
+msgid "System update completed"
+msgstr "Atualização do Sistema Concluida"
 
 #. module: base
 #: field:ir.model.fields,selection:0
@@ -2952,6 +3270,7 @@ msgid "draft"
 msgstr "esboço"
 
 #. module: base
+#: selection:ir.property,type:0
 #: field:res.currency,date:0
 #: field:res.currency.rate,name:0
 #: field:res.partner,date:0
@@ -2967,25 +3286,22 @@ msgstr "endereço do SXW"
 
 #. module: base
 #: view:ir.attachment:0
-#: field:ir.attachment,datas:0
 msgid "Data"
 msgstr "Dados"
 
-#. module: base
-#: view:res.users:0
-msgid "Groups are used to defined access rights on each screen and menu."
-msgstr ""
-"Grupos são usados para definir direitos de acesso a cada tela e menu."
-
 #. module: base
 #: field:ir.ui.menu,parent_id:0
 #: field:wizard.ir.model.menu.create,menu_id:0
 msgid "Parent Menu"
 msgstr "Menu Superior(pai)"
 
+#. module: base
+#: field:ir.rule,perm_unlink:0
+msgid "Apply For Delete"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.act_window.view,multi:0
-#: help:ir.actions.report.custom,multi:0
 #: help:ir.actions.report.xml,multi:0
 msgid ""
 "If set to true, the action will not be displayed on the right toolbar of a "
@@ -2995,9 +3311,14 @@ msgstr ""
 "a direita."
 
 #. module: base
-#: model:ir.ui.menu,name:base.menu_custom_multicompany
-msgid "Multi company"
-msgstr "Multiplas Companhias"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gtk-go-back-rtl"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.al
+msgid "Albania"
+msgstr "Albânia"
 
 #. module: base
 #: view:ir.attachment:0
@@ -3027,10 +3348,15 @@ msgid "Mexico"
 msgstr "México"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Swedish / svenska"
 msgstr "Swedish / svenska"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_base_config_plugins
+msgid "Plugins"
+msgstr ""
+
 #. module: base
 #: field:res.company,child_ids:0
 msgid "Child Companies"
@@ -3052,17 +3378,17 @@ msgid "General Description"
 msgstr "Descrição geral"
 
 #. module: base
-#: selection:res.partner.event,type:0
-msgid "Sale Opportunity"
-msgstr "Oportunidade de venda"
+#: model:ir.actions.act_window,name:base.action_config_simple_view_form
+msgid "Configure Your Interface"
+msgstr ""
 
 #. module: base
-#: view:maintenance.contract.wizard:0
-msgid "Maintenance contract added !"
-msgstr "Contrato de manutenção adicionado !"
+#: field:ir.values,meta:0
+msgid "Meta Datas"
+msgstr "Meta-dados"
 
 #. module: base
-#: field:ir.rule,field_id:0
+#: field:ir.property,fields_id:0
 #: selection:ir.translation,type:0
 #: field:multi_company.default,field_id:0
 msgid "Field"
@@ -3073,6 +3399,11 @@ msgstr "Campo"
 msgid "Venezuela"
 msgstr "Venezuela"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Malayalam / India"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "9.  %j              ==> 340"
@@ -3083,12 +3414,6 @@ msgstr "9.  %j              ==> 340"
 msgid "Zambia"
 msgstr "Zâmbia"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.ir_action_report_xml
-#: model:ir.ui.menu,name:base.menu_ir_action_report_xml
-msgid "Report Xml"
-msgstr "Relatório XML"
-
 #. module: base
 #: help:res.partner,user_id:0
 msgid ""
@@ -3127,24 +3452,33 @@ msgstr "Cazaquistão"
 #: field:ir.module.category,name:0
 #: field:ir.module.module,name:0
 #: field:ir.module.module.dependency,name:0
-#: rml:ir.module.reference:0
-#: field:ir.module.repository,name:0
+#: report:ir.module.reference.graph:0
 #: field:ir.property,name:0
-#: field:ir.report.custom.fields,name:0
+#: field:ir.rule,name:0
+#: field:ir.sequence,name:0
+#: field:ir.sequence.type,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
+#: field:multi_company.default,name:0
 #: field:res.bank,name:0
 #: field:res.config.view,name:0
 #: field:res.lang,name:0
 #: field:res.partner,name:0
 #: field:res.partner.bank.type,name:0
+#: view:res.partner.event:0
 #: field:res.request.link,name:0
-#: field:res.users,name:0
 #: field:workflow,name:0
 #: field:workflow.activity,name:0
 msgid "Name"
 msgstr "Nome"
 
+#. module: base
+#: help:ir.actions.act_window,multi:0
+msgid ""
+"If set to true, the action will not be displayed on the right toolbar of a "
+"form view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ms
 msgid "Montserrat"
@@ -3156,9 +3490,12 @@ msgid "Application Terms"
 msgstr "Condições de inscrição"
 
 #. module: base
-#: selection:ir.report.custom.fields,operation:0
-msgid "Calculate Average"
-msgstr "Calcular média"
+#: help:res.config.users,context_tz:0
+#: help:res.users,context_tz:0
+msgid ""
+"The user's timezone, used to perform timezone conversions between the server "
+"and the client."
+msgstr ""
 
 #. module: base
 #: field:ir.module.module,demo:0
@@ -3166,7 +3503,7 @@ msgid "Demo data"
 msgstr "Base de dados de demonstração"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "English (UK)"
 msgstr "Inglês (GB)"
 
@@ -3175,41 +3512,38 @@ msgstr "Inglês (GB)"
 msgid "Antarctica"
 msgstr "Antártida"
 
+#. module: base
+#: help:workflow.transition,act_from:0
+msgid ""
+"Source activity. When this activity is over, the condition is tested to "
+"determine if we can start the ACT_TO activity."
+msgstr ""
+
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_3
 msgid "Starter Partner"
 msgstr "Parceiro Inicial"
 
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Your system will be updated."
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_view
 msgid "ir.actions.act_window.view"
 msgstr "ir.actions.act_window.view"
 
 #. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "Web"
 msgstr "Web"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "English (CA)"
 msgstr "Inglês (CA)"
 
-#. module: base
-#: field:res.partner.event,planned_revenue:0
-msgid "Planned Revenue"
-msgstr "Receita Planejada"
-
-#. module: base
-#: wizard_view:module.lang.import,init:0
-msgid ""
-"You have to import a .CSV file wich is encoded in UTF-8.  Please check that "
-"the first line of your file is one of the following:"
-msgstr ""
-"Voce pode importar um arquivo .CSV com codificação UTF-8. Por favor "
-"verifique se a primeira linha de seu arquivo contem uma das seguintes "
-"situações:"
-
 #. module: base
 #: model:res.country,name:base.et
 msgid "Ethiopia"
@@ -3221,9 +3555,9 @@ msgid "%H - Hour (24-hour clock) as a decimal number [00,23]."
 msgstr "%H - Hora (relógio de 24 horas) [00,23]."
 
 #. module: base
-#: view:res.roles:0
-msgid "Role"
-msgstr "Papel"
+#: view:res.lang:0
+msgid "%M - Minute as a decimal number [00,59]."
+msgstr "%M - Minuto com dois decimais [00,59]."
 
 #. module: base
 #: help:res.country.state,code:0
@@ -3236,25 +3570,34 @@ msgid "Svalbard and Jan Mayen Islands"
 msgstr "Ilhas Svalbard e Jan Mayen"
 
 #. module: base
-#: view:ir.rule:0
-msgid "Test"
-msgstr "Teste"
+#: model:ir.ui.menu,name:base.menu_view_base_module_update
+msgid " Update Modules List"
+msgstr ""
 
 #. module: base
-#: field:ir.report.custom.fields,groupby:0
+#: view:ir.actions.act_window:0
+#: view:ir.actions.report.xml:0
+#: view:ir.actions.server:0
+#: view:ir.filters:0
+#: view:res.request:0
 msgid "Group By"
 msgstr "Agrupar Por"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:0
-#, python-format
-msgid ""
-"'%s' contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+#: view:res.config:0
+#: view:res.config.installer:0
+msgid "title"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_language_install
+msgid "Install Language"
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Translation"
 msgstr ""
-"'%s' contem muitos pontos. Identificações XML não devem conter ponto final! "
-"Estes devem ser utilizados para referência a dados de outros módulos como "
-"em: module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -3272,7 +3615,7 @@ msgid "closed"
 msgstr "fechado"
 
 #. module: base
-#: selection:wizard.module.lang.export,state:0
+#: selection:base.language.export,state:0
 msgid "get"
 msgstr "obter"
 
@@ -3286,15 +3629,26 @@ msgstr "propriedade \"on delete\" para campos \"many2one\""
 msgid "Write Id"
 msgstr "ID de Gravação"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_product
+msgid "Products"
+msgstr "Produtos"
+
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-accessories-archiver-minus"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.act_window,domain:0
+#: field:ir.filters,domain:0
 msgid "Domain Value"
 msgstr "Valor do domínio"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
-msgid "STOCK_ITALIC"
-msgstr "STOCK_ITALIC"
+msgid "STOCK_REDO"
+msgstr "STOCK_REDO"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -3324,12 +3678,6 @@ msgstr "Tipo de banco"
 msgid "The name of the group can not start with \"-\""
 msgstr "Nome do grupo não pode iniciar com \"-\""
 
-#. module: base
-#: wizard_view:module.upgrade,end:0
-#: wizard_view:module.upgrade,start:0
-msgid "We suggest you to reload the menu tab (Ctrl+t Ctrl+r)."
-msgstr "Nós sugerimos recarregar o menu (Ctrl+t Ctrl+r)."
-
 #. module: base
 #: view:ir.ui.view_sc:0
 #: field:res.partner.title,shortcut:0
@@ -3342,15 +3690,15 @@ msgid "Init Date"
 msgstr "Data Inicial"
 
 #. module: base
+#: view:workflow.activity:0
 #: field:workflow.activity,flow_start:0
 msgid "Flow Start"
 msgstr "Iniciar fluxo"
 
 #. module: base
-#: view:ir.model:0
-#: view:ir.model.fields:0
-msgid "Security on Groups"
-msgstr "Segurança nos grupos"
+#: model:ir.model,name:base.model_res_partner_title
+msgid "res.partner.title"
+msgstr "res.partner.title"
 
 #. module: base
 #: view:res.partner.bank:0
@@ -3359,11 +3707,11 @@ msgstr "Titular da conta bancária"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_values_form
-#: model:ir.ui.menu,name:base.menu_values_form
 msgid "Client Actions Connections"
 msgstr "Conexões de ações de cliente"
 
 #. module: base
+#: field:ir.attachment,res_name:0
 #: field:ir.ui.view_sc,resource:0
 msgid "Resource Name"
 msgstr "Nome do Recurso"
@@ -3379,18 +3727,26 @@ msgid "Guadeloupe (French)"
 msgstr ""
 
 #. module: base
-#: field:ir.report.custom.fields,cumulate:0
-msgid "Accumulate"
-msgstr "Acumulado"
-
-#. module: base
-#: code:addons/base/ir/ir_report_custom.py:0
+#: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "Tree can only be used in tabular reports"
-msgstr "Visão em arvore, somente pode ser usada em relatórios tabulares"
+msgid "User Error"
+msgstr ""
 
 #. module: base
-#: rml:ir.module.reference:0
+#: help:workflow.transition,signal:0
+msgid ""
+"When the operation of transition comes from a button pressed in the client "
+"form, signal tests the name of the pressed button. If signal is NULL, no "
+"button is necessary to validate this transition."
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,object_id:0
+msgid "Object affected by this rule"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference.graph:0
 msgid "Directory"
 msgstr "Diretório"
 
@@ -3400,19 +3756,14 @@ msgid "Menu Name"
 msgstr "Nome do Menu"
 
 #. module: base
-#: field:ir.report.custom,title:0
-msgid "Report Title"
-msgstr "Título do Relatório"
+#: view:ir.module.module:0
+msgid "Author Website"
+msgstr ""
 
 #. module: base
-#: field:ir.report.custom.fields,fontcolor:0
-msgid "Font color"
-msgstr "Cor da Fonte"
-
-#. module: base
-#: selection:ir.ui.menu,icon:0
-msgid "STOCK_SORT_DESCENDING"
-msgstr "STOCK_SORT_DESCENDING"
+#: view:ir.attachment:0
+msgid "Month"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.my
@@ -3420,9 +3771,10 @@ msgid "Malaysia"
 msgstr "Malásia"
 
 #. module: base
-#: model:ir.model,name:base.model_res_request_history
-msgid "res.request.history"
-msgstr "res.request.history"
+#: view:base.language.install:0
+#: model:ir.actions.act_window,name:base.action_view_base_language_install
+msgid "Load Official Translation"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.server:0
@@ -3430,15 +3782,18 @@ msgid "Client Action Configuration"
 msgstr "Configuração de ação"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_partner_address_form
 #: model:ir.model,name:base.model_res_partner_address
-#: model:ir.ui.menu,name:base.menu_partner_address_form
 #: view:res.partner.address:0
 msgid "Partner Addresses"
 msgstr "Endereços do parceiro"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gtk-stop"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
 msgid "Indonesian / Bahasa Indonesia"
 msgstr ""
 
@@ -3464,12 +3819,6 @@ msgstr ""
 msgid "Events"
 msgstr "Eventos"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.action_res_roles
-#: model:ir.ui.menu,name:base.menu_action_res_roles
-msgid "Roles Structure"
-msgstr "Extrutura dos papeis"
-
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_url
 #: selection:ir.ui.menu,action:0
@@ -3493,20 +3842,37 @@ msgid "Partner Contacts"
 msgstr "Contatos do Parceiro"
 
 #. module: base
-#: wizard_field:module.module.update,update,add:0
+#: field:base.module.update,add:0
 msgid "Number of modules added"
 msgstr "Numero de módulos adicionados"
 
 #. module: base
-#: field:workflow.transition,role_id:0
-msgid "Role Required"
-msgstr "Papel requerido"
+#: view:res.currency:0
+msgid "Price Accuracy"
+msgstr ""
+
+#. module: base
+#: view:res.config:0
+#: view:res.config.installer:0
+msgid "vsep"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.server,name:base.action_start_configurator
+#: model:ir.ui.menu,name:base.menu_view_base_module_configuration
+msgid "Start Configuration"
+msgstr ""
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Menus"
 msgstr "Menus criados"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-idea"
+msgstr ""
+
 #. module: base
 #: field:workflow.triggers,workitem_id:0
 msgid "Workitem"
@@ -3529,6 +3895,7 @@ msgstr "STOCK_ZOOM_OUT"
 #: field:ir.ui.menu,action:0
 #: field:ir.values,action_id:0
 #: selection:ir.values,key:0
+#: view:res.users:0
 msgid "Action"
 msgstr "Ação"
 
@@ -3542,6 +3909,16 @@ msgstr "Configuração de Email"
 msgid "ir.cron"
 msgstr "ir.cron"
 
+#. module: base
+#: view:ir.rule:0
+msgid "Combination of rules"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Current Year without Century: %(y)s"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "terp-mrp"
@@ -3572,11 +3949,6 @@ msgstr "Sudão"
 msgid "%m - Month as a decimal number [01,12]."
 msgstr "%m - Mes com dois decimais [01,12]."
 
-#. module: base
-#: view:wizard.module.lang.export:0
-msgid "Export Data"
-msgstr "Exportar Dados"
-
 #. module: base
 #: model:res.country,name:base.fm
 msgid "Micronesia"
@@ -3594,36 +3966,49 @@ msgstr "Histórico das mensagens"
 msgid "Menus"
 msgstr "Menus"
 
+#. module: base
+#: selection:ir.module.module.dependency,state:0
+msgid "Uninstallable"
+msgstr "Não instalado"
+
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "STOCK_SORT_DESCENDING"
+msgstr "STOCK_SORT_DESCENDING"
+
 #. module: base
 #: model:res.country,name:base.il
 msgid "Israel"
 msgstr "Israel"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-stock_symbol-selection"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_maintenance_contract_form
+#: model:ir.ui.menu,name:base.menu_maintenance_contract
+msgid "Maintenance Contracts"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.wizard,name:base.wizard_server_action_create
 msgid "Create Action"
 msgstr "Criar Ação"
 
 #. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "HTML from HTML"
-msgstr "HTML de HTML"
-
-#. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "html"
-msgstr "html"
+#: model:ir.actions.act_window,name:base.action_model_model
+#: model:ir.model,name:base.model_ir_model
+#: model:ir.ui.menu,name:base.ir_model_model_menu
+msgid "Objects"
+msgstr "Objetos"
 
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
 msgstr "Formato da Hora"
 
-#. module: base
-#: wizard_view:module.upgrade,next:0
-msgid "Your system will be upgraded."
-msgstr "Seu sistema foi atualizado."
-
 #. module: base
 #: view:ir.module.module:0
 msgid "Defined Reports"
@@ -3640,15 +4025,17 @@ msgid "Report xml"
 msgstr "Relatório xml"
 
 #. module: base
+#: field:base.language.export,modules:0
 #: model:ir.actions.act_window,name:base.action_module_open_categ
 #: model:ir.actions.act_window,name:base.open_module_tree
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.menu_management
 #: model:ir.ui.menu,name:base.menu_module_tree
-#: field:wizard.module.lang.export,modules:0
 msgid "Modules"
 msgstr "Módulos"
 
 #. module: base
+#: view:workflow.activity:0
 #: selection:workflow.activity,kind:0
 #: field:workflow.activity,subflow_id:0
 #: field:workflow.workitem,subflow_id:0
@@ -3666,11 +4053,18 @@ msgid "Signal (button Name)"
 msgstr "Sinal (Nome do botão)"
 
 #. module: base
+#: model:ir.actions.act_window,name:base.action_res_bank_form
+#: model:ir.ui.menu,name:base.menu_action_res_bank_form
 #: view:res.bank:0
 #: field:res.partner,bank_ids:0
 msgid "Banks"
 msgstr "Bancos"
 
+#. module: base
+#: view:res.log:0
+msgid "Unread"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "terp-sale"
@@ -3687,7 +4081,7 @@ msgid "%I - Hour (12-hour clock) as a decimal number [01,12]."
 msgstr "%I - Hora (relógio de 12 horas) com 2 decimais [01,12]."
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Romanian / limba română"
 msgstr "Romanian / limba română"
 
@@ -3723,9 +4117,11 @@ msgid "United Kingdom"
 msgstr "Reino Unido"
 
 #. module: base
-#: view:ir.actions.server:0
-msgid "Create / Write"
-msgstr "Criar / Gravar"
+#: view:res.config:0
+#: view:res.config.users:0
+#: view:res.config.view:0
+msgid "res_config_contents"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -3733,7 +4129,7 @@ msgid "The active field allows you to hide the category without removing it."
 msgstr "O campo ativo permite esconder a categoria sem removê-la."
 
 #. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "Object:"
 msgstr "Objeto:"
 
@@ -3749,21 +4145,16 @@ msgstr "Botsuana (ou Botswana)"
 msgid "Partner Titles"
 msgstr "Tratamentos para Parceiros"
 
-#. module: base
-#: selection:ir.actions.todo,type:0
-msgid "Service"
-msgstr "Serviço"
-
 #. module: base
 #: help:ir.actions.act_window,auto_refresh:0
 msgid "Add an auto-refresh on the view"
 msgstr "Incluir recarregamento automático dos dados"
 
 #. module: base
-#: wizard_view:module.upgrade,next:0
-#: wizard_field:module.upgrade,next,module_download:0
-msgid "Modules to download"
-msgstr "Módulos para donwload"
+#: field:ir.actions.report.xml,report_rml_content:0
+#: field:ir.actions.report.xml,report_rml_content_data:0
+msgid "RML content"
+msgstr "Conteúdo RML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_workitem_form
@@ -3772,12 +4163,22 @@ msgid "Workitems"
 msgstr "Itens de trabalho"
 
 #. module: base
-#: field:wizard.module.lang.export,advice:0
+#: field:base.language.export,advice:0
 msgid "Advice"
 msgstr "Advertência"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: model:ir.model,name:base.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
+#. module: base
+#: view:base.language.import:0
+msgid "- module,type,name,res_id,src,value"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
 msgid "Lithuanian / Lietuvių kalba"
 msgstr "Lithuanian / Lietuvių kalba"
 
@@ -3796,15 +4197,42 @@ msgid "Inherited View"
 msgstr "View herdada"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: view:ir.translation:0
+msgid "Source Term"
+msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree_install
-#: model:ir.ui.menu,name:base.menu_module_tree_install
-msgid "Installed modules"
-msgstr "Módulos instalados"
+#: model:ir.ui.menu,name:base.menu_main_pm
+msgid "Project"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+msgid "Module file successfully imported!"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: base
+#: view:partner.clear.ids:0
+msgid "Want to Clear Ids ? "
+msgstr ""
+
+#. module: base
+#: selection:res.request,priority:0
+msgid "Low"
+msgstr "Baixo"
+
+#. module: base
+#: field:res.partner,customer:0
+#: view:res.partner.address:0
+#: field:res.partner.address,is_customer_add:0
+#: model:res.partner.category,name:base.res_partner_category_0
+msgid "Customer"
+msgstr "Cliente"
 
 #. module: base
 #: model:res.country,name:base.lc
@@ -3823,16 +4251,9 @@ msgid "Select the object from the model on which the workflow will executed."
 msgstr "Selecione o objeto do modelo sobre o qual o workflow será executado."
 
 #. module: base
-#: field:ir.model,state:0
-#: field:ir.model.fields,state:0
-#: field:ir.model.grid,state:0
-msgid "Manually Created"
-msgstr "Criado manualmente"
-
-#. module: base
-#: selection:ir.report.custom.fields,operation:0
-msgid "Calculate Count"
-msgstr "Calculo da Quantidade"
+#: field:res.partner,employee:0
+msgid "Employee"
+msgstr ""
 
 #. module: base
 #: field:ir.model.access,perm_create:0
@@ -3844,11 +4265,33 @@ msgstr "Criar Acesso"
 msgid "Fed. State"
 msgstr "Estado(UF)"
 
+#. module: base
+#: field:ir.actions.server,copy_object:0
+msgid "Copy Of"
+msgstr ""
+
+#. module: base
+#: field:ir.model,osv_memory:0
+msgid "In-memory model"
+msgstr ""
+
+#. module: base
+#: view:partner.clear.ids:0
+msgid "Clear Ids"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.io
 msgid "British Indian Ocean Territory"
 msgstr "Território britânico do Oceano Índico"
 
+#. module: base
+#: field:res.config.users,view:0
+#: field:res.config.view,view:0
+#: field:res.users,view:0
+msgid "Interface"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.server:0
 msgid "Field Mapping"
@@ -3881,6 +4324,7 @@ msgid "Left-to-Right"
 msgstr "esquerda-para-direita"
 
 #. module: base
+#: view:res.lang:0
 #: field:res.lang,translatable:0
 msgid "Translatable"
 msgstr "Traduzível"
@@ -3891,29 +4335,47 @@ msgid "Vietnam"
 msgstr "Vietnã"
 
 #. module: base
+#: field:res.config.users,signature:0
+#: view:res.users:0
 #: field:res.users,signature:0
 msgid "Signature"
 msgstr "Assinatura"
 
+#. module: base
+#: model:ir.model,name:base.model_res_widget_user
+msgid "res.widget.user"
+msgstr ""
+
 #. module: base
 #: field:res.partner.category,complete_name:0
 msgid "Full Name"
 msgstr "Nome completo"
 
+#. module: base
+#: view:base.module.configuration:0
+msgid "_Ok"
+msgstr ""
+
+#. module: base
+#: help:ir.filters,user_id:0
+msgid "False means for every user"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.mz
 msgid "Mozambique"
 msgstr "Moçambique"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.grant_menu_access
-#: model:ir.ui.menu,name:base.menu_grant_menu_access
-msgid "Manage Menus"
-msgstr "Gerenciar Menus"
+#: model:ir.ui.menu,name:base.menu_project_long_term
+msgid "Long Term Planning"
+msgstr ""
 
 #. module: base
 #: field:ir.actions.server,message:0
-#: wizard_field:res.partner.spam_send,init,text:0
+#: view:partner.sms.send:0
+#: field:partner.wizard.spam,text:0
+#: field:res.log,name:0
 msgid "Message"
 msgstr "Mensagem"
 
@@ -3923,7 +4385,12 @@ msgid "On Multiple Doc."
 msgstr "Em múltiplos Docs."
 
 #. module: base
-#: model:ir.ui.menu,name:base.menu_base_config_contact
+#: view:res.partner:0
+#: field:res.partner,user_id:0
+msgid "Salesman"
+msgstr "Representante"
+
+#. module: base
 #: field:res.partner,address:0
 #: view:res.partner.address:0
 msgid "Contacts"
@@ -3935,8 +4402,17 @@ msgid "Faroe Islands"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.wizard,name:base.wizard_upgrade
-#: model:ir.ui.menu,name:base.menu_wizard_upgrade
+#: code:addons/base/res/res_user.py:0
+#, python-format
+msgid ""
+"\"email_from\" needs to be set to send welcome mails '\n"
+"                  'to users"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+#: model:ir.actions.act_window,name:base.action_view_base_module_upgrade_window
+#: model:ir.ui.menu,name:base.menu_view_base_module_upgrade
 msgid "Apply Scheduled Upgrades"
 msgstr "Aplicar atualizações agendadas"
 
@@ -3945,26 +4421,38 @@ msgstr "Aplicar atualizações agendadas"
 msgid "Maintenance"
 msgstr "Manutenção"
 
+#. module: base
+#: view:res.widget:0
+msgid "Widgets"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.mp
 msgid "Northern Mariana Islands"
 msgstr "Ilhas Marianas do Norte"
 
 #. module: base
-#: wizard_view:module.lang.import,init:0
-msgid "module,type,name,res_id,src,value"
-msgstr "module,type,name,res_id,src,value"
+#: selection:ir.property,type:0
+msgid "Integer"
+msgstr ""
 
 #. module: base
-#: model:ir.ui.menu,name:base.menu_management
-msgid "Modules Management"
-msgstr "Administração de módulos"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-mail-"
+msgstr ""
 
 #. module: base
-#: rml:ir.module.reference:0
-#: field:maintenance.contract.module,version:0
-msgid "Version"
-msgstr "Versão"
+#: help:ir.actions.report.xml,report_rml:0
+msgid ""
+"The path to the main report file (depending on Report Type) or NULL if the "
+"content is in another data field"
+msgstr ""
+
+#. module: base
+#: help:res.config.users,company_id:0
+#: help:res.users,company_id:0
+msgid "The company this user is currently working for."
+msgstr ""
 
 #. module: base
 #: model:ir.model,name:base.model_wizard_ir_model_menu_create
@@ -3977,20 +4465,25 @@ msgid "Transition"
 msgstr "Transição"
 
 #. module: base
-#: field:ir.actions.todo,active:0
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gtk-select-all"
+msgstr ""
+
+#. module: base
 #: field:ir.cron,active:0
-#: field:ir.module.repository,active:0
 #: field:ir.sequence,active:0
 #: field:res.bank,active:0
+#: field:res.config.users,active:0
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
 #: field:res.partner.address,active:0
 #: field:res.partner.canal,active:0
 #: field:res.partner.category,active:0
-#: field:res.partner.event.type,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
+#: view:workflow.instance:0
+#: view:workflow.workitem:0
 msgid "Active"
 msgstr "Ativo"
 
@@ -4009,17 +4502,13 @@ msgstr "Mongólia"
 #: code:addons/base/ir/ir_model.py:0
 #: code:addons/base/maintenance/maintenance.py:0
 #: code:addons/base/module/module.py:0
+#: code:addons/base/res/res_config.py:0
 #: code:addons/base/res/res_currency.py:0
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid "Error"
 msgstr "Erro"
 
-#. module: base
-#: view:res.partner.som:0
-msgid "Partner State of Mind"
-msgstr "Estado emocional do parceiro"
-
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "mdx"
@@ -4031,20 +4520,30 @@ msgid "Burundi"
 msgstr "Burundi"
 
 #. module: base
-#: wizard_button:base.module.import,import,open_window:0
-#: wizard_button:module.upgrade,end,end:0
-#: wizard_button:module.upgrade,start,end:0
+#: view:base.language.install:0
+#: view:base.module.import:0
+#: view:base.module.update:0
+#: view:res.request:0
 #: wizard_button:server.action.create,init,end:0
 #: wizard_button:server.action.create,step_1,end:0
-#: view:wizard.module.lang.export:0
 msgid "Close"
 msgstr "Fechar"
 
+#. module: base
+#: view:res.log:0
+msgid "My Logs"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.bt
 msgid "Bhutan"
 msgstr "Butão"
 
+#. module: base
+#: help:ir.sequence,number_next:0
+msgid "Next number of this sequence"
+msgstr ""
+
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_11
 msgid "Textile Suppliers"
@@ -4056,7 +4555,12 @@ msgid "This Window"
 msgstr "Esta janela"
 
 #. module: base
-#: field:wizard.module.lang.export,format:0
+#: help:res.log,name:0
+msgid "The logging message."
+msgstr ""
+
+#. module: base
+#: field:base.language.export,format:0
 msgid "File Format"
 msgstr "Formato do arquivo"
 
@@ -4070,6 +4574,12 @@ msgstr "Código ISO"
 msgid "res.config.view"
 msgstr "res.config.view"
 
+#. module: base
+#: view:res.log:0
+#: field:res.log,read:0
+msgid "Read"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_INDENT"
@@ -4086,10 +4596,10 @@ msgid "Saint Vincent & Grenadines"
 msgstr "Saint Vincent & Grenadines"
 
 #. module: base
-#: field:ir.model.config,password:0
 #: field:maintenance.contract,password:0
 #: field:maintenance.contract.wizard,password:0
-#: wizard_field:res.partner.sms_send,init,password:0
+#: field:partner.sms.send,password:0
+#: field:res.config.users,password:0
 #: field:res.users,password:0
 msgid "Password"
 msgstr "Senha"
@@ -4100,45 +4610,55 @@ msgstr "Senha"
 #: field:ir.model,field_id:0
 #: model:ir.model,name:base.model_ir_model_fields
 #: view:ir.model.fields:0
-#: field:ir.model.grid,field_id:0
-#: field:ir.property,fields_id:0
-#: field:ir.report.custom,fields_child0:0
 #: model:ir.ui.menu,name:base.ir_model_model_fields
 msgid "Fields"
 msgstr "Campos"
 
 #. module: base
-#: wizard_view:base.module.import,import:0
-msgid "Module successfully imported !"
-msgstr "Módulo importado!"
+#: model:ir.actions.act_window,name:base.action_partner_employee_form
+msgid "Employees"
+msgstr "Colaboradores"
+
+#. module: base
+#: help:res.log,read:0
+msgid ""
+"If this log item has been read, get() should not send it to the client"
+msgstr ""
 
 #. module: base
 #: field:res.company,rml_header2:0
+#: field:res.company,rml_header3:0
 msgid "RML Internal Header"
 msgstr "Cabeçalho RML interno"
 
-#. module: base
-#: selection:ir.report.custom,print_format:0
-msgid "a4"
-msgstr "a4"
-
 #. module: base
 #: field:ir.actions.act_window,search_view_id:0
 msgid "Search View Ref."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,installed_version:0
+msgid "Latest version"
+msgstr "Última verão"
+
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
 msgstr "acc_number"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_address_form
+#: model:ir.ui.menu,name:base.menu_partner_address_form
+msgid "Addresses"
+msgstr "Endereços"
+
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
 msgstr "Mianmar"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Chinese (CN) / 简体中文"
 msgstr "Chinese (CN) / 简体中文"
 
@@ -4159,11 +4679,6 @@ msgstr "Rua"
 msgid "Yugoslavia"
 msgstr "Iugoslávia"
 
-#. module: base
-#: wizard_view:module.upgrade,next:0
-msgid "Note that this operation my take a few minutes."
-msgstr "Esta operação pode demorar alguns minutos."
-
 #. module: base
 #: field:ir.model.data,name:0
 msgid "XML Identifier"
@@ -4175,9 +4690,9 @@ msgid "Canada"
 msgstr "Canadá"
 
 #. module: base
-#: field:ir.actions.report.xml,report_name:0
-msgid "Internal Name"
-msgstr "Nome Interno"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-rating-rated"
+msgstr ""
 
 #. module: base
 #: selection:ir.module.module.dependency,state:0
@@ -4195,15 +4710,10 @@ msgid "Invalid model name in the action definition."
 msgstr "Nome do modelo inválido na definição da ação."
 
 #. module: base
-#: wizard_field:res.partner.sms_send,init,text:0
+#: field:partner.sms.send,text:0
 msgid "SMS Message"
 msgstr "Mensagem SMS"
 
-#. module: base
-#: selection:ir.ui.menu,icon:0
-msgid "STOCK_EDIT"
-msgstr "STOCK_EDIT"
-
 #. module: base
 #: model:res.country,name:base.cm
 msgid "Cameroon"
@@ -4229,24 +4739,22 @@ msgstr "Ignorado"
 msgid "Custom Field"
 msgstr "Customizar campo"
 
+#. module: base
+#: field:ir.module.module,web:0
+msgid "Has a web component"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.cc
 msgid "Cocos (Keeling) Islands"
 msgstr "Ilhas Cocos"
 
 #. module: base
-#: field:workflow.instance,uid:0
-msgid "User ID"
-msgstr "ID do Usuário"
-
-#. module: base
-#: view:ir.actions.server:0
-msgid ""
-"Access all the fields related to the current object using expression in "
-"double brackets, i.e.[[ object.partner_id.name ]]"
+#: selection:base.language.install,state:0
+#: selection:base.module.import,state:0
+#: selection:base.module.update,state:0
+msgid "init"
 msgstr ""
-"Acessar todos os campos relacionados com o objeto corrente usando expressões "
-"entre duplo colchete, ex.: [[ object.partner_id.name ]]"
 
 #. module: base
 #: view:res.lang:0
@@ -4259,15 +4767,20 @@ msgid "Bank type fields"
 msgstr "Campos do tipo de banco"
 
 #. module: base
-#: wizard_view:module.lang.import,init:0
-msgid "type,name,res_id,src,value"
-msgstr "tipo, nome, recurso_id, original, tradução"
-
-#. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Dutch / Nederlands"
 msgstr "Holandês / Nederlands"
 
+#. module: base
+#: model:ir.model,name:base.model_res_widget_wizard
+msgid "Add a widget"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,interval_number:0
+msgid "Repeat every x."
+msgstr ""
+
 #. module: base
 #: wizard_view:server.action.create,step_1:0
 #: wizard_field:server.action.create,step_1,report:0
@@ -4275,17 +4788,15 @@ msgid "Select Report"
 msgstr "Selecionar Relatório"
 
 #. module: base
-#: field:ir.report.custom.fields,fc1_condition:0
-#: field:ir.report.custom.fields,fc2_condition:0
-#: field:ir.report.custom.fields,fc3_condition:0
-msgid "condition"
-msgstr "condição"
-
-#. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "1cm 28cm 20cm 28cm"
 msgstr "1cm 28cm 20cm 28cm"
 
+#. module: base
+#: field:ir.module.module,maintainer:0
+msgid "Maintainer"
+msgstr ""
+
 #. module: base
 #: field:ir.sequence,suffix:0
 msgid "Suffix"
@@ -4302,7 +4813,7 @@ msgid "Labels"
 msgstr "Etiquetas"
 
 #. module: base
-#: wizard_field:res.partner.spam_send,init,from:0
+#: field:partner.wizard.spam,email_from:0
 msgid "Sender's email"
 msgstr "E-mail do Remetente"
 
@@ -4312,7 +4823,7 @@ msgid "Object Field"
 msgstr "Campo de objeto"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "French (CH) / Français (CH)"
 msgstr "Frances (CH)"
 
@@ -4322,25 +4833,31 @@ msgid "STOCK_NEW"
 msgstr "STOCK_NEW"
 
 #. module: base
-#: selection:ir.report.custom.fields,operation:0
-msgid "None"
-msgstr "Nenhum"
+#: help:res.config.users,action_id:0
+#: help:res.users,action_id:0
+msgid ""
+"If specified, this action will be opened at logon for this user, in addition "
+"to the standard menu."
+msgstr ""
 
 #. module: base
-#: view:ir.report.custom.fields:0
-msgid "Report Fields"
-msgstr "Campos de Relatório"
-
-#. module: base
-#: view:res.partner:0
-msgid "General"
-msgstr "Geral"
+#: view:ir.values:0
+msgid "Client Actions"
+msgstr ""
 
 #. module: base
 #: field:workflow.transition,act_to:0
 msgid "Destination Activity"
 msgstr "Atividade Destino"
 
+#. module: base
+#: code:addons/base/res/res_config.py:0
+#, python-format
+msgid ""
+"Can't set an ir.actions.todo's state to \"\n"
+"                               \"nothingness"
+msgstr ""
+
 #. module: base
 #: view:ir.values:0
 msgid "Connect Events to Actions"
@@ -4356,6 +4873,16 @@ msgstr "STOCK_SORT_ASCENDING"
 msgid "STOCK_ABOUT"
 msgstr "STOCK_ABOUT"
 
+#. module: base
+#: model:ir.model,name:base.model_base_update_translations
+msgid "base.update.translations"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,select_level:0
+msgid "Advanced Search"
+msgstr "Pesquisa avançada"
+
 #. module: base
 #: field:ir.module.category,parent_id:0
 #: field:res.partner.category,parent_id:0
@@ -4363,13 +4890,14 @@ msgid "Parent Category"
 msgstr "Categoria superior(pai)"
 
 #. module: base
-#: model:res.country,name:base.fi
-msgid "Finland"
-msgstr "Finlândia"
+#: selection:ir.property,type:0
+msgid "Integer Big"
+msgstr ""
 
 #. module: base
 #: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
+#: view:res.users:0
 msgid "Contact"
 msgstr "Contato"
 
@@ -4378,6 +4906,11 @@ msgstr "Contato"
 msgid "ir.ui.menu"
 msgstr "ir.ui.menu"
 
+#. module: base
+#: model:res.country,name:base.us
+msgid "United States"
+msgstr "Estados Unidos"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Uninstall"
@@ -4390,6 +4923,11 @@ msgstr "Cancelar desinstalação"
 msgid "Communication"
 msgstr "Comunicação"
 
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "RML Report"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_ir_server_object_lines
 msgid "ir.server.object.lines"
@@ -4406,6 +4944,11 @@ msgstr "Módulo %s: Certificado de qualidad inválido"
 msgid "Kuwait"
 msgstr "Kuwait"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-go-week"
+msgstr ""
+
 #. module: base
 #: field:workflow.workitem,inst_id:0
 msgid "Instance"
@@ -4422,6 +4965,11 @@ msgstr ""
 "expressões python contendo objetos e variáveis de tempo para gerar nomes "
 "dinâmiamente. Se omitido, os relatórios não serão salvos."
 
+#. module: base
+#: selection:ir.property,type:0
+msgid "Many2One"
+msgstr "MuitosParaUm"
+
 #. module: base
 #: model:res.country,name:base.ng
 msgid "Nigeria"
@@ -4432,6 +4980,11 @@ msgstr "Nigéria"
 msgid "res.partner.event"
 msgstr "res.partner.event"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_sms_send
+msgid "SMS Send"
+msgstr "Enviar SMS"
+
 #. module: base
 #: field:res.company,user_ids:0
 msgid "Accepted Users"
@@ -4447,6 +5000,11 @@ msgstr "STOCK_UNDERLINE"
 msgid "Values for Event Type"
 msgstr "Valores para Tipos de evento"
 
+#. module: base
+#: model:res.country,name:base.zr
+msgid "Zaire"
+msgstr "Zaire"
+
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Always Searchable"
@@ -4457,6 +5015,14 @@ msgstr "Sempre Pesquisável"
 msgid "STOCK_CLOSE"
 msgstr "STOCK_CLOSE"
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.hk
 msgid "Hong Kong"
@@ -4470,9 +5036,9 @@ msgstr ""
 "faturas"
 
 #. module: base
-#: model:ir.ui.menu,name:base.next_id_10
-msgid "Scheduler"
-msgstr "Agendador"
+#: selection:ir.ui.menu,icon:0
+msgid "STOCK_ZOOM_100"
+msgstr "STOCK_ZOOM_100"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4500,25 +5066,19 @@ msgid "2.  %a ,%A         ==> Fri, Friday"
 msgstr "2.  %a ,%A         ==> Sex, Sexta"
 
 #. module: base
-#: wizard_view:module.lang.install,start:0
-msgid ""
-"The selected language has been successfully installed. You must change the "
-"preferences of the user and open a new menu to view changes."
+#: field:res.widget,content:0
+msgid "Content"
 msgstr ""
-"O idioma selecionado foi instalado com sucesso. Voce precisa trocar a "
-"preferência do usuário e abrir um novo menu para visualizar as alterações."
 
 #. module: base
-#: model:ir.model,name:base.model_ir_sequence
-msgid "ir.sequence"
-msgstr "ir.sequence"
+#: help:ir.rule,global:0
+msgid "If no group is specified the rule is global and applied to everyone"
+msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_res_partner_event_type
-#: model:ir.ui.menu,name:base.next_id_14
-#: view:res.partner.event:0
-msgid "Partner Events"
-msgstr "Eventos dos parceiros"
+#: model:res.country,name:base.td
+msgid "Chad"
+msgstr "Chad"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_transition
@@ -4531,7 +5091,7 @@ msgid "%a - Abbreviated weekday name."
 msgstr "%a - Nome da semana abreviado."
 
 #. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "Introspection report on objects"
 msgstr "Relatório de instrospecção nos objetos"
 
@@ -4546,9 +5106,15 @@ msgid "Dominica"
 msgstr "Dominica"
 
 #. module: base
-#: model:ir.model,name:base.model_res_currency_rate
-msgid "Currency Rate"
-msgstr "Taxa de Câmbio"
+#: help:ir.cron,nextcall:0
+msgid "Next planned execution date for this scheduler"
+msgstr ""
+
+#. module: base
+#: help:res.config.users,view:0
+#: help:res.users,view:0
+msgid "Choose between the simplified interface and the extended one"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.np
@@ -4556,12 +5122,25 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #. module: base
-#: field:res.partner.event,event_ical_id:0
-msgid "iCal id"
-msgstr "iCal id"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-dolar"
+msgstr ""
 
 #. module: base
-#: wizard_view:res.partner.sms_send,init:0
+#: help:ir.cron,args:0
+msgid "Arguments to be passed to the method. e.g. (uid,)"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.menu,groups_id:0
+msgid ""
+"If you have groups, the visibility of this menu will be based on these "
+"groups. If this field is empty, OpenERP will compute visibility based on the "
+"related object's read access."
+msgstr ""
+
+#. module: base
+#: view:partner.sms.send:0
 msgid "Bulk SMS send"
 msgstr "Enviar SMS em massa"
 
@@ -4570,26 +5149,11 @@ msgstr "Enviar SMS em massa"
 msgid "%Y - Year with century as a decimal number."
 msgstr "%Y - Ano com 4 posições."
 
-#. module: base
-#: selection:ir.report.custom,type:0
-msgid "Pie Chart"
-msgstr "Gráfico de pizza"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Seconde: %(sec)s"
 msgstr "Segundo: %(sec)s"
 
-#. module: base
-#: selection:ir.translation,type:0
-#: field:res.bank,code:0
-#: field:res.currency,code:0
-#: field:res.partner,ref:0
-#: field:res.partner.bank.type,code:0
-#: field:res.partner.function,code:0
-msgid "Code"
-msgstr "Código"
-
 #. module: base
 #: code:addons/base/module/module.py:0
 #, python-format
@@ -4601,10 +5165,9 @@ msgstr ""
 " %s"
 
 #. module: base
-#: model:ir.actions.wizard,name:base.wizard_update
-#: model:ir.ui.menu,name:base.menu_module_update
-msgid "Update Modules List"
-msgstr "Atualizar lista de módulos"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-accessories-archiver"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -4612,18 +5175,12 @@ msgid "Continue"
 msgstr "Continuar"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_property_form
-#: model:ir.ui.menu,name:base.menu_ir_property_form
-msgid "Default Properties"
-msgstr "Propriedades Padrão"
-
-#. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Slovenian / slovenščina"
 msgstr "Slovenian / slovenščina"
 
@@ -4637,32 +5194,21 @@ msgstr "Recaregar do anexo"
 msgid "Bouvet Island"
 msgstr "Ilha Bouvet"
 
-#. module: base
-#: field:ir.report.custom,print_orientation:0
-msgid "Print orientation"
-msgstr "Orientação de impressão"
-
-#. module: base
-#: model:ir.actions.act_window,name:base.action_wizard_lang_export
-#: model:ir.ui.menu,name:base.menu_wizard_lang_export
-msgid "Export a Translation File"
-msgstr "Exportar um arquivo de tradução"
-
 #. module: base
 #: field:ir.attachment,name:0
 msgid "Attachment Name"
 msgstr "Nome do anexo"
 
 #. module: base
-#: wizard_field:module.lang.import,init,data:0
-#: field:wizard.module.lang.export,data:0
+#: field:base.language.export,data:0
+#: field:base.language.import,data:0
 msgid "File"
 msgstr "Arquivo"
 
 #. module: base
-#: view:res.users:0
-msgid "Add User"
-msgstr "Adicionar usuário"
+#: model:ir.actions.act_window,name:base.action_view_base_module_upgrade_install
+msgid "Module Upgrade Install"
+msgstr ""
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_configuration_wizard
@@ -4676,6 +5222,8 @@ msgstr "%b - Nome do mes abreviado."
 
 #. module: base
 #: field:res.partner,supplier:0
+#: view:res.partner.address:0
+#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_8
 msgid "Supplier"
 msgstr "Fornecedor"
@@ -4687,7 +5235,10 @@ msgid "Multi Actions"
 msgstr "Ações Múltiplas"
 
 #. module: base
+#: view:base.language.export:0
+#: view:base.language.import:0
 #: view:maintenance.contract.wizard:0
+#: view:wizard.ir.model.menu.create:0
 msgid "_Close"
 msgstr "_Close"
 
@@ -4696,17 +5247,44 @@ msgstr "_Close"
 msgid "Full"
 msgstr "Completo"
 
+#. module: base
+#: field:multi_company.default,company_dest_id:0
+msgid "Default Company"
+msgstr "Empresa Padrão"
+
+#. module: base
+#: help:ir.ui.view,xml_id:0
+msgid "ID of the view defined in xml file"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_module_import
+#: model:ir.ui.menu,name:base.menu_view_base_module_import
+msgid "Import Module"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.as
 msgid "American Samoa"
 msgstr "Samoa Americana"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_model_model
-#: model:ir.model,name:base.model_ir_model
-#: model:ir.ui.menu,name:base.ir_model_model_menu
-msgid "Objects"
-msgstr "Objetos"
+#: code:addons/base/res/res_user.py:0
+#, python-format
+msgid ""
+"--\n"
+"%(name)s %(email)s\n"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,res_model:0
+msgid "Model name of the object to open in the view window"
+msgstr ""
+
+#. module: base
+#: field:res.log,secondary:0
+msgid "Secondary Log"
+msgstr "Log Secundário"
 
 #. module: base
 #: field:ir.model.fields,selectable:0
@@ -4719,8 +5297,9 @@ msgid "Request Link"
 msgstr "Link"
 
 #. module: base
+#: view:ir.attachment:0
+#: selection:ir.attachment,type:0
 #: field:ir.module.module,url:0
-#: field:ir.module.repository,url:0
 msgid "URL"
 msgstr "URL"
 
@@ -4749,11 +5328,33 @@ msgstr "Emirados Árabes Unidos"
 msgid "STOCK_MEDIA_RECORD"
 msgstr "STOCK_MEDIA_RECORD"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_crm_case_job_req_main
+msgid "Recruitment"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Occitan (post 1500) / France"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.re
 msgid "Reunion (French)"
 msgstr "Reunião"
 
+#. module: base
+#: view:ir.model.access:0
+#: view:ir.rule:0
+#: field:ir.rule,global:0
+msgid "Global"
+msgstr "Global"
+
+#. module: base
+#: view:res.users:0
+msgid "You must logout and login again after changing your password."
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4770,6 +5371,11 @@ msgstr "Ilhas Salomão"
 msgid "AccessError"
 msgstr "AccessError"
 
+#. module: base
+#: view:res.request:0
+msgid "Waiting"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "8.  %I:%M:%S %p  ==> 06:25:20 PM"
@@ -4786,6 +5392,11 @@ msgstr "Traduções"
 msgid "Number padding"
 msgstr "Preencher número"
 
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Report"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ua
 msgid "Ukraine"
@@ -4803,15 +5414,20 @@ msgid "Module Category"
 msgstr "Categoria de Módulos"
 
 #. module: base
-#: model:res.country,name:base.us
-msgid "United States"
-msgstr "Estados Unidos"
+#: view:partner.wizard.ean.check:0
+msgid "Ignore"
+msgstr ""
 
 #. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "Reference Guide"
 msgstr "Guia de Referência"
 
+#. module: base
+#: view:ir.ui.view:0
+msgid "Architecture"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ml
 msgid "Mali"
@@ -4822,6 +5438,26 @@ msgstr "Mali"
 msgid "STOCK_UNINDENT"
 msgstr "STOCK_UNINDENT"
 
+#. module: base
+#: help:res.config.users,email:0
+#: help:res.users,email:0
+msgid ""
+"If an email is provided, the user will be sent a message welcoming him.\n"
+"\n"
+"Warning: if \"email_from\" and \"smtp_server\" aren't configured, it won't "
+"be possible to email new users."
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-face-plain"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Japanese / Japan"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -4848,6 +5484,7 @@ msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
 #. module: base
+#: view:ir.actions.act_window:0
 #: field:ir.actions.act_window,view_type:0
 #: field:ir.actions.act_window.view,view_mode:0
 #: field:ir.ui.view,type:0
@@ -4876,18 +5513,10 @@ msgid "ir.actions.todo"
 msgstr "ir.actions.todo"
 
 #. module: base
-#: view:wizard.module.lang.export:0
-msgid "Get file"
-msgstr "Pegar arquivo"
-
-#. module: base
-#: wizard_view:module.module.update,init:0
-msgid ""
-"This function will check for new modules in the 'addons' path and on module "
-"repositories:"
-msgstr ""
-"Esta função pesquisará por novos módulos na pasta 'addons' e no repositório "
-"de módulos:"
+#: code:addons/base/res/res_config.py:0
+#, python-format
+msgid "Couldn't find previous ir.actions.todo"
+msgstr "Não foi encontrado a ir.actions.todo anterior"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4900,7 +5529,7 @@ msgid "General Settings"
 msgstr "Configurações Gerais"
 
 #. module: base
-#: model:ir.ui.menu,name:base.custom_shortcuts
+#: model:ir.ui.menu,name:base.menu_administration_shortcut
 msgid "Custom Shortcuts"
 msgstr "Atalhos Customizados"
 
@@ -4909,18 +5538,29 @@ msgstr "Atalhos Customizados"
 msgid "Algeria"
 msgstr "Algéria"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-stock_format-scientific"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.be
 msgid "Belgium"
 msgstr "Bélgica"
 
 #. module: base
+#: selection:base.language.install,lang:0
+msgid "Inuktitut / Canada"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,lang:0
+#: field:base.language.install,lang:0
+#: field:base.update.translations,lang:0
 #: field:ir.translation,lang:0
-#: wizard_field:module.lang.install,init,lang:0
+#: field:res.config.users,context_lang:0
 #: field:res.partner,lang:0
 #: field:res.users,context_lang:0
-#: field:wizard.module.lang.export,lang:0
-#: field:wizard.module.update_translations,lang:0
 msgid "Language"
 msgstr "Idioma"
 
@@ -4931,12 +5571,32 @@ msgstr "Gâmbia"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_company_form
+#: model:ir.model,name:base.model_res_company
 #: model:ir.ui.menu,name:base.menu_action_res_company_form
 #: model:ir.ui.menu,name:base.menu_res_company_global
 #: view:res.company:0
+#: field:res.config.users,company_ids:0
+#: view:res.users:0
+#: field:res.users,company_ids:0
 msgid "Companies"
 msgstr "Empresas"
 
+#. module: base
+#: model:ir.model,name:base.model_res_widget
+msgid "res.widget"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Norwegian Bokmål / Norway"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.server:0
 #: field:ir.actions.server,code:0
@@ -4945,7 +5605,7 @@ msgid "Python Code"
 msgstr "Código Python"
 
 #. module: base
-#: code:addons/base/module/wizard/wizard_module_import.py:0
+#: code:addons/base/module/wizard/base_module_import.py:0
 #, python-format
 msgid "Can not create the module file: %s !"
 msgstr "Impossível criar o arquivo de módulo: %s !"
@@ -4956,28 +5616,19 @@ msgid "The kernel of OpenERP, needed for all installation."
 msgstr "O kernel do OpenERP, necessário para qualquer instalação."
 
 #. module: base
-#: wizard_button:base.module.import,init,end:0
-#: selection:ir.actions.todo,state:0
-#: wizard_button:module.lang.import,init,end:0
-#: wizard_button:module.lang.install,init,end:0
-#: wizard_button:module.module.update,init,end:0
-#: wizard_button:module.upgrade,next,end:0
-#: wizard_button:res.partner.sms_send,init,end:0
-#: wizard_button:res.partner.spam_send,init,end:0
-#: view:wizard.ir.model.menu.create:0
-#: view:wizard.module.lang.export:0
-#: view:wizard.module.update_translations:0
+#: view:base.language.install:0
+#: view:base.module.import:0
+#: view:base.module.update:0
+#: view:base.module.upgrade:0
+#: view:base.update.translations:0
+#: view:partner.clear.ids:0
+#: view:partner.sms.send:0
+#: view:partner.wizard.spam:0
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:0
-#, python-format
-msgid "Please specify server option --smtp-from !"
-msgstr "Por favor especifique a opção para o servidor --smtp-from !"
-
-#. module: base
-#: selection:wizard.module.lang.export,format:0
+#: selection:base.language.export,format:0
 msgid "PO File"
 msgstr "Arquivo PO"
 
@@ -4987,10 +5638,14 @@ msgid "STOCK_SPELL_CHECK"
 msgstr "STOCK_SPELL_CHECK"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_partner_category
-#: model:ir.ui.menu,name:base.menu_partner_category_main
-msgid "Partners by Categories"
-msgstr "Parceiros por categorias"
+#: view:ir.model:0
+msgid "Custom"
+msgstr ""
+
+#. module: base
+#: view:res.request:0
+msgid "Current"
+msgstr ""
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_9
@@ -4998,15 +5653,12 @@ msgid "Components Supplier"
 msgstr "Fornecedor de componentes"
 
 #. module: base
-#: field:ir.actions.act_window,default_user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
-#: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
 #: field:res.groups,users:0
-#: field:res.roles,users:0
 #: view:res.users:0
 msgid "Users"
 msgstr "Usuários"
@@ -5022,10 +5674,10 @@ msgid "Iceland"
 msgstr "Islândia"
 
 #. module: base
-#: view:res.users:0
-msgid "Roles are used to defined available actions, provided by workflows."
-msgstr ""
-"Regras são usadas para definir ações disponibilizadas pelos workflows."
+#: model:ir.actions.act_window,name:base.ir_action_window
+#: model:ir.ui.menu,name:base.menu_ir_action_window
+msgid "Window Actions"
+msgstr "Ações da janela"
 
 #. module: base
 #: model:res.country,name:base.de
@@ -5048,7 +5700,7 @@ msgid "STOCK_HARDDISK"
 msgstr "STOCK_HARDDISK"
 
 #. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "Reports :"
 msgstr "Relatórios :"
 
@@ -5057,39 +5709,23 @@ msgstr "Relatórios :"
 msgid "STOCK_APPLY"
 msgstr "STOCK_APPLY"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.action_maintenance_contract_form
-#: model:ir.ui.menu,name:base.menu_maintenance_contract
-msgid "Your Maintenance Contracts"
-msgstr "Seus contratos de manutenção"
-
-#. module: base
-#: view:res.users:0
-msgid ""
-"Please note that you will have to logout and relog if you change your "
-"password."
-msgstr "Por favor, voce precisará fazer um logout se voce trocou sua senha."
-
 #. module: base
 #: model:res.country,name:base.gy
 msgid "Guyana"
 msgstr "Guiana"
 
 #. module: base
-#: selection:ir.module.module,license:0
-msgid "GPL-3"
-msgstr "GPL-3"
-
-#. module: base
-#: selection:ir.module.module,license:0
-msgid "GPL-2"
-msgstr "GPL-2"
-
-#. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Portugese (BR) / português (BR)"
 msgstr "Portugese (BR) / português (BR)"
 
+#. module: base
+#: help:ir.actions.act_window,view_type:0
+msgid ""
+"View type: set to 'tree' for a hierarchical tree view, or 'form' for other "
+"views"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,record_id:0
 msgid "Create Id"
@@ -5100,11 +5736,23 @@ msgstr "Criar ID"
 msgid "Honduras"
 msgstr "Honduras"
 
+#. module: base
+#: help:res.config.users,menu_tips:0
+#: help:res.users,menu_tips:0
+msgid ""
+"Check out this box if you want to always display tips on each menu action"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.eg
 msgid "Egypt"
 msgstr "Egito"
 
+#. module: base
+#: field:ir.rule,perm_read:0
+msgid "Apply For Read"
+msgstr "Aplicar para Leitura"
+
 #. module: base
 #: help:ir.actions.server,model_id:0
 msgid ""
@@ -5112,6 +5760,22 @@ msgid ""
 msgstr ""
 "Selecione o objeto sobre o qual a ação irá atuar (ler, escrever, criar)"
 
+#. module: base
+#: code:addons/base/ir/ir_actions.py:0
+#, python-format
+msgid "Please specify server option --email-from !"
+msgstr ""
+
+#. module: base
+#: field:base.language.import,name:0
+msgid "Language Name"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Boolean"
+msgstr ""
+
 #. module: base
 #: view:ir.model:0
 msgid "Fields Description"
@@ -5123,21 +5787,32 @@ msgid "STOCK_CDROM"
 msgstr "STOCK_CDROM"
 
 #. module: base
+#: view:ir.attachment:0
+#: view:ir.cron:0
+#: view:ir.model.access:0
+#: view:ir.model.data:0
+#: view:ir.model.fields:0
+#: view:ir.module.module:0
+#: view:ir.rule:0
+#: view:ir.ui.view:0
+#: view:ir.values:0
+#: view:res.partner:0
+#: view:res.partner.address:0
+#: view:workflow.activity:0
+msgid "Group By..."
+msgstr "Agrupado Por..."
+
+#. module: base
+#: view:ir.model.fields:0
 #: field:ir.model.fields,readonly:0
 #: field:res.partner.bank.type.field,readonly:0
 msgid "Readonly"
 msgstr "Somente Leitura"
 
 #. module: base
-#: field:res.partner.event,type:0
-msgid "Type of Event"
-msgstr "Tipo de Evento"
-
-#. module: base
-#: model:ir.actions.act_window,name:base.ir_sequence_type
-#: model:ir.ui.menu,name:base.menu_ir_sequence_type
-msgid "Sequence Types"
-msgstr "Tipos de Sequencias"
+#: selection:ir.ui.menu,icon:0
+msgid "STOCK_ITALIC"
+msgstr "STOCK_ITALIC"
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -5146,11 +5821,24 @@ msgid "To be installed"
 msgstr "A ser instalado"
 
 #. module: base
+#: help:ir.actions.act_window,display_menu_tip:0
+msgid ""
+"It gives the status if the tip has to be displayed or not when a user "
+"executes an action"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
 #: model:ir.module.module,shortdesc:base.module_meta_information
 #: field:res.currency,base:0
 msgid "Base"
 msgstr "Base"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-dialog-close"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.lr
 msgid "Liberia"
@@ -5162,28 +5850,48 @@ msgstr "Libéria"
 #: view:res.groups:0
 #: view:res.partner:0
 #: field:res.partner,comment:0
-#: field:res.partner.function,ref:0
 msgid "Notes"
 msgstr "Notas"
 
 #. module: base
-#: field:ir.property,value:0
+#: selection:ir.ui.menu,icon:0
+msgid "terp-folder-blue"
+msgstr ""
+
+#. module: base
+#: field:ir.property,value_binary:0
+#: field:ir.property,value_datetime:0
+#: field:ir.property,value_float:0
+#: field:ir.property,value_integer:0
+#: field:ir.property,value_reference:0
+#: field:ir.property,value_text:0
 #: selection:ir.server.object.lines,type:0
 #: field:ir.server.object.lines,value:0
+#: view:ir.values:0
 #: field:ir.values,value:0
 #: field:ir.values,value_unpickle:0
 msgid "Value"
 msgstr "Valor"
 
 #. module: base
-#: view:wizard.module.update_translations:0
-msgid "Update Translations"
-msgstr "Atualizar traduções"
+#: field:ir.sequence,code:0
+#: field:ir.sequence.type,code:0
+#: selection:ir.translation,type:0
+#: field:res.bank,code:0
+#: field:res.currency,code:0
+#: field:res.partner.bank.type,code:0
+msgid "Code"
+msgstr "Código"
 
 #. module: base
-#: view:res.config.view:0
-msgid "Set"
-msgstr "Definir"
+#: model:ir.model,name:base.model_res_config_installer
+msgid "res.config.installer"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Sinhalese / Sri Lanka"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.mc
@@ -5196,27 +5904,60 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #. module: base
-#: wizard_view:module.upgrade,end:0
-#: wizard_view:module.upgrade,start:0
-msgid "The modules have been upgraded / installed !"
-msgstr "O módulos foram atualizados / instalados !"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gnome-cpu-frequency-applet+"
+msgstr ""
 
 #. module: base
 #: selection:ir.translation,type:0
-#: view:wizard.module.lang.export:0
 msgid "Help"
 msgstr "Ajuda"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: help:res.config.users,menu_id:0
+#: help:res.users,menu_id:0
+msgid ""
+"If specified, the action will replace the standard menu for this user."
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Write Object"
+msgstr "Objeto de gravação"
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_fundrising
+msgid "Fund Raising"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_sequence_type
+#: model:ir.ui.menu,name:base.menu_ir_sequence_type
+msgid "Sequence Codes"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Abkhazian (RU)"
+msgstr ""
+
+#. module: base
+#: view:base.module.configuration:0
+msgid ""
+"All pending configuration wizards have been executed. You may restart "
+"individual wizards via the list of configuration wizards."
+msgstr ""
 
 #. module: base
 #: wizard_button:server.action.create,step_1,create:0
 msgid "Create"
 msgstr "Criar"
 
+#. module: base
+#: view:ir.sequence:0
+msgid "Current Year with Century: %(year)s"
+msgstr ""
+
 #. module: base
 #: field:ir.exports,export_fields:0
 msgid "Export ID"
@@ -5228,14 +5969,20 @@ msgid "France"
 msgstr "França"
 
 #. module: base
+#: model:ir.model,name:base.model_res_log
+msgid "res.log"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
 #: field:workflow.activity,flow_stop:0
 msgid "Flow Stop"
 msgstr "Parar fluxo"
 
 #. module: base
-#: model:res.country,name:base.ar
-msgid "Argentina"
-msgstr "Argentina"
+#: selection:ir.cron,interval_type:0
+msgid "Weeks"
+msgstr "Semanas"
 
 #. module: base
 #: model:res.country,name:base.af
@@ -5243,7 +5990,7 @@ msgid "Afghanistan, Islamic State of"
 msgstr "Afeganistão"
 
 #. module: base
-#: code:addons/base/module/wizard/wizard_module_import.py:0
+#: code:addons/base/module/wizard/base_module_import.py:0
 #, python-format
 msgid "Error !"
 msgstr "Erro!"
@@ -5253,6 +6000,11 @@ msgstr "Erro!"
 msgid "country_id"
 msgstr "country_id"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-accessories-archiver+"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_type:0
 msgid "Interval Unit"
@@ -5264,11 +6016,6 @@ msgstr "Intervalo de unidade"
 msgid "Kind"
 msgstr "Tipo"
 
-#. module: base
-#: selection:ir.actions.todo,start_on:0
-msgid "Manual"
-msgstr "Manual"
-
 #. module: base
 #: field:res.bank,fax:0
 #: field:res.partner.address,fax:0
@@ -5281,15 +6028,11 @@ msgid "Thousands Separator"
 msgstr "Separador de Milhares"
 
 #. module: base
+#: field:res.log,create_date:0
 #: field:res.request,create_date:0
 msgid "Created Date"
 msgstr "Data de Criação"
 
-#. module: base
-#: selection:ir.report.custom,type:0
-msgid "Line Plot"
-msgstr "Gráfico de linha"
-
 #. module: base
 #: help:ir.actions.server,loop_action:0
 msgid ""
@@ -5300,7 +6043,7 @@ msgstr ""
 "do laço (recursividade)."
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Chinese (TW) / 正體字"
 msgstr "Chinês (TW) / 正體字"
 
@@ -5315,44 +6058,67 @@ msgid "res.request"
 msgstr "res.request"
 
 #. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "pdf"
-msgstr "pdf"
+#: view:ir.model:0
+msgid "In Memory"
+msgstr ""
 
 #. module: base
+#: view:ir.actions.todo:0
+msgid "Todo"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: field:ir.attachment,company_id:0
 #: field:ir.default,company_id:0
 #: field:ir.property,company_id:0
 #: field:ir.sequence,company_id:0
 #: field:ir.values,company_id:0
 #: view:res.company:0
+#: field:res.config.users,company_id:0
 #: field:res.currency,company_id:0
 #: field:res.partner,company_id:0
 #: field:res.partner.address,company_id:0
 #: view:res.users:0
-#: field:res.users,company:0
 #: field:res.users,company_id:0
 msgid "Company"
 msgstr "Empresa"
 
+#. module: base
+#: field:ir.attachment,datas:0
+msgid "File Content"
+msgstr "Conteúdo do arquivo"
+
 #. module: base
 #: model:res.country,name:base.pa
 msgid "Panama"
 msgstr "Panamá"
 
 #. module: base
-#: selection:ir.report.custom,state:0
-msgid "Unsubscribed"
-msgstr "Remover inscrição"
+#: model:res.partner.title,name:base.res_partner_title_ltd
+msgid "Ltd"
+msgstr "Ltd"
 
 #. module: base
-#: view:ir.attachment:0
-msgid "Preview"
-msgstr "Pré-visualizar"
+#: help:workflow.transition,group_id:0
+msgid ""
+"The group that a user must have to be authorized to validate this transition."
+msgstr ""
 
 #. module: base
-#: view:ir.actions.configuration.wizard:0
-msgid "Skip Step"
-msgstr "Saltar etapa"
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gi
+msgid "Gibraltar"
+msgstr "Gibraltar"
+
+#. module: base
+#: field:ir.actions.report.xml,report_name:0
+msgid "Service Name"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.pn
@@ -5360,22 +6126,22 @@ msgid "Pitcairn Island"
 msgstr "Ilhas Pitcairn"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.res_partner_event_type-act
-#: model:ir.ui.menu,name:base.menu_res_partner_event_type-act
-msgid "Active Partner Events"
-msgstr "Ativar eventos dos parceiros"
+#: view:base.module.upgrade:0
+msgid ""
+"We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."
+msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_partner_function_form
-#: model:ir.ui.menu,name:base.menu_partner_function_form
-#: view:res.partner.function:0
-msgid "Contact Functions"
-msgstr "Funções do Contato"
+#: model:ir.actions.act_window,name:base.action_rule
+#: model:ir.ui.menu,name:base.menu_action_rule
+msgid "Record Rules"
+msgstr "Registro de regras"
 
 #. module: base
-#: view:multi_company.default:0
-msgid "Multi Company"
-msgstr "Multi-Companhia"
+#: field:res.config.users,name:0
+#: field:res.users,name:0
+msgid "User Name"
+msgstr ""
 
 #. module: base
 #: view:ir.sequence:0
@@ -5390,11 +6156,17 @@ msgstr "Zona Neutra"
 #. module: base
 #: view:ir.model:0
 #: view:ir.model.fields:0
-#: view:ir.property:0
-#: model:ir.ui.menu,name:base.next_id_15
+#: view:workflow.activity:0
 msgid "Properties"
 msgstr "Propriedades"
 
+#. module: base
+#: help:ir.sequence,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -5405,29 +6177,14 @@ msgstr "%A - Nome da semana completo."
 msgid "Months"
 msgstr "Meses"
 
-#. module: base
-#: selection:ir.translation,type:0
-msgid "Selection"
-msgstr "Seleção"
-
 #. module: base
 #: field:ir.actions.act_window,search_view:0
 msgid "Search View"
 msgstr "Visão de Busca"
 
-#. module: base
-#: field:ir.rule,domain_force:0
-msgid "Force Domain"
-msgstr "Forçar domínio"
-
-#. module: base
-#: help:ir.sequence,weight:0
-msgid "If two sequences match, the highest weight will be used."
-msgstr ""
-"Quando os números de seqüencia são idênticos, prevalece o de  maior peso."
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_attachment
+#: view:ir.actions.report.xml:0
 #: view:ir.attachment:0
 #: model:ir.ui.menu,name:base.menu_action_attachment
 msgid "Attachments"
@@ -5443,6 +6200,13 @@ msgstr "_Validar"
 msgid "maintenance.contract.wizard"
 msgstr "maintenance.contract.wizard"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_base_partner
+#: model:ir.ui.menu,name:base.menu_sale_config_sales
+#: model:ir.ui.menu,name:base.menu_sales
+msgid "Sales"
+msgstr "Vendas"
+
 #. module: base
 #: field:ir.actions.server,child_ids:0
 msgid "Other Actions"
@@ -5454,9 +6218,9 @@ msgid "Done"
 msgstr "Concluído"
 
 #. module: base
-#: selection:maintenance.contract.wizard,state:0
-msgid "Validated"
-msgstr "Validado"
+#: selection:ir.ui.menu,icon:0
+msgid "STOCK_GOTO_FIRST"
+msgstr "STOCK_GOTO_FIRST"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_miss
@@ -5464,7 +6228,9 @@ msgid "Miss"
 msgstr "Srta."
 
 #. module: base
+#: view:ir.model.access:0
 #: field:ir.model.access,perm_write:0
+#: view:ir.rule:0
 msgid "Write Access"
 msgstr "Acesso de gravação"
 
@@ -5487,22 +6253,30 @@ msgid "Italy"
 msgstr "Itália"
 
 #. module: base
-#: selection:ir.rule,operator:0
-msgid "<>"
-msgstr "<>"
+#: view:ir.actions.todo:0
+#: selection:ir.actions.todo,state:0
+msgid "To Do"
+msgstr ""
 
 #. module: base
-#: selection:ir.rule,operator:0
-msgid "<="
-msgstr "<="
+#: selection:ir.ui.menu,icon:0
+msgid "terp-check"
+msgstr ""
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Estonian / Eesti keel"
 msgstr "Estonian / Eesti keel"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: field:res.config.users,email:0
+#: field:res.partner,email:0
+#: field:res.users,email:0
+msgid "E-mail"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
 msgid "Portugese / português"
 msgstr "Portugese / português"
 
@@ -5511,33 +6285,33 @@ msgstr "Portugese / português"
 msgid "GPL-3 or later version"
 msgstr "GPL-3 ou versão posterior"
 
-#. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "HTML from HTML(Mako)"
-msgstr "HTML from HTML(Mako)"
-
 #. module: base
 #: field:workflow.activity,action:0
 msgid "Python Action"
 msgstr "Ação Python"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "English (US)"
 msgstr "Inglês (EUA)"
 
 #. module: base
-#: field:res.partner.event,probability:0
-msgid "Probability (0.50)"
-msgstr "Probabilidade (0.50)"
+#: model:ir.actions.act_window,name:base.action_model_data
+#: view:ir.model.data:0
+#: model:ir.ui.menu,name:base.ir_model_data_menu
+msgid "Object Identifiers"
+msgstr ""
 
 #. module: base
-#: field:ir.report.custom,repeat_header:0
-msgid "Repeat Header"
-msgstr "Repetir cabeçalho"
+#: view:base.language.export:0
+msgid "To browse official translations, you can start with these links:"
+msgstr ""
 
 #. module: base
 #: view:res.bank:0
+#: field:res.config.users,address_id:0
+#: view:res.partner.address:0
+#: view:res.users:0
 #: field:res.users,address_id:0
 msgid "Address"
 msgstr "Endereço"
@@ -5547,16 +6321,21 @@ msgstr "Endereço"
 msgid "Installed version"
 msgstr "Versão instalada"
 
-#. module: base
-#: model:ir.ui.menu,name:base.menu_workflow_root
-msgid "Workflow Definitions"
-msgstr "Definição de workflow"
-
 #. module: base
 #: model:res.country,name:base.mr
 msgid "Mauritania"
 msgstr "Mauritânia"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
+
+#. module: base
+#: view:base.module.update:0
+msgid "Module update result"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 #: field:workflow.workitem,act_id:0
@@ -5585,9 +6364,9 @@ msgid "Congo"
 msgstr "Congo"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_exports_line
-msgid "ir.exports.line"
-msgstr "ir.exports.line"
+#: view:res.lang:0
+msgid "Examples"
+msgstr "Exemplos"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -5595,21 +6374,14 @@ msgid "STOCK_MEDIA_PAUSE"
 msgstr "STOCK_MEDIA_PAUSE"
 
 #. module: base
-#: model:ir.model,name:base.model_res_country_state
-msgid "Country state"
-msgstr "Estado do país"
+#: model:ir.ui.menu,name:base.menu_tools
+msgid "Tools"
+msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_property_form_all
-#: model:ir.ui.menu,name:base.menu_ir_property_form_all
-msgid "All Properties"
-msgstr "Todas propriedades"
-
-#. module: base
-#: model:ir.actions.act_window,name:base.ir_action_window
-#: model:ir.ui.menu,name:base.menu_ir_action_window
-msgid "Window Actions"
-msgstr "Ações da janela"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gtk-go-back-ltr"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.kn
@@ -5624,7 +6396,6 @@ msgstr "STOCK_HOME"
 #. module: base
 #: field:ir.model,name:0
 #: field:ir.model.fields,model:0
-#: field:ir.model.grid,name:0
 #: field:ir.values,model:0
 msgid "Object Name"
 msgstr "Nome do Objeto"
@@ -5638,12 +6409,14 @@ msgstr ""
 "Objeto no qual você deseja gravar/criar. Se vazio, veja o campo \"Objeto\"."
 
 #. module: base
+#: view:ir.module.module:0
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "Not Installed"
 msgstr "Não Instalado"
 
 #. module: base
+#: view:workflow.activity:0
 #: field:workflow.activity,out_transitions:0
 msgid "Outgoing Transitions"
 msgstr "Transições de saida"
@@ -5653,20 +6426,20 @@ msgstr "Transições de saida"
 msgid "Icon"
 msgstr "Ícone"
 
-#. module: base
-#: wizard_button:module.lang.import,init,finish:0
-#: wizard_button:module.lang.install,start,end:0
-#: wizard_button:module.module.update,update,open_window:0
-msgid "Ok"
-msgstr "Ok"
-
 #. module: base
 #: model:res.country,name:base.mq
 msgid "Martinique (French)"
 msgstr "Martinica(França)"
 
 #. module: base
-#: model:ir.ui.menu,name:base.next_id_12
+#: view:ir.sequence.type:0
+msgid "Sequences Type"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_request-act
+#: model:ir.ui.menu,name:base.menu_res_request_act
+#: model:ir.ui.menu,name:base.menu_resquest_ref
 #: view:res.request:0
 msgid "Requests"
 msgstr "Mensagens"
@@ -5687,15 +6460,23 @@ msgid "Pakistan"
 msgstr "Paquistão"
 
 #. module: base
-#: model:res.country,name:base.al
-msgid "Albania"
-msgstr "Albânia"
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.ws
 msgid "Samoa"
 msgstr "Samoa"
 
+#. module: base
+#: view:base.language.install:0
+#: view:base.module.import:0
+msgid ""
+"Please be patient, this operation may take a few minutes (depending on the "
+"number of modules currently installed)..."
+msgstr ""
+
 #. module: base
 #: field:ir.ui.menu,child_id:0
 msgid "Child IDs"
@@ -5707,6 +6488,12 @@ msgstr "IDs filhos"
 msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Prbolemas na configuracao do 'id do registro' na ação do servidor!"
 
+#. module: base
+#: view:base.module.import:0
+#: view:base.module.update:0
+msgid "Open Modules"
+msgstr ""
+
 #. module: base
 #: code:addons/base/maintenance/maintenance.py:0
 #, python-format
@@ -5714,9 +6501,7 @@ msgid "This error occurs on database %s"
 msgstr "Erro ocorrrido no Banco de Dados %s"
 
 #. module: base
-#: wizard_button:base.module.import,init,import:0
-#: model:ir.actions.wizard,name:base.wizard_base_module_import
-#: model:ir.ui.menu,name:base.menu_wizard_module_import
+#: view:base.module.import:0
 msgid "Import module"
 msgstr "Importar módulo"
 
@@ -5725,6 +6510,13 @@ msgstr "Importar módulo"
 msgid "STOCK_DISCONNECT"
 msgstr "STOCK_DISCONNECT"
 
+#. module: base
+#: help:ir.actions.report.xml,report_file:0
+msgid ""
+"The path to the main report file (depending on Report Type) or NULL if the "
+"content is in another field"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.la
 msgid "Laos"
@@ -5732,25 +6524,50 @@ msgstr "Laos"
 
 #. module: base
 #: selection:ir.actions.server,state:0
+#: model:ir.ui.menu,name:base.menu_mail_gateway
+#: field:res.config.users,user_email:0
+#: field:res.users,user_email:0
 msgid "Email"
 msgstr "E-mail"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_wizard_update_translations
-#: model:ir.ui.menu,name:base.menu_wizard_update_translations
-msgid "Resynchronise Terms"
-msgstr "Re-sincroniar termos"
+#: field:res.config.users,action_id:0
+#: field:res.users,action_id:0
+msgid "Home Action"
+msgstr "Ação Inicial"
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_lunch_reporting
+#: model:ir.ui.menu,name:base.menu_project_report
+#: model:ir.ui.menu,name:base.menu_report_association
+#: model:ir.ui.menu,name:base.menu_report_marketing
+#: model:ir.ui.menu,name:base.menu_reporting
+#: model:ir.ui.menu,name:base.next_id_64
+#: model:ir.ui.menu,name:base.next_id_73
+#: model:ir.ui.menu,name:base.reporting_menu
+msgid "Reporting"
+msgstr "Relatórios"
 
 #. module: base
 #: model:res.country,name:base.tg
 msgid "Togo"
 msgstr "Togo"
 
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "Other Proprietary"
+msgstr ""
+
 #. module: base
 #: selection:workflow.activity,kind:0
 msgid "Stop All"
 msgstr "Parar todos"
 
+#. module: base
+#: view:ir.model.data:0
+msgid "Updatable"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "3.  %x ,%X         ==> 12/05/08, 18:25:20"
@@ -5762,16 +6579,9 @@ msgid "Cascade"
 msgstr "Cascata"
 
 #. module: base
-#: code:addons/base/ir/ir_report_custom.py:0
-#, python-format
-msgid "Field %d should be a figure"
-msgstr "Campo %d pode ser uma imagem"
-
-#. module: base
-#: model:ir.actions.act_window,name:base.action_inventory_form
-#: model:ir.ui.menu,name:base.menu_action_inventory_form
-msgid "Default Company per Object"
-msgstr "Companhia Padrão por Objeto"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -5793,6 +6603,18 @@ msgstr "Romênia"
 msgid "STOCK_PREFERENCES"
 msgstr "STOCK_PREFERENCES"
 
+#. module: base
+#: help:ir.cron,doall:0
+msgid ""
+"Enable this if you want to execute missed occurences as soon as the server "
+"restarts."
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Start update"
+msgstr ""
+
 #. module: base
 #: field:res.country.state,name:0
 msgid "State Name"
@@ -5804,6 +6626,7 @@ msgid "Join Mode"
 msgstr "Modo de junção"
 
 #. module: base
+#: field:res.config.users,context_tz:0
 #: field:res.users,context_tz:0
 msgid "Timezone"
 msgstr "Fuso horário"
@@ -5820,21 +6643,19 @@ msgid "ir.actions.report.xml"
 msgstr "ir.actions.report.xml"
 
 #. module: base
-#: view:wizard.module.lang.export:0
-msgid ""
-"To improve some terms of the official translations of OpenERP, you should "
-"modify the terms directly on the launchpad interface. If you made lots of "
-"translations for your own module, you can also publish all your translation "
-"at once."
+#: model:res.partner.title,shortcut:base.res_partner_title_miss
+msgid "Mss"
 msgstr ""
-"Para implementar novos termos na tradução oficial do OpenERP, voce poderá "
-"modificá-los direitamente na interface do launchpad. Se voce fez muitas "
-"traduções em seu próprio módulo, voce tambem pode publica-las."
 
 #. module: base
-#: wizard_button:module.lang.install,init,start:0
-msgid "Start installation"
-msgstr "Iniciar instalação"
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
+#. module: base
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
 
 #. module: base
 #: help:res.lang,code:0
@@ -5847,6 +6668,16 @@ msgstr ""
 msgid "OpenERP Partners"
 msgstr "Parceiros OpenERP"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_hr_manager
+msgid "HR Manager Dashboard"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Search modules"
+msgstr "Buscar módulos"
+
 #. module: base
 #: model:res.country,name:base.by
 msgid "Belarus"
@@ -5858,6 +6689,7 @@ msgstr "Bielorrússia"
 #: field:ir.actions.actions,name:0
 #: field:ir.actions.server,name:0
 #: field:ir.actions.url,name:0
+#: field:ir.filters,name:0
 msgid "Action Name"
 msgstr "Nome da ação"
 
@@ -5873,11 +6705,21 @@ msgid "Street2"
 msgstr "Complemento"
 
 #. module: base
+#: model:ir.actions.act_window,name:base.action_view_base_module_update
+msgid "Module Update"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
 #: field:ir.cron,user_id:0
+#: view:ir.filters:0
+#: field:ir.filters,user_id:0
 #: field:ir.ui.view.custom,user_id:0
 #: field:ir.values,user_id:0
+#: field:res.log,user_id:0
 #: field:res.partner.event,user_id:0
 #: view:res.users:0
+#: field:res.widget.user,user_id:0
 msgid "User"
 msgstr "Usuário"
 
@@ -5903,12 +6745,21 @@ msgstr ""
 msgid "Open Window"
 msgstr "Abrir Janela"
 
+#. module: base
+#: field:ir.actions.act_window,auto_search:0
+msgid "Auto Search"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.act_window,filter:0
-#: field:ir.module.repository,filter:0
 msgid "Filter"
 msgstr "Filtro"
 
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_madam
+msgid "Ms."
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ch
 msgid "Switzerland"
@@ -5935,15 +6786,20 @@ msgid "Rounding factor"
 msgstr "Arredondamento"
 
 #. module: base
-#: model:ir.model,name:base.model_res_company
-msgid "res.company"
-msgstr "res.company"
+#: view:base.language.install:0
+msgid "Load"
+msgstr ""
 
 #. module: base
-#: wizard_view:module.upgrade,end:0
-#: wizard_view:module.upgrade,start:0
-msgid "System upgrade done"
-msgstr "Atualização de sistema concluída"
+#: help:res.config.users,name:0
+#: help:res.users,name:0
+msgid "The new user's real name, used for searching and most listings"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_request_history
+msgid "res.request.history"
+msgstr "res.request.history"
 
 #. module: base
 #: model:res.country,name:base.so
@@ -5951,9 +6807,9 @@ msgid "Somalia"
 msgstr "Somália"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_config_simple_view_form
-msgid "Configure Simple View"
-msgstr "Configurar Visão Simplificada"
+#: model:ir.model,name:base.model_res_config
+msgid "res.config"
+msgstr ""
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_13
@@ -5961,56 +6817,51 @@ msgid "Important customers"
 msgstr "Clientes importantes"
 
 #. module: base
+#: view:res.lang:0
+msgid "Update Terms"
+msgstr ""
+
+#. module: base
+#: field:partner.sms.send,mobile_to:0
 #: field:res.request,act_to:0
 #: field:res.request.history,act_to:0
 msgid "To"
 msgstr "Para"
 
 #. module: base
+#: view:ir.cron:0
 #: field:ir.cron,args:0
 msgid "Arguments"
 msgstr "Argumentos"
 
 #. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "sxw"
-msgstr "sxw"
+#: selection:ir.module.module,license:0
+msgid "GPL Version 2"
+msgstr "GPL Versão 2"
 
 #. module: base
-#: field:ir.actions.report.xml,auto:0
-msgid "Automatic XSL:RML"
-msgstr "XSL:RML Automático"
+#: selection:ir.module.module,license:0
+msgid "GPL Version 3"
+msgstr "GPL Versão 3"
 
 #. module: base
-#: view:ir.rule:0
-msgid "Manual domain setup"
-msgstr "Configuração manual do domínio"
+#: view:partner.wizard.ean.check:0
+msgid "Correct EAN13"
+msgstr ""
 
 #. module: base
-#: field:res.partner,customer:0
-#: model:res.partner.category,name:base.res_partner_category_0
-#: selection:res.partner.event,partner_type:0
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: base
-#: field:ir.actions.report.custom,name:0
-#: field:ir.report.custom,name:0
-msgid "Report Name"
-msgstr "Nome do Relatório"
+#: model:ir.ui.menu,name:base.menu_audit
+msgid "Audit"
+msgstr ""
 
 #. module: base
 #: field:ir.module.module,shortdesc:0
 msgid "Short Description"
 msgstr "Breve Descrição"
 
-#. module: base
-#: field:res.partner.event,partner_type:0
-msgid "Partner Relation"
-msgstr "Relações de parceiros"
-
 #. module: base
 #: field:ir.actions.act_window,context:0
+#: field:ir.filters,context:0
 msgid "Context Value"
 msgstr "Valor do contexto"
 
@@ -6019,6 +6870,11 @@ msgstr "Valor do contexto"
 msgid "Hour 00->24: %(h24)s"
 msgstr "Hora 00->24: %(h24)s"
 
+#. module: base
+#: field:ir.cron,nextcall:0
+msgid "Next Execution Date"
+msgstr ""
+
 #. module: base
 #: help:multi_company.default,field_id:0
 msgid "Select field property"
@@ -6038,12 +6894,15 @@ msgstr "Mes: %(month)s"
 #: field:ir.actions.act_window.view,sequence:0
 #: field:ir.actions.server,sequence:0
 #: field:ir.actions.todo,sequence:0
-#: field:ir.module.repository,sequence:0
-#: field:ir.report.custom.fields,sequence:0
+#: view:ir.cron:0
 #: view:ir.sequence:0
 #: field:ir.ui.menu,sequence:0
+#: view:ir.ui.view:0
+#: field:ir.ui.view,priority:0
 #: field:ir.ui.view_sc,sequence:0
+#: field:multi_company.default,sequence:0
 #: field:res.partner.bank,sequence:0
+#: field:res.widget.user,sequence:0
 #: field:wizard.ir.model.menu.create.line,sequence:0
 msgid "Sequence"
 msgstr "Sequência"
@@ -6054,18 +6913,18 @@ msgid "Tunisia"
 msgstr "Tunísia"
 
 #. module: base
-#: field:ir.actions.wizard,name:0
-msgid "Wizard Info"
-msgstr "Info. do Assistente"
+#: view:base.language.export:0
+#: model:ir.actions.act_window,name:base.action_wizard_lang_export
+#: model:ir.ui.menu,name:base.menu_wizard_lang_export
+msgid "Export Translation"
+msgstr ""
 
 #. module: base
-#: help:ir.cron,numbercall:0
-msgid ""
-"Number of time the function is called,\n"
-"a negative number indicates that the function will always be called"
-msgstr ""
-"Numero de vezes que a função foi chamada.\n"
-"Um número negativo indica que a função nunca foi chamada."
+#: model:ir.actions.act_window,name:base.action_server_action
+#: view:ir.actions.server:0
+#: model:ir.ui.menu,name:base.menu_server_action
+msgid "Server Actions"
+msgstr "Ações do Servidor"
 
 #. module: base
 #: view:ir.module.module:0
@@ -6078,15 +6937,9 @@ msgid "Legends for Date and Time Formats"
 msgstr "Legenda para formato de data e hora"
 
 #. module: base
-#: selection:ir.report.custom,frequency:0
-msgid "Monthly"
-msgstr "Mensalmente"
-
-#. module: base
-#: model:ir.actions.act_window,name:base.res_partner_som-act
-#: model:ir.ui.menu,name:base.menu_res_partner_som-act
-msgid "States of mind"
-msgstr "Estado Emocional"
+#: selection:ir.actions.server,state:0
+msgid "Copy Object"
+msgstr "Copiar Objeto"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country_state
@@ -6106,34 +6959,35 @@ msgid "Table Ref."
 msgstr "Ref. Tabela"
 
 #. module: base
-#: field:res.roles,parent_id:0
-msgid "Parent"
-msgstr "Superior"
-
-#. module: base
-#: view:multi_company.default:0
-msgid "Returning"
-msgstr "Retornando"
+#: view:res.config:0
+#: view:res.config.installer:0
+msgid "description"
+msgstr "descrição"
 
 #. module: base
 #: field:ir.actions.act_window,res_model:0
-#: field:ir.actions.report.custom,model:0
 #: field:ir.actions.report.xml,model:0
 #: field:ir.actions.server,model_id:0
 #: field:ir.actions.wizard,model:0
 #: field:ir.cron,model:0
 #: field:ir.default,field_tbl:0
-#: view:ir.model:0
+#: field:ir.filters,model_id:0
 #: field:ir.model,model:0
+#: view:ir.model.access:0
 #: field:ir.model.access,model_id:0
+#: view:ir.model.data:0
 #: field:ir.model.data,model:0
-#: field:ir.model.grid,model:0
-#: field:ir.report.custom,model_id:0
+#: view:ir.model.fields:0
+#: view:ir.rule:0
+#: field:ir.rule,model_id:0
 #: selection:ir.translation,type:0
+#: view:ir.ui.view:0
 #: field:ir.ui.view,model:0
+#: view:ir.values:0
 #: field:ir.values,model_id:0
+#: field:multi_company.default,object_id:0
+#: field:res.log,res_model:0
 #: field:res.request.link,object:0
-#: field:wizard.ir.model.menu.create,model_id:0
 #: field:workflow.triggers,model:0
 msgid "Object"
 msgstr "Objeto"
@@ -6149,9 +7003,16 @@ msgid "Minute: %(min)s"
 msgstr "Minuto: %(min)s"
 
 #. module: base
-#: selection:ir.ui.menu,icon:0
-msgid "STOCK_ZOOM_100"
-msgstr "STOCK_ZOOM_100"
+#: view:base.update.translations:0
+#: model:ir.actions.act_window,name:base.action_wizard_update_translations
+#: model:ir.ui.menu,name:base.menu_wizard_update_translations
+msgid "Synchronize Translations"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_10
+msgid "Scheduler"
+msgstr "Agendador"
 
 #. module: base
 #: view:res.lang:0
@@ -6159,18 +7020,30 @@ msgid "%w - Weekday as a decimal number [0(Sunday),6]."
 msgstr "%w - Dia da semana [0(Domingo),6]."
 
 #. module: base
-#: view:wizard.module.lang.export:0
-msgid "Export translation file"
-msgstr "Exportar arquivo de tradução"
+#: help:ir.cron,numbercall:0
+msgid ""
+"Number of time the function is called,\n"
+"a negative number indicates no limit"
+msgstr ""
 
 #. module: base
 #: field:ir.ui.view_sc,user_id:0
 msgid "User Ref."
 msgstr "Ref. Usuário"
 
+#. module: base
+#: code:addons/base/res/res_user.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Aviso !"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config
 #: model:ir.ui.menu,name:base.menu_config
+#: model:ir.ui.menu,name:base.menu_event_config
+#: model:ir.ui.menu,name:base.menu_lunch_survey_root
+#: model:ir.ui.menu,name:base.menu_marketing_config_association
+#: model:ir.ui.menu,name:base.menu_marketing_config_root
 #: view:res.company:0
 msgid "Configuration"
 msgstr "Configuração"
@@ -6181,19 +7054,9 @@ msgid "Loop Expression"
 msgstr "Expressão de repetição"
 
 #. module: base
-#: selection:res.partner.event,partner_type:0
-msgid "Retailer"
-msgstr "Varejista"
-
-#. module: base
-#: selection:ir.report.custom,type:0
-msgid "Tabular"
-msgstr "Tabular"
-
-#. module: base
-#: field:ir.actions.todo,start_on:0
-msgid "Start On"
-msgstr "Iniciar Em"
+#: help:res.partner,website:0
+msgid "Website of Partner"
+msgstr "site do parceiro"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_5
@@ -6203,11 +7066,11 @@ msgstr "Parceiro especial"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: field:res.partner.address,partner_id:0
+#: view:res.partner.address:0
 #: field:res.partner.bank,partner_id:0
 #: field:res.partner.event,partner_id:0
 #: selection:res.partner.title,domain:0
-#: view:res.users:0
+#: model:res.request.link,name:base.req_link_partner
 msgid "Partner"
 msgstr "Parceiro"
 
@@ -6222,47 +7085,41 @@ msgid "Falkland Islands"
 msgstr "Ilhas Falkland"
 
 #. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "odt"
-msgstr "odt"
+#: model:res.country,name:base.lb
+msgid "Lebanon"
+msgstr "Líbano"
 
 #. module: base
-#: field:ir.actions.report.custom,type:0
-#: field:ir.actions.report.xml,type:0
-#: field:ir.report.custom,type:0
+#: view:ir.actions.report.xml:0
+#: field:ir.actions.report.xml,report_type:0
 msgid "Report Type"
 msgstr "Tipo de Relatório"
 
 #. module: base
 #: field:ir.actions.todo,state:0
+#: view:ir.module.module:0
 #: field:ir.module.module,state:0
 #: field:ir.module.module.dependency,state:0
-#: field:ir.report.custom,state:0
 #: field:maintenance.contract,state:0
 #: field:res.bank,state:0
 #: view:res.country.state:0
 #: field:res.partner.bank,state_id:0
+#: view:res.request:0
 #: field:res.request,state:0
 #: field:workflow.instance,state:0
 #: field:workflow.workitem,state:0
 msgid "State"
 msgstr "Estado"
 
-#. module: base
-#: selection:ir.module.module,license:0
-msgid "Other proprietary"
-msgstr "Outro proprietário"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "terp-administration"
 msgstr "terp-administration"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_translation
-#: model:ir.ui.menu,name:base.menu_action_translation
-msgid "All terms"
-msgstr "Todos os termos"
+#: selection:base.language.install,lang:0
+msgid "Galician / Galego"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.no
@@ -6275,11 +7132,16 @@ msgid "4.  %b, %B         ==> Dec, December"
 msgstr "4.  %b, %B         ==> Dez, Dezembro"
 
 #. module: base
-#: model:ir.actions.wizard,name:base.wizard_lang_install
-#: model:ir.ui.menu,name:base.menu_wizard_lang_install
+#: view:base.language.install:0
+#: model:ir.ui.menu,name:base.menu_view_base_language_install
 msgid "Load an Official Translation"
 msgstr "Carregar uma tradução oficial"
 
+#. module: base
+#: view:res.currency:0
+msgid "Miscelleanous"
+msgstr ""
+
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_10
 msgid "Open Source Service Company"
@@ -6291,25 +7153,25 @@ msgid "waiting"
 msgstr "Aguardando"
 
 #. module: base
-#: field:ir.attachment,link:0
-msgid "Link"
-msgstr "Link"
+#: field:ir.actions.report.xml,report_file:0
+msgid "Report file"
+msgstr ""
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_triggers
 msgid "workflow.triggers"
 msgstr "workflow.triggers"
 
-#. module: base
-#: field:ir.report.custom.fields,report_id:0
-msgid "Report Ref"
-msgstr "Ref. Relatório"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "terp-hr"
 msgstr "terp-hr"
 
+#. module: base
+#: view:ir.attachment:0
+msgid "Created"
+msgstr "Criado"
+
 #. module: base
 #: help:ir.actions.wizard,multi:0
 msgid ""
@@ -6318,6 +7180,11 @@ msgid ""
 msgstr ""
 "Se marcado, o ajudante não mostrará a barra de ferramenta no formulário"
 
+#. module: base
+#: view:base.language.import:0
+msgid "- type,name,res_id,src,value"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_DND"
@@ -6334,16 +7201,14 @@ msgid "View Ref."
 msgstr "Ref. de visão"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Dutch (Belgium) / Nederlands (Belgïe)"
 msgstr "Holandês (Bélgica)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_repository_tree
-#: view:ir.module.repository:0
-#: model:ir.ui.menu,name:base.menu_module_repository_tree
-msgid "Repository list"
-msgstr "Lista de repositório"
+#: selection:ir.translation,type:0
+msgid "Selection"
+msgstr "Seleção"
 
 #. module: base
 #: field:res.company,rml_header1:0
@@ -6354,6 +7219,8 @@ msgstr "Cabeçalho do relatório"
 #: field:ir.actions.act_window,type:0
 #: field:ir.actions.act_window_close,type:0
 #: field:ir.actions.actions,type:0
+#: field:ir.actions.report.xml,type:0
+#: view:ir.actions.server:0
 #: field:ir.actions.server,state:0
 #: field:ir.actions.server,type:0
 #: field:ir.actions.url,type:0
@@ -6361,16 +7228,31 @@ msgstr "Cabeçalho do relatório"
 msgid "Action Type"
 msgstr "Tipo de ação"
 
+#. module: base
+#: view:base.language.import:0
+#: model:ir.actions.act_window,name:base.action_view_base_import_language
+#: model:ir.ui.menu,name:base.menu_view_base_import_language
+msgid "Import Translation"
+msgstr ""
+
 #. module: base
 #: field:res.partner.bank.type,field_ids:0
 msgid "Type fields"
 msgstr "Tipos de campos"
 
 #. module: base
+#: view:ir.module.module:0
 #: field:ir.module.module,category_id:0
 msgid "Category"
 msgstr "Categoria"
 
+#. module: base
+#: view:ir.attachment:0
+#: selection:ir.attachment,type:0
+#: selection:ir.property,type:0
+msgid "Binary"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_FLOPPY"
@@ -6394,17 +7276,16 @@ msgid "Your can't submit bug reports due to uncovered modules: %s"
 msgstr ""
 "Você não pode enviar relatórios de erros devido a módulos não cobertos: %s"
 
+#. module: base
+#: view:workflow.activity:0
+msgid "Conditions"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_other_form
 msgid "Other Partners"
 msgstr "Outros Parceiros"
 
-#. module: base
-#: view:ir.model:0
-#: view:res.request:0
-msgid "Status"
-msgstr "Status"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_currency_form
 #: model:ir.ui.menu,name:base.menu_action_currency_form
@@ -6452,6 +7333,16 @@ msgstr "Sra."
 msgid "Estonia"
 msgstr "Estônia"
 
+#. module: base
+#: model:ir.ui.menu,name:base.dashboard
+msgid "Dashboards"
+msgstr ""
+
+#. module: base
+#: help:ir.attachment,type:0
+msgid "Binary File or external URL"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nl
 msgid "Netherlands"
@@ -6462,16 +7353,6 @@ msgstr "Holanda"
 msgid "Low Level Objects"
 msgstr "Objetos de baixo nível"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_report_custom
-msgid "ir.report.custom"
-msgstr "ir.report.custom"
-
-#. module: base
-#: selection:res.partner.event,type:0
-msgid "Purchase Offer"
-msgstr "Promoção"
-
 #. module: base
 #: model:ir.model,name:base.model_ir_values
 msgid "ir.values"
@@ -6482,6 +7363,11 @@ msgstr "ir.values"
 msgid "STOCK_ZOOM_FIT"
 msgstr "STOCK_ZOOM_FIT"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_emails
+msgid "Emails"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.cd
 msgid "Congo, The Democratic Republic of the"
@@ -6505,21 +7391,11 @@ msgid "Number of Calls"
 msgstr "Numero de chamadas"
 
 #. module: base
-#: wizard_view:module.lang.install,start:0
-msgid "Language file loaded."
-msgstr "Carregado arquivo de idioma."
-
-#. module: base
-#: wizard_view:module.upgrade,next:0
-#: wizard_field:module.upgrade,next,module_info:0
+#: view:base.module.upgrade:0
+#: field:base.module.upgrade,module_info:0
 msgid "Modules to update"
 msgstr "Módulos para atualizar"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.action2
-msgid "Company Architecture"
-msgstr "Estrutura da Empresa"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_GOTO_BOTTOM"
@@ -6551,7 +7427,7 @@ msgid "Trigger Date"
 msgstr "Data de disparo"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Croatian / hrvatski jezik"
 msgstr "Croatian / hrvatski jezik"
 
@@ -6560,15 +7436,20 @@ msgstr "Croatian / hrvatski jezik"
 msgid "STOCK_GO_FORWARD"
 msgstr "STOCK_GO_FORWARD"
 
+#. module: base
+#: field:base.language.install,overwrite:0
+msgid "Overwrite Existing Terms"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.server,code:0
 msgid "Python code to be executed"
 msgstr "Código python a ser executado"
 
 #. module: base
-#: selection:ir.module.module.dependency,state:0
-msgid "Uninstallable"
-msgstr "Não instalado"
+#: model:ir.ui.menu,name:base.menu_project_management_time_tracking
+msgid "Time Tracking"
+msgstr ""
 
 #. module: base
 #: view:res.partner.category:0
@@ -6582,26 +7463,23 @@ msgid "Trigger"
 msgstr "Gatilho"
 
 #. module: base
+#: model:ir.model,name:base.model_base_module_update
+msgid "Update Module"
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
 #: field:ir.model.fields,translate:0
 msgid "Translate"
 msgstr "Traduzir"
 
-#. module: base
-#: view:ir.actions.server:0
-msgid ""
-"Access all the fields related to the current object using expression in "
-"double brackets, i.e. [[ object.partner_id.name ]]"
-msgstr ""
-"Acessar todos os campos relacionados no objeto usando expressões em duplo "
-"colchete, ex.: [[object.partner_id.name ]]"
-
 #. module: base
 #: field:res.request.history,body:0
 msgid "Body"
 msgstr "Corpo"
 
 #. module: base
-#: wizard_button:res.partner.spam_send,init,send:0
+#: view:partner.wizard.spam:0
 msgid "Send Email"
 msgstr "Enviar email"
 
@@ -6611,12 +7489,13 @@ msgid "STOCK_SELECT_FONT"
 msgstr "STOCK_SELECT_FONT"
 
 #. module: base
+#: field:res.config.users,menu_id:0
 #: field:res.users,menu_id:0
 msgid "Menu Action"
 msgstr "Menu Ação"
 
 #. module: base
-#: selection:wizard.module.lang.export,state:0
+#: selection:base.language.export,state:0
 msgid "choose"
 msgstr "Escolher"
 
@@ -6627,6 +7506,13 @@ msgstr "Escolher"
 msgid "Graph"
 msgstr "Gráfico"
 
+#. module: base
+#: help:ir.model,osv_memory:0
+msgid ""
+"Indicates whether this object model lives in memory only, i.e. is not "
+"persisted (osv.osv_memory)"
+msgstr ""
+
 #. module: base
 #: field:res.partner,child_ids:0
 #: field:res.request,ref_partner_id:0
@@ -6634,14 +7520,11 @@ msgid "Partner Ref."
 msgstr "Código parceiro"
 
 #. module: base
-#: field:ir.report.custom,print_format:0
-msgid "Print format"
-msgstr "Formato de impressão"
-
-#. module: base
-#: model:ir.ui.menu,name:base.menu_low_workflow
-msgid "Workflow Items"
-msgstr "Itens do Fluxo de Trabalho"
+#: model:ir.actions.act_window,name:base.action_partner_supplier_form
+#: model:ir.ui.menu,name:base.menu_procurement_management_supplier_name
+#: view:res.partner:0
+msgid "Suppliers"
+msgstr "Fornecedores"
 
 #. module: base
 #: field:res.request,ref_doc2:0
@@ -6665,6 +7548,7 @@ msgstr "ir.model.data"
 
 #. module: base
 #: view:ir.model:0
+#: view:ir.rule:0
 #: view:res.groups:0
 msgid "Access Rights"
 msgstr "Direitos de acesso"
@@ -6674,14 +7558,6 @@ msgstr "Direitos de acesso"
 msgid "Greenland"
 msgstr "Groenlândia"
 
-#. module: base
-#: help:ir.actions.report.xml,report_rml:0
-msgid ""
-"The .rml path of the file or NULL if the content is in report_rml_content"
-msgstr ""
-"O caminho (path) do arquivo .rml ou NULL para utilizar conteúdo de "
-"report_rml_content"
-
 #. module: base
 #: field:res.partner.bank,acc_number:0
 msgid "Account Number"
@@ -6692,27 +7568,11 @@ msgstr "Número da conta"
 msgid "1.  %c              ==> Fri Dec  5 18:25:20 2008"
 msgstr "1.  %c              ==> Sex Dez  5 18:25:20 2008"
 
-#. module: base
-#: help:ir.ui.menu,groups_id:0
-msgid ""
-"If you have groups, the visibility of this menu will be based on these "
-"groups. If this field is empty, Open ERP will compute visibility based on "
-"the related object's read access."
-msgstr ""
-"Se voce tem grupos, a visibilidade deste menu será baseada nestes grupos. Se "
-"este campo está vazio, OpenERP definirá a visibilidade baseado no acesso de "
-"leitura do objeto relacionado."
-
 #. module: base
 #: model:res.country,name:base.nc
 msgid "New Caledonia (French)"
 msgstr "Nova Caledônia (França)"
 
-#. module: base
-#: field:res.partner.function,name:0
-msgid "Function Name"
-msgstr "Nome da função"
-
 #. module: base
 #: view:maintenance.contract.wizard:0
 msgid "_Cancel"
@@ -6723,9 +7583,17 @@ msgstr "_Cancelar"
 msgid "Cyprus"
 msgstr "Chipre"
 
+#. module: base
+#: view:base.module.import:0
+msgid ""
+"This wizard helps you add a new language to you OpenERP system. After "
+"loading a new language it becomes available as default interface language "
+"for users and partners."
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,subject:0
-#: wizard_field:res.partner.spam_send,init,subject:0
+#: field:partner.wizard.spam,subject:0
 #: field:res.request,name:0
 msgid "Subject"
 msgstr "Assunto"
@@ -6737,6 +7605,17 @@ msgid "From"
 msgstr "De"
 
 #. module: base
+#: view:res.users:0
+msgid "Preferences"
+msgstr "Preferências"
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_consumers0
+msgid "Consumers"
+msgstr ""
+
+#. module: base
+#: view:res.config:0
 #: wizard_button:server.action.create,init,step_1:0
 msgid "Next"
 msgstr "Próximo"
@@ -6747,27 +7626,35 @@ msgid "terp-report"
 msgstr "terp-report"
 
 #. module: base
-#: field:ir.actions.report.xml,report_rml_content:0
-#: field:ir.actions.report.xml,report_rml_content_data:0
-msgid "RML content"
-msgstr "Conteúdo RML"
+#: help:ir.cron,function:0
+msgid ""
+"Name of the method to be called on the object when this scheduler is "
+"executed."
+msgstr ""
 
 #. module: base
-#: view:workflow.activity:0
-msgid "Incoming transitions"
-msgstr "Transições de entrada"
+#: model:res.company,overdue_msg:base.main_company
+msgid ""
+"Would your payment have been carried out after this mail was sent, please "
+"consider the present one as void. Do not hesitate to contact our accounting "
+"department"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,url:0
+msgid "Url"
+msgstr "URL"
 
 #. module: base
 #: model:res.country,name:base.cn
 msgid "China"
 msgstr "China"
 
-#. module: base
-#: code:addons/base/ir/ir_model.py:0
-#, python-format
-msgid "Password empty !"
-msgstr "Senha em branco !"
-
 #. module: base
 #: model:res.country,name:base.eh
 msgid "Western Sahara"
@@ -6784,20 +7671,30 @@ msgid "Indonesia"
 msgstr "Indonésia"
 
 #. module: base
-#: selection:ir.actions.todo,start_on:0
-msgid "At Once"
-msgstr "só uma vez"
+#: view:base.update.translations:0
+msgid ""
+"This wizard will detect new terms to translate in the application, so that "
+"you can then add translations manually or perform a complete export (as a "
+"template for a new language example)."
+msgstr ""
 
 #. module: base
-#: selection:ir.actions.server,state:0
-msgid "Write Object"
-msgstr "Objeto de gravação"
+#: help:multi_company.default,expression:0
+msgid ""
+"Expression, must be True to match\n"
+"use context.get or user (browse)"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.bg
 msgid "Bulgaria"
 msgstr "Bulgária"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-folder-green"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ao
 msgid "Angola"
@@ -6808,15 +7705,6 @@ msgstr "Angola"
 msgid "French Southern Territories"
 msgstr "Terras Austrais e Antárticas Francesas"
 
-#. module: base
-#: view:ir.actions.server:0
-msgid ""
-"Only one client action will be execute, last                                 "
-"clinent action will be consider in case of multiples clients actions"
-msgstr ""
-"Somente uma ação do cliente será executada, a ultima ação do cliente será "
-"considerada no caso de múltiplas ações."
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_HELP"
@@ -6824,7 +7712,6 @@ msgstr "STOCK_HELP"
 
 #. module: base
 #: model:ir.model,name:base.model_res_currency
-#: view:res.company:0
 #: field:res.company,currency_id:0
 #: field:res.company,currency_ids:0
 #: view:res.currency:0
@@ -6843,51 +7730,77 @@ msgstr "Nome do canal"
 msgid "5.  %y, %Y         ==> 08, 2008"
 msgstr "5.  %y, %Y  ==> 08, 2008"
 
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_ltd
+msgid "ltd"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model_id:0
 #: field:ir.values,res_id:0
+#: field:res.log,res_id:0
 msgid "Object ID"
 msgstr "ID do Objeto"
 
 #. module: base
-#: selection:ir.report.custom,print_orientation:0
+#: view:res.company:0
 msgid "Landscape"
 msgstr "Paisagem"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.action_partner_form
-#: model:ir.ui.menu,name:base.menu_base_config_partner
-#: model:ir.ui.menu,name:base.menu_base_partner
-#: model:ir.ui.menu,name:base.menu_partner_form
-#: view:res.partner:0
-#: view:res.partner.category:0
-#: field:res.partner.category,partner_ids:0
-msgid "Partners"
-msgstr "Parceiros"
-
 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration
 msgid "Administration"
 msgstr "Administração"
 
 #. module: base
-#: selection:ir.rule,operator:0
-msgid "child_of"
-msgstr "child_of"
+#: view:base.module.update:0
+msgid "Click on Update below to start the process..."
+msgstr ""
 
 #. module: base
-#: view:res.users:0
-#: field:res.users,company_ids:0
-msgid "Accepted Companies"
-msgstr "Empresas Permitidas"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-go-today"
+msgstr ""
 
 #. module: base
-#: field:ir.report.custom.fields,operation:0
+#: model:res.country,name:base.ir
+msgid "Iran"
+msgstr "Irã"
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_widget_user_act_window
+#: model:ir.ui.menu,name:base.menu_res_widget_user_act_window
+msgid "Widgets per User"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Slovak / Slovenský jazyk"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
-#: field:wizard.module.lang.export,state:0
+#: field:res.widget.wizard,widget_id:0
 msgid "unknown"
 msgstr "desconhecido"
 
+#. module: base
+#: field:res.currency,symbol:0
+msgid "Symbol"
+msgstr ""
+
+#. module: base
+#: help:res.config.users,login:0
+#: help:res.users,login:0
+msgid "Used to log into the system"
+msgstr ""
+
+#. module: base
+#: view:base.update.translations:0
+msgid "Synchronize Translation"
+msgstr ""
+
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
 msgid "Resource Ref."
@@ -6903,16 +7816,22 @@ msgstr "Kiribati"
 msgid "Iraq"
 msgstr "Iraque"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_association
+msgid "Association"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.server:0
 msgid "Action to Launch"
 msgstr "Ação de Lançamento"
 
 #. module: base
-#: wizard_view:base.module.import,import:0
-#: wizard_view:base.module.import,init:0
-msgid "Module import"
-msgstr "Importar módulo"
+#: model:ir.ui.menu,name:base.menu_address_book
+#: model:ir.ui.menu,name:base.menu_config_address_book
+#: model:ir.ui.menu,name:base.menu_procurement_management_supplier
+msgid "Address Book"
+msgstr "Agenda de Endereços"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_sequence_type
@@ -6920,13 +7839,23 @@ msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
 #. module: base
-#: selection:wizard.module.lang.export,format:0
+#: selection:base.language.export,format:0
 msgid "CSV File"
 msgstr "Arquivos CSV"
 
+#. module: base
+#: field:res.company,account_no:0
+msgid "Account No."
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
 #. module: base
 #: selection:ir.model,state:0
-#: selection:ir.model.grid,state:0
 msgid "Base Object"
 msgstr "Objeto Base"
 
@@ -6941,15 +7870,7 @@ msgid "STOCK_STRIKETHROUGH"
 msgstr "STOCK_STRIKETHROUGH"
 
 #. module: base
-#: selection:ir.report.custom.fields,fc0_op:0
-#: selection:ir.report.custom.fields,fc1_op:0
-#: selection:ir.report.custom.fields,fc2_op:0
-#: selection:ir.report.custom.fields,fc3_op:0
-msgid "(year)="
-msgstr "(Ano)="
-
-#. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "Dependencies :"
 msgstr "Dependências"
 
@@ -6979,21 +7900,11 @@ msgid "Antigua and Barbuda"
 msgstr "Antígua e Barbuda"
 
 #. module: base
-#: field:ir.actions.server,condition:0
-#: field:ir.report.custom.fields,fc0_condition:0
-#: field:ir.sequence,condition:0
-#: view:multi_company.default:0
-#: field:workflow.transition,condition:0
-msgid "Condition"
-msgstr "Condição"
+#: model:res.country,name:base.gw
+msgid "Guinea Bissau"
+msgstr "Guiné Bissau"
 
 #. module: base
-#: model:res.country,name:base.zr
-msgid "Zaire"
-msgstr "Zaire"
-
-#. module: base
-#: field:ir.attachment,res_id:0
 #: field:ir.model.data,res_id:0
 #: field:ir.translation,res_id:0
 #: field:workflow.instance,res_id:0
@@ -7004,34 +7915,25 @@ msgstr "ID do recurso"
 #. module: base
 #: view:ir.cron:0
 #: field:ir.model,info:0
-#: field:ir.model.grid,info:0
-#: view:maintenance.contract:0
 msgid "Information"
 msgstr "Informação"
 
 #. module: base
-#: view:wizard.module.lang.export:0
-msgid ""
-"The official translations pack of all OpenERP/OpenObjects module are managed "
-"through launchpad. We use their online interface to synchronize all "
-"translations efforts."
+#: selection:ir.ui.menu,icon:0
+msgid "terp-call-start"
 msgstr ""
-"O pacote oficial de traduções de todos os módlos OpenERP/OpenObjects são "
-"administrados através do launchpad. Nos usamos sua interface online para "
-"sincronizar todos os esforços de tradução."
 
 #. module: base
-#: field:ir.actions.report.xml,report_rml:0
-msgid "RML path"
-msgstr "Path do RML"
+#: view:res.widget.user:0
+msgid "User Widgets"
+msgstr ""
 
 #. module: base
-#: field:ir.actions.configuration.wizard,item_id:0
-msgid "Next Configuration Wizard"
-msgstr "Proximo passo do assistente de configuração"
+#: view:base.module.update:0
+msgid "Update Module List"
+msgstr ""
 
 #. module: base
-#: selection:ir.actions.todo,type:0
 #: selection:res.partner.address,type:0
 msgid "Other"
 msgstr "Outro"
@@ -7042,21 +7944,10 @@ msgid "Reply"
 msgstr "Responder"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Turkish / Türkçe"
 msgstr "Turkish / Türkçe"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.action_translation_untrans
-#: model:ir.ui.menu,name:base.menu_action_translation_untrans
-msgid "Untranslated terms"
-msgstr "Termos não traduzidos"
-
-#. module: base
-#: wizard_view:module.lang.import,init:0
-msgid "Import New Language"
-msgstr "Importar Novo Idioma"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_activity_form
 #: model:ir.ui.menu,name:base.menu_workflow_activity
@@ -7071,31 +7962,48 @@ msgid "Auto-Refresh"
 msgstr "Auto-atualizar"
 
 #. module: base
-#: selection:ir.report.custom.fields,fc0_op:0
-#: selection:ir.report.custom.fields,fc1_op:0
-#: selection:ir.report.custom.fields,fc2_op:0
-#: selection:ir.report.custom.fields,fc3_op:0
-#: selection:ir.rule,operator:0
-msgid "="
-msgstr "="
+#: selection:ir.ui.view,type:0
+msgid "Diagram"
+msgstr "Diagrama"
 
 #. module: base
-#: code:addons/base/ir/ir_report_custom.py:0
-#, python-format
-msgid "Second field should be figures"
-msgstr "O segundo campo deve ser uma imagem"
+#: help:multi_company.default,name:0
+msgid "Name it to easily find a record"
+msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_model_grid_security
-#: model:ir.ui.menu,name:base.menu_ir_access_grid
-msgid "Access Controls Grid"
-msgstr "Grid dos controles de acesso"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-locked"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.grant_menu_access
+#: model:ir.ui.menu,name:base.menu_grant_menu_access
+msgid "Menu Items"
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-personal"
+msgstr ""
+
+#. module: base
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_event_association
+#: model:ir.ui.menu,name:base.menu_event_main
+msgid "Events Organisation"
+msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_actions
 #: model:ir.ui.menu,name:base.menu_custom_action
 #: model:ir.ui.menu,name:base.menu_ir_sequence_actions
 #: model:ir.ui.menu,name:base.next_id_6
+#: view:workflow.activity:0
 msgid "Actions"
 msgstr "Ações"
 
@@ -7130,9 +8038,9 @@ msgid "Add or not the coporate RML header"
 msgstr "Adicionar ou não um cabeçalho RML corporativo"
 
 #. module: base
-#: field:res.partner.event,document:0
-msgid "Document"
-msgstr "Documento"
+#: help:workflow.transition,act_to:0
+msgid "The destination activity."
+msgstr ""
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7145,7 +8053,8 @@ msgid "STOCK_STOP"
 msgstr "STOCK_STOP"
 
 #. module: base
-#: view:wizard.module.update_translations:0
+#: view:base.module.update:0
+#: view:base.update.translations:0
 msgid "Update"
 msgstr "Atualizar"
 
@@ -7165,7 +8074,7 @@ msgid "Tanzania"
 msgstr "Tanzânia"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Danish / Dansk"
 msgstr ""
 
@@ -7180,38 +8089,76 @@ msgid "Other Actions Configuration"
 msgstr "Outras ações de configuração"
 
 #. module: base
-#: selection:ir.ui.menu,icon:0
-msgid "STOCK_EXECUTE"
-msgstr "STOCK_EXECUTE"
+#: view:res.lang:0
+msgid "%c - Appropriate date and time representation."
+msgstr "%c - representação adequada para Data e hora."
+
+#. module: base
+#: view:res.config.installer:0
+msgid "Install Modules"
+msgstr "Instalar Módulos"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_partner_canal-act
 #: model:ir.model,name:base.model_res_partner_canal
 #: model:ir.ui.menu,name:base.menu_res_partner_canal-act
+#: view:res.partner.canal:0
 msgid "Channels"
 msgstr "Canais"
 
+#. module: base
+#: view:ir.ui.view:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_values_form_action
+#: model:ir.ui.menu,name:base.menu_values_form_action
+msgid "Client Events"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Schedule for Installation"
 msgstr "Agendar para instalação"
 
 #. module: base
-#: selection:ir.model.fields,select_level:0
-msgid "Advanced Search"
-msgstr "Pesquisa avançada"
+#: model:ir.model,name:base.model_partner_wizard_ean_check
+msgid "Ean Check"
+msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_res_partner_bank
-#: view:res.partner.bank:0
-msgid "Bank Accounts"
-msgstr "Contas Bancaria"
+#: code:addons/base/res/res_user.py:0
+#, python-format
+msgid "You can not have two users with the same login !"
+msgstr "Não é permitido criar dois usuários com o mesmo login!"
+
+#. module: base
+#: code:addons/base/res/res_user.py:0
+#, python-format
+msgid ""
+"Please keep in mind that data currently displayed may not be relevant after "
+"switching to another company. If you have unsaved changes, please make sure "
+"to save and close the forms before switching to a different company (you can "
+"click on Cancel now)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_multi_company_default
+msgid "Default multi company"
+msgstr ""
 
 #. module: base
 #: view:res.request:0
 msgid "Send"
 msgstr "Enviar"
 
+#. module: base
+#: field:res.config.users,menu_tips:0
+#: field:res.users,menu_tips:0
+msgid "Menu Tips"
+msgstr ""
+
 #. module: base
 #: field:ir.translation,src:0
 msgid "Source"
@@ -7233,7 +8180,7 @@ msgid "Internal Header/Footer"
 msgstr "Cabeçalho/Rodapé interno"
 
 #. module: base
-#: code:addons/base/module/wizard/wizard_export_lang.py:0
+#: code:addons/base/module/wizard/base_export_language.py:0
 #, python-format
 msgid ""
 "Save this document to a .tgz file. This archive containt UTF-8 %s files and "
@@ -7243,13 +8190,24 @@ msgstr ""
 "com codificação UTF-8 e pode ser feito upload para o launchpad."
 
 #. module: base
-#: wizard_button:module.upgrade,end,config:0
-#: wizard_button:module.upgrade,start,config:0
+#: view:base.module.upgrade:0
 msgid "Start configuration"
 msgstr "Iniciar configuração"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: view:base.language.export:0
+msgid "_Export"
+msgstr ""
+
+#. module: base
+#: field:base.language.install,state:0
+#: field:base.module.import,state:0
+#: field:base.module.update,state:0
+msgid "state"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
 msgid "Catalan / Català"
 msgstr "Catalan / Català"
 
@@ -7268,12 +8226,6 @@ msgstr "STOCK_COLOR_PICKER"
 msgid "Saudi Arabia"
 msgstr "Arábia Saudita"
 
-#. module: base
-#: code:addons/base/ir/ir_report_custom.py:0
-#, python-format
-msgid "Bar charts need at least two fields"
-msgstr "Gráfico de barras necessita de pelo menos 2 campos"
-
 #. module: base
 #: help:res.partner,supplier:0
 msgid ""
@@ -7288,31 +8240,48 @@ msgstr ""
 msgid "Relation Field"
 msgstr "Campo de relação"
 
+#. module: base
+#: view:res.partner.event:0
+msgid "Event Logs"
+msgstr "Logs de Evento"
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_configuration.py:0
+#, python-format
+msgid "System Configuration done"
+msgstr ""
+
 #. module: base
 #: field:workflow.triggers,instance_id:0
 msgid "Destination Instance"
 msgstr "Instância de destino"
 
 #. module: base
+#: field:ir.actions.act_window,multi:0
 #: field:ir.actions.wizard,multi:0
 msgid "Action on Multiple Doc."
 msgstr "Ação em Multiplos Docs."
 
 #. module: base
-#: view:wizard.module.lang.export:0
+#: view:base.language.export:0
 msgid "https://translations.launchpad.net/openobject"
 msgstr "https://translations.launchpad.net/openobject"
 
-#. module: base
-#: field:ir.actions.todo,start_date:0
-msgid "Start Date"
-msgstr "Data Inicial"
-
 #. module: base
 #: field:ir.actions.report.xml,report_xml:0
 msgid "XML path"
 msgstr "Path do XML"
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-go-year"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,restart:0
+msgid "On Skip"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.gn
 msgid "Guinea"
@@ -7324,27 +8293,26 @@ msgid "Luxembourg"
 msgstr "Luxemburgo"
 
 #. module: base
-#: model:ir.actions.todo,note:base.config_wizard_step_user
-msgid ""
-"Create your users.\n"
-"You will be able to assign groups to users. Groups define the access rights "
-"of each users on the different objects of the system.\n"
-"            "
+#: view:base.module.upgrade:0
+msgid "The selected modules have been updated / installed !"
 msgstr ""
-"Crie seus usuários.\n"
-"Você será capaz de atribuir grupos de usuários. Grupos define os direitos de "
-"acesso de usuários em cada um dos diferentes objetos do sistema.\n"
-"            "
 
 #. module: base
-#: selection:res.request,priority:0
-msgid "Low"
-msgstr "Baixo"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Erro ! Você não pode criar menu recursivo."
 
 #. module: base
-#: view:ir.values:0
-msgid "tree_but_action, client_print_multi"
-msgstr "tree_but_action, client_print_multi"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-gtk-jump-to-rtl"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"3. If user belongs to several groups, the results from step 2 are combined "
+"with logical OR operator"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.sv
@@ -7353,10 +8321,20 @@ msgstr "El Salvador"
 
 #. module: base
 #: field:res.bank,phone:0
+#: field:res.partner,phone:0
 #: field:res.partner.address,phone:0
 msgid "Phone"
 msgstr "Telefone"
 
+#. module: base
+#: help:ir.actions.report.xml,attachment_use:0
+msgid ""
+"If you check this, then the second time the user prints with same attachment "
+"name, it returns the previous report."
+msgstr ""
+"Se marcar esta opção, na segunda vez que usar a impressora com o mesmo "
+"anexo, usará a impressora anterior"
+
 #. module: base
 #: field:res.groups,menu_access:0
 msgid "Access Menu"
@@ -7368,22 +8346,9 @@ msgid "Thailand"
 msgstr "Tailândia"
 
 #. module: base
-#: selection:ir.report.custom.fields,fc0_op:0
-#: selection:ir.report.custom.fields,fc1_op:0
-#: selection:ir.report.custom.fields,fc2_op:0
-#: selection:ir.report.custom.fields,fc3_op:0
-msgid ">"
-msgstr ">"
-
-#. module: base
-#: field:ir.model.access,perm_unlink:0
-msgid "Delete Permission"
-msgstr "Permissão para excluir"
-
-#. module: base
-#: model:ir.model,name:base.model_multi_company_default
-msgid "multi_company.default"
-msgstr "multi_company.default"
+#: model:ir.ui.menu,name:base.menu_crm_config_lead
+msgid "Leads & Opportunities"
+msgstr ""
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
@@ -7402,12 +8367,10 @@ msgid "STOCK_PRINT"
 msgstr "STOCK_PRINT"
 
 #. module: base
-#: selection:ir.report.custom.fields,fc0_op:0
-#: selection:ir.report.custom.fields,fc1_op:0
-#: selection:ir.report.custom.fields,fc2_op:0
-#: selection:ir.report.custom.fields,fc3_op:0
-msgid "<"
-msgstr "<"
+#: view:ir.rule:0
+#: view:res.partner:0
+msgid "General"
+msgstr "Geral"
 
 #. module: base
 #: model:res.country,name:base.uz
@@ -7420,6 +8383,11 @@ msgstr "Uzbequistão"
 msgid "ir.actions.act_window"
 msgstr "ir.actions.act_window"
 
+#. module: base
+#: field:ir.rule,perm_create:0
+msgid "Apply For Create"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.vi
 msgid "Virgin Islands (USA)"
@@ -7431,13 +8399,11 @@ msgid "Taiwan"
 msgstr "Taiwan"
 
 #. module: base
-#: view:ir.rule:0
-msgid "If you don't force the domain, it will use the simple domain setup"
-msgstr ""
-"Se você não forçar o domínio, ele irá usar a configuração de domínio simples"
+#: model:ir.model,name:base.model_res_currency_rate
+msgid "Currency Rate"
+msgstr "Taxa de Câmbio"
 
 #. module: base
-#: field:ir.report.custom,field_parent:0
 #: field:ir.ui.view,field_parent:0
 msgid "Child Field"
 msgstr "Campo inferior(filho)"
@@ -7446,7 +8412,6 @@ msgstr "Campo inferior(filho)"
 #: field:ir.actions.act_window,usage:0
 #: field:ir.actions.act_window_close,usage:0
 #: field:ir.actions.actions,usage:0
-#: field:ir.actions.report.custom,usage:0
 #: field:ir.actions.report.xml,usage:0
 #: field:ir.actions.server,usage:0
 #: field:ir.actions.wizard,usage:0
@@ -7464,7 +8429,7 @@ msgid "Not Installable"
 msgstr "Não instalável"
 
 #. module: base
-#: rml:ir.module.reference:0
+#: report:ir.module.reference.graph:0
 msgid "View :"
 msgstr "View :"
 
@@ -7474,10 +8439,10 @@ msgid "View Auto-Load"
 msgstr "Auto-carregar Visão"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_partner_supplier_form
-#: view:res.partner:0
-msgid "Suppliers"
-msgstr "Fornecedores"
+#: code:addons/base/ir/ir_model.py:0
+#, python-format
+msgid "You cannot remove the field '%s' !"
+msgstr ""
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7485,12 +8450,13 @@ msgid "STOCK_JUMP_TO"
 msgstr "STOCK_JUMP_TO"
 
 #. module: base
-#: field:ir.actions.todo,end_date:0
-msgid "End Date"
-msgstr "Data Final"
+#: selection:base.language.install,lang:0
+msgid "Gujarati / India"
+msgstr ""
 
 #. module: base
 #: field:ir.exports,resource:0
+#: view:ir.property:0
 #: field:ir.property,res_id:0
 msgid "Resource"
 msgstr "Recurso"
@@ -7502,9 +8468,21 @@ msgid "Contract ID"
 msgstr "ID do contrato"
 
 #. module: base
-#: selection:ir.report.custom.fields,alignment:0
-msgid "center"
-msgstr "Centralizar"
+#: selection:base.language.install,lang:0
+msgid "Persian / فارس"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "View Ordering"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid ""
+"Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
+"Portable Objects)"
+msgstr ""
 
 #. module: base
 #: field:maintenance.contract.wizard,state:0
@@ -7512,24 +8490,19 @@ msgid "States"
 msgstr "Status"
 
 #. module: base
-#: view:multi_company.default:0
-msgid "Matching"
-msgstr "Correspondendo a"
-
-#. module: base
-#: field:ir.actions.configuration.wizard,name:0
-msgid "Next Wizard"
-msgstr "Próximo assistente"
+#: model:ir.model,name:base.model_base_module_configuration
+msgid "base.module.configuration"
+msgstr ""
 
 #. module: base
+#: field:base.language.export,name:0
 #: field:ir.attachment,datas_fname:0
-#: field:wizard.module.lang.export,name:0
 msgid "Filename"
 msgstr "Nome do Arquivo"
 
 #. module: base
 #: field:ir.model,access_ids:0
-#: field:ir.model.grid,access_ids:0
+#: view:ir.model.access:0
 msgid "Access"
 msgstr "Acesso"
 
@@ -7544,9 +8517,9 @@ msgid "Aruba"
 msgstr "Aruba"
 
 #. module: base
-#: selection:ir.cron,interval_type:0
-msgid "Weeks"
-msgstr "Semanas"
+#: model:res.country,name:base.ar
+msgid "Argentina"
+msgstr "Argentina"
 
 #. module: base
 #: field:res.groups,name:0
@@ -7568,6 +8541,16 @@ msgstr "Segmentação"
 msgid "STOCK_FIND"
 msgstr "STOCK_FIND"
 
+#. module: base
+#: view:res.users:0
+msgid "Email & Signature"
+msgstr "Email & Assinatura"
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_aftersale
+msgid "After-Sale Services"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.action_maintenance_contract_add_wizard
 #: model:ir.ui.menu,name:base.menu_maintenance_contract_add
@@ -7576,13 +8559,17 @@ msgid "Add Maintenance Contract"
 msgstr "Incluir contrato de manutenção"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: view:ir.actions.todo:0
+msgid "Launch"
+msgstr "Executar"
+
+#. module: base
+#: selection:base.language.install,lang:0
 msgid "Vietnam / Cộng hòa xã hội chủ nghĩa Việt Nam"
 msgstr "Vietnam"
 
 #. module: base
 #: field:ir.actions.act_window,limit:0
-#: field:ir.report.custom,limitt:0
 msgid "Limit"
 msgstr "Limite"
 
@@ -7596,6 +8583,11 @@ msgstr "Fluxo de trabalho a ser executado nesse modelo"
 msgid "Jamaica"
 msgstr "Jamaica"
 
+#. module: base
+#: model:ir.ui.menu,name:base.menu_mrp_root
+msgid "Manufacturing"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.az
 msgid "Azerbaijan"
@@ -7608,15 +8600,10 @@ msgid "Warning"
 msgstr "Aviso"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Arabic / الْعَرَبيّة"
 msgstr "Arabic / الْعَرَبيّة"
 
-#. module: base
-#: model:res.country,name:base.gi
-msgid "Gibraltar"
-msgstr "Gibraltar"
-
 #. module: base
 #: model:res.country,name:base.vg
 msgid "Virgin Islands (British)"
@@ -7628,7 +8615,13 @@ msgid "STOCK_MEDIA_PREVIOUS"
 msgstr "STOCK_MEDIA_PREVIOUS"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: view:ir.property:0
+#: model:ir.ui.menu,name:base.next_id_15
+msgid "Parameters"
+msgstr "Parâmetros"
+
+#. module: base
+#: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
 msgstr "Czech / Čeština"
 
@@ -7637,21 +8630,16 @@ msgstr "Czech / Čeština"
 msgid "Wallis and Futuna Islands"
 msgstr "Ilhas Wallis e Futuna"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_wizard_screen
+msgid "ir.wizard.screen"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.rw
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#. module: base
-#: constraint:res.partner:0
-msgid "The VAT doesn't seem to be correct."
-msgstr "O imposto não parece estar correto."
-
-#. module: base
-#: selection:ir.report.custom.fields,operation:0
-msgid "Calculate Sum"
-msgstr "Calcular a Soma"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day of the week (0:Monday): %(weekday)s"
@@ -7662,24 +8650,13 @@ msgstr "Dia da Semana(0:Domingo): %(weekday)s"
 msgid "Cook Islands"
 msgstr "Ilhas Cook"
 
-#. module: base
-#: help:ir.actions.server,mobile:0
-msgid ""
-"Provides fields that be used to fetch the mobile number, e.g. you select the "
-"invoice, then `object.invoice_address_id.mobile` is the field which gives "
-"the correct mobile number"
-msgstr ""
-"Define os campos que serão usados para capturar o número do celular, por "
-"exemplo: quando você seleciona a fatura, o campo que irá conter o número do "
-"celular é: 'object.invoice_address_id.mobile'"
-
 #. module: base
 #: field:ir.model.data,noupdate:0
 msgid "Non Updatable"
 msgstr "Não atualizável"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Klingon"
 msgstr "Klingon"
 
@@ -7709,47 +8686,60 @@ msgstr "STOCK_NETWORK"
 #: view:res.country:0
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
+#: view:res.partner.address:0
 #: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "País"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Telugu / India"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,complete_name:0
 #: field:ir.ui.menu,complete_name:0
 msgid "Complete Name"
 msgstr "Nome Completo"
 
-#. module: base
-#: view:ir.report.custom:0
-msgid "Subscribe Report"
-msgstr "Subscreva relatório"
-
 #. module: base
 #: field:ir.values,object:0
 msgid "Is Object"
 msgstr "É objeto"
 
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"1. Global rules are combined together with a logical AND operator, and with "
+"the result of the following steps"
+msgstr ""
+
 #. module: base
 #: field:res.partner.category,name:0
 msgid "Category Name"
 msgstr "Nome de Categoria"
 
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_15
+msgid "IT sector"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "Select Groups"
 msgstr "Selecionar grupos"
 
-#. module: base
-#: field:ir.sequence,weight:0
-msgid "Weight"
-msgstr "Peso"
-
 #. module: base
 #: view:res.lang:0
 msgid "%X - Appropriate time representation."
 msgstr "%X - Tempo de representação adequado."
 
+#. module: base
+#: selection:ir.ui.menu,icon:0
+msgid "terp-mail_delete"
+msgstr ""
+
 #. module: base
 #: view:res.company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
@@ -7770,12 +8760,12 @@ msgstr ""
 "caso."
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_partner_customer_form_new
-msgid "New Partner"
-msgstr "Novo parceiro"
+#: selection:ir.ui.menu,icon:0
+msgid "terp-go-month"
+msgstr ""
 
 #. module: base
-#: selection:ir.report.custom,print_orientation:0
+#: view:res.company:0
 msgid "Portrait"
 msgstr "Retrato"
 
@@ -7784,38 +8774,34 @@ msgstr "Retrato"
 msgid "Wizard Button"
 msgstr "Butão do assistente"
 
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Report/Template"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_DIRECTORY"
 msgstr "STOCK_DIRECTORY"
 
-#. module: base
-#: field:ir.module.module,installed_version:0
-msgid "Latest version"
-msgstr "Última verão"
-
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_server
+#: selection:ir.ui.menu,action:0
 msgid "ir.actions.server"
 msgstr "ir.actions.server"
 
-#. module: base
-#: model:ir.actions.act_window,name:base.action_rule
-#: model:ir.ui.menu,name:base.menu_action_rule
-msgid "Record Rules"
-msgstr "Registro de regras"
-
-#. module: base
-#: view:ir.actions.report.custom:0
-msgid "Report custom"
-msgstr "Configurar relatório"
-
 #. module: base
 #: field:ir.actions.configuration.wizard,progress:0
+#: field:res.config,progress:0
+#: field:res.config.installer,progress:0
+#: field:res.config.users,progress:0
+#: field:res.config.view,progress:0
 msgid "Configuration Progress"
 msgstr "Progresso da configuração"
 
 #. module: base
+#: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
+#: model:ir.ui.menu,name:base.menu_ir_actions_todo_form
 #: model:ir.ui.menu,name:base.next_id_11
 msgid "Configuration Wizards"
 msgstr "Assistentes de configuração"
@@ -7830,16 +8816,16 @@ msgstr "Código de País/Língua"
 msgid "Split Mode"
 msgstr "Modo de separação"
 
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Note that this operation might take a few minutes."
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_localisation
 msgid "Localisation"
 msgstr "Localização"
 
-#. module: base
-#: selection:res.config.view,view:0
-msgid "Simplified Interface"
-msgstr "Interface simplificada"
-
 #. module: base
 #: model:res.country,name:base.cl
 msgid "Chile"
@@ -7851,10 +8837,15 @@ msgid "STOCK_REVERT_TO_SAVED"
 msgstr "STOCK_REVERT_TO_SAVED"
 
 #. module: base
-#: model:ir.actions.wizard,name:base.wizard_lang_import
-#: model:ir.ui.menu,name:base.menu_wizard_lang_import
-msgid "Import a Translation File"
-msgstr "Importar arquivo de tradução"
+#: view:ir.cron:0
+msgid "Execution"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,condition:0
+#: field:workflow.transition,condition:0
+msgid "Condition"
+msgstr "Condição"
 
 #. module: base
 #: help:ir.values,model_id:0
@@ -7867,7 +8858,7 @@ msgid "View Name"
 msgstr "Nome da view"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Italian / Italiano"
 msgstr "Italian / Italiano"
 
@@ -7876,6 +8867,13 @@ msgstr "Italian / Italiano"
 msgid "Save As Attachment Prefix"
 msgstr "Salvar como prefixo de anexo"
 
+#. module: base
+#: view:ir.actions.server:0
+msgid ""
+"Only one client action will be executed, last client action will be "
+"considered in case of multiple client actions."
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.hr
 msgid "Croatia"
@@ -7896,21 +8894,26 @@ msgid "Partner Categories"
 msgstr "Categorias de parceiros"
 
 #. module: base
-#: field:ir.sequence,code:0
-#: field:ir.sequence.type,code:0
-msgid "Sequence Code"
-msgstr "Código de sequência"
+#: view:base.module.upgrade:0
+msgid "System Update"
+msgstr ""
 
 #. module: base
-#: selection:ir.report.custom,print_format:0
-msgid "a5"
-msgstr "a5"
+#: help:ir.sequence,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.sc
 msgid "Seychelles"
 msgstr "Seicheles"
 
+#. module: base
+#: model:ir.model,name:base.model_res_partner_bank
+#: view:res.partner.bank:0
+msgid "Bank Accounts"
+msgstr "Contas Bancaria"
+
 #. module: base
 #: model:res.country,name:base.sl
 msgid "Sierra Leone"
@@ -7938,12 +8941,21 @@ msgid "Account Owner"
 msgstr "Titular da Conta"
 
 #. module: base
-#: field:ir.attachment,res_model:0
+#: selection:ir.ui.menu,icon:0
+msgid "terp-mail-message-new"
+msgstr ""
+
+#. module: base
 #: field:workflow,osv:0
 #: field:workflow.instance,res_type:0
 msgid "Resource Object"
 msgstr "Recurso do objeto"
 
+#. module: base
+#: help:ir.sequence,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,function:0
 #: field:res.partner.address,function:0
@@ -7951,25 +8963,31 @@ msgstr "Recurso do objeto"
 msgid "Function"
 msgstr "Função"
 
+#. module: base
+#: view:res.widget:0
+msgid "Search Widget"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,restart:0
+msgid "Never"
+msgstr "Numca"
+
 #. module: base
 #: selection:res.partner.address,type:0
 msgid "Delivery"
 msgstr "Entrega"
 
-#. module: base
-#: field:ir.attachment,preview:0
-msgid "Image Preview"
-msgstr "Pré-visualização da Imagem"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
+#: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
 msgid "Corp."
 msgstr "Empr."
 
 #. module: base
-#: model:res.country,name:base.gw
-msgid "Guinea Bissau"
-msgstr "Guiné Bissau"
+#: selection:base.language.install,lang:0
+msgid "Korean / Korea, Republic of"
+msgstr ""
 
 #. module: base
 #: view:workflow.instance:0
@@ -7987,16 +9005,17 @@ msgstr "Parceiros "
 msgid "North Korea"
 msgstr "Coréia do Norte"
 
-#. module: base
-#: view:ir.report.custom:0
-msgid "Unsubscribe Report"
-msgstr "Cancelar relatorio"
-
 #. module: base
 #: selection:ir.actions.server,state:0
 msgid "Create Object"
 msgstr "Criar Objeto"
 
+#. module: base
+#: view:ir.filters:0
+#: field:res.log,context:0
+msgid "Context"
+msgstr ""
+
 #. module: base
 #: field:res.bank,bic:0
 msgid "BIC/Swift code"
@@ -8008,7 +9027,7 @@ msgid "Prospect"
 msgstr "Prospecto"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Polish / Język polski"
 msgstr "Polish / Język polski"
 
@@ -8026,167 +9045,963 @@ msgstr ""
 "Usado para selecionar automaticamento o endereço certo de acordo com o "
 "contexto nos documentos de compra e venda."
 
-#. module: base
-#: wizard_view:module.lang.install,init:0
-msgid "Choose a language to install:"
-msgstr "Escolha o idioma a instalar:"
-
 #. module: base
 #: model:res.country,name:base.lk
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
 #. module: base
-#: selection:module.lang.install,init,lang:0
+#: selection:base.language.install,lang:0
 msgid "Russian / русский язык"
 msgstr "Russo / русский язык"
 
-#. module: base
-#: sql_constraint:res.user:0
-msgid "You cannot have two users with the same login !"
-msgstr "Não é permitido criar dois usuários com o mesmo login!"
+#~ msgid "Yearly"
+#~ msgstr "Anualmente"
 
-#. module: base
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
+#~ msgid ""
+#~ "Choose between the \"Simplified Interface\" or the extended one.\n"
+#~ "If you are testing or using OpenERP for the first time, we suggest you to "
+#~ "use\n"
+#~ "the simplified interface, which has less options and fields but is easier "
+#~ "to\n"
+#~ "understand. You will be able to switch to the extended view later.\n"
+#~ "            "
+#~ msgstr ""
+#~ "Escolha entre a 'Interface simplificada' ou a estendida.\n"
+#~ "Se você está testando ou usando o OpenERP pela primeira vez, nós sugerimos "
+#~ "que use\n"
+#~ "a interface simplificada, por ter menos opções e os campos poder ser "
+#~ "facilmente\n"
+#~ "entendidos. Você pode alternar para interface estendida  mais tarde.\n"
+#~ "            "
 
-#. module: base
-#: sql_constraint:ir.ui.view_sc:0
-msgid "Shortcut for this menu already exists!"
-msgstr ""
+#~ msgid "Operand"
+#~ msgstr "Operando"
 
-#. module: base
-#: sql_constraint:ir.model.data:0
-msgid ""
-"You cannot have multiple records with the same id for the same module !"
-msgstr "Não é permitido criar dois usuários com o mesmo login!"
+#~ msgid "ir.actions.report.custom"
+#~ msgstr "ir.actions.report.custom"
 
-#. module: base
-#: sql_constraint:maintenance.contract:0
-msgid "Your maintenance contract is already subscribed in the system !"
-msgstr ""
+#~ msgid "Sorted By"
+#~ msgstr "Ordenado Por"
 
-#. module: base
-#: sql_constraint:ir.module.module:0
-#: sql_constraint:ir.module.web:0
-msgid "The name of the module must be unique !"
-msgstr ""
+#~ msgid "ir.report.custom.fields"
+#~ msgstr "ir.report.custom.fields"
 
-#. module: base
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
+#~ msgid "Get Max"
+#~ msgstr "Pegar o máximo"
 
-#. module: base
-#: sql_constraint:res.partner.function:0
-msgid "The Code of the Partner Function must be unique !"
-msgstr ""
+#~ msgid "To browse official translations, you can visit this link: "
+#~ msgstr "Para ver traduções oficiais, você pode visitar este link: "
 
-#. module: base
-#: sql_constraint:res.partner:0
-msgid "The name of the Partner must be unique !"
-msgstr ""
+#~ msgid "Uninstalled modules"
+#~ msgstr "Módulos não instalados"
 
-#. module: base
-#: sql_constraint:res.country:0
-msgid "The name of the country must be unique !"
-msgstr ""
+#~ msgid "Configure"
+#~ msgstr "Configurar"
 
-#. module: base
-#: sql_constraint:res.country:0
-msgid "The code of the country must be unique !"
-msgstr ""
+#~ msgid "Extended Interface"
+#~ msgstr "Interface extendida"
 
-#. module: base
-#: sql_constraint:res.lang:0
-msgid "The name of the language must be unique !"
-msgstr ""
+#~ msgid "Configure simple view"
+#~ msgstr "Configurar uma view simples"
 
-#. module: base
-#: sql_constraint:res.lang:0
-msgid "The code of the language must be unique !"
-msgstr ""
+#~ msgid "Bar Chart"
+#~ msgstr "Gráfico de Barras"
 
-#. module: base
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
+#~ msgid "Factor"
+#~ msgstr "Fator"
 
-#. module: base
-#: code:addons/osv/osv.py:0
-#, python-format
-msgid "Constraint Error"
-msgstr ""
+#~ msgid "Sequence Name"
+#~ msgstr "Nome da Sequencia"
 
-#. module: base
-#: code:addons/osv/osv.py:0
-#, python-format
-msgid ""
-"The operation cannot be completed, probably due to the following:\n"
-"- deletion: you may be trying to delete a record while other records still "
-"reference it\n"
-"- creation/update: a mandatory field is not correctly set"
-msgstr ""
+#~ msgid "Alignment"
+#~ msgstr "Alinhamento"
 
-#. module: base
-#: code:addons/osv/osv.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"[object with reference: %s - %s]"
-msgstr ""
+#~ msgid ">="
+#~ msgstr ">="
 
-#. module: base
-#: code:addons/osv/osv.py:0
-#, python-format
-msgid "Integrity Error"
-msgstr ""
+#~ msgid "Planned Cost"
+#~ msgstr "Custo Planejado"
 
-#. module: base
-#: code:addons/base/res/res_lang.py:0
-#, python-format
-msgid "User Error"
-msgstr ""
+#~ msgid "ir.model.config"
+#~ msgstr "ir.model.config"
 
-#. module: base
-#: code:addons/base/res/res_lang.py:0
-#, python-format
-msgid "Base Language 'en_US' can not be deleted !"
-msgstr ""
+#~ msgid "Repository"
+#~ msgstr "Repositório"
 
-#. module: base
-#: code:addons/base/res/res_lang.py:0
-#, python-format
-msgid "You cannot delete the language which is User's Preferred Language !"
-msgstr ""
+#~ msgid "RML"
+#~ msgstr "RML"
 
-#. module: base
-#: code:addons/base/res/res_lang.py:0
-#, python-format
-msgid ""
-"You cannot delete the language which is Active !\n"
-"Please de-activate the language first."
-msgstr ""
+#~ msgid "Partners by Categories"
+#~ msgstr "Parceiros por categorias"
 
-#~ msgid "Attached Model"
-#~ msgstr "Modelo anexado"
+#~ msgid "Frequency"
+#~ msgstr "Frequência"
+
+#~ msgid "Relation"
+#~ msgstr "Relação"
+
+#~ msgid "Define New Users"
+#~ msgstr "Definir novos usuários"
+
+#~ msgid "Role Name"
+#~ msgstr "Nome da Regra"
+
+#~ msgid "Dedicated Salesman"
+#~ msgstr "Vendedor"
+
+#~ msgid "Please give your module .ZIP file to import."
+#~ msgstr "Por favor, peque seu arquivo de módulo .ZIP para importar"
+
+#~ msgid "Check new modules"
+#~ msgstr "Pesquisar novos módulos"
+
+#~ msgid "Fixed Width"
+#~ msgstr "Largura Fixa"
+
+#~ msgid "Report Custom"
+#~ msgstr "Customizar relatório"
+
+#~ msgid "Auto"
+#~ msgstr "Automático"
+
+#~ msgid "Note that this operation may take a few minutes."
+#~ msgstr "Esta operação pode demorar alguns minutos."
+
+#~ msgid "Year without century: %(y)s"
+#~ msgstr "Ano com 2 dígitos: %(y)s"
+
+#~ msgid ""
+#~ "This wizard will detect new terms in the application so that you can update "
+#~ "them manually."
+#~ msgstr ""
+#~ "Este assistente detectou novos termos na aplicação, assim voce pode atualizá-"
+#~ "los manualmente."
+
+#~ msgid "Configure User"
+#~ msgstr "Configurar usuário"
+
+#~ msgid "left"
+#~ msgstr "esquerda"
+
+#~ msgid "Operator"
+#~ msgstr "Operador"
+
+#~ msgid "right"
+#~ msgstr "direita"
 
 #~ msgid "Others Partners"
 #~ msgstr "Outros parceiros"
 
+#~ msgid "Year with century: %(year)s"
+#~ msgstr "Ano com 4 digitos: %(year)s"
+
+#~ msgid "Daily"
+#~ msgstr "Diariamente"
+
+#~ msgid "Choose Your Mode"
+#~ msgstr "Escolha seu modo"
+
+#~ msgid "Background Color"
+#~ msgstr "Cor de fundo"
+
+#~ msgid "res.partner.som"
+#~ msgstr "res.partner.som"
+
+#~ msgid "Start Upgrade"
+#~ msgstr "Iniciar atualização"
+
+#~ msgid "Export language"
+#~ msgstr "Exportar idioma"
+
+#~ msgid "You can also import .po files."
+#~ msgstr "Voce tambem pode importar arquivos .po ."
+
+#~ msgid "Function of the contact"
+#~ msgstr "Função para o contato"
+
+#~ msgid "Modules to be installed, upgraded or removed"
+#~ msgstr "Módulos a serem instalados, atualizados ou removidos"
+
+#~ msgid "Report Footer"
+#~ msgstr "Rodapé do relatório"
+
+#~ msgid "Import language"
+#~ msgstr "Importar idioma"
+
+#~ msgid "Categories of Modules"
+#~ msgstr "Categorias de Módulos"
+
+#~ msgid "Not Started"
+#~ msgstr "Não Iniciado"
+
+#~ msgid "Roles"
+#~ msgstr "Papéis"
+
+#~ msgid "Repositories"
+#~ msgstr "Repositórios"
+
+#~ msgid "Subscribed"
+#~ msgstr "Inscrito"
+
+#~ msgid "System Upgrade"
+#~ msgstr "Atualização de Sistema"
+
+#~ msgid "Partner Address"
+#~ msgstr "Endereço do parceiro"
+
+#~ msgid "wizard.module.update_translations"
+#~ msgstr "wizard.module.update_translations"
+
+#~ msgid "Configuration Wizard"
+#~ msgstr "Assistente de Configuração"
+
+#~ msgid "res.roles"
+#~ msgstr "res.roles"
+
+#~ msgid ""
+#~ "Choose the simplified interface if you are testing OpenERP for the first "
+#~ "time. Less used options or fields are automatically hidden. You will be able "
+#~ "to change this, later, through the Administration menu."
+#~ msgstr ""
+#~ "Escolha a interface simplificada se voce esta testando o OpenERP pela "
+#~ "primeira vez. Opções ou campos menos usados são automaticamente escondidos. "
+#~ "Voce pode alterar isto mais tarde no menu Administração"
+
+#~ msgid "Key"
+#~ msgstr "Chave"
+
+#~ msgid "Scan for new modules"
+#~ msgstr "Procurando por novos módulos"
+
+#~ msgid "wizard.module.lang.export"
+#~ msgstr "wizard.module.lang.export"
+
+#~ msgid "Groups are used to defined access rights on each screen and menu."
+#~ msgstr ""
+#~ "Grupos são usados para definir direitos de acesso a cada tela e menu."
+
+#~ msgid "Sale Opportunity"
+#~ msgstr "Oportunidade de venda"
+
+#~ msgid "Report Xml"
+#~ msgstr "Relatório XML"
+
+#~ msgid "Calculate Average"
+#~ msgstr "Calcular média"
+
+#~ msgid "Planned Revenue"
+#~ msgstr "Receita Planejada"
+
+#~ msgid ""
+#~ "You have to import a .CSV file wich is encoded in UTF-8.  Please check that "
+#~ "the first line of your file is one of the following:"
+#~ msgstr ""
+#~ "Voce pode importar um arquivo .CSV com codificação UTF-8. Por favor "
+#~ "verifique se a primeira linha de seu arquivo contem uma das seguintes "
+#~ "situações:"
+
+#~ msgid "Role"
+#~ msgstr "Papel"
+
+#~ msgid "Test"
+#~ msgstr "Teste"
+
+#~ msgid "We suggest you to reload the menu tab (Ctrl+t Ctrl+r)."
+#~ msgstr "Nós sugerimos recarregar o menu (Ctrl+t Ctrl+r)."
+
+#~ msgid "Security on Groups"
+#~ msgstr "Segurança nos grupos"
+
+#~ msgid "Font color"
+#~ msgstr "Cor da Fonte"
+
+#~ msgid "Roles Structure"
+#~ msgstr "Extrutura dos papeis"
+
+#~ msgid "Role Required"
+#~ msgstr "Papel requerido"
+
+#~ msgid "Export Data"
+#~ msgstr "Exportar Dados"
+
+#~ msgid "Your system will be upgraded."
+#~ msgstr "Seu sistema foi atualizado."
+
+#~ msgid "in"
+#~ msgstr "em"
+
+#~ msgid "Create / Write"
+#~ msgstr "Criar / Gravar"
+
+#~ msgid "Service"
+#~ msgstr "Serviço"
+
+#~ msgid "Modules to download"
+#~ msgstr "Módulos para donwload"
+
+#~ msgid "Installed modules"
+#~ msgstr "Módulos instalados"
+
+#~ msgid "Partner State of Mind"
+#~ msgstr "Estado emocional do parceiro"
+
+#~ msgid "a4"
+#~ msgstr "a4"
+
+#~ msgid "Note that this operation my take a few minutes."
+#~ msgstr "Esta operação pode demorar alguns minutos."
+
+#~ msgid "Internal Name"
+#~ msgstr "Nome Interno"
+
+#~ msgid "User ID"
+#~ msgstr "ID do Usuário"
+
+#~ msgid ""
+#~ "Access all the fields related to the current object using expression in "
+#~ "double brackets, i.e.[[ object.partner_id.name ]]"
+#~ msgstr ""
+#~ "Acessar todos os campos relacionados com o objeto corrente usando expressões "
+#~ "entre duplo colchete, ex.: [[ object.partner_id.name ]]"
+
+#~ msgid "type,name,res_id,src,value"
+#~ msgstr "tipo, nome, recurso_id, original, tradução"
+
+#~ msgid "condition"
+#~ msgstr "condição"
+
+#~ msgid "Report Fields"
+#~ msgstr "Campos de Relatório"
+
+#~ msgid ""
+#~ "The selected language has been successfully installed. You must change the "
+#~ "preferences of the user and open a new menu to view changes."
+#~ msgstr ""
+#~ "O idioma selecionado foi instalado com sucesso. Voce precisa trocar a "
+#~ "preferência do usuário e abrir um novo menu para visualizar as alterações."
+
+#~ msgid "Partner Events"
+#~ msgstr "Eventos dos parceiros"
+
+#~ msgid "Pie Chart"
+#~ msgstr "Gráfico de pizza"
+
+#~ msgid "Update Modules List"
+#~ msgstr "Atualizar lista de módulos"
+
+#~ msgid "Print orientation"
+#~ msgstr "Orientação de impressão"
+
+#~ msgid "Export a Translation File"
+#~ msgstr "Exportar um arquivo de tradução"
+
+#~ msgid "Add User"
+#~ msgstr "Adicionar usuário"
+
+#~ msgid "html"
+#~ msgstr "html"
+
 #~ msgid "Partner Functions"
 #~ msgstr "Função"
 
+#~ msgid "Get file"
+#~ msgstr "Pegar arquivo"
+
+#~ msgid ""
+#~ "This function will check for new modules in the 'addons' path and on module "
+#~ "repositories:"
+#~ msgstr ""
+#~ "Esta função pesquisará por novos módulos na pasta 'addons' e no repositório "
+#~ "de módulos:"
+
 #~ msgid "Customers Partners"
 #~ msgstr "Parceiros clientes"
 
-#~ msgid "File Content"
-#~ msgstr "Conteúdo do arquivo"
+#~ msgid "Roles are used to defined available actions, provided by workflows."
+#~ msgstr ""
+#~ "Regras são usadas para definir ações disponibilizadas pelos workflows."
+
+#~ msgid "Your Maintenance Contracts"
+#~ msgstr "Seus contratos de manutenção"
+
+#~ msgid "GPL-3"
+#~ msgstr "GPL-3"
+
+#~ msgid "GPL-2"
+#~ msgstr "GPL-2"
+
+#~ msgid "Type of Event"
+#~ msgstr "Tipo de Evento"
+
+#~ msgid "Sequence Types"
+#~ msgstr "Tipos de Sequencias"
+
+#~ msgid "Update Translations"
+#~ msgstr "Atualizar traduções"
+
+#~ msgid "The modules have been upgraded / installed !"
+#~ msgstr "O módulos foram atualizados / instalados !"
+
+#~ msgid "Manual"
+#~ msgstr "Manual"
+
+#~ msgid "pdf"
+#~ msgstr "pdf"
+
+#~ msgid "Preview"
+#~ msgstr "Pré-visualizar"
+
+#~ msgid "Skip Step"
+#~ msgstr "Saltar etapa"
+
+#~ msgid "Active Partner Events"
+#~ msgstr "Ativar eventos dos parceiros"
+
+#~ msgid "<>"
+#~ msgstr "<>"
+
+#~ msgid "<="
+#~ msgstr "<="
+
+#~ msgid "Probability (0.50)"
+#~ msgstr "Probabilidade (0.50)"
+
+#~ msgid "Repeat Header"
+#~ msgstr "Repetir cabeçalho"
+
+#~ msgid "Workflow Definitions"
+#~ msgstr "Definição de workflow"
+
+#~ msgid "All Properties"
+#~ msgstr "Todas propriedades"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid ""
+#~ "To improve some terms of the official translations of OpenERP, you should "
+#~ "modify the terms directly on the launchpad interface. If you made lots of "
+#~ "translations for your own module, you can also publish all your translation "
+#~ "at once."
+#~ msgstr ""
+#~ "Para implementar novos termos na tradução oficial do OpenERP, voce poderá "
+#~ "modificá-los direitamente na interface do launchpad. Se voce fez muitas "
+#~ "traduções em seu próprio módulo, voce tambem pode publica-las."
+
+#~ msgid "Start installation"
+#~ msgstr "Iniciar instalação"
+
+#~ msgid "New modules"
+#~ msgstr "Novos módulos"
+
+#~ msgid "res.company"
+#~ msgstr "res.company"
+
+#~ msgid "System upgrade done"
+#~ msgstr "Atualização de sistema concluída"
+
+#~ msgid "Custom Report"
+#~ msgstr "Configurar relatório"
+
+#~ msgid "sxw"
+#~ msgstr "sxw"
+
+#~ msgid "Manual domain setup"
+#~ msgstr "Configuração manual do domínio"
+
+#~ msgid "Report Name"
+#~ msgstr "Nome do Relatório"
+
+#~ msgid "Partner Relation"
+#~ msgstr "Relações de parceiros"
+
+#~ msgid ""
+#~ "Number of time the function is called,\n"
+#~ "a negative number indicates that the function will always be called"
+#~ msgstr ""
+#~ "Numero de vezes que a função foi chamada.\n"
+#~ "Um número negativo indica que a função nunca foi chamada."
+
+#~ msgid "Monthly"
+#~ msgstr "Mensalmente"
+
+#~ msgid "Parent"
+#~ msgstr "Superior"
+
+#~ msgid "Export translation file"
+#~ msgstr "Exportar arquivo de tradução"
+
+#~ msgid "Start On"
+#~ msgstr "Iniciar Em"
+
+#~ msgid "odt"
+#~ msgstr "odt"
+
+#~ msgid "Other proprietary"
+#~ msgstr "Outro proprietário"
+
+#~ msgid "All terms"
+#~ msgstr "Todos os termos"
+
+#~ msgid "Link"
+#~ msgstr "Link"
+
+#~ msgid "Repository list"
+#~ msgstr "Lista de repositório"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "ir.report.custom"
+#~ msgstr "ir.report.custom"
+
+#~ msgid "Purchase Offer"
+#~ msgstr "Promoção"
+
+#~ msgid "Language file loaded."
+#~ msgstr "Carregado arquivo de idioma."
+
+#~ msgid ""
+#~ "Access all the fields related to the current object using expression in "
+#~ "double brackets, i.e. [[ object.partner_id.name ]]"
+#~ msgstr ""
+#~ "Acessar todos os campos relacionados no objeto usando expressões em duplo "
+#~ "colchete, ex.: [[object.partner_id.name ]]"
+
+#~ msgid "Incoming transitions"
+#~ msgstr "Transições de entrada"
+
+#~ msgid "Set"
+#~ msgstr "Definir"
+
+#~ msgid "At Once"
+#~ msgstr "só uma vez"
+
+#~ msgid "module,type,name,res_id,src,value"
+#~ msgstr "module,type,name,res_id,src,value"
+
+#~ msgid "child_of"
+#~ msgstr "child_of"
+
+#~ msgid "Module import"
+#~ msgstr "Importar módulo"
 
 #~ msgid "Suppliers Partners"
 #~ msgstr "Parceiros Fornecedores"
 
+#~ msgid "(year)="
+#~ msgstr "(Ano)="
+
+#~ msgid "Modules Management"
+#~ msgstr "Administração de módulos"
+
+#~ msgid ""
+#~ "The official translations pack of all OpenERP/OpenObjects module are managed "
+#~ "through launchpad. We use their online interface to synchronize all "
+#~ "translations efforts."
+#~ msgstr ""
+#~ "O pacote oficial de traduções de todos os módlos OpenERP/OpenObjects são "
+#~ "administrados através do launchpad. Nos usamos sua interface online para "
+#~ "sincronizar todos os esforços de tradução."
+
+#~ msgid "Next Configuration Wizard"
+#~ msgstr "Proximo passo do assistente de configuração"
+
+#~ msgid "Untranslated terms"
+#~ msgstr "Termos não traduzidos"
+
+#~ msgid "="
+#~ msgstr "="
+
+#~ msgid "Document"
+#~ msgstr "Documento"
+
 #~ msgid "Titles"
 #~ msgstr "Títulos"
+
+#~ msgid "Start Date"
+#~ msgstr "Data Inicial"
+
+#~ msgid ""
+#~ "Create your users.\n"
+#~ "You will be able to assign groups to users. Groups define the access rights "
+#~ "of each users on the different objects of the system.\n"
+#~ "            "
+#~ msgstr ""
+#~ "Crie seus usuários.\n"
+#~ "Você será capaz de atribuir grupos de usuários. Grupos define os direitos de "
+#~ "acesso de usuários em cada um dos diferentes objetos do sistema.\n"
+#~ "            "
+
+#~ msgid ">"
+#~ msgstr ">"
+
+#~ msgid "Delete Permission"
+#~ msgstr "Permissão para excluir"
+
+#~ msgid "<"
+#~ msgstr "<"
+
+#~ msgid "If you don't force the domain, it will use the simple domain setup"
+#~ msgstr ""
+#~ "Se você não forçar o domínio, ele irá usar a configuração de domínio simples"
+
+#~ msgid "Print format"
+#~ msgstr "Formato de impressão"
+
+#~ msgid "End Date"
+#~ msgstr "Data Final"
+
+#~ msgid "center"
+#~ msgstr "Centralizar"
+
+#~ msgid "Unsubscribed"
+#~ msgstr "Remover inscrição"
+
+#~ msgid "The VAT doesn't seem to be correct."
+#~ msgstr "O imposto não parece estar correto."
+
+#~ msgid "Module successfully imported !"
+#~ msgstr "Módulo importado!"
+
+#~ msgid "New Partner"
+#~ msgstr "Novo parceiro"
+
+#~ msgid "Report custom"
+#~ msgstr "Configurar relatório"
+
+#~ msgid "Simplified Interface"
+#~ msgstr "Interface simplificada"
+
+#~ msgid "Import a Translation File"
+#~ msgstr "Importar arquivo de tradução"
+
+#~ msgid "Sequence Code"
+#~ msgstr "Código de sequência"
+
+#~ msgid "a5"
+#~ msgstr "a5"
+
+#~ msgid "State of Mind"
+#~ msgstr "Estado emocional"
+
+#~ msgid "Image Preview"
+#~ msgstr "Pré-visualização da Imagem"
+
+#~ msgid "Choose a language to install:"
+#~ msgstr "Escolha o idioma a instalar:"
+
+#~ msgid ""
+#~ "Please note that you will have to logout and relog if you change your "
+#~ "password."
+#~ msgstr "Por favor, voce precisará fazer um logout se voce trocou sua senha."
+
+#~ msgid "txt"
+#~ msgstr "txt"
+
+#, python-format
+#~ msgid "This url '%s' must provide an html file with links to zip modules"
+#~ msgstr ""
+#~ "Esta url %s providenciará um arquivo html com links para os módulos zip"
+
+#, python-format
+#~ msgid "Password mismatch !"
+#~ msgstr "Senha incorreta !"
+
+#~ msgid "Objects Security Grid"
+#~ msgstr "Grid de segurança de objetos"
+
+#, python-format
+#~ msgid "Pie charts need exactly two fields"
+#~ msgstr "Gráfico de pizza necessita de dois campos"
+
+#~ msgid "Commercial Prospect"
+#~ msgstr "Prospecção Comercial"
+
+#~ msgid ""
+#~ "If set, sequence will only be used in case this python expression matches, "
+#~ "and will precede other sequences."
+#~ msgstr ""
+#~ "Se marcado, sequencia somente será usada em caso de coincidência das "
+#~ "expressões python, e precederá outras sequencias."
+
+#, python-format
+#~ msgid "Model %s Does not Exist !"
+#~ msgstr "Modelo %s não existe !"
+
+#~ msgid "This user can not connect using this company !"
+#~ msgstr "Compnanhia inválida para este usuário"
+
+#~ msgid "The company this user is currently working on."
+#~ msgstr "Companhia para a qual este usuário está trabalhando"
+
+#~ msgid ""
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "consider the present one as void. Do not hesitate to contact our accounting "
+#~ "department at (+32).81.81.37.00."
+#~ msgstr ""
+#~ "Por favor desconsidere este aviso caso o pagamento já tenha sido efetuado. "
+#~ "Qualquer dúvida entre em contato com nosso setor de cobrança através do "
+#~ "telefone (+55) 11 3333-4444"
+
+#~ msgid "Simple domain setup"
+#~ msgstr "Comfiguração simples de domínio"
+
+#~ msgid ""
+#~ "Regexp to search module on the repository webpage:\n"
+#~ "- The first parenthesis must match the name of the module.\n"
+#~ "- The second parenthesis must match the whole version number.\n"
+#~ "- The last parenthesis must match the extension of the module."
+#~ msgstr ""
+#~ "Expressão regular para pesquisar módulos no repositório:\n"
+#~ "- O primeiro parenteses deve conter o nome do módulo.\n"
+#~ "- O segundo parenteses deve conter um inteiro com o número da versão.\n"
+#~ "- O último parenteses deve conter a extensão do módulo."
+
+#~ msgid "Connect Actions To Client Events"
+#~ msgstr "Conectar ações a eventos de clientes"
+
+#~ msgid "Multi company"
+#~ msgstr "Multiplas Companhias"
+
+#~ msgid "Accumulate"
+#~ msgstr "Acumulado"
+
+#, python-format
+#~ msgid "Tree can only be used in tabular reports"
+#~ msgstr "Visão em arvore, somente pode ser usada em relatórios tabulares"
+
+#~ msgid "Report Title"
+#~ msgstr "Título do Relatório"
+
+#~ msgid "HTML from HTML"
+#~ msgstr "HTML de HTML"
+
+#~ msgid "Calculate Count"
+#~ msgstr "Calculo da Quantidade"
+
+#~ msgid "Manage Menus"
+#~ msgstr "Gerenciar Menus"
+
+#~ msgid "Manually Created"
+#~ msgstr "Criado manualmente"
+
+#~ msgid "Default Properties"
+#~ msgstr "Propriedades Padrão"
+
+#~ msgid "iCal id"
+#~ msgstr "iCal id"
+
+#, python-format
+#~ msgid "Please specify server option --smtp-from !"
+#~ msgstr "Por favor especifique a opção para o servidor --smtp-from !"
+
+#~ msgid "Line Plot"
+#~ msgstr "Gráfico de linha"
+
+#~ msgid "If two sequences match, the highest weight will be used."
+#~ msgstr ""
+#~ "Quando os números de seqüencia são idênticos, prevalece o de  maior peso."
+
+#~ msgid "Force Domain"
+#~ msgstr "Forçar domínio"
+
+#~ msgid "Multi Company"
+#~ msgstr "Multi-Companhia"
+
+#~ msgid "Contact Functions"
+#~ msgstr "Funções do Contato"
+
+#~ msgid "Default Company per Object"
+#~ msgstr "Companhia Padrão por Objeto"
+
+#~ msgid "Configure Simple View"
+#~ msgstr "Configurar Visão Simplificada"
+
+#~ msgid "Automatic XSL:RML"
+#~ msgstr "XSL:RML Automático"
+
+#~ msgid "Retailer"
+#~ msgstr "Varejista"
+
+#~ msgid "Tabular"
+#~ msgstr "Tabular"
+
+#~ msgid "Report Ref"
+#~ msgstr "Ref. Relatório"
+
+#~ msgid "Company Architecture"
+#~ msgstr "Estrutura da Empresa"
+
+#~ msgid "Workflow Items"
+#~ msgstr "Itens do Fluxo de Trabalho"
+
+#~ msgid ""
+#~ "If you have groups, the visibility of this menu will be based on these "
+#~ "groups. If this field is empty, Open ERP will compute visibility based on "
+#~ "the related object's read access."
+#~ msgstr ""
+#~ "Se voce tem grupos, a visibilidade deste menu será baseada nestes grupos. Se "
+#~ "este campo está vazio, OpenERP definirá a visibilidade baseado no acesso de "
+#~ "leitura do objeto relacionado."
+
+#~ msgid "Function Name"
+#~ msgstr "Nome da função"
+
+#~ msgid ""
+#~ "The .rml path of the file or NULL if the content is in report_rml_content"
+#~ msgstr ""
+#~ "O caminho (path) do arquivo .rml ou NULL para utilizar conteúdo de "
+#~ "report_rml_content"
+
+#~ msgid ""
+#~ "Only one client action will be execute, last                                 "
+#~ "clinent action will be consider in case of multiples clients actions"
+#~ msgstr ""
+#~ "Somente uma ação do cliente será executada, a ultima ação do cliente será "
+#~ "considerada no caso de múltiplas ações."
+
+#, python-format
+#~ msgid "Password empty !"
+#~ msgstr "Senha em branco !"
+
+#~ msgid "Accepted Companies"
+#~ msgstr "Empresas Permitidas"
+
+#~ msgid "Import New Language"
+#~ msgstr "Importar Novo Idioma"
+
+#~ msgid "RML path"
+#~ msgstr "Path do RML"
+
+#, python-format
+#~ msgid "Second field should be figures"
+#~ msgstr "O segundo campo deve ser uma imagem"
+
+#, python-format
+#~ msgid "Bar charts need at least two fields"
+#~ msgstr "Gráfico de barras necessita de pelo menos 2 campos"
+
+#~ msgid "multi_company.default"
+#~ msgstr "multi_company.default"
+
+#~ msgid "Weight"
+#~ msgstr "Peso"
+
+#~ msgid "You may have to reinstall some language pack."
+#~ msgstr "Voce pode ter que reinstalar alguns pacotes de idioma."
+
+#~ msgid "End of Request"
+#~ msgstr "Fim da mensagem"
+
+#~ msgid "My Closed Requests"
+#~ msgstr "Minhas mensagens encerradas"
+
+#~ msgid "Accepted Links in Requests"
+#~ msgstr "Links aceitos nas mensagens"
+
+#~ msgid "Confirmation"
+#~ msgstr "Confirmação"
+
+#, python-format
+#~ msgid "Enter at least one field !"
+#~ msgstr "Digite pelo menos um campo !"
+
+#~ msgid "Installation Done"
+#~ msgstr "Instalação concluída"
+
+#~ msgid "Prospect Contact"
+#~ msgstr "Contato"
+
+#, python-format
+#~ msgid "Invalid operation"
+#~ msgstr "Operação inválida"
+
+#~ msgid "Children"
+#~ msgstr "Filhos"
+
+#, python-format
+#~ msgid "You can not remove the field '%s' !"
+#~ msgstr "Voce não pode remover o campo '%s' !"
+
+#~ msgid "Next Call Date"
+#~ msgstr "Data da próxima chamada"
+
+#, python-format
+#~ msgid "Using a relation field which uses an unknown object"
+#~ msgstr "Usando uma relação que usa um objeto desconhecido"
+
+#~ msgid "Field child0"
+#~ msgstr "Campo filho0"
+
+#~ msgid "Field child3"
+#~ msgstr "Campo filho3"
+
+#~ msgid "Field child1"
+#~ msgstr "Campo filho 1"
+
+#~ msgid "Field child2"
+#~ msgstr "Campo filho2"
+
+#~ msgid "HTML from HTML(Mako)"
+#~ msgstr "HTML from HTML(Mako)"
+
+#~ msgid "Resynchronise Terms"
+#~ msgstr "Re-sincroniar termos"
+
+#, python-format
+#~ msgid "Field %d should be a figure"
+#~ msgstr "Campo %d pode ser uma imagem"
+
+#~ msgid "Returning"
+#~ msgstr "Retornando"
+
+#~ msgid "Access Controls Grid"
+#~ msgstr "Grid dos controles de acesso"
+
+#~ msgid "Matching"
+#~ msgstr "Correspondendo a"
+
+#~ msgid "Subscribe Report"
+#~ msgstr "Subscreva relatório"
+
+#~ msgid "Unsubscribe Report"
+#~ msgstr "Cancelar relatorio"
+
+#~ msgid "Document Link"
+#~ msgstr "Link do documento"
+
+#~ msgid "raw"
+#~ msgstr "não processado"
+
+#~ msgid "Calculate Sum"
+#~ msgstr "Calcular a Soma"
+
+#~ msgid "Report Ref."
+#~ msgstr "Ref. do Relatório"
+
+#~ msgid "Language name"
+#~ msgstr "Nome do Idioma"
+
+#~ msgid "My Requests"
+#~ msgstr "Minhas Mensagens"
+
+#~ msgid "Bank List"
+#~ msgstr "Lista de Bancos"
+
+#~ msgid "None"
+#~ msgstr "Nenhum"
+
+#~ msgid "States of mind"
+#~ msgstr "Estado Emocional"
+
+#~ msgid "Outgoing transitions"
+#~ msgstr "Transições de saída"
+
+#~ msgid "You cannot have two users with the same login !"
+#~ msgstr "Não é permitido criar dois usuários com o mesmo login!"
+
+#~ msgid ""
+#~ "You cannot have multiple records with the same id for the same module !"
+#~ msgstr "Não é permitido criar dois usuários com o mesmo login!"
diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po
index 21f419e0e98..2d3986da5ef 100644
--- a/bin/addons/base/i18n/ru.po
+++ b/bin/addons/base/i18n/ru.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: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-24 15:16+0000\n"
+"PO-Revision-Date: 2010-10-25 07:03+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-10-25 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From beae37adb04148470f41985c76e556b28de40d4b Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 26 Oct 2010 04:40:38 +0000
Subject: [PATCH 107/114] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101026044038-5c6szph4ycp588u8
---
 addons/account/i18n/es.po                   |    6 +-
 addons/account/i18n/es_EC.po                |    2 +-
 addons/account/i18n/it.po                   |   18 +-
 addons/account/i18n/mn.po                   |   16 +-
 addons/account/i18n/ru.po                   |    4 +-
 addons/account/i18n/sr.po                   |   64 +-
 addons/account_analytic_analysis/i18n/es.po |    6 +-
 addons/account_analytic_analysis/i18n/sr.po |  221 +-
 addons/account_analytic_default/i18n/sr.po  |  256 +-
 addons/account_analytic_plans/i18n/sr.po    |  439 ++-
 addons/account_budget/i18n/es.po            |    6 +-
 addons/account_followup/i18n/es.po          |    6 +-
 addons/account_reporting/i18n/sr.po         |   85 +-
 addons/account_voucher/i18n/ru.po           |    4 +-
 addons/account_voucher/i18n/sr.po           |  997 ++++--
 addons/analytic/i18n/sr.po                  |  185 +-
 addons/base_contact/i18n/ru.po              |  670 ++--
 addons/base_vat/i18n/ru.po                  |   61 +-
 addons/claim_from_delivery/i18n/es.po       |    6 +-
 addons/crm/i18n/nl.po                       |  367 ++-
 addons/crm/i18n/pl.po                       |   38 +-
 addons/crm_profiling/i18n/ru.po             |   75 +-
 addons/delivery/i18n/ru.po                  |  689 ++--
 addons/hr/i18n/pl.po                        |   24 +-
 addons/hr_holidays/i18n/pl.po               |   46 +-
 addons/hr_payroll/i18n/sv.po                |    6 +-
 addons/hr_timesheet/i18n/it.po              |    6 +-
 addons/mrp/i18n/pl.po                       |   38 +-
 addons/multi_company/i18n/ru.po             |  271 +-
 addons/point_of_sale/i18n/sv.po             |    6 +-
 addons/procurement/i18n/ru.po               |  108 +-
 addons/product/i18n/ru.po                   | 3213 +++++++++++--------
 addons/purchase/i18n/ru.po                  |   10 +-
 addons/purchase_analytic_plans/i18n/ru.po   |    4 +-
 addons/sale/i18n/ru.po                      |    4 +-
 addons/sale_analytic_plans/i18n/ru.po       |   21 +-
 addons/sale_mrp/i18n/ru.po                  |   61 +
 addons/stock/i18n/ru.po                     |    4 +-
 addons/wiki_faq/i18n/ru.po                  |   27 +
 39 files changed, 4966 insertions(+), 3104 deletions(-)
 create mode 100644 addons/sale_mrp/i18n/ru.po
 create mode 100644 addons/wiki_faq/i18n/ru.po

diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 34706585b02..1e4fdb2bc94 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-24 21:56+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-10-25 07:09+0000\n"
+"Last-Translator: Carlos-smile <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-10-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index d6551425629..9affb3cdd31 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 8f7225d973c..0b82719a3b0 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-20 07:22+0000\n"
-"Last-Translator: Lorenzo Battistini <lorenzo.battistini@domsense.com>\n"
+"PO-Revision-Date: 2010-10-25 21:04+0000\n"
+"Last-Translator: Davide Corio - Domsense <davide.corio@domsense.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-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -372,7 +372,7 @@ msgstr "Contabilità Analitica"
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr ""
+msgstr "Calcolo su tasse figlie"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -416,7 +416,7 @@ msgstr "Riconciliazione dei pagamenti"
 #. module: account
 #: model:account.journal,name:account.expenses_journal
 msgid "Journal de frais"
-msgstr ""
+msgstr "Giornale Acquisti"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
@@ -494,7 +494,7 @@ msgstr "Rif"
 #. module: account
 #: field:account.tax.template,type_tax_use:0
 msgid "Tax Use In"
-msgstr ""
+msgstr "Tassa usata per"
 
 #. module: account
 #: help:account.tax.template,include_base_amount:0
@@ -572,7 +572,7 @@ msgstr "Linea"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 msgid "J.C. or Move name"
-msgstr ""
+msgstr "J.C. o nome movimento"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -634,7 +634,7 @@ msgstr "(Tenere vuoto per aprire la situazione corrente)"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Mapping"
-msgstr ""
+msgstr "Mappatura Posizioni Fiscali"
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -666,7 +666,7 @@ msgstr "Sconto (%)"
 #: wizard_field:account.move.line.reconcile,init_full,writeoff:0
 #: wizard_field:account.move.line.reconcile,init_partial,writeoff:0
 msgid "Write-Off amount"
-msgstr ""
+msgstr "Conto per storno"
 
 #. module: account
 #: help:account.fiscalyear,company_id:0
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 63ac7694aec..55d3114fa94 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.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: 2010-10-21 09:08+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-26 04:01+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@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-10-22 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -5204,7 +5204,7 @@ msgstr "Дансны татварын кодны загвар"
 #. module: account
 #: view:account.subscription:0
 msgid "Subscription Periods"
-msgstr ""
+msgstr "Баталгааны мөчлөгүүд"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
@@ -5484,7 +5484,7 @@ msgstr "Баримтын бичилт"
 #: model:ir.actions.act_window,name:account.action_invoice_tree6
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree6
 msgid "PRO-FORMA Customer Invoices"
-msgstr ""
+msgstr "Үйлчлүүлэгчийн нэхэмжлэл PRO-FORMA"
 
 #. module: account
 #: field:account.subscription,period_total:0
@@ -5609,7 +5609,7 @@ msgstr "Ажил гүйлгээ"
 #. module: account
 #: selection:account.invoice,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "Pro-forma"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_form
@@ -5647,7 +5647,7 @@ msgstr "Баримтын дугаараар"
 #. module: account
 #: rml:account.overdue:0
 msgid "Total amount due:"
-msgstr ""
+msgstr "Нийт товлосон хэмжээ"
 
 #. module: account
 #: wizard_field:account.analytic.account.chart,init,to_date:0
@@ -5701,7 +5701,7 @@ msgstr "Загварууд"
 #. module: account
 #: wizard_button:account.vat.declaration,init,report:0
 msgid "Print VAT Decl."
-msgstr ""
+msgstr "НӨАТ хэвлэх"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_intracom
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index cbc4a421440..a1019d56947 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-24 09:01+0000\n"
+"PO-Revision-Date: 2010-10-25 07:13+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-10-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index e49ea2c9c9e..4cad5720c03 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.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: 2010-10-18 12:12+0000\n"
-"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"PO-Revision-Date: 2010-10-25 21:56+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@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-10-20 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -80,7 +80,7 @@ msgstr ""
 #. module: account
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
-msgstr ""
+msgstr "Ostavi prazno da bi koristio validacioni period ( racuna) datuma."
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
@@ -501,6 +501,8 @@ msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
 msgstr ""
+"Postavi ovo ukoliko iznos ovog poreza mora biti ukljucen u osnovicu pre "
+"izračuna sledećeg poreza."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -569,7 +571,7 @@ msgstr "Red"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 msgid "J.C. or Move name"
-msgstr ""
+msgstr "J.C. ili pomeri ime"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -589,7 +591,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
-msgstr ""
+msgstr "account.tax"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -599,13 +601,13 @@ msgstr "Datum štampe"
 #. module: account
 #: rml:account.general.ledger:0
 msgid "Mvt"
-msgstr ""
+msgstr "Mvt"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_aged_trial_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
-msgstr ""
+msgstr "Godisnja potraživanja/obaveze partnera"
 
 #. module: account
 #: view:account.journal:0
@@ -618,6 +620,7 @@ msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones"
 msgstr ""
+"Ovo polje se koristi da se odredi redosled resursa od najnizeg ka najvecem"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -726,12 +729,12 @@ msgstr "Ukupan iznos dugovanja kupca"
 #. module: account
 #: view:account.move.line:0
 msgid "St."
-msgstr ""
+msgstr "St."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_line_open
 msgid "account.move.line"
-msgstr ""
+msgstr "account.move.line"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
@@ -773,7 +776,7 @@ msgstr "Delimično plaćanje"
 #. module: account
 #: wizard_view:account_use_models,create:0
 msgid "Move Lines Created."
-msgstr ""
+msgstr "Kreirani redovi prenosa"
 
 #. module: account
 #: field:account.fiscalyear,state:0
@@ -920,6 +923,8 @@ msgid ""
 "If a default tax is given in the partner it only overrides taxes from "
 "accounts (or products) in the same group."
 msgstr ""
+"Ako je dat podrazumevani porez partnera, on samo upisuje poreze iz naloga ( "
+"ili proizvoda) iste grupe."
 
 #. module: account
 #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
@@ -1024,7 +1029,7 @@ msgstr "Neto Ukupno"
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Mapping"
-msgstr ""
+msgstr "Poreska mapiranja"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1167,7 +1172,7 @@ msgstr "Iznos je predstavljen opciono u drugoj valuti"
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Mapping Template"
-msgstr ""
+msgstr "Predlozak poreskog mapiranja"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1238,7 +1243,7 @@ msgstr "Valuta preduzeca"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Template Account Fiscal Mapping"
-msgstr ""
+msgstr "Predlozak poreskog mapiranja konta"
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -2023,7 +2028,7 @@ msgstr "Iznos poreza"
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr ""
+msgstr "J.C./Pomeri ime"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -2034,7 +2039,7 @@ msgstr "Naziv dnevnika-razdoblja"
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr ""
+msgstr "Naziv pozicije PDV obrasca"
 
 #. module: account
 #: help:account.journal,entry_posted:0
@@ -2043,6 +2048,9 @@ msgid ""
 "'draft' state and instead goes directly to the 'posted state' without any "
 "manual validation."
 msgstr ""
+"Cekirajte ovde ukoliko ne zelite da novi nalog ne prolazi \" pripremni "
+"stadijum\" vec zelite da ode u \" zakljuceno stanje\" bez ikakve rucne "
+"validacije"
 
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
@@ -2104,7 +2112,7 @@ msgstr "Period početnog stanja"
 #: model:ir.actions.wizard,name:account.wizard_validate_account_moves_line
 #: model:ir.ui.menu,name:account.menu_validate_account_moves
 msgid "Validate Account Moves"
-msgstr ""
+msgstr "Potvrdi osnovice"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -2375,7 +2383,7 @@ msgstr "Predložak kontnog plana"
 #. module: account
 #: model:account.journal,name:account.refund_sales_journal
 msgid "Journal d'extourne"
-msgstr ""
+msgstr "Dnevnik povrata"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -2469,7 +2477,7 @@ msgstr "Otvori dnevnik"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "KI"
-msgstr ""
+msgstr "KI"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_account_analytic_line
@@ -3151,7 +3159,7 @@ msgstr "Osnova"
 #. module: account
 #: field:account.model,name:0
 msgid "Model Name"
-msgstr ""
+msgstr "Naziv modela"
 
 #. module: account
 #: selection:account.account,type:0
@@ -3404,6 +3412,8 @@ msgid ""
 "This account will be used instead of the default one as the receivable "
 "account for the current partner"
 msgstr ""
+"Ovaj ce se nalog koristiti umesto podrazumevanog kao prijemni nalog datog "
+"partnera"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -3490,6 +3500,7 @@ msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
 msgstr ""
+"Iznos troskova u drugoj opcionoj valuti ako je ovo multi-valutni sadrzaj"
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -3907,6 +3918,8 @@ msgid ""
 "This account will be used instead of the default one to value outgoing stock "
 "for the current product"
 msgstr ""
+"Ovaj nalog ce se koristiti umesto podrazumevanog da potvrdi izlazni magacin "
+"za dati prozivod"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
@@ -4444,6 +4457,9 @@ msgid ""
 "to the higher ones. The order is important if you have a tax with several "
 "tax children. In this case, the evaluation order is important."
 msgstr ""
+"Ovo polje se korosti da odredi redosled poreza od najmanjeg do najveceg. "
+"Ovaj redosled je vazan ako imate porez sa nekoliko podporeza,\r\n"
+"U tom slucaju, evolucioni poredak je jako vazan."
 
 #. module: account
 #: view:account.tax:0
@@ -4510,7 +4526,7 @@ msgstr "Opcione kolicine u stavkama"
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "JNRL"
-msgstr ""
+msgstr "JNRL"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -5265,7 +5281,7 @@ msgstr "Predznak na izveštajima"
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr ""
+msgstr "Opciona druga valuta ako je ovo multi-valutni  sadrzaj"
 
 #. module: account
 #: view:account.invoice:0
@@ -5747,6 +5763,8 @@ msgid ""
 "This account will be used instead of the default one as the payable account "
 "for the current partner"
 msgstr ""
+"Ovaj nalog ce se koristiti umesto podrazumevanog kao platni nalog za datog "
+"partnera"
 
 #. module: account
 #: field:account.tax.code,code:0
@@ -6066,7 +6084,7 @@ msgstr "Dospela potraživanja"
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Board for accountant"
-msgstr ""
+msgstr "Tabla Naloga"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_income
diff --git a/addons/account_analytic_analysis/i18n/es.po b/addons/account_analytic_analysis/i18n/es.po
index f3e8c2fd5c7..490c3722d37 100644
--- a/addons/account_analytic_analysis/i18n/es.po
+++ b/addons/account_analytic_analysis/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-24 21:58+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-10-25 07:12+0000\n"
+"Last-Translator: Carlos-smile <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-10-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/sr.po b/addons/account_analytic_analysis/i18n/sr.po
index a80ba1aa2c1..42ae022cd18 100644
--- a/addons/account_analytic_analysis/i18n/sr.po
+++ b/addons/account_analytic_analysis/i18n/sr.po
@@ -7,14 +7,14 @@ 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-10-14 07:30+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-25 17:55+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@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-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -26,14 +26,16 @@ msgstr ""
 "Broj sati koji mogu biti fakturirani zajedno s onima koji su već fakturisana."
 
 #. module: account_analytic_analysis
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
-msgid "Hours summary by user"
-msgstr "Sati sumarno od strane korisnika"
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
-msgstr "Zadnji Datum fakture"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -46,25 +48,10 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 msgstr "Izračunato pomoću formule: Najveća količina - Ukupno vrijeme"
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
-msgid "All Analytic Accounts"
-msgstr "Svi analitički računi"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
-msgid "My Current Accounts"
-msgstr "Moji tekući računi"
-
-#. module: account_analytic_analysis
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Datum zadnje fakture kreirana za ovaj analitički račun."
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#, python-format
+msgid "AccessError"
+msgstr "Greška u pristupu"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -72,28 +59,25 @@ msgid "Theorical Revenue"
 msgstr "Prihodi teoretski"
 
 #. module: account_analytic_analysis
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji akcije."
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr "Zadnji Datum fakture"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "Date of the last invoice created for this analytic account."
+msgstr "Datum zadnje fakture kreirana za ovaj analitički račun."
+
+#. module: account_analytic_analysis
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
 msgstr "Izračunato pomoću formule: Prihodi Teorijski - Ukupni troškovi"
 
-#. module: account_analytic_analysis
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_new
-msgid "New Analytic Account"
-msgstr "Novi analitički račun"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theorical Margin"
@@ -104,17 +88,6 @@ msgstr "Teoretska margina"
 msgid "Real Margin Rate (%)"
 msgstr "Realna Stopa Margine (%)"
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
-msgid "Current Analytic Accounts"
-msgstr "Tekući analitički računi"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_worked_date:0
-msgid "Date of the latest work done on this account."
-msgstr "Datum najnovijeg rada obavljenog na ovom računu."
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
 msgid ""
@@ -126,8 +99,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
-msgid "Invoicing"
-msgstr "Fakturiranje"
+msgid "Billing"
+msgstr "Obracunavanje"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
@@ -171,85 +144,56 @@ msgid "User"
 msgstr "Korisnik"
 
 #. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
-msgid "My Pending Accounts"
-msgstr "Moji računi na čekanju"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
-msgid "My Uninvoiced Entries"
-msgstr "Moji nefakturirani Ulazi"
+#: field:account.analytic.account,ca_to_invoice:0
+msgid "Uninvoiced Amount"
+msgstr "Nefakturirani iznos"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
 msgstr "Izračunato korištenjem formule: Fakturirani iznos - Ukupni troškovi."
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
-msgid "My Accounts"
-msgstr "Moji računi"
-
-#. module: account_analytic_analysis
-#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
-msgid ""
-"Modify account analytic view to show\n"
-"important data for project manager of services companies.\n"
-"Add menu to show relevant information for each manager."
-msgstr ""
-"Promeni prozor analitičkog prikaza računa da bi video\n"
-"važne podatke za projekt menadžer od usluznih kompanija.\n"
-"Dodaj meni da prikaze relevantne informacije za svakog menadžera."
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Hours"
 msgstr "Nefakturirani sati"
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,hours_quantity:0
-msgid "Hours Tot"
-msgstr "Ukupno sati"
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
+msgstr "Datum najnovijeg rada obavljenog na ovom računu."
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_account
-msgid "Analytic Accounts"
-msgstr "Analitička konta"
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
 msgstr "izvestaj_analitickog_konta"
 
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours Summary by User"
+msgstr "Ukupno sati po Korisniku"
+
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
 msgstr "Fakturirani iznos"
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
-msgid "Financial Project Management"
-msgstr "Finansijski Projekt Menadzment"
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#, python-format
+msgid "You try to bypass an access rule (Document type: %s)."
+msgstr "Pokušavate da zaobiđete pravilo za pristup (Dokument tipa: %s)."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
 msgstr "Datum zadnje fakturiranog troška"
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_to_invoice:0
-msgid "Uninvoiced Amount"
-msgstr "Nefakturirani iznos"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
-msgid "Pending Analytic Accounts"
-msgstr "Analitički računi na čekanju"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Hours"
@@ -258,7 +202,7 @@ msgstr "Fakturirani sati"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
 msgid "Real Margin"
-msgstr "Realna margina"
+msgstr "Realna marza"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
@@ -312,37 +256,43 @@ msgstr "Izračunato korištenjem formule: Fakturirani iznos / Ukupno sati"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Hours (real)"
-msgstr ""
+msgstr "Prihod po satiima ( stvarni)"
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,unit_amount:0
 #: field:account_analytic_analysis.summary.user,unit_amount:0
 msgid "Total Time"
-msgstr ""
+msgstr "Ukupno Vreme"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,month_ids:0
 #: field:account_analytic_analysis.summary.month,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mesec"
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,account_id:0
 #: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitički konto"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
 msgid "Overpassed Accounts"
-msgstr ""
+msgstr "Prekoračeni računi"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "All Uninvoiced Entries"
-msgstr ""
+msgstr "Sve nefakturirane stavke"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Hours Tot"
+msgstr "Ukupno sati"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@@ -350,3 +300,50 @@ msgid ""
 "Total of costs for this account. It includes real costs (from invoices) and "
 "indirect costs, like time spent on timesheets."
 msgstr ""
+"Ukupno troškova za ovaj račun. Uključuje stvarne troškove (iz faktura) i "
+"indirektne troškove, kao, npr,vrijeme potrošeno na timesheetovima."
+
+#~ msgid "My Current Accounts"
+#~ msgstr "Moji tekući računi"
+
+#~ msgid "Hours summary by user"
+#~ msgstr "Sati sumarno od strane korisnika"
+
+#~ msgid "All Analytic Accounts"
+#~ msgstr "Svi analitički računi"
+
+#~ msgid "New Analytic Account"
+#~ msgstr "Novi analitički račun"
+
+#~ msgid "Current Analytic Accounts"
+#~ msgstr "Tekući analitički računi"
+
+#~ msgid "Invoicing"
+#~ msgstr "Fakturiranje"
+
+#~ msgid "My Pending Accounts"
+#~ msgstr "Moji računi na čekanju"
+
+#~ msgid "My Uninvoiced Entries"
+#~ msgstr "Moji nefakturirani Ulazi"
+
+#~ msgid "My Accounts"
+#~ msgstr "Moji računi"
+
+#~ msgid ""
+#~ "Modify account analytic view to show\n"
+#~ "important data for project manager of services companies.\n"
+#~ "Add menu to show relevant information for each manager."
+#~ msgstr ""
+#~ "Promeni prozor analitičkog prikaza računa da bi video\n"
+#~ "važne podatke za projekt menadžer od usluznih kompanija.\n"
+#~ "Dodaj meni da prikaze relevantne informacije za svakog menadžera."
+
+#~ msgid "Financial Project Management"
+#~ msgstr "Finansijski Projekt Menadzment"
+
+#~ msgid "Pending Analytic Accounts"
+#~ msgstr "Analitički računi na čekanju"
+
+#~ msgid "Analytic Accounts"
+#~ msgstr "Analitička konta"
diff --git a/addons/account_analytic_default/i18n/sr.po b/addons/account_analytic_default/i18n/sr.po
index a5aca6fe52a..2dac621098c 100644
--- a/addons/account_analytic_default/i18n/sr.po
+++ b/addons/account_analytic_default/i18n/sr.po
@@ -7,33 +7,21 @@ 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-10-14 07:31+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-25 20:26+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@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-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: account_analytic_default
-#: view:account.analytic.default:0
-#: 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 "Uobičajene postavke analitike"
-
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
 msgid "Account Analytic Default"
 msgstr "Uobičajene postavke analize računa"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
-
 #. module: account_analytic_default
 #: constraint:ir.model:0
 msgid ""
@@ -42,69 +30,21 @@ msgstr ""
 "Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
 
 #. module: account_analytic_default
-#: view:account.analytic.default:0
-msgid "Seq"
-msgstr "Red"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
 
 #. module: account_analytic_default
-#: field:account.analytic.default,date_stop:0
-msgid "End Date"
-msgstr "Završni Datum"
-
-#. module: account_analytic_default
-#: field:account.analytic.default,company_id:0
-msgid "Company"
-msgstr "Preduzeće"
-
-#. module: account_analytic_default
-#: field:account.analytic.default,sequence:0
-msgid "Sequence"
-msgstr "Sekvenca"
-
-#. module: account_analytic_default
-#: field:account.analytic.default,product_id:0
-msgid "Product"
-msgstr "Proizvod"
-
-#. module: account_analytic_default
-#: field:account.analytic.default,analytic_id:0
-msgid "Analytic Account"
-msgstr "Analitički nalog"
-
-#. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distributions"
-msgstr "Distribucije analitike"
-
-#. module: account_analytic_default
-#: field:account.analytic.default,user_id:0
-msgid "User"
-msgstr "Korisnik"
-
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji akcije."
-
-#. module: account_analytic_default
-#: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
-msgid "Entries"
-msgstr "Stavke"
-
-#. module: account_analytic_default
-#: field:account.analytic.default,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: account_analytic_default
-#: field:account.analytic.default,date_start:0
-msgid "Start Date"
-msgstr "Početni datum"
-
-#. module: account_analytic_default
-#: view:account.analytic.default:0
-msgid "Conditions"
-msgstr "Uslovi"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"select a partner which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"partner, it will automatically take this as an analytical account)"
+msgstr ""
+"Selektuj partnera koji ce koristiti analiticki konto specificiran kao "
+"analiticki podrazumevani konto ( npr, kreiras novu fakturu, ili nabavnu "
+"fakturu, i ako sad selektujemo partnera, on ce automatski ova podesavanja "
+"kao svoj analiticki konto)"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -112,3 +52,165 @@ msgstr "Uslovi"
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
 msgid "Analytic Rules"
 msgstr "Pravila analitike"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,analytic_id:0
+msgid "Analytical Account"
+msgstr "Analiticka Konta"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Current"
+msgstr "Trenutni"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Group By..."
+msgstr "Grupirano po"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_stop:0
+msgid "Default end date for this Analytical Account"
+msgstr "podrzaumevani Krajnji datum za ovaj Analiticki Konto"
+
+#. module: account_analytic_default
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_stock_picking
+msgid "Picking List"
+msgstr "Izborna Lista"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Conditions"
+msgstr "Uslovi"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"select a company which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"company, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_sale_order_line
+msgid "Sale Order Line"
+msgstr "Stavke naloga za prodaju"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_start:0
+msgid "Default start date for this Analytical Account"
+msgstr "Podrazumevani Pocetni datum za ovaj Analiticki konto"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Analitička Distribucija"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,company_id:0
+msgid "Company"
+msgstr "Preduzeće"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
+msgid "Entries"
+msgstr "Stavke"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_stop:0
+msgid "End Date"
+msgstr "Datum završetka"
+
+#. module: account_analytic_default
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,user_id:0
+msgid ""
+"select a user which will use analytical account specified in analytic default"
+msgstr ""
+"Izaberi korisnika koji ce koristiti onaj analiticki konto koji je "
+"specificiran kao podrazumevani."
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
+#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
+msgid "Analytic Defaults"
+msgstr "Uobičajene postavke analitike"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"select a product which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"product, it will automatically take this as an analytical account)"
+msgstr ""
+"Izaberi proizvod koji ce koristiti Analiticki konto koji je specificiran kao "
+"podrazumevani ( npr, kada kreiras racun, ili narudzbenicu, i ako selektujes "
+"ovaj proizvod, on ce automatski preuzeti ovaj kao svoj Analiticki konto)"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Faktura"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,analytic_id:0
+msgid "Analytic Account"
+msgstr "Analitički konto"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Accounts"
+msgstr "Nalozi"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_start:0
+msgid "Start Date"
+msgstr "Datum početka"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of analytic distribution"
+msgstr ""
+"Daje redosled sekvence pri prikazivanju liste analiticke distribucije"
+
+#~ msgid "Seq"
+#~ msgstr "Red"
+
+#~ msgid "Analytic Distributions"
+#~ msgstr "Distribucije analitike"
diff --git a/addons/account_analytic_plans/i18n/sr.po b/addons/account_analytic_plans/i18n/sr.po
index fc4ee2ee586..a5612c2ecb2 100644
--- a/addons/account_analytic_plans/i18n/sr.po
+++ b/addons/account_analytic_plans/i18n/sr.po
@@ -7,14 +7,14 @@ 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-10-14 07:31+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-25 21:37+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@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-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -22,6 +22,11 @@ msgstr ""
 msgid "Account4 Id"
 msgstr "Šifra računa4"
 
+#. module: account_analytic_plans
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
 #. module: account_analytic_plans
 #: constraint:ir.model:0
 msgid ""
@@ -30,8 +35,10 @@ msgstr ""
 "Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
 
 #. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: view:account.crossovered.analytic:0
+#: model:ir.actions.act_window,name:account_analytic_plans.action_account_crossovered_analytic
 #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
-#: model:ir.actions.wizard,name:account_analytic_plans.account_analytic_account_inverted_balance_report
 msgid "Crossovered Analytic"
 msgstr "Unakrsna analitika"
 
@@ -41,10 +48,15 @@ msgid "Account5 Id"
 msgstr "Šifra računa5"
 
 #. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,date2:0
+#: field:account.crossovered.analytic,date2:0
 msgid "End Date"
 msgstr "Završni Datum"
 
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr "Šifra računa3"
+
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,rate:0
 msgid "Rate (%)"
@@ -55,27 +67,41 @@ msgstr "Stopa (%)"
 #: field:account.analytic.plan,name:0
 #: field:account.analytic.plan.line,plan_id:0
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
 msgid "Analytic Plan"
 msgstr "Analiticki Plan"
 
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid ""
+"This distribution model has been saved.You will be able to reuse it later."
+msgstr ""
+"Distribucioni model je sacuvan. Bicete u mogucnosti da ga kasnije koristite."
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#, python-format
+msgid "Please put a name and a code before saving the model !"
+msgstr "Molim postavite Ime i sadrzaj pre nego sacuvate model !"
+
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
 msgid "Analytic Instance Line"
-msgstr ""
+msgstr "Red Analiticke Instance"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Lines"
-msgstr "Red analitičke instance"
+msgstr "Red Analiticke Distribucije"
 
 #. module: account_analytic_plans
-#: wizard_button:wizard.crossovered.analytic,init,print:0
+#: view:account.crossovered.analytic:0
 msgid "Print"
 msgstr "Štampaj"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
 msgstr "Do datuma"
 
@@ -90,9 +116,9 @@ msgid "Analytic Distribution's Models"
 msgstr "Modeli analitičke distribucije"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Account Name"
-msgstr "Naziv računa"
+msgstr "Naziv Naloga"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
@@ -110,88 +136,114 @@ msgid "Invalid model name in the action definition."
 msgstr "Pogrešno ime modela u definiciji akcije."
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.line,name:0
-msgid "Plan Name"
-msgstr "Ime Plana"
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Printing date"
 msgstr "Datum stampe"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Percentage"
 msgstr "Procenat"
 
 #. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,empty_line:0
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sale Order Line"
+msgstr "Stavke naloga za prodaju"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,empty_line:0
 msgid "Dont show empty lines"
-msgstr "Ne prikazuj prazme redove"
+msgstr "Ne prikazuj prazne redove"
 
 #. module: account_analytic_plans
-#: wizard_view:wizard.crossovered.analytic,init:0
-msgid "Select Information"
-msgstr "Selektuj informaciju"
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
+msgstr "analytic.plan.create.model.action"
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account3_ids:0
-msgid "Account3 Id"
-msgstr "Šifra računa3"
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "A model having this name and code already exists !"
+msgstr "Model sa ovim imenom i sadrzajem vec postoji !"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
-#: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
+#: view:account.crossovered.analytic:0
+#: field:account.crossovered.analytic,journal_ids:0
 msgid "Analytic Journal"
 msgstr "Analiticki Dnevnik"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "100.00%"
 msgstr "100.00%"
 
 #. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,ref:0
-msgid "Analytic Account Ref."
-msgstr "Veza analitičkog konta"
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
+msgstr "Valuta"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
 msgstr "Analiticki konto :"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
 msgid "Analytic Plan Line"
 msgstr "Red Analitickog Plana"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#, python-format
+msgid "No analytic plan defined !"
+msgstr "Analiticki plan nije definisan !"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account Reference:"
 msgstr "Veza analitičkog konta:"
 
 #. module: account_analytic_plans
-#: model:ir.actions.wizard,name:account_analytic_plans.create_model
-msgid "Create Model"
-msgstr "Kreiraj Model"
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr "Ime Plana"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan,default_instance_id:0
 msgid "Default Entries"
-msgstr "Uobičajene stavke"
+msgstr "Podrazumevane Stavke"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#, python-format
+msgid "Error"
+msgstr "Greška"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
 #: field:account.analytic.plan,plan_ids:0
 #: field:account.journal,plan_id:0
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
 msgid "Analytic Plans"
 msgstr "Analitički planovi"
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.line,min_required:0
-msgid "Minimum Allowed (%)"
-msgstr "Minimalno dozvoljeno (%)"
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:0
+#, python-format
+msgid "User Error"
+msgstr "Korisnicka Greska"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr "Sadrzaj Dnevnika"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
+msgstr "analytic.plan.create.model"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
@@ -204,9 +256,16 @@ msgid "Maximum Allowed (%)"
 msgstr "Maksimalno dozvoljeno (%)"
 
 #. module: account_analytic_plans
-#: wizard_view:create.model,info:0
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr "Osnovni nalog (root)"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#: view:analytic.plan.create.model:0
+#, python-format
 msgid "Distribution Model Saved"
-msgstr "Model distribucije je sacuvan"
+msgstr "Distribucioni model je sacuvan"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
@@ -223,6 +282,62 @@ msgstr "Nevažeći XML za pregled arhitekture"
 msgid "Distribution Models"
 msgstr "Dsitribucioni Modeli"
 
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Ok"
+msgstr "U redu"
+
+#. module: account_analytic_plans
+#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
+msgid "Multiple-plans management in Analytic Accounting"
+msgstr "Visestruki-planovi menadzmenta u Analitickom racunovodstvu"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Lines"
+msgstr "Redovi analitičkog plana"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr "Minimalno dozvoljeno (%)"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr "Plan modela"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr "Šifra računa2"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "The Total Should be Between %s and %s"
+msgstr "Ukupni iznos bi trebalo da se nalazi izmedju %s  i  %s"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Red bankovnog izvoda"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr "Iznos"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
+msgstr "Stampa Unakrsne Analitike"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr "Šifra računa6"
+
 #. module: account_analytic_plans
 #: model:ir.module.module,description:account_analytic_plans.module_meta_information
 msgid ""
@@ -255,115 +370,69 @@ msgid ""
 "So when this line of invoice will be confirmed, it will generate 3 analytic "
 "lines,\n"
 "for one account entry.\n"
+"The analytic plan validates the minimum and maximum percentage at the time "
+"of creation\n"
+"of distribution models.\n"
 "        "
 msgstr ""
-"Ovaj modul vam omogucava da koristite nekoliko analiticka plana, koji "
-"odgovaraju osnovnom dnevniku,\n"
-"i tako visestruko analizirate stavke kreirane kada je racun ili stavka\n"
-"potvrdjena\n"
-"\n"
-"Na primer, mozete definisati sledecu analiticku strukturu:\n"
-"  Projekat\n"
-"      Projekat 1\n"
-"                   SubProj 1.1\n"
-"                   SubProj 1.2\n"
-"      Projekat 2\n"
-"  Prodavac\n"
-"               Janko\n"
-"               Marko\n"
-"\n"
-"Ovde imamo dva plana. Projekat i Prodavac. Red racuna mora da\n"
-"moze da napise analiticke stavke u 2 plana: SubProj 1.1 i\n"
-"Marko.  Iznos se takodje deli. Sledeci primer je za racune koji \n"
-"su zajednicko sa dva subprojekta i dodati su jednom prodavcu:\n"
-"\n"
-"Plan1:\n"
-"    SubProj 1.1 : 50%\n"
-"    SubProj 1.2 : 50%\n"
-"PLan2:\n"
-"    Janko: 100%\n"
-"\n"
-"Tako da kad se ova linija racuna potvrdi, ona ce generisati 3 \n"
-"analiticke linije za jednu stavku racuna.\n"
-"        "
 
 #. module: account_analytic_plans
-#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
-msgid "Multiple-plans management in Analytic Accounting"
-msgstr "Visestruki-planovi menadzmenta u Analitickom racunovodstvu"
+#: view:analytic.plan.create.model:0
+msgid "Save This Distribution as a Model"
+msgstr "Sacuvaj Ovu Distribuciju kao Model"
 
 #. module: account_analytic_plans
-#: view:account.analytic.plan.line:0
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
-msgid "Analytic Plan Lines"
-msgstr "Redovi analitičkog plana"
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Crossovered Analytic -"
-msgstr "Unakrsna Analitika-"
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,plan_id:0
-msgid "Model's Plan"
-msgstr "Plan modela"
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account2_ids:0
-msgid "Account2 Id"
-msgstr "Šifra računa2"
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Amount"
-msgstr "Iznos"
-
-#. module: account_analytic_plans
-#: help:account.analytic.plan.line,root_analytic_id:0
-msgid "Root account of this plan."
-msgstr "Osnovni konto ovog plana."
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account6_ids:0
-msgid "Account6 Id"
-msgstr "Šifra računa6"
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Quantity"
 msgstr "Količina"
 
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
+msgstr "Multi-Planovi"
+
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
 msgstr "Šifra konta"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Code"
 msgstr "Kod"
 
 #. module: account_analytic_plans
-#: wizard_button:create.model,info,end:0
-msgid "OK"
-msgstr "U redu"
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
+msgstr "Dnevnik"
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.line,root_analytic_id:0
-msgid "Root Account"
-msgstr "Osnovni nalog (root)"
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr "TReba da definises analiticki dnevnik u '%s' dnevnika!"
 
 #. module: account_analytic_plans
-#: wizard_view:create.model,info:0
-msgid ""
-"This distribution model has been saved. You will be able to reuse it later."
-msgstr "Distribucijski Model je sacuvan. Možete ga koristiti kasnije."
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "No Analytic Journal !"
+msgstr "Nema Analitickog Dnevnika"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
 msgid "Sequence"
 msgstr "Sekvenca"
 
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Faktura"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Izvod banke"
+
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
 msgid "Analytic Account"
@@ -373,32 +442,140 @@ msgstr "Analitički nalog"
 #: field:account.analytic.default,analytics_id:0
 #: view:account.analytic.plan.instance:0
 #: field:account.analytic.plan.instance,name:0
+#: field:account.bank.statement.line,analytics_id:0
 #: field:account.invoice.line,analytics_id:0
 #: field:account.move.line,analytics_id:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_default
 msgid "Analytic Distribution"
 msgstr "Analitička Distribucija"
 
 #. module: account_analytic_plans
-#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action
-msgid "Analytic Distribution's models"
-msgstr "Modeli Analitičkih Distribucija"
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "Value Error"
+msgstr "Pogresna Vrednost"
 
 #. module: account_analytic_plans
-#: wizard_button:wizard.crossovered.analytic,init,end:0
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr "Osnovni konto ovog plana."
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
+msgstr "referenca Analitickjog naloga"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
 msgid "Cancel"
 msgstr "Otkaži"
 
 #. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,date1:0
+#: field:account.crossovered.analytic,date1:0
 msgid "Start Date"
 msgstr "Početni datum"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "at"
 msgstr "u"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr "Preduzeće"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
 msgstr "Od datuma"
+
+#~ msgid "Analytic Account Ref."
+#~ msgstr "Veza analitičkog konta"
+
+#~ msgid "Select Information"
+#~ msgstr "Selektuj informaciju"
+
+#~ msgid "Create Model"
+#~ msgstr "Kreiraj Model"
+
+#~ msgid ""
+#~ "This module allows to use several analytic plans, according to the general "
+#~ "journal,\n"
+#~ "so that multiple analytic lines are created when the invoice or the entries\n"
+#~ "are confirmed.\n"
+#~ "\n"
+#~ "For example, you can define the following analytic structure:\n"
+#~ "  Projects\n"
+#~ "      Project 1\n"
+#~ "          SubProj 1.1\n"
+#~ "          SubProj 1.2\n"
+#~ "      Project 2\n"
+#~ "  Salesman\n"
+#~ "      Eric\n"
+#~ "      Fabien\n"
+#~ "\n"
+#~ "Here, we have two plans: Projects and Salesman. An invoice line must\n"
+#~ "be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
+#~ "Fabien. The amount can also be split. The following example is for\n"
+#~ "an invoice that touches the two subproject and assigned to one salesman:\n"
+#~ "\n"
+#~ "Plan1:\n"
+#~ "    SubProject 1.1 : 50%\n"
+#~ "    SubProject 1.2 : 50%\n"
+#~ "Plan2:\n"
+#~ "    Eric: 100%\n"
+#~ "\n"
+#~ "So when this line of invoice will be confirmed, it will generate 3 analytic "
+#~ "lines,\n"
+#~ "for one account entry.\n"
+#~ "        "
+#~ msgstr ""
+#~ "Ovaj modul vam omogucava da koristite nekoliko analiticka plana, koji "
+#~ "odgovaraju osnovnom dnevniku,\n"
+#~ "i tako visestruko analizirate stavke kreirane kada je racun ili stavka\n"
+#~ "potvrdjena\n"
+#~ "\n"
+#~ "Na primer, mozete definisati sledecu analiticku strukturu:\n"
+#~ "  Projekat\n"
+#~ "      Projekat 1\n"
+#~ "                   SubProj 1.1\n"
+#~ "                   SubProj 1.2\n"
+#~ "      Projekat 2\n"
+#~ "  Prodavac\n"
+#~ "               Janko\n"
+#~ "               Marko\n"
+#~ "\n"
+#~ "Ovde imamo dva plana. Projekat i Prodavac. Red racuna mora da\n"
+#~ "moze da napise analiticke stavke u 2 plana: SubProj 1.1 i\n"
+#~ "Marko.  Iznos se takodje deli. Sledeci primer je za racune koji \n"
+#~ "su zajednicko sa dva subprojekta i dodati su jednom prodavcu:\n"
+#~ "\n"
+#~ "Plan1:\n"
+#~ "    SubProj 1.1 : 50%\n"
+#~ "    SubProj 1.2 : 50%\n"
+#~ "PLan2:\n"
+#~ "    Janko: 100%\n"
+#~ "\n"
+#~ "Tako da kad se ova linija racuna potvrdi, ona ce generisati 3 \n"
+#~ "analiticke linije za jednu stavku racuna.\n"
+#~ "        "
+
+#~ msgid "Crossovered Analytic -"
+#~ msgstr "Unakrsna Analitika-"
+
+#~ msgid "Analytic Distribution's models"
+#~ msgstr "Modeli Analitičkih Distribucija"
+
+#~ msgid ""
+#~ "This distribution model has been saved. You will be able to reuse it later."
+#~ msgstr "Distribucijski Model je sacuvan. Možete ga koristiti kasnije."
+
+#~ msgid "OK"
+#~ msgstr "U redu"
diff --git a/addons/account_budget/i18n/es.po b/addons/account_budget/i18n/es.po
index 40fc2f92db2..73efedb2aa8 100644
--- a/addons/account_budget/i18n/es.po
+++ b/addons/account_budget/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-24 22:06+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-10-25 07:16+0000\n"
+"Last-Translator: Carlos-smile <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-10-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_followup/i18n/es.po b/addons/account_followup/i18n/es.po
index 64d8204d602..595e8dcccec 100644
--- a/addons/account_followup/i18n/es.po
+++ b/addons/account_followup/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-24 22:16+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-10-25 07:09+0000\n"
+"Last-Translator: Carlos-smile <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-10-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_reporting/i18n/sr.po b/addons/account_reporting/i18n/sr.po
index 38289723f44..d516e486df5 100644
--- a/addons/account_reporting/i18n/sr.po
+++ b/addons/account_reporting/i18n/sr.po
@@ -7,16 +7,21 @@ 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-10-15 09:23+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-25 21:58+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@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-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: account_reporting
+#: model:ir.model,name:account_reporting.model_color_rml
+msgid "Rml Color"
+msgstr "Rml Boja"
+
 #. module: account_reporting
 #: field:color.rml,code:0
 msgid "code"
@@ -55,11 +60,26 @@ msgstr "Tip izveštaja"
 msgid "Balance Sheet Report"
 msgstr "Izvještaj Liste Salda"
 
+#. module: account_reporting
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
+#. module: account_reporting
+#: view:account.reporting.balance.report:0
+msgid "Print"
+msgstr "Štampaj"
+
 #. module: account_reporting
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Pogrešno ime modela u definiciji akcije."
 
+#. module: account_reporting
+#: field:account.report.bs,font_style:0
+msgid "Font"
+msgstr "Font"
+
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Courier"
@@ -71,12 +91,7 @@ msgid "Courier-BoldOblique"
 msgstr "Courier-BoldOblique"
 
 #. module: account_reporting
-#: wizard_button:account.account.balancesheet.report,init,report:0
-msgid "Print BalanceSheet"
-msgstr "Ispis ListeSalda"
-
-#. module: account_reporting
-#: help:account.account.balancesheet.report,init,periods:0
+#: help:account.reporting.balance.report,periods:0
 msgid "All periods if empty"
 msgstr "Ako je prazno, sva razdoblja"
 
@@ -160,11 +175,6 @@ msgstr "Times-Italic"
 msgid "Report Objects Only"
 msgstr "Izveštaj samo objekata"
 
-#. module: account_reporting
-#: model:ir.model,name:account_reporting.model_color_rml
-msgid "Rml Colors"
-msgstr "Rml Boje"
-
 #. module: account_reporting
 #: model:ir.module.module,shortdesc:account_reporting.module_meta_information
 msgid "Reporting of Balancesheet for accounting"
@@ -180,6 +190,11 @@ msgstr "Šifra"
 msgid "Parent"
 msgstr "Roditelj"
 
+#. module: account_reporting
+#: view:account.reporting.balance.report:0
+msgid "Select Dates Period"
+msgstr "Selektuj Datume razdoblja"
+
 #. module: account_reporting
 #: field:account.report.bs,sequence:0
 msgid "Sequence"
@@ -190,13 +205,20 @@ msgstr "Sekvenca"
 msgid "Times-Bold"
 msgstr "Times-Bold"
 
+#. module: account_reporting
+#: help:account.report.bs,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of account reporting for "
+"balance sheet."
+msgstr ""
+
 #. module: account_reporting
 #: view:account.report.bs:0
 msgid "General"
 msgstr "Opšte"
 
 #. module: account_reporting
-#: wizard_field:account.account.balancesheet.report,init,fiscalyear:0
+#: field:account.reporting.balance.report,fiscalyear:0
 msgid "Fiscal year"
 msgstr "Fiskalna Godina"
 
@@ -207,7 +229,8 @@ msgid "Accounts"
 msgstr "Nalozi"
 
 #. module: account_reporting
-#: wizard_field:account.account.balancesheet.report,init,periods:0
+#: view:account.reporting.balance.report:0
+#: field:account.reporting.balance.report,periods:0
 msgid "Periods"
 msgstr "Razdoblja"
 
@@ -217,12 +240,7 @@ msgid "Back Color"
 msgstr "Pozadinska Boja"
 
 #. module: account_reporting
-#: field:account.report.bs,child_id:0
-msgid "Children"
-msgstr "Podređeni"
-
-#. module: account_reporting
-#: wizard_button:account.account.balancesheet.report,init,end:0
+#: view:account.reporting.balance.report:0
 msgid "Cancel"
 msgstr "Otkaži"
 
@@ -237,11 +255,20 @@ msgid "Helvetica-Oblique"
 msgstr "Helvetica-Oblique"
 
 #. module: account_reporting
-#: field:account.report.bs,font_style:0
-msgid "Font"
-msgstr "Font"
+#: model:ir.model,name:account_reporting.model_account_reporting_balance_report
+msgid "Account balance report"
+msgstr ""
 
 #. module: account_reporting
-#: wizard_view:account.account.balancesheet.report,init:0
-msgid "Customize Report"
-msgstr "Prilagodi Izvestaj"
+#: field:account.report.bs,child_id:0
+msgid "Children"
+msgstr "Podređeni"
+
+#~ msgid "Print BalanceSheet"
+#~ msgstr "Ispis ListeSalda"
+
+#~ msgid "Rml Colors"
+#~ msgstr "Rml Boje"
+
+#~ msgid "Customize Report"
+#~ msgstr "Prilagodi Izvestaj"
diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po
index 3a57fdc7327..de25b05f4fe 100644
--- a/addons/account_voucher/i18n/ru.po
+++ b/addons/account_voucher/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-24 09:02+0000\n"
+"PO-Revision-Date: 2010-10-25 07:11+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-10-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po
index 5c134d5bd0e..99d569dc9f5 100644
--- a/addons/account_voucher/i18n/sr.po
+++ b/addons/account_voucher/i18n/sr.po
@@ -7,37 +7,52 @@ 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-10-17 17:33+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-25 21:24+0000\n"
 "Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@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-10-18 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_account_acount_move_line_open1
-msgid "Opening Balance Entry"
-msgstr "Otvaranje sadrzaja salda"
+#: view:account.voucher.unreconcile:0
+msgid "Unreconciliation transactions"
+msgstr "Neponistene transakcije"
 
 #. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_bakreceipt_voucher_list
-msgid "Bank Receipts"
-msgstr "Bankovni primitci"
+#: view:account.voucher:0
+msgid "Form view not available for Payment Lines"
+msgstr "Pregled Forme nije dostupan za linije Placanja"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: view:account.voucher:0
+msgid "Payment Ref"
+msgstr "Referentna Placanja"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Customer Journal Entries"
+msgstr "Otvori stavke Korisnikove Knjige"
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "Particulars"
 msgstr "Pojedinosti"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "State :"
-msgstr "Stanje :"
+#: view:account.voucher:0
+msgid "Group By..."
+msgstr "Grupirano po"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid "Cannot delete Voucher(s) which are already opened or paid !"
+msgstr "Ne mozes obrisati vaucer(e) koji su vec otvoreni ili placeni !"
 
 #. module: account_voucher
 #: constraint:ir.actions.act_window:0
@@ -45,106 +60,196 @@ msgid "Invalid model name in the action definition."
 msgstr "Pogrešno ime modela u definiciji akcije."
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: report:voucher.cash_receipt.drcr:0
 msgid "Ref. :"
 msgstr "Ref. :"
 
 #. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_cont_voucher_form
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_cont_voucher_form
-msgid "Contra Voucher"
-msgstr "Suprotna priznanica"
+#: view:account.voucher:0
+msgid "Supplier"
+msgstr "Dobavljač"
+
+#. module: account_voucher
+#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_print
+msgid "Voucher Print"
+msgstr "Stampa Vaucera"
+
+#. module: account_voucher
+#: model:ir.module.module,description:account_voucher.module_meta_information
+msgid ""
+"Account Voucher module includes all the basic requirements of\n"
+"    Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, "
+"etc...\n"
+"    * Voucher Entry\n"
+"    * Voucher Receipt\n"
+"    * Cheque Register\n"
+"    "
+msgstr ""
+"Modul naloga VAucera sadrzi sve bazne predispozicije za\n"
+"    Vaucer za Banke, Kes, Prodaju, Kupovinu, Prosirenja, Contre, itd\n"
+"    *Sadrzaj Vaucera\n"
+"    *Prijem Vaucera\n"
+"    *Cek Registar\n"
+"    "
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_pay_bills
+msgid "Bill Payment"
+msgstr "Isplate racuna"
+
+#. module: account_voucher
+#: field:account.voucher.line,amount_original:0
+msgid "Originial Amount"
+msgstr "Originalna Suma"
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+#: code:addons/account_voucher/wizard/account_statement_from_invoice.py:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
+#, python-format
+msgid "Import Entries"
+msgstr "Uvezi stavke"
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_voucher_unreconcile
+msgid "Account voucher unreconcile"
+msgstr "Ponisteni Nalozi Vaucera"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Pay Bill"
+msgstr "Isplata Racuna"
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0
+#: field:account.voucher.line,company_id:0
 msgid "Company"
 msgstr "Preduzeće"
 
-#. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_jour_voucher_form
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_voucher_form
-msgid "Journal Voucher"
-msgstr "Nalog za knjiženje"
-
-#. module: account_voucher
-#: rml:voucher.cash_receipt.drcr:0
-msgid ","
-msgstr ","
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Set to Draft"
 msgstr "Postavi u pripremu"
 
 #. module: account_voucher
-#: wizard_button:account.voucher.open,init,open:0
-msgid "Open Voucher Entries"
-msgstr "Otvori Stavke Priznanice"
+#: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
+msgid "Unreconcile entries"
+msgstr "Ponisti stavke"
 
 #. module: account_voucher
-#: model:ir.model,name:account_voucher.model_account_voucher_line
-msgid "Voucher Line"
-msgstr "Red Priznanice"
+#: view:account.voucher:0
+msgid "Voucher Statistics"
+msgstr "Statistike Vaucera"
 
 #. module: account_voucher
-#: view:account.move:0
-msgid "Total Credit"
-msgstr "Ukupno potrazuje"
+#: view:account.voucher:0
+msgid "Validate"
+msgstr "Overi"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Search Vouchers"
+msgstr "Pretrazi Vaucere"
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+msgid "Purchase"
+msgstr "Kupovina"
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0
 #: field:account.voucher.line,account_id:0
 msgid "Account"
-msgstr "Konto"
+msgstr "Nalog"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-msgid "D"
-msgstr "D"
+#: field:account.voucher,line_dr_ids:0
+msgid "Debits"
+msgstr "Dugovanja"
 
 #. module: account_voucher
-#: field:account.account,level:0
-msgid "Level"
-msgstr "Nivo"
+#: view:account.statement.from.invoice.lines:0
+msgid "Ok"
+msgstr "U redu"
 
 #. module: account_voucher
-#: view:account.move:0
-msgid "Account Entry Line"
-msgstr "Stavke knjiženja"
+#: field:account.voucher,date_due:0
+#: field:account.voucher.line,date_due:0
+msgid "Due Date"
+msgstr "Datum dospeća"
 
 #. module: account_voucher
-#: view:account.move:0
-msgid "Total Debit"
-msgstr "Ukupno duguje"
+#: field:account.voucher,narration:0
+msgid "Notes"
+msgstr "Napomene"
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+msgid "Sale"
+msgstr "Prodaja"
+
+#. module: account_voucher
+#: field:account.voucher.line,move_line_id:0
+msgid "Journal Item"
+msgstr "Stavka Dnevnika"
+
+#. module: account_voucher
+#: field:account.voucher,reference:0
+msgid "Ref #"
+msgstr "Ref #"
 
 #. module: account_voucher
-#: field:account.voucher,amount:0
 #: field:account.voucher.line,amount:0
-#: rml:voucher.cash_amount:0
+#: report:voucher.print:0
 msgid "Amount"
 msgstr "Iznos"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: view:account.voucher:0
+msgid "Payment Options"
+msgstr "Opcije Placanja"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Bill Information"
+msgstr "Informacije Racuna"
+
+#. module: account_voucher
+#: selection:account.voucher,state:0
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#. module: account_voucher
+#: field:account.statement.from.invoice,date:0
+msgid "Date payment"
+msgstr "Datum plaćanja"
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "Receiver's Signature"
 msgstr "Potpis Primaoca"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "No."
-msgstr "Br."
+#: model:ir.model,name:account_voucher.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Red bankovnog izvoda"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Supplier Vouchers"
+msgstr "Vauceri Dobavljaca"
+
+#. module: account_voucher
+#: field:account.voucher,tax_id:0
+msgid "Tax"
+msgstr "Porez"
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "Amount (in words) :"
 msgstr "Iznos ( napisano slovima )"
 
@@ -154,446 +259,642 @@ msgid "Analytic Account"
 msgstr "Analitički konto"
 
 #. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_jour_sale_voucher_form
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_sale_voucher_form
-msgid "Journal Sale Voucher"
-msgstr "Dnevnik prodaje priznanicama"
+#: report:voucher.cash_receipt.drcr:0
+msgid "Journal:"
+msgstr "Dnevnik:"
 
 #. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_receipt_vou_voucher_list
-#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_vou_voucher_list
-msgid "Receipt Vouchers"
-msgstr "Priznanice prijema"
+#: view:account.voucher:0
+msgid "Payment Information"
+msgstr "Informacije Placanja"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
+#: view:account.statement.from.invoice:0
+msgid "Go"
+msgstr "Kreni"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,partner_id:0
+#: field:account.voucher.line,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_voucher
+#: view:account.bank.statement:0
+msgid "Import Invoices"
+msgstr "Uvezi Racune"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid ""
+"You have to configure account base code and account tax code on the '%s' tax!"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.print:0
 msgid "Account :"
 msgstr "Nalog :"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: selection:account.voucher,type:0
+msgid "Receipt"
+msgstr "Racun"
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "On Account of :"
 msgstr "Na Nalogu od:"
 
 #. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_payments_bankpay_voucher_list
-#: model:ir.actions.act_window,name:account_voucher.action_payments_cashpay_voucher_list
-#: model:ir.actions.act_window,name:account_voucher.action_payments_voucher_list
-#: model:ir.ui.menu,name:account_voucher.menu_action_payments_voucher_list
-msgid "Payment Vouchers"
-msgstr "Priznanice plaćanja"
+#: view:account.voucher:0
+msgid "Sales Lines"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
+msgid "Date:"
+msgstr "Datum:"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Create"
-msgstr "Kreiraj"
+#: field:account.voucher,period_id:0
+msgid "Period"
+msgstr "Razdoblje"
 
 #. module: account_voucher
-#: selection:account.account,type1:0
-#: selection:account.account.template,type1:0
-msgid "None"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher,number:0
-msgid "Number"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.move:0
+#: view:account.voucher:0
 #: field:account.voucher,state:0
-#: wizard_field:account.voucher.open,init,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: account_voucher
-#: selection:account.account,type1:0
-#: selection:account.account.template,type1:0
-#: selection:account.voucher.line,type:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Debit"
-msgstr ""
+#: model:ir.module.module,shortdesc:account_voucher.module_meta_information
+msgid "Accounting Voucher Entries"
+msgstr "Knjigovodstveni Sadrzaj Vaucera"
 
 #. module: account_voucher
-#: field:account.voucher,type:0
-#: field:account.voucher.line,type:0
-msgid "Type"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_voucher_list
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
 msgid "Voucher Entries"
-msgstr ""
+msgstr "Sadrzaj Vaucera"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid "Error !"
+msgstr "Greška !"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier Voucher"
+msgstr "Vaucer Dobavljaca"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
+msgid "Vouchers Entries"
+msgstr "Sadrzaji Vaucera"
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "Authorised Signatory"
-msgstr ""
+msgstr "Autorizovanj Potpis"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
-msgid "Vouchers"
-msgstr ""
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipt"
+msgstr "Racun Prodaje"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Neispravna akcija!"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher.line,voucher_id:0
-#: model:res.request.link,name:account_voucher.req_link_voucher
-msgid "Voucher"
-msgstr ""
+msgid "Other Information"
+msgstr "Ostale informacije"
 
 #. module: account_voucher
-#: wizard_view:account.voucher.open,init:0
-#: model:ir.ui.menu,name:account_voucher.menu_wizard_account_voucher_open
-msgid "Open Vouchers"
-msgstr ""
+#: view:account.voucher.unreconcile:0
+msgid "Unreconciliation"
+msgstr "Poništavanje zatvaranja"
 
 #. module: account_voucher
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za pregled arhitekture"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Dated :"
-msgstr ""
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Vendor Payment"
+msgstr "Placanja Proizvodjaca"
 
 #. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_cashreceipt_voucher_list
-msgid "Cash Receipts"
-msgstr ""
+#: view:account.invoice:0
+#: code:addons/account_voucher/invoice.py:0
+#, python-format
+msgid "Pay Invoice"
+msgstr "Racun"
 
 #. module: account_voucher
-#: field:account.voucher,partner_id:0
-#: field:account.voucher.line,partner_id:0
-msgid "Partner"
-msgstr ""
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid "No Account Base Code and Account Tax Code!"
+msgstr "Nema bazne postavke naloga kao ni poreza za isti."
 
 #. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_pay_voucher_form
-msgid "New Bank Payment"
-msgstr ""
+#: field:account.voucher,tax_amount:0
+msgid "Tax Amount"
+msgstr "Iznos poreza"
 
 #. module: account_voucher
 #: view:account.voucher:0
+msgid "Voucher Entry"
+msgstr "Sadrzaj Vaucera"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Paid Amount"
+msgstr "Suma Isplate"
+
+#. module: account_voucher
+#: selection:account.voucher,pay_now:0
+msgid "Pay Directly"
+msgstr "Direktna Isplata"
+
+#. module: account_voucher
+#: field:account.statement.from.invoice,line_ids:0
+#: field:account.statement.from.invoice.lines,line_ids:0
+msgid "Invoices"
+msgstr "Računi"
+
+#. module: account_voucher
+#: field:account.voucher.unreconcile,remove:0
+msgid "Want to remove accounting entries too ?"
+msgstr "Zelis da uklonis i sadrzaj racuna ?"
+
+#. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
-msgstr ""
+msgstr "Linije Vaucera"
 
 #. module: account_voucher
 #: field:account.voucher,currency_id:0
 msgid "Currency"
+msgstr "Valuta"
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+msgid "Payable and Receivables"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,pay_now:0
+msgid "Pay Later or Group Funds"
 msgstr ""
 
 #. module: account_voucher
-#: view:account.move:0
-#: field:account.move,narration:0
 #: view:account.voucher:0
-#: field:account.voucher,narration:0
-msgid "Narration"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher,reference:0
-msgid "Voucher Reference"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_rec_voucher_form
-msgid "New Cash Receipt"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_amt
-msgid "Voucher Report"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.account,open_bal:0
-msgid "Opening Balance"
-msgstr ""
-
-#. module: account_voucher
 #: selection:account.voucher,state:0
-#: selection:account.voucher.open,init,state:0
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "Draft"
-msgstr ""
+msgstr "Priprema"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Currency:"
+msgstr "Valuta:"
+
+#. module: account_voucher
+#: field:account.move.line,amount_unreconciled:0
+msgid "Unreconciled Amount"
+msgstr "Stornirana Suma"
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "PRO-FORMA"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_receipt_cashreceipt_voucher_list
-msgid "Cash Receipt"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_pay_voucher_form
-msgid "New Cash Payment"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.move:0
-msgid "Optional Information"
-msgstr ""
+msgstr "Predračun"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "General Entries"
-msgstr ""
+msgid "Total Amount"
+msgstr "Ukupni iznos"
+
+#. module: account_voucher
+#: field:account.voucher.line,type:0
+msgid "Cr/Dr"
+msgstr "Cr/Dr"
+
+#. module: account_voucher
+#: field:account.voucher,audit:0
+msgid "Audit Complete ?"
+msgstr "Pregled KOmpletan?"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Vendor"
+msgstr "proizvođač"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Terms"
+msgstr "Uslovi plaćanja"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Compute Tax"
+msgstr "Izracunaj Porez"
 
 #. module: account_voucher
 #: field:account.voucher,date:0
+#: field:account.voucher.line,date_original:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid ":"
-msgstr ""
+#: view:account.voucher:0
+msgid "Post"
+msgstr "Пошаљи"
 
 #. module: account_voucher
-#: field:account.account,type1:0
-#: field:account.account.template,type1:0
-msgid "Dr/Cr"
-msgstr ""
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
+msgid "Number:"
+msgstr "Broj:"
 
 #. module: account_voucher
-#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher
-msgid "Voucher Report (Cr/Dr)"
-msgstr ""
+#: field:account.bank.statement.line,amount_reconciled:0
+msgid "Amount reconciled"
+msgstr "Zatvoreni iznos"
 
 #. module: account_voucher
-#: field:account.move,voucher_type:0
-#: wizard_field:account.voucher.open,init,type:0
-msgid "Voucher Type"
-msgstr ""
+#: view:account.voucher:0
+msgid "Expense Lines"
+msgstr "Troskovi"
+
+#. module: account_voucher
+#: field:account.voucher,pre_line:0
+msgid "Previous Payments ?"
+msgstr "Predhodne Isplate"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
+#: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
+msgid "Journal Vouchers"
+msgstr "Dnevnik Vaucera"
 
 #. module: account_voucher
-#: selection:account.account,type1:0
-#: selection:account.account.template,type1:0
 #: selection:account.voucher.line,type:0
-#: rml:voucher.cash_receipt.drcr:0
+#: report:voucher.cash_receipt.drcr:0
 msgid "Credit"
-msgstr ""
+msgstr "Kredit"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: view:account.voucher:0
+msgid "Extended options..."
+msgstr "Dodatne Opcije"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid "Please define a sequence on the journal !"
+msgstr "Molim definisite sekvencu Knjige"
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "Through :"
+msgstr "Kroz:"
+
+#. module: account_voucher
+#: help:account.voucher,reference:0
+msgid "Transaction reference number."
+msgstr "referentni broj Transakcije"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Invoices and outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher,reference_type:0
-msgid "Reference Type"
-msgstr ""
+#: view:account.voucher:0
+msgid "Bill Date"
+msgstr "Datum Racuna"
 
 #. module: account_voucher
+#: view:account.voucher:0
+#: view:account.voucher.unreconcile:0
+msgid "Unreconcile"
+msgstr "Poništi zatvaranje"
+
+#. module: account_voucher
+#: view:account.voucher:0
 #: model:ir.model,name:account_voucher.model_account_voucher
 msgid "Accounting Voucher"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher,period_id:0
-msgid "Period"
-msgstr ""
+#: field:account.voucher,number:0
+msgid "Number"
+msgstr "Broj"
 
 #. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_payments_bankpay_voucher_list
-msgid "Bank Payments"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.move:0
-msgid "General Information"
-msgstr ""
-
-#. module: account_voucher
-#: wizard_field:account.voucher.open,init,period_ids:0
-msgid "Periods"
-msgstr ""
+#: model:ir.model,name:account_voucher.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Izvod banke"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: selection:account.voucher,state:0
-#: wizard_button:account.voucher.open,init,end:0
-#: selection:account.voucher.open,init,state:0
+msgid "To Review"
+msgstr "Pregledati"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Sales Information"
+msgstr "Informacije Prodaje"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Vendor Journal Entries"
+msgstr "Otvori Dnevnik Proizvodjaca"
+
+#. module: account_voucher
+#: field:account.voucher.line,voucher_id:0
+#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher
+#: model:res.request.link,name:account_voucher.req_link_voucher
+msgid "Voucher"
+msgstr "Vaucer"
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_invoice
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Items"
+msgstr "Sadrzaj Vaucera"
+
+#. module: account_voucher
+#: view:account.statement.from.invoice:0
+#: view:account.statement.from.invoice.lines:0
+#: view:account.voucher:0
+#: view:account.voucher.unreconcile:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
+
+#. module: account_voucher
+#: selection:account.voucher,state:0
+msgid "Pro-forma"
+msgstr "Predračun"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: selection:account.voucher,state:0
-#: selection:account.voucher.open,init,state:0
-msgid "Pro-forma"
-msgstr ""
+#: field:account.voucher,move_ids:0
+#: model:ir.model,name:account_voucher.model_account_move_line
+msgid "Journal Items"
+msgstr "Sadrzaj Dnevnika"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payment"
+msgstr "Placanja Stranki"
 
 #. module: account_voucher
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: account_voucher
+#: view:account.statement.from.invoice:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice
+msgid "Import Invoices in Statement"
+msgstr "Uvezi račune u izvod"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Other Info"
-msgstr ""
+msgid "Pay"
+msgstr "Plati"
 
 #. module: account_voucher
-#: model:ir.module.module,shortdesc:account_voucher.module_meta_information
-msgid "Accounting Voucher Entries"
-msgstr ""
+#: selection:account.voucher.line,type:0
+#: report:voucher.cash_receipt.drcr:0
+msgid "Debit"
+msgstr "Duguje"
 
 #. module: account_voucher
-#: field:res.currency,sub_name:0
-msgid "Sub Currency"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_other_voucher_list
-#: model:ir.ui.menu,name:account_voucher.menu_action_other_voucher_list
-msgid "Other Vouchers"
-msgstr ""
+#: view:account.voucher:0
+msgid "Payment Method"
+msgstr "Nacin Placanja"
 
 #. module: account_voucher
 #: field:account.voucher.line,name:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "Canceled"
-msgstr ""
+msgstr "Otkazano"
 
 #. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_cash_pay_voucher_form
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Cash Payment Voucher"
-msgstr ""
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid "Please change partner and try again !"
+msgstr "Molim p;romenite partnera i probajte ponovo !"
 
 #. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_receipt_bakreceipt_voucher_list
-msgid "Bank Receipt"
-msgstr ""
+#: field:account.statement.from.invoice,journal_ids:0
+#: view:account.voucher:0
+#: field:account.voucher,journal_id:0
+msgid "Journal"
+msgstr "Dnevnik"
 
 #. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: report:voucher.cash_receipt.drcr:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: account_voucher
-#: selection:account.move,voucher_type:0
+#: view:account.voucher:0
+msgid "Internal Notes"
+msgstr "Interne Napomene"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,line_cr_ids:0
+msgid "Credits"
+msgstr "Krediti"
+
+#. module: account_voucher
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
+msgid "State:"
+msgstr "Stanje:"
+
+#. module: account_voucher
+#: field:account.bank.statement.line,voucher_id:0
+#: view:account.invoice:0
+#: view:account.voucher:0
+#: field:account.voucher,pay_now:0
 #: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_jour_pur_voucher_form
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_pur_voucher_form
-msgid "Journal Purchase Voucher"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.account:0
-msgid "Closing Balance"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher.line,ref:0
-msgid "Ref."
-msgstr ""
+msgid "Payment"
+msgstr "Isplata"
 
 #. module: account_voucher
+#: view:account.voucher:0
 #: selection:account.voucher,state:0
-#: selection:account.voucher.open,init,state:0
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
 msgid "Posted"
-msgstr ""
+msgstr "Proknjiženo"
 
 #. module: account_voucher
-#: field:account.voucher,name:0
-msgid "Name"
-msgstr ""
+#: view:account.voucher:0
+msgid "Customer"
+msgstr "Kupac"
 
 #. module: account_voucher
-#: field:account.voucher,move_ids:0
-msgid "Real Entry"
-msgstr ""
+#: field:account.voucher,type:0
+msgid "Default Type"
+msgstr "Podrazumevani Tip"
 
 #. module: account_voucher
-#: model:ir.actions.wizard,name:account_voucher.wizard_account_voucher_open
-msgid "Open a Voucher Entry"
-msgstr ""
+#: model:ir.model,name:account_voucher.model_account_statement_from_invoice
+#: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
+msgid "Entries by Statement from Invoices"
+msgstr "Sadrzaj po stavkama iz Racuna"
 
 #. module: account_voucher
 #: field:account.voucher,move_id:0
 msgid "Account Entry"
+msgstr "Sadrzaj Naloga"
+
+#. module: account_voucher
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid "Invalid Error !"
+msgstr "Nedefinisana Greska !"
+
+#. module: account_voucher
+#: help:account.voucher,date:0
+msgid "Effective date for accounting entries"
+msgstr "Efektivni datum za sadrzaj racuna"
+
+#. module: account_voucher
+#: view:account.voucher.unreconcile:0
+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 ""
+"Ako želite poništiti zatvaranja transakcija, morate također provjeriti sve "
+"radnje koje su povezane sa tim transakcijama jer neće biti onemogućene"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Entry Lines"
-msgstr ""
+msgid "Vendor Invoices and Outstanding transactions"
+msgstr "Proizvodjacevi racuni i neobradjene transakcije"
 
 #. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_rec_voucher_form
-msgid "New Bank Receipt"
-msgstr ""
+#: field:account.voucher.line,untax_amount:0
+msgid "Untax Amount"
+msgstr "Neporezovan Iznos"
 
 #. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_payments_cashpay_voucher_list
-msgid "Cash Payments"
-msgstr ""
+#: view:account.voucher:0
+#: field:account.voucher.line,amount_unreconciled:0
+msgid "Open Balance"
+msgstr "Otvori Stanje"
 
 #. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_cash_rec_voucher_form
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Cash Receipt Voucher"
-msgstr ""
+#: view:account.voucher:0
+#: field:account.voucher,amount:0
+msgid "Total"
+msgstr "Ukupno"
 
 #. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_bank_pay_voucher_form
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Bank Payment Voucher"
-msgstr ""
+#: field:account.voucher,name:0
+msgid "Memo"
+msgstr "Memo"
 
-#. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_bank_rec_voucher_form
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Bank Receipt Voucher"
-msgstr ""
+#~ msgid "Journal Voucher"
+#~ msgstr "Nalog za knjiženje"
 
-#. module: account_voucher
-#: field:account.account,journal_id:0
-#: field:account.voucher,journal_id:0
-msgid "Journal"
-msgstr ""
+#~ msgid "Opening Balance Entry"
+#~ msgstr "Otvaranje sadrzaja salda"
+
+#~ msgid "Contra Voucher"
+#~ msgstr "Suprotna priznanica"
+
+#~ msgid ","
+#~ msgstr ","
+
+#~ msgid "State :"
+#~ msgstr "Stanje :"
+
+#~ msgid "Bank Receipts"
+#~ msgstr "Bankovni primitci"
+
+#~ msgid "Total Credit"
+#~ msgstr "Ukupno potrazuje"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "Open Voucher Entries"
+#~ msgstr "Otvori Stavke Priznanice"
+
+#~ msgid "Total Debit"
+#~ msgstr "Ukupno duguje"
+
+#~ msgid "Level"
+#~ msgstr "Nivo"
+
+#~ msgid "Account Entry Line"
+#~ msgstr "Stavke knjiženja"
+
+#~ msgid "Voucher Line"
+#~ msgstr "Red Priznanice"
+
+#~ msgid "Journal Sale Voucher"
+#~ msgstr "Dnevnik prodaje priznanicama"
+
+#~ msgid "Receipt Vouchers"
+#~ msgstr "Priznanice prijema"
+
+#~ msgid "No."
+#~ msgstr "Br."
+
+#~ msgid "Create"
+#~ msgstr "Kreiraj"
+
+#~ msgid "Payment Vouchers"
+#~ msgstr "Priznanice plaćanja"
diff --git a/addons/analytic/i18n/sr.po b/addons/analytic/i18n/sr.po
index 77fb1553933..22fbdb5b4bf 100644
--- a/addons/analytic/i18n/sr.po
+++ b/addons/analytic/i18n/sr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-06-18 10:59+0000\n"
-"PO-Revision-Date: 2010-10-15 08:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-25 21:45+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@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-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -22,14 +22,6 @@ msgstr ""
 msgid "Child Accounts"
 msgstr "Podređeni Nalozi"
 
-#. module: analytic
-#: help:account.analytic.line,amount_currency:0
-msgid ""
-"The amount expressed in the related account currency if not equal to the "
-"company one."
-msgstr ""
-"Vrednost izrazena u datom iznosu valute ako nije jednaka valuti preduzeca"
-
 #. module: analytic
 #: constraint:ir.model:0
 msgid ""
@@ -40,18 +32,13 @@ msgstr ""
 #. module: analytic
 #: field:account.analytic.account,name:0
 msgid "Account Name"
-msgstr "Naziv računa"
+msgstr "Naziv Naloga"
 
 #. module: analytic
 #: help:account.analytic.line,unit_amount:0
 msgid "Specifies the amount of quantity to count."
 msgstr "Specificira koju kolicinu iznosa da broji"
 
-#. module: analytic
-#: help:account.analytic.line,currency_id:0
-msgid "The related account currency if not equal to the company one."
-msgstr "Dati iznos valute ako nije jednaka valuti preduzeca"
-
 #. module: analytic
 #: model:ir.module.module,description:analytic.module_meta_information
 msgid ""
@@ -86,40 +73,6 @@ msgstr "Zatvoren"
 msgid "Debit"
 msgstr "Duguje"
 
-#. module: analytic
-#: help:account.analytic.account,state:0
-msgid ""
-"* When an account is created its in 'Draft' state.                           "
-"       \n"
-"* If any associated partner is there, it can be in 'Open' state.             "
-"                     \n"
-"* If any pending balance is there it can be in 'Pending'.                    "
-"               \n"
-"* And finally when all the transactions are over, it can be in 'Close' "
-"state.                                   \n"
-"* The project can be in either if the states 'Template' and 'Running'.\n"
-" If it is template then we can make projects based on the template projects. "
-"If its in 'Running' state it is a normal project.                            "
-"     \n"
-" If it is to be reviewed then the state is 'Pending'.\n"
-" When the project is completed the state is set to 'Done'."
-msgstr ""
-"*Kada je neka faktura kreirana a nalazi se u ' U Toku'.                      "
-"                                                    \n"
-"*Ako je bilo koji asocirani partner tamo, on mora biti u stanju ' Otvoren'.  "
-"                                                                     \n"
-"*Ako je bilo koji Saldo u stanju 'U izvrsenju' on mora i biti tamo.          "
-"                                                                             "
-"\n"
-"*I , na kraju kada su sve transakcije gotove, mora se naci u stanju ' "
-"Zatvoreno'.                                                                  "
-"             \n"
-" Ako je ovo shema(obrazac) onda mi mozemo napraviri projekat baziran na "
-"istom. Ako je u stanju ' U izvrsenju' to je normalnan\n"
-"projekat.\n"
-" Ako zelimo da ga pregledamo, stanje mora biti ' U Toku'.\n"
-" Kada je projekat zavrsen stanje je postavljeno na ' Zavrseno'."
-
 #. module: analytic
 #: field:account.analytic.account,type:0
 msgid "Account Type"
@@ -147,12 +100,9 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price."
-msgstr ""
-"Izracunato mnozenjem kolicine i cene dobijene iz Proizvodove cene kostanja"
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "Normalan"
 
 #. module: analytic
 #: field:account.analytic.account,company_id:0
@@ -182,14 +132,23 @@ msgstr "Datum"
 
 #. module: analytic
 #: field:account.analytic.account,currency_id:0
-#: field:account.analytic.line,currency_id:0
 msgid "Account currency"
 msgstr "Valuta Naloga"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "View"
-msgstr "Pregled"
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Izracunato mnozenjem kolicine i cene date u proizvodovom cenovniku. Uvek "
+"prikazano u osnovnoj valuti preduzeca."
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
@@ -222,31 +181,29 @@ msgid "Balance"
 msgstr "Saldo"
 
 #. module: analytic
-#: field:account.analytic.account,date_start:0
-msgid "Date Start"
-msgstr "Početni datum"
-
-#. module: analytic
-#: field:account.analytic.account,quantity:0
-#: field:account.analytic.line,unit_amount:0
-msgid "Quantity"
-msgstr "Količina"
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account."
+msgstr ""
+"Ukoliko izaberete PREGLED, to znaci da ne zelite da kreirate sadrzaj "
+"dnevnika, koristeci taj nalog."
 
 #. module: analytic
 #: field:account.analytic.account,date:0
 msgid "Date End"
 msgstr "Završni datum"
 
+#. module: analytic
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
+
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
 msgstr "Sifra Naloga"
 
-#. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Normal"
-msgstr "Normalan"
-
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
 msgid "Full Account Name"
@@ -260,19 +217,19 @@ msgid "Analytic Account"
 msgstr "Analitički konto"
 
 #. module: analytic
-#: field:account.analytic.account,company_currency_id:0
-msgid "Currency"
-msgstr "Valuta"
-
-#. module: analytic
-#: field:account.analytic.line,amount_currency:0
-msgid "Amount currency"
-msgstr "Iznos valute"
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "Pregled"
 
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
-msgid "Associated Partner"
-msgstr "Povezani partner"
+msgid "Partner"
+msgstr "Partner"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "Početni datum"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -283,3 +240,59 @@ msgstr "Otvori"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Analitičke stavke"
+
+#~ msgid ""
+#~ "The amount expressed in the related account currency if not equal to the "
+#~ "company one."
+#~ msgstr ""
+#~ "Vrednost izrazena u datom iznosu valute ako nije jednaka valuti preduzeca"
+
+#~ msgid "The related account currency if not equal to the company one."
+#~ msgstr "Dati iznos valute ako nije jednaka valuti preduzeca"
+
+#~ msgid ""
+#~ "* When an account is created its in 'Draft' state.                           "
+#~ "       \n"
+#~ "* If any associated partner is there, it can be in 'Open' state.             "
+#~ "                     \n"
+#~ "* If any pending balance is there it can be in 'Pending'.                    "
+#~ "               \n"
+#~ "* And finally when all the transactions are over, it can be in 'Close' "
+#~ "state.                                   \n"
+#~ "* The project can be in either if the states 'Template' and 'Running'.\n"
+#~ " If it is template then we can make projects based on the template projects. "
+#~ "If its in 'Running' state it is a normal project.                            "
+#~ "     \n"
+#~ " If it is to be reviewed then the state is 'Pending'.\n"
+#~ " When the project is completed the state is set to 'Done'."
+#~ msgstr ""
+#~ "*Kada je neka faktura kreirana a nalazi se u ' U Toku'.                      "
+#~ "                                                    \n"
+#~ "*Ako je bilo koji asocirani partner tamo, on mora biti u stanju ' Otvoren'.  "
+#~ "                                                                     \n"
+#~ "*Ako je bilo koji Saldo u stanju 'U izvrsenju' on mora i biti tamo.          "
+#~ "                                                                             "
+#~ "\n"
+#~ "*I , na kraju kada su sve transakcije gotove, mora se naci u stanju ' "
+#~ "Zatvoreno'.                                                                  "
+#~ "             \n"
+#~ " Ako je ovo shema(obrazac) onda mi mozemo napraviri projekat baziran na "
+#~ "istom. Ako je u stanju ' U izvrsenju' to je normalnan\n"
+#~ "projekat.\n"
+#~ " Ako zelimo da ga pregledamo, stanje mora biti ' U Toku'.\n"
+#~ " Kada je projekat zavrsen stanje je postavljeno na ' Zavrseno'."
+
+#~ msgid ""
+#~ "Calculated by multiplying the quantity and the price given in the Product's "
+#~ "cost price."
+#~ msgstr ""
+#~ "Izracunato mnozenjem kolicine i cene dobijene iz Proizvodove cene kostanja"
+
+#~ msgid "Currency"
+#~ msgstr "Valuta"
+
+#~ msgid "Associated Partner"
+#~ msgstr "Povezani partner"
+
+#~ msgid "Amount currency"
+#~ msgstr "Iznos valute"
diff --git a/addons/base_contact/i18n/ru.po b/addons/base_contact/i18n/ru.po
index 7d9c14ffa43..fe3105581d2 100644
--- a/addons/base_contact/i18n/ru.po
+++ b/addons/base_contact/i18n/ru.po
@@ -6,25 +6,269 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 08:45+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-25 19:25+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-09-30 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: base_contact
+#: field:res.partner.contact,title:0
+msgid "Title"
+msgstr "Название"
+
+#. module: base_contact
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия."
+
+#. module: base_contact
+#: view:res.partner.address:0
+msgid "# of Contacts"
+msgstr "Кол-во контактных лиц"
+
+#. module: base_contact
+#: field:res.partner.job,fax:0
+msgid "Fax"
+msgstr "Факс"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "title"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,date_start:0
+msgid "Start date of job(Joining Date)"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,function:0
+msgid "Function of this contact with this partner"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,state:0
+msgid "Status of Address"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,name:0
+msgid ""
+"You may                     enter Address first,Partner will be linked "
+"automatically if any."
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,fax:0
+msgid "Job FAX no."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,mobile:0
+msgid "Mobile"
+msgstr "Моб. тел."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,comment:0
+msgid "Notes"
+msgstr "Примечания"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_contacts0
+msgid "People you work with."
+msgstr "Люди с которыми вы работает"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
+msgid "Define functions and address."
+msgstr "Определить функции и адреса."
+
+#. module: base_contact
+#: help:res.partner.job,date_stop:0
+msgid "Last date of job"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+#: field:base.contact.installer,migrate:0
+msgid "Migrate"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.job,name:0
+msgid "Partner"
+msgstr "Партнер"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_function0
+msgid "Jobs at a same partner address."
+msgstr "Должности с таким же адресом партнера"
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_partners0
+msgid "Partners"
+msgstr "Партнеры"
+
+#. module: base_contact
+#: field:res.partner.job,function:0
+msgid "Partner Function"
+msgstr "Функции партнера"
+
+#. module: base_contact
+#: field:res.partner.job,state:0
+msgid "State"
+msgstr "Состояние"
+
+#. module: base_contact
+#: model:ir.module.module,shortdesc:base_contact.module_meta_information
+#: model:process.process,name:base_contact.process_process_basecontactprocess0
+msgid "Base Contact"
+msgstr "Основной контакт"
+
+#. module: base_contact
+#: field:res.partner.job,date_stop:0
+msgid "Date Stop"
+msgstr "Дата Остановки"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
+msgid "Contact's Jobs"
+msgstr "Должность контакта"
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Categories"
+msgstr "Категории"
+
+#. module: base_contact
+#: help:res.partner.job,sequence_partner:0
+msgid ""
+"Order of importance                 of this job title in the list of job "
+"title of the linked partner"
+msgstr ""
+
+#. module: base_contact
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильный XML для просмотра архитектуры!"
+
+#. module: base_contact
+#: field:res.partner.job,extension:0
+msgid "Extension"
+msgstr "Расширение"
+
+#. module: base_contact
+#: help:res.partner.job,extension:0
+msgid "Internal/External extension phone number"
+msgstr "Внутренний / внешний расширение телефонного номера"
+
+#. module: base_contact
+#: help:res.partner.job,phone:0
+msgid "Job Phone no."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,job_ids:0
+msgid "Functions and Addresses"
+msgstr "Функции и Адреса"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_contact
+#: field:res.partner.job,contact_id:0
+msgid "Contact"
+msgstr "Контакт"
+
+#. module: base_contact
+#: help:res.partner.job,email:0
+msgid "Job E-Mail"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,sequence_partner:0
+msgid "Partner Seq."
+msgstr "Последовательность партнеров"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
+msgid "Function to address"
+msgstr "Адрес функции"
+
+#. module: base_contact
+#: field:res.partner.contact,name:0
+msgid "Last Name"
+msgstr "Фамилия"
+
+#. module: base_contact
+#: view:res.partner:0
+#: view:res.partner.contact:0
+msgid "Communication"
+msgstr ""
+
+#. module: base_contact
+#: field:base.contact.installer,config_logo:0
+#: field:res.partner.contact,photo:0
+msgid "Image"
+msgstr ""
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Past"
+msgstr "Прошлые"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_address
+msgid "Partner Addresses"
+msgstr ""
+
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
 msgstr "Последовательность контакта"
 
 #. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-msgid "res.partner.contact"
-msgstr "Контакт партнера"
+#: view:res.partner.address:0
+msgid "Search Contact"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
+#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
+#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
+#: model:process.node,name:base_contact.process_node_contacts0
+#: view:res.partner:0
+#: field:res.partner.address,job_ids:0
+msgid "Contacts"
+msgstr "Контакты"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid ""
+"Due to changes in Address and Partner's relation, some of the details from "
+"address are needed to be migrated into contact information."
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_addresses0
+msgid "Working and private addresses."
+msgstr "Рабочие и дополнительные адреса."
+
+#. module: base_contact
+#: help:res.partner.job,address_id:0
+msgid "Address which is linked to the Partner"
+msgstr ""
+
+#. module: base_contact
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
 
 #. module: base_contact
 #: constraint:ir.model:0
@@ -35,24 +279,117 @@ msgstr ""
 "символов !"
 
 #. module: base_contact
-#: field:res.partner.job,function_id:0
-msgid "Partner Function"
-msgstr "Функции партнера"
+#: help:res.partner.job,other:0
+msgid "Additional phone field"
+msgstr "Дополнительное поле телефона"
 
 #. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: view:res.partner:0
-#: view:res.partner.address:0
-#: field:res.partner.address,job_ids:0
-msgid "Contacts"
-msgstr "Контакты"
+#: field:res.partner.contact,website:0
+msgid "Website"
+msgstr "Сайт"
 
 #. module: base_contact
-#: field:res.partner.job,sequence_partner:0
-msgid "Partner Seq."
-msgstr "Последовательность партнеров"
+#: view:base.contact.installer:0
+msgid "Otherwise these details will not be visible from address/contact."
+msgstr ""
+
+#. module: base_contact
+#: field:base.contact.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,email:0
+#: field:res.partner.job,email:0
+msgid "E-Mail"
+msgstr "Эл. почта"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_base_contact_installer
+msgid "base.contact.installer"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.contact,active:0
+msgid ""
+"If the active field is set to true,                 it will allow you to "
+"hide the partner contact without removing it."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.job:0
+msgid "Contact Functions"
+msgstr "Функции контакта"
+
+#. module: base_contact
+#: field:res.partner.job,phone:0
+msgid "Phone"
+msgstr "Телефон"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Do you want to migrate your Address data in Contact Data?"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,active:0
+msgid "Active"
+msgstr "Активен"
+
+#. module: base_contact
+#: field:res.partner.contact,function:0
+msgid "Main Function"
+msgstr "Личная функция"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
+msgid "Define partners and their addresses."
+msgstr "Определить партнеров и их адреса."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Seq."
+msgstr "Посл-ть"
+
+#. module: base_contact
+#: field:res.partner.contact,lang_id:0
+msgid "Language"
+msgstr "Язык"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Extra Information"
+msgstr "Доп. информация"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_partners0
+msgid "Companies you work with."
+msgstr "Организации с которыми вы работаете"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Partner Contact"
+msgstr "Контакт партнера"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "General"
+msgstr "Основной"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Photo"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,birthdate:0
+msgid "Birth Date"
+msgstr "Дата рождения"
+
+#. module: base_contact
+#: help:base.contact.installer,migrate:0
+msgid "If you select this, all addresses will be migrated."
+msgstr ""
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -74,195 +411,47 @@ msgstr "Функции сотрудника партнера"
 msgid "Other"
 msgstr "Другое"
 
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_contacttofunction0
-msgid "Contact to function"
-msgstr "Функции контакта"
-
-#. module: base_contact
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Адрес партнера"
-
-#. module: base_contact
-#: view:res.partner.address:0
-msgid "# of Contacts"
-msgstr "Кол-во контактных лиц"
-
-#. module: base_contact
-#: help:res.partner.job,other:0
-msgid "Additional phone field"
-msgstr "Дополнительное поле телефона"
-
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
 msgid "Function"
 msgstr "Функция"
 
-#. module: base_contact
-#: field:res.partner.job,fax:0
-msgid "Fax"
-msgstr "Факс"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Язык"
-
-#. module: base_contact
-#: field:res.partner.job,phone:0
-msgid "Phone"
-msgstr "Телефон"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_contacttofunction0
-msgid "Defines contacts and functions."
-msgstr "Определить контакты и функции"
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Название"
-
-#. module: base_contact
-#: view:res.partner.job:0
-msgid "Contact Functions"
-msgstr "Функции контакта"
-
-#. module: base_contact
-#: model:ir.module.module,shortdesc:base_contact.module_meta_information
-msgid "Base Contact"
-msgstr "Основной контакт"
-
-#. module: base_contact
-#: help:res.partner.job,sequence_partner:0
-msgid ""
-"Order of importance of this job title in the list of job title of the linked "
-"partner"
-msgstr ""
-"С учетом важности этой работы названия в списке Должность связанного партнера"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-#: field:res.partner.job,email:0
-msgid "E-Mail"
-msgstr "Эл. почта"
-
-#. module: base_contact
-#: field:res.partner.job,date_stop:0
-msgid "Date Stop"
-msgstr "Дата Остановки"
-
-#. module: base_contact
-#: view:res.partner:0
-#: field:res.partner.job,address_id:0
-msgid "Address"
-msgstr "Адрес"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
-#: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job
-msgid "Contact's Jobs"
-msgstr "Должность контакта"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Национальность"
-
-#. module: base_contact
-#: help:res.partner.job,sequence_contact:0
-msgid ""
-"Order of importance of this address in the list of addresses of the linked "
-"contact"
-msgstr "Уровень важности этого адреса в списке адресов связанного контакта"
-
 #. module: base_contact
 #: field:res.partner.address,job_id:0
 #: field:res.partner.contact,job_id:0
 msgid "Main Job"
 msgstr "Основная должность"
 
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_contacttofunction0
+msgid "Defines contacts and functions."
+msgstr "Определить контакты и функции"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_contacttofunction0
+msgid "Contact to function"
+msgstr "Функции контакта"
+
 #. module: base_contact
 #: view:res.partner:0
-msgid "Categories"
-msgstr "Категории"
+#: field:res.partner.job,address_id:0
+msgid "Address"
+msgstr "Адрес"
 
 #. module: base_contact
-#: field:res.partner.contact,function_id:0
-msgid "Main Function"
-msgstr "Личная функция"
+#: field:res.partner.contact,country_id:0
+msgid "Nationality"
+msgstr "Национальность"
 
 #. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Определить партнеров и их адреса."
+#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
+msgid "Open Jobs"
+msgstr ""
 
 #. module: base_contact
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact Process"
-msgstr "Основной контакт"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Seq."
-msgstr "Посл-ть"
-
-#. module: base_contact
-#: field:res.partner.job,extension:0
-msgid "Extension"
-msgstr "Расширение"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Моб. тел."
-
-#. module: base_contact
-#: help:res.partner.job,extension:0
-msgid "Internal/External extension phone number"
-msgstr "Внутренний / внешний расширение телефонного номера"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Люди с которыми вы работает"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Доп. информация"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Функции и Адреса"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Активен"
-
-#. module: base_contact
-#: field:res.partner.job,contact_id:0
-msgid "Contact"
-msgstr "Контакт"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Организации с которыми вы работаете"
+#: field:base.contact.installer,name:0
+msgid "Name"
+msgstr ""
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
@@ -270,24 +459,14 @@ msgid "Main Employer"
 msgstr "Основной работодатель"
 
 #. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
-msgid "Function to address"
-msgstr "Адрес функции"
+#: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
+msgid "Address Migration"
+msgstr ""
 
 #. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
-msgid "Partner Contacts"
-msgstr "Контакты партнера"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Контакт партнера"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Партнеры"
+#: view:res.partner:0
+msgid "Postal Address"
+msgstr ""
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
@@ -296,45 +475,9 @@ msgid "Addresses"
 msgstr "Адреса"
 
 #. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Рабочие и дополнительные адреса."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Last Name"
-msgstr "Фамилия"
-
-#. module: base_contact
-#: field:res.partner.job,state:0
-msgid "State"
-msgstr "Состояние"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: view:res.partner.job:0
-msgid "General"
-msgstr "Основной"
-
-#. module: base_contact
-#: selection:res.partner.job,state:0
-msgid "Past"
-msgstr "Прошлые"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General Information"
-msgstr "Общая информация"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_function0
-msgid "Jobs at a same partner address."
-msgstr "Должности с таким же адресом партнера"
-
-#. module: base_contact
-#: field:res.partner.job,name:0
-msgid "Partner"
-msgstr "Партнер"
+#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
+msgid "Partner to address"
+msgstr "Адрес партнера"
 
 #. module: base_contact
 #: field:res.partner.job,date_start:0
@@ -342,16 +485,31 @@ msgid "Date Start"
 msgstr "Дата начала"
 
 #. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
-msgid "Define functions and address."
-msgstr "Определить функции и адреса."
+#: help:res.partner.job,sequence_contact:0
+msgid ""
+"Order of                     importance of this address in the list of "
+"addresses of the linked contact"
+msgstr ""
 
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Сайт"
+#~ msgid "General Information"
+#~ msgstr "Общая информация"
 
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Дата рождения"
+#~ msgid "res.partner.contact"
+#~ msgstr "Контакт партнера"
+
+#~ msgid ""
+#~ "Order of importance of this job title in the list of job title of the linked "
+#~ "partner"
+#~ msgstr ""
+#~ "С учетом важности этой работы названия в списке Должность связанного партнера"
+
+#~ msgid "Base Contact Process"
+#~ msgstr "Основной контакт"
+
+#~ msgid "Partner Contacts"
+#~ msgstr "Контакты партнера"
+
+#~ msgid ""
+#~ "Order of importance of this address in the list of addresses of the linked "
+#~ "contact"
+#~ msgstr "Уровень важности этого адреса в списке адресов связанного контакта"
diff --git a/addons/base_vat/i18n/ru.po b/addons/base_vat/i18n/ru.po
index 685138c095f..f2bf161ed7d 100644
--- a/addons/base_vat/i18n/ru.po
+++ b/addons/base_vat/i18n/ru.po
@@ -6,35 +6,70 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 03:17+0000\n"
-"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-25 19:14+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@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-09-29 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
-#: model:ir.module.module,description:base_vat.module_meta_information
+#: code:addons/base_vat/base_vat.py:0
+#, python-format
 msgid ""
-"Enable the VAT Number for the partner. Check the validity of that VAT Number."
-msgstr ""
-"Разрешить использование кода налога для партнера. Проверьте правильность "
-"кода налога."
+"The Vat does not seems to be correct. You should have entered something like "
+"this %s"
+msgstr "НДС не кажется верным. Вы должны ввести что-то вроде этого: %s"
 
 #. module: base_vat
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Некорректный формат XML структуры для просмотра."
 
+#. module: base_vat
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Название объекта должно начинаться с x_  и не должно содержать специальных "
+"символов !"
+
+#. module: base_vat
+#: model:ir.module.module,shortdesc:base_vat.module_meta_information
+msgid "Base VAT - To check VAT number validity"
+msgstr "База НДС - для проверки правильности НДС"
+
+#. module: base_vat
+#: code:addons/base_vat/base_vat.py:0
+#, python-format
+msgid "The VAT is invalid, It should begin with the country code"
+msgstr "НДС неправильный, он должен начинаться с кода страны"
+
+#. module: base_vat
+#: help:res.partner,vat_subjected:0
+msgid ""
+"Check this box if the partner is subjected to the VAT. It will be used for "
+"the VAT legal statement."
+msgstr ""
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_partner
+msgid "Partner"
+msgstr "Партнёр"
+
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
 msgstr "Действующий код налога"
 
-#. module: base_vat
-#: model:ir.module.module,shortdesc:base_vat.module_meta_information
-msgid "VAT"
-msgstr "Код налога"
+#~ msgid "VAT"
+#~ msgstr "Код налога"
+
+#~ msgid ""
+#~ "Enable the VAT Number for the partner. Check the validity of that VAT Number."
+#~ msgstr ""
+#~ "Разрешить использование кода налога для партнера. Проверьте правильность "
+#~ "кода налога."
diff --git a/addons/claim_from_delivery/i18n/es.po b/addons/claim_from_delivery/i18n/es.po
index e9e7faa12b2..9b4a2b36206 100644
--- a/addons/claim_from_delivery/i18n/es.po
+++ b/addons/claim_from_delivery/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-24 21:49+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-10-25 07:14+0000\n"
+"Last-Translator: Carlos-smile <Unknown>\n"
 "Language-Team: Spanish <es@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-10-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: claim_from_delivery
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index e76dc7a8f6c..991a614c00e 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-24 09:03+0000\n"
+"PO-Revision-Date: 2010-10-25 13:14+0000\n"
 "Last-Translator: Douwe Wullink (Dypalio) <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-10-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -412,12 +412,12 @@ msgstr "Fondsenwerving"
 #: view:res.partner:0
 #: field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "Leads en verkoopkansen"
 
 #. module: crm
 #: view:crm.send.mail:0
 msgid "_Send"
-msgstr ""
+msgstr "Ver_stuur"
 
 #. module: crm
 #: view:crm.lead:0
@@ -427,33 +427,33 @@ msgstr "Communicatie"
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Change Responsible"
-msgstr ""
+msgstr "Wijzig verantwoordelijke"
 
 #. module: crm
 #: field:crm.merge.opportunity,state:0
 msgid "Set State To"
-msgstr ""
+msgstr "Zet status op"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_action
 msgid "Convert/Merge Opportunity"
-msgstr ""
+msgstr "Verkoopkans omzetten/samenvoegen"
 
 #. module: crm
 #: field:crm.lead,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Wijzigingsdatum"
 
 #. module: crm
 #: help:crm.meeting,count:0
 msgid "Repeat max that times"
-msgstr ""
+msgstr "Herhaal max aantal keren"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: field:crm.lead2opportunity.action,name:0
 msgid "Select Action"
-msgstr ""
+msgstr "Selecteer actie"
 
 #. module: crm
 #: field:base.action.rule,trg_categ_id:0
@@ -471,17 +471,17 @@ msgstr "Categorie"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr ""
+msgstr "#Verkoopkansen"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor2
 msgid "Campaign 1"
-msgstr ""
+msgstr "Campagne 1"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor1
 msgid "Campaign 2"
-msgstr ""
+msgstr "Campagne 2"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -491,12 +491,12 @@ msgstr "Privacy"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr ""
+msgstr "Verkoopkans analyse"
 
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "Locatie gebeurtenis"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
@@ -506,7 +506,7 @@ msgstr "Herhaling regel"
 #. module: crm
 #: help:crm.installer,fetchmail:0
 msgid "Allows you to receive E-Mails from POP/IMAP server."
-msgstr ""
+msgstr "Laat u e-mails ontvangen van POP/IMAP server."
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -566,27 +566,27 @@ msgstr "Niet lopend"
 #: view:crm.send.mail:0
 #: model:ir.actions.act_window,name:crm.action_crm_reply_mail
 msgid "Reply to last Mail"
-msgstr ""
+msgstr "Beantwoordt laatste mail"
 
 #. module: crm
 #: field:crm.lead,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "E-Mail"
 
 #. module: crm
 #: field:crm.installer,wiki_sale_faq:0
 msgid "Sale FAQ"
-msgstr ""
+msgstr "Verkoop FAQ"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail_attachment
 msgid "crm.send.mail.attachment"
-msgstr ""
+msgstr "crm.send.mail.attachment"
 
 #. module: crm
 #: field:crm.meeting,count:0
 msgid "Count"
-msgstr ""
+msgstr "Aantal"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -610,7 +610,7 @@ msgstr "Deze personen ontvangen email."
 #: view:crm.meeting:0
 #: field:crm.meeting,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Samenvatting"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -623,6 +623,9 @@ msgid ""
 "Thick this box if you want that on escalation, the responsible of this sale "
 "team automatically becomes responsible of the lead/opportunity escaladed"
 msgstr ""
+"Vink aan als u wilt dat bij escalatie de verantwoordelijke van het "
+"verkoopteam automatisch de verantwoordelijke van de geëscaleerde "
+"lead/verkoopkans wordt."
 
 #. module: crm
 #: help:crm.installer,outlook:0
@@ -631,6 +634,8 @@ msgid ""
 "Allows you to link your e-mail to OpenERP's documents. You can attach it to "
 "any existing one in OpenERP or create a new one."
 msgstr ""
+"Laat uw e-mail koppelen met OpenERP's documenten. U kunt het bijvoegen bij "
+"alle bestaande in OpenERP of een nieuwe maken."
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -655,7 +660,7 @@ msgstr "Profielschetsopties"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr ""
+msgstr "#Telefoontjes"
 
 #. module: crm
 #: view:crm.lead:0
@@ -669,12 +674,15 @@ msgid ""
 "modes available with the customer. With each commercial opportunity, you can "
 "indicate                         the canall which is this opportunity source."
 msgstr ""
+"De kanalen vertegenwoordigen de verschillende beschikbare "
+"communicatiemiddelen met de klant. Met elke verkoopkans kunt u het kanaal "
+"aangeven dat de bron van de verkoopkans is."
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:0
 #, python-format
 msgid "The meeting '%s' has been confirmed."
-msgstr ""
+msgstr "De afspraak '%s' is bevestigd."
 
 #. module: crm
 #: field:crm.case.section,user_id:0
@@ -693,6 +701,8 @@ msgid ""
 "The email address put in the 'Reply-To' of all emails sent by OpenERP about "
 "cases in this sales team"
 msgstr ""
+"Het e-mail adres bij 'Beantwoordt aan' van alle door OpenERP verstuurde e-"
+"mails omtrent dossiers in dit verkoopteam"
 
 #. module: crm
 #: view:res.users:0
@@ -705,6 +715,8 @@ msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
+"Definieer een regel of herhaalpatroon of tijd om uit te sluiten van de "
+"herhaalregel."
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -717,12 +729,14 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the event "
 "alarm information without removing it."
 msgstr ""
+"Als het actief veld wordt uitgezet, kunt u het verbergen zonder te moeten "
+"verwijderen"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.meeting:0
 msgid "Details"
-msgstr ""
+msgstr "Details"
 
 #. module: crm
 #: help:crm.installer,crm_caldav:0
@@ -730,11 +744,13 @@ msgid ""
 "Helps you to synchronize the meetings with other calendar clients and "
 "mobiles."
 msgstr ""
+"Helpt u bij het synchroniseren van de afspraken met andere agenda software "
+"en mobiele telefoons."
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Years"
-msgstr ""
+msgstr "Jaren"
 
 #. module: crm
 #: help:crm.installer,crm_claim:0
@@ -742,6 +758,8 @@ msgid ""
 "Manages the suppliers and customers claims, including your corrective or "
 "preventive actions."
 msgstr ""
+"Beheert de leveranciers- en klantklachten, inclusief uw correctieve en "
+"voorkomende activiteiten."
 
 #. module: crm
 #: view:crm.lead:0
@@ -757,7 +775,7 @@ msgstr "Segmentatie relaties"
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "Verwachte omzet"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -773,13 +791,13 @@ msgstr "Waarschijnlijkheid (%)"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "Leads generatie"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "Statistisch dashboard"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
@@ -804,7 +822,7 @@ msgstr "Televisie"
 #. module: crm
 #: field:crm.installer,crm_caldav:0
 msgid "Calendar Synchronizing"
-msgstr ""
+msgstr "Agenda synchronisatie"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -831,23 +849,23 @@ msgstr "Naam verkoopkans"
 #. module: crm
 #: field:crm.meeting,byday:0
 msgid "By day"
-msgstr ""
+msgstr "Op dag"
 
 #. module: crm
 #: field:base.action.rule,act_section_id:0
 msgid "Set Team to"
-msgstr ""
+msgstr "Zet team op"
 
 #. module: crm
 #: view:calendar.attendee:0
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
-msgstr ""
+msgstr "Soort gebeurtenis"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_installer
 msgid "crm.installer"
-msgstr ""
+msgstr "crm.installer"
 
 #. module: crm
 #: field:crm.segmentation,exclusif:0
@@ -858,7 +876,7 @@ msgstr "Exclusief"
 #: code:addons/crm/crm_opportunity.py:0
 #, python-format
 msgid "The opportunity '%s' has been won."
-msgstr ""
+msgstr "Verkoopkans '%s' is gewonnen."
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -866,11 +884,13 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
 msgstr ""
+"Als het actief veld is aangevinkt, kunt u het verkoopteam verbergen zonder "
+"het te verwijderen."
 
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "Stel het alarm in op een tijd voorafgaand aan de gebeurtenis"
 
 #. module: crm
 #: model:ir.module.module,description:crm.module_meta_information
@@ -906,12 +926,39 @@ msgid ""
 "    * My Cases (list)\n"
 "    * Jobs Tracking (graph)\n"
 msgstr ""
+"Het generieke OpenERP Customer Relationship Management\n"
+"systeem laat een groep mensen intelligent en efficiënt werken met\n"
+"leads, verkoopkansen, afspraken, telefoongesprekken etc.\n"
+"Het beheer tkerntaken zoals communicatie, identificatie, priorisatie,\n"
+"toewijzing, oplossing en notificatie.\n"
+"\n"
+"OpenERP zorgt dat gebruikers, klanten en leveranciers erin slagen alle "
+"dossiers te volgen. \n"
+"Het verzorgt automatische herinneringen, escaleert aanvragen, activeert "
+"specifieke methoden\n"
+"en tal van andere acties gebaseerd op het bedrijfsbeleid.\n"
+"\n"
+"Het mooiste van dit systeem dat gebruikers niets sopeciaals hoeven te doen.\n"
+"Ze kunnen gewoon een email naar de aanvraag volger sturen. OpenERP zorgt "
+"voor het bedanken voor de email, het automatisch doorsturen naar de "
+"betreffende medewerkers, en zorgt dat alle toekomstige correspondentie naar "
+"de juiste plaats gaat.\n"
+"\n"
+"De CRM module heeft een email gateway voor de synchronisatie tussen email en "
+"OpenERP. \n"
+"Maak dashboard voor CRM dat bevat:\n"
+"    * Mijn leads (list)\n"
+"    * Leads per stadium (graph)\n"
+"    * Mijn afspraken (list)\n"
+"    * Verkoop pijplijn per stadium (graph)\n"
+"    * Mijn dossiers (list)\n"
+"    * Banen volgen (graph)\n"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
 #: field:crm.phonecall.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Aanmaakdatum"
 
 #. module: crm
 #: field:crm.lead,ref2:0
@@ -927,7 +974,7 @@ msgstr "Verkoop Inkoop"
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "Vereisten"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
@@ -935,11 +982,13 @@ msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
 msgstr ""
+"Deze eigenschap definieert de lijst van datum/tijd uitzonderingen voor een "
+"terugkerend agenda-item."
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "Convert To Opportunity "
-msgstr ""
+msgstr "Converteer naar verkoopkans "
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
@@ -965,22 +1014,22 @@ msgstr "Categorie relatie"
 #: view:crm.add.note:0
 #: model:ir.actions.act_window,name:crm.action_crm_add_note
 msgid "Add Note"
-msgstr ""
+msgstr "Voeg notitie toe"
 
 #. module: crm
 #: field:crm.lead,is_supplier_add:0
 msgid "Supplier"
-msgstr ""
+msgstr "Leverancier"
 
 #. module: crm
 #: help:crm.send.mail,reply_to:0
 msgid "Reply-to of the Sales team defined on this case"
-msgstr ""
+msgstr "Beantwoordt-aan van het voor dit dosseir gedefinieerde verkoopteam"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Markeren als gewonnen"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -990,7 +1039,7 @@ msgstr "Inkoophoeveelheid"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr ""
+msgstr "Markeren als verloren"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1003,17 +1052,17 @@ msgstr "Maart"
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The opportunity '%s' has been closed."
-msgstr ""
+msgstr "Verkoopkans '%s' is gesloten."
 
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dagen voor openen"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show time as"
-msgstr ""
+msgstr "Tijd weergeven als"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -1036,7 +1085,7 @@ msgstr "Mobiel"
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
-msgstr ""
+msgstr "Volgende stadium"
 
 #. module: crm
 #: view:board.board:0
@@ -1051,7 +1100,7 @@ msgstr "Referentie"
 #. module: crm
 #: field:crm.lead,optin:0
 msgid "Opt-In"
-msgstr ""
+msgstr "Opt-In"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:0
@@ -1079,12 +1128,12 @@ msgstr "Volgende actie"
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "Herhaal tot"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Extended Options..."
-msgstr ""
+msgstr "Uitgebreide opties..."
 
 #. module: crm
 #: field:crm.meeting,date_deadline:0
@@ -1110,12 +1159,12 @@ msgstr "Relatiesegmenten"
 #. module: crm
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "Vorige"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Statistics"
-msgstr ""
+msgstr "Statistieken"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
@@ -1126,33 +1175,33 @@ msgstr "Deelnemers"
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "Volgende"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Stage:"
-msgstr ""
+msgstr "Stadium:"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
 #: view:crm.lead:0
 msgid "Won"
-msgstr ""
+msgstr "Gewonnen"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Overschreden einddatum"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
 msgid "Sales Department"
-msgstr ""
+msgstr "Verkoopafdeling"
 
 #. module: crm
 #: field:crm.send.mail,html:0
 msgid "HTML formatting?"
-msgstr ""
+msgstr "HTML formaat?"
 
 #. module: crm
 #: field:crm.lead,type:0
@@ -1181,7 +1230,7 @@ msgstr "Laagste"
 #: view:crm.send.mail:0
 #: field:crm.send.mail.attachment,binary:0
 msgid "Attachment"
-msgstr ""
+msgstr "Bijlage"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1196,12 +1245,12 @@ msgstr "Aanmaakdatum"
 #. module: crm
 #: help:crm.meeting,interval:0
 msgid "Repeat every x"
-msgstr ""
+msgstr "Herhaal elke x"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Need a Website Design"
-msgstr ""
+msgstr "Heeft website ontwerp nodig"
 
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
@@ -1219,7 +1268,7 @@ msgstr "Onderwerp"
 #. module: crm
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr ""
+msgstr "Din"
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -1233,7 +1282,7 @@ msgstr "Fase"
 #. module: crm
 #: view:crm.lead:0
 msgid "History Information"
-msgstr ""
+msgstr "Historie informatie"
 
 #. module: crm
 #: constraint:ir.ui.view:0
@@ -1243,27 +1292,27 @@ msgstr "Ongeldige XML voor weergave!"
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
-msgstr ""
+msgstr "Mail naar relatie"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mailings"
-msgstr ""
+msgstr "Mailings"
 
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Mark as"
-msgstr ""
+msgstr "Markeren als"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "Laat de gebeurtenis automatisch herhalen met dit interval"
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition Case Fields"
-msgstr ""
+msgstr "Conditie dossier velden"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1299,23 +1348,23 @@ msgstr "Max relatie-ID bereikt"
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
 #: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
 msgid "Phone Calls Analysis"
-msgstr ""
+msgstr "Telefoongesprek Analyse"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
 #: field:crm.phonecall.report,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Openingsdatum"
 
 #. module: crm
 #: help:crm.phonecall,duration:0
 msgid "Duration in Minutes"
-msgstr ""
+msgstr "Duur in minuten"
 
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
-msgstr ""
+msgstr "Beheert een helpdesk dienst."
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
@@ -1326,28 +1375,28 @@ msgstr "Dagen per periode"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #, python-format
 msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
-msgstr ""
+msgstr "Gesloten/Geannuleerd \\nLeads konden niet omgezet in verkoopkans"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Jaar  "
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Edit All"
-msgstr ""
+msgstr "Bewerk alles"
 
 #. module: crm
 #: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "Vrij"
 
 #. module: crm
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Schrijfdatum"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1372,7 +1421,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_crm_lead2partner
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
 msgid "Create a Partner"
-msgstr ""
+msgstr "Relatie aanmaken"
 
 #. module: crm
 #: field:crm.segmentation,state:0
@@ -1382,19 +1431,19 @@ msgstr "Uitvoeringsstatus"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "Maandag"
 
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Dagen tot sluiting"
 
 #. module: crm
 #: field:crm.add.note,attachment_ids:0
 #: field:crm.case.section,complete_name:0
 #: field:crm.send.mail,attachment_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "onbekend"
 
 #. module: crm
 #: field:crm.lead,id:0
@@ -1406,7 +1455,7 @@ msgstr "ID"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
 msgid "Partner To Opportunity"
-msgstr ""
+msgstr "Relatie naar verkoopkans"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1424,22 +1473,22 @@ msgstr "Datum"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Uitgebreide filters..."
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Informatie deelnemer"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
-msgstr ""
+msgstr "Zoeken"
 
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
-msgstr ""
+msgstr "Interval"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1455,7 +1504,7 @@ msgstr "Historie"
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Code"
-msgstr ""
+msgstr "Code"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
@@ -1483,7 +1532,7 @@ msgstr "Telefonische verkoop"
 #. module: crm
 #: field:crm.meeting,freq:0
 msgid "Frequency"
-msgstr ""
+msgstr "Frequentie"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1508,17 +1557,17 @@ msgstr "Annuleren"
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge two Opportunities"
-msgstr ""
+msgstr "Twee verkoopkansen samenvoegen"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Custom"
-msgstr ""
+msgstr "Aangepast"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1541,22 +1590,22 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr ""
+msgstr "Telefoongesprek categoriën"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr ""
+msgstr "Personen uitnodigen"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities By Categories"
-msgstr ""
+msgstr "Verkoopkansen op categorie"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "Fout ! U kunt geen recursief verkoopteam maken."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1573,6 +1622,7 @@ msgstr "Verkoopbedrag"
 #, python-format
 msgid "Unable to send mail. Please check SMTP is configured properly."
 msgstr ""
+"Kan geen mail versturen. Controleer aub of SMTP juist is geconfigureerd."
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1582,7 +1632,7 @@ msgstr "="
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "Onbevestigd"
 
 #. module: crm
 #: field:crm.case.categ,name:0
@@ -1608,27 +1658,27 @@ msgstr "Plan een gewone of telefonische afspraak"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "Mijn dossier(s)"
 
 #. module: crm
 #: field:crm.lead,birthdate:0
 msgid "Birthdate"
-msgstr ""
+msgstr "Geboortedatum"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "The"
-msgstr ""
+msgstr "De"
 
 #. module: crm
 #: field:crm.send.mail.attachment,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Assistent"
 
 #. module: crm
 #: constraint:ir.rule:0
 msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
+msgstr "Regels worden niet ondersteund voor osv_memory objecten !"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1636,12 +1686,14 @@ msgid ""
 "Sales team to which this case belongs to. Defines responsible user and e-"
 "mail address for the mail gateway."
 msgstr ""
+"Verkoopteam waar dit dossier bij hoort. Definieert verantwoordelijke en e-"
+"mail adres voor de mail gateway."
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Creation"
-msgstr ""
+msgstr "Aanmaak"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1659,37 +1711,37 @@ msgstr "Converteer naar prospect naar zakenrelatie"
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "_Convert"
-msgstr ""
+msgstr "_Omzetten"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Zaterdag"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Vijfde"
 
 #. module: crm
 #: view:crm.phonecall2phonecall:0
 msgid "_Schedule"
-msgstr ""
+msgstr "_Planning"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Wachttijd tot sluiting"
 
 #. module: crm
 #: field:crm.meeting,we:0
 msgid "Wed"
-msgstr ""
+msgstr "Woe"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Potential Reseller"
-msgstr ""
+msgstr "Potentiele wederverkoper"
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
@@ -1703,27 +1755,27 @@ msgstr "Geraamde omzet"
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Groepeer op.."
 
 #. module: crm
 #: help:crm.lead,partner_id:0
 msgid "Optional linked partner, usually after conversion of the lead"
-msgstr ""
+msgstr "Optioneel gekoppelde relatie, meestal na omzetten van de lead"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation details"
-msgstr ""
+msgstr "Details uitnodiging"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr ""
+msgstr "Bovenliggende team"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Volgende actiedatum"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -1738,18 +1790,18 @@ msgstr "Uren"
 #. module: crm
 #: field:crm.lead,zip:0
 msgid "Zip"
-msgstr ""
+msgstr "Postcode"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The case '%s' has been opened."
-msgstr ""
+msgstr "Dossier '%s' is geopend."
 
 #. module: crm
 #: view:crm.installer:0
 msgid "title"
-msgstr ""
+msgstr "titel"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
@@ -1764,22 +1816,24 @@ msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
 msgstr ""
+"Dit percentage geeft de standaard/gemiddelde waarschijnlijkheid aan voor dit "
+"stadium om te slagen bij het dossier"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr ""
+msgstr "Telefoongesprek"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr ""
+msgstr "Vrij"
 
 #. module: crm
 #: view:crm.installer:0
 msgid "Synchronization"
-msgstr ""
+msgstr "Synchronisatie"
 
 #. module: crm
 #: field:crm.case.section,allow_unlink:0
@@ -1789,7 +1843,7 @@ msgstr "Sta verwijderen toe"
 #. module: crm
 #: field:crm.meeting,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "Maa"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1804,7 +1858,7 @@ msgstr "Hoogste"
 #: view:crm.lead:0
 #: field:crm.lead,description:0
 msgid "Notes"
-msgstr ""
+msgstr "Notities"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
@@ -1820,18 +1874,18 @@ msgstr "Waarde"
 #: view:crm.lead:0
 #: view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr ""
+msgstr "Verkoopkansen op categorie"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,partner_name:0
 msgid "Customer Name"
-msgstr ""
+msgstr "Klantnaam"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
-msgstr ""
+msgstr "Telefoongesprek naar verkoopkans"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
@@ -1846,7 +1900,7 @@ msgstr "Minuten"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select stages for this Sales Team"
-msgstr ""
+msgstr "Selecteer stadia voor dit verkoopteam"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
@@ -1854,6 +1908,7 @@ msgstr ""
 msgid ""
 "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
 msgstr ""
+"Er zijn geen andere 'Open' of 'Wachtend' verkoopkansen voor de relatie '%s'."
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
@@ -1890,32 +1945,32 @@ msgstr "Extra info"
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge Opportunities"
-msgstr ""
+msgstr "Verkoopkansen samenvoegen"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
 msgid "Google Adwords"
-msgstr ""
+msgstr "Google Adwords"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
 msgid "crm.phonecall"
-msgstr ""
+msgstr "crm.phonecall"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Mail Campaign 2"
-msgstr ""
+msgstr "Mail Campagne 2"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead2
 msgid "Mail Campaign 1"
-msgstr ""
+msgstr "Mail Campagne 1"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create"
-msgstr ""
+msgstr "Aanmaken"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1942,7 +1997,7 @@ msgstr "Gebruik Verkoop-/Inkoop-regels"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr ""
+msgstr "Lead naar verkoopkans relatie"
 
 #. module: crm
 #: field:crm.meeting,location:0
@@ -1952,18 +2007,18 @@ msgstr "Locatie"
 #. module: crm
 #: view:crm.lead:0
 msgid "Reply"
-msgstr ""
+msgstr "Antwoord"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Weeks"
-msgstr ""
+msgstr "Weken"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #, python-format
 msgid "Lead "
-msgstr ""
+msgstr "Lead "
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1974,7 +2029,7 @@ msgstr "Fout!"
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Seconds"
-msgstr ""
+msgstr "Seconden"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -1995,23 +2050,25 @@ msgstr "Caldav URL"
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr ""
+msgstr "Verwachte omzet"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Google Adwords 2"
-msgstr ""
+msgstr "Google Adwords 2"
 
 #. module: crm
 #: help:crm.lead,type:0
 #: help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "Soort wordt gebruikt om leads en verkoopkansen te scheiden"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Are you sure you want to create a partner based on this Phonecall ?"
 msgstr ""
+"Weet u zeker dat u een relatie wilt aanmaken op basis van dit "
+"telefoongesprek?"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -2025,12 +2082,12 @@ msgstr "Juli"
 #: model:ir.model,name:crm.model_crm_case_section
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sales Teams"
-msgstr ""
+msgstr "Verkoopteams"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr ""
+msgstr "Lead naar relatie"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2042,12 +2099,12 @@ msgstr "Segmentatie"
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Team"
 
 #. module: crm
 #: field:crm.installer,outlook:0
 msgid "MS-Outlook"
-msgstr ""
+msgstr "MS-Outlook"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2059,7 +2116,7 @@ msgstr "Niet vastgehouden"
 #. module: crm
 #: field:crm.lead.report,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "Waarschijnlijkheid"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2089,28 +2146,30 @@ msgstr "Maak een nieuwe relatie"
 #: view:crm.meeting:0
 #: view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "Startdatum"
 
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
 msgid "Todo"
-msgstr ""
+msgstr "Te doen"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegeren"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Decline"
-msgstr ""
+msgstr "Weigeren"
 
 #. module: crm
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
 msgstr ""
+"Als opt-in is aangevinkt, heeft deze contactpersoon geaccepteerd om emails "
+"te ontvangen."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2149,7 +2208,7 @@ msgstr "Gesloten"
 #. module: crm
 #: view:crm.installer:0
 msgid "Plug-In"
-msgstr ""
+msgstr "Plug-In"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
@@ -2180,7 +2239,7 @@ msgstr "Klant afspraak"
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
-msgstr ""
+msgstr "Globale CC"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2194,7 +2253,7 @@ msgstr "Telefoongesprekken"
 #: help:crm.lead.report,delay_open:0
 #: help:crm.phonecall.report,delay_open:0
 msgid "Number of Days to open the case"
-msgstr ""
+msgstr "Aantal dagen tot openen dossier"
 
 #. module: crm
 #: field:crm.lead,phone:0
@@ -2224,7 +2283,7 @@ msgstr ">"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Onzeker"
 
 #. module: crm
 #: field:crm.send.mail,email_cc:0
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 185113bcff3..967d7359bc8 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-24 13:14+0000\n"
+"PO-Revision-Date: 2010-10-25 18:27+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-10-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -445,13 +445,13 @@ msgstr "Zaktualizuj datę"
 #. module: crm
 #: help:crm.meeting,count:0
 msgid "Repeat max that times"
-msgstr ""
+msgstr "Powtórz maksymalnie razy"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: field:crm.lead2opportunity.action,name:0
 msgid "Select Action"
-msgstr ""
+msgstr "Wybierz akcję"
 
 #. module: crm
 #: field:base.action.rule,trg_categ_id:0
@@ -469,17 +469,17 @@ msgstr "Kategoria"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr ""
+msgstr "#Szans"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor2
 msgid "Campaign 1"
-msgstr ""
+msgstr "Kampania 1"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor1
 msgid "Campaign 2"
-msgstr ""
+msgstr "Kampania 2"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -489,12 +489,12 @@ msgstr "Prywatność"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr ""
+msgstr "Analiza szans"
 
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "Miejsce zdarzenia"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
@@ -504,7 +504,7 @@ msgstr "Reguła rekurencyjna"
 #. module: crm
 #: help:crm.installer,fetchmail:0
 msgid "Allows you to receive E-Mails from POP/IMAP server."
-msgstr ""
+msgstr "Pozwala otrzymywać maile z serwera PO/IMAP."
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -514,7 +514,7 @@ msgstr "Spotkanie albo rozmowa telefoniczna w sprawie szansy"
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr "Pierwszy kontakt z tą okazją"
+msgstr "Pierwszy kontakt z nowym potencjalnym klientem"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -564,7 +564,7 @@ msgstr "Nie uruchomiony"
 #: view:crm.send.mail:0
 #: model:ir.actions.act_window,name:crm.action_crm_reply_mail
 msgid "Reply to last Mail"
-msgstr ""
+msgstr "Odpowiedz na ostatni mail"
 
 #. module: crm
 #: field:crm.lead,email:0
@@ -584,7 +584,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,count:0
 msgid "Count"
-msgstr ""
+msgstr "Liczba"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -608,7 +608,7 @@ msgstr "Ci ludzie otrzymają wiadomość"
 #: view:crm.meeting:0
 #: field:crm.meeting,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Podsumowanie"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -629,6 +629,8 @@ msgid ""
 "Allows you to link your e-mail to OpenERP's documents. You can attach it to "
 "any existing one in OpenERP or create a new one."
 msgstr ""
+"Pozwala połączyć twoje wiadomości z dokumentami OpenERP. Możesz połączyć je "
+"z dowolnym istniejącym dokumentem lub utworzyć nowy dokument."
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -648,12 +650,12 @@ msgstr ""
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
-msgstr ""
+msgstr "Opcje profilowania"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr ""
+msgstr "# telefonów"
 
 #. module: crm
 #: view:crm.lead:0
@@ -666,13 +668,13 @@ msgid ""
 "The channels represent the different communication                         "
 "modes available with the customer. With each commercial opportunity, you can "
 "indicate                         the canall which is this opportunity source."
-msgstr ""
+msgstr "Kanały są różnymi sposobami komunikowania się z klientem."
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:0
 #, python-format
 msgid "The meeting '%s' has been confirmed."
-msgstr ""
+msgstr "Spotkanie '%s' zostało potwierdzone."
 
 #. module: crm
 #: field:crm.case.section,user_id:0
diff --git a/addons/crm_profiling/i18n/ru.po b/addons/crm_profiling/i18n/ru.po
index 815e7f56a5c..5b4e1007cbb 100644
--- a/addons/crm_profiling/i18n/ru.po
+++ b/addons/crm_profiling/i18n/ru.po
@@ -6,16 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:27+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-25 19:14+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+msgid "Questions List"
+msgstr "Опросный лист"
+
 #. module: crm_profiling
 #: constraint:ir.model:0
 msgid ""
@@ -24,6 +29,11 @@ msgstr ""
 "Название объекта должно начинаться с x_  и не должно содержать специальных "
 "символов !"
 
+#. module: crm_profiling
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия."
+
 #. module: crm_profiling
 #: field:crm_profiling.answer,question_id:0
 #: field:crm_profiling.question,name:0
@@ -42,14 +52,14 @@ msgid "Child Profiles"
 msgstr "Подчиненные профили"
 
 #. module: crm_profiling
-#: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
-msgid "crm_profiling management"
-msgstr "Управление профилями CRM"
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr "Сегментация партнеров"
 
 #. module: crm_profiling
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Ошибка ! Нельзя создать зацикленные меню."
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,name:0
@@ -57,12 +67,23 @@ msgstr "Недопустимое имя модели в определении 
 msgid "Answer"
 msgstr "Ответ"
 
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_crm_segmentation
+msgid "Partner Segmentation"
+msgstr ""
+
 #. module: crm_profiling
 #: view:res.partner:0
 msgid "Profiling"
 msgstr "Профилирование"
 
 #. module: crm_profiling
+#: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
+msgid "Crm Profiling management - To Perform Segmentation within Partners"
+msgstr ""
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
 #: field:crm_profiling.questionnaire,description:0
 msgid "Description"
 msgstr "Описание"
@@ -102,11 +123,12 @@ msgid "Questionnaires"
 msgstr "Опросники"
 
 #. module: crm_profiling
-#: field:crm_profiling.questionnaire,name:0
-#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
-#: wizard_view:open_questionnaire,init:0
-msgid "Questionnaire"
-msgstr "Опросник"
+#: help:crm.segmentation,profiling_active:0
+msgid ""
+"Check                             this box if you want to use this tab as "
+"part of the                              segmentation rule. If not checked, "
+"the criteria beneath will be ignored"
+msgstr ""
 
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
@@ -129,13 +151,6 @@ msgstr "Доступные ответы"
 msgid "Included Answers"
 msgstr "Включенные Ответы"
 
-#. module: crm_profiling
-#: help:crm.segmentation,profiling_active:0
-msgid ""
-"Check this box if you want to use this tab as part of the segmentation rule. "
-"If not checked, the criteria beneath will be ignored"
-msgstr ""
-
 #. module: crm_profiling
 #: view:crm_profiling.question:0
 #: field:crm_profiling.questionnaire,questions_ids:0
@@ -156,9 +171,18 @@ msgid "Cancel"
 msgstr "Отмена"
 
 #. module: crm_profiling
-#: view:crm.segmentation:0
-msgid "Partner Segmentations"
-msgstr "Сегментация партнеров"
+#: model:ir.model,name:crm_profiling.model_res_partner
+msgid "Partner"
+msgstr "Партнёр"
+
+#. module: crm_profiling
+#: code:addons/crm_profiling/crm_profiling.py:0
+#: field:crm_profiling.questionnaire,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
+#: wizard_view:open_questionnaire,init:0
+#, python-format
+msgid "Questionnaire"
+msgstr "Опросник"
 
 #. module: crm_profiling
 #: model:ir.actions.wizard,name:crm_profiling.wizard_open_questionnaire
@@ -169,3 +193,6 @@ msgstr "Используя опросник"
 #: wizard_button:open_questionnaire,open,compute:0
 msgid "Save Data"
 msgstr "Сохранить данные"
+
+#~ msgid "crm_profiling management"
+#~ msgstr "Управление профилями CRM"
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index 1049fb707fe..141027c0126 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -6,16 +6,367 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-16 09:49+0000\n"
-"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-25 19:23+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@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-10-17 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Order Ref."
+msgstr "Ссылка заказа"
+
+#. module: delivery
+#: model:product.template,name:delivery.delivery_product_product_template
+msgid "Delivery by Poste"
+msgstr "Доставка почтой"
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Destination"
+msgstr "Место назначения"
+
+#. module: delivery
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Вес нетто"
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:0
+#, python-format
+msgid "No price available !"
+msgstr "Нет каталога !"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr ""
+
+#. module: delivery
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия."
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Delivery grids"
+msgstr "Расценки на доставку"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Объем"
+
+#. module: delivery
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Разделяемая строка"
+
+#. module: delivery
+#: model:ir.actions.report.xml,name:delivery.report_shipping
+msgid "Delivery order"
+msgstr "Заказ на доставку"
+
+#. module: delivery
+#: view:res.partner:0
+msgid "Deliveries Properties"
+msgstr "Свойства доставки"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree4
+msgid "Picking to be invoiced"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr ""
+
+#. module: delivery
+#: view:delivery.grid:0
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Страны"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Delivery Order :"
+msgstr "Заказ на доставку:"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sale Order"
+msgstr "Заказ на продажу"
+
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Переменный фактор"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Фиксированный"
+
+#. module: delivery
+#: view:delivery.sale.order:0
+#: field:delivery.sale.order,carrier_id:0
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+#: field:res.partner,property_delivery_carrier:0
+msgid "Delivery Method"
+msgstr "Метод доставки"
+
+#. module: delivery
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the delivery "
+"grid without removing it."
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Движение ТМЦ"
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:0
+#, python-format
+msgid "No line matched this order in the choosed delivery grids !"
+msgstr ""
+
+#. module: delivery
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr ""
+
+#. module: delivery
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Вес нетто"
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Grid Lines"
+msgstr "Разделяемые строки"
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Grid definition"
+msgstr "Определение разделения"
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#. module: delivery
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Оператор"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Партнёр"
+
+#. module: delivery
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Ошибка ! Нельзя создать зацикленные меню."
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Invoiced to"
+msgstr "счет-фактура"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Комплектовочный лист"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_sale_order
+msgid "Make Delievery"
+msgstr "Сделать доставку"
+
+#. module: delivery
+#: model:ir.module.module,description:delivery.module_meta_information
+msgid ""
+"Allows you to add delivery methods in sale orders and picking.\n"
+"     You can define your own carrier and delivery grids for prices.\n"
+"     When creating invoices from picking, OpenERP is able to add and compute "
+"the shipping line.\n"
+"\n"
+"     "
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:0
+#, python-format
+msgid "Warning"
+msgstr "Внимание"
+
+#. module: delivery
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Разделение"
+
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Почтовый индекс получателя"
+
+#. module: delivery
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильный XML для просмотра архитектуры!"
+
+#. module: delivery
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+"Ошибка. Единицы продажи и единицы измерения должны принадлежать к разным "
+"категориям."
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Order Date"
+msgstr "Дата заказа"
+
+#. module: delivery
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Имя разделения"
+
+#. module: delivery
+#: view:stock.move:0
+msgid "Weights"
+msgstr "Вес"
+
+#. module: delivery
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Количество упаковок"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: report:sale.shipping:0
+#: field:stock.move,weight:0
+#: field:stock.picking,weight:0
+msgid "Weight"
+msgstr "Вес"
+
+#. module: delivery
+#: field:sale.order,carrier_id:0
+msgid "Delivery method"
+msgstr "Метод доставки"
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#, python-format
+msgid "No grid available !"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
+
+#. module: delivery
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Ошибка. ЕИМ по умолчанию и закупочная ЕИМ должны иметь одинаковую категорию."
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#, python-format
+msgid "Order not in draft state !"
+msgstr "Заказ не в состоянии \"Черновик\" !"
+
+#. module: delivery
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Ошибка! Вы не можете создать рекурсивных связанных участников."
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Lot"
+msgstr "Партия"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Расценки на доставку"
+
+#. module: delivery
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Активен"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Shipping Date"
+msgstr "Дата отгрузки"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Услуга или изделие, соответствующее доставке"
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Condition"
+msgstr "Условие"
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Себестоимость"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Переменная"
+
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Максимальное значение"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Quantity"
+msgstr "Количество"
+
+#. module: delivery
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Почтовый индекс отправителя"
+
+#. module: delivery
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+
 #. module: delivery
 #: constraint:ir.model:0
 msgid ""
@@ -25,9 +376,9 @@ msgstr ""
 "символов !"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.carrier,partner_id:0
+msgid "Carrier Partner"
+msgstr "Партнер по доставке"
 
 #. module: delivery
 #: view:res.partner:0
@@ -35,61 +386,20 @@ msgid "Sales & Purchases"
 msgstr "Продажи и закупки"
 
 #. module: delivery
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Место назначения"
+#: view:delivery.sale.order:0
+msgid "Create Deliveries"
+msgstr "Создать доставки"
 
 #. module: delivery
-#: model:product.template,name:delivery.delivery_product_product_template
-msgid "Delivery by Poste"
-msgstr "Доставка почтой"
+#: model:ir.actions.act_window,name:delivery.action_delivery_cost
+#: view:sale.order:0
+msgid "Delivery Costs"
+msgstr "Стоимость поставки"
 
 #. module: delivery
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
-#. module: delivery
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Ошибка! Вы не можете создать рекурсивных связанных участников."
-
-#. module: delivery
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Cостояния"
-
-#. module: delivery
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
-#. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from packing."
-msgstr ""
-"Этот метод доставки должен использоваться при фактурировании на основании "
-"данных упаковки."
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "Расценки на доставку"
-
-#. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Почтовый индекс отправителя"
-
-#. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Фиксированный"
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Разделяемая строка"
+#: report:sale.shipping:0
+msgid "Description"
+msgstr "Описание"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
@@ -98,47 +408,23 @@ msgid "Delivery Pricelist"
 msgstr "Каталог доставки"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree5
-#: model:ir.ui.menu,name:delivery.menu_action_picking_tree5
-msgid "Generate Draft Invoices On Receptions"
-msgstr "Генерировать черновики счетов при получении"
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Цена"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery line of grid"
-msgstr "Разделяемая строка поставки"
+#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#, python-format
+msgid "No grid matching for this carrier !"
+msgstr ""
 
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
 msgid "Delivery"
 msgstr "Доставка"
 
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Разделяемые строки"
-
-#. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Разделение"
-
-#. module: delivery
-#: view:res.partner:0
-msgid "Deliveries Properties"
-msgstr "Свойства доставки"
-
-#. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Активен"
-
-#. module: delivery
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Определение разделения"
-
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
@@ -151,24 +437,10 @@ msgid "="
 msgstr "="
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Услуга или изделие, соответствующее доставке"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Условие"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_carrier
-msgid "Carrier and delivery grids"
-msgstr "Разделение поставки и перевозчика"
-
-#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Себестоимость"
+#: code:addons/delivery/stock.py:0
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr ""
 
 #. module: delivery
 #: field:delivery.grid.line,name:0
@@ -176,77 +448,26 @@ msgid "Name"
 msgstr "Название"
 
 #. module: delivery
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-"Ошибка. Единицы продажи и единицы измерения должны принадлежать к разным "
-"категориям."
-
-#. module: delivery
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Страны"
-
-#. module: delivery
-#: constraint:product.template:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
+"If the active field is set to true, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-"Ошибка. ЕИМ по умолчанию и закупочная ЕИМ должны иметь одинаковую категорию."
-
-#. module: delivery
-#: view:sale.order:0
-msgid "Notes"
-msgstr "Примечания"
-
-#. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Переменный фактор"
-
-#. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Переменная"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "Имя разделения"
 
 #. module: delivery
 #: view:delivery.carrier:0
 #: field:delivery.carrier,name:0
 #: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: report:sale.shipping:0
 #: field:stock.picking,carrier_id:0
 msgid "Carrier"
 msgstr "Доставка"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-msgid "Volume"
-msgstr "Объем"
-
-#. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Максимальное значение"
-
-#. module: delivery
-#: wizard_button:delivery.sale.order,init,delivery:0
-msgid "Add Delivery Costs"
-msgstr "Добавить стоимость доставки"
-
-#. module: delivery
-#: wizard_field:delivery.sale.order,init,carrier_id:0
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-#: field:res.partner,property_delivery_carrier:0
-msgid "Delivery Method"
-msgstr "Метод доставки"
+#: view:delivery.sale.order:0
+msgid "_Apply"
+msgstr "_Применить"
 
 #. module: delivery
 #: field:sale.order,id:0
@@ -254,9 +475,11 @@ msgid "ID"
 msgstr "Идентификатор"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Оператор"
+#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
+msgstr ""
+"Состояние заказа должно быть \"Черновик\" для добавления позиций доставки."
 
 #. module: delivery
 #: model:ir.module.module,shortdesc:delivery.module_meta_information
@@ -268,96 +491,72 @@ msgstr "Перевозчики и поставки"
 msgid "Delivery Grids"
 msgstr "Разделение поставки"
 
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,weight:0
-msgid "Weight"
-msgstr "Вес"
-
 #. module: delivery
 #: field:delivery.grid,sequence:0
 msgid "Sequence"
 msgstr "Последовательность"
 
-#. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Carrier Partner"
-msgstr "Партнер по доставке"
-
-#. module: delivery
-#: model:ir.module.module,description:delivery.module_meta_information
-msgid ""
-"Allows you to add delivery methods in sales orders and packing. You can "
-"define your own carrier and delivery grids for prices. When creating "
-"invoices from picking, Open ERP is able to add and compute the shipping line."
-msgstr ""
-"Позволяет добавить методы доставки в заказы на продажу и упаковку. Вы можете "
-"определить своего собственного перевозчика и выполнить разделение поставка "
-"для определения стоимости. При создании счета-фактуры на основании упаковки, "
-"Open ERP имеет возможность добавлять и вычислить строки доставки."
-
-#. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Почтовый индекс получателя"
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-#: model:ir.ui.menu,name:delivery.menu_action_picking_tree3
-msgid "Packing to be invoiced"
-msgstr "Фактурирование по упаковке"
-
-#. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on packing."
-msgstr ""
-"Заполните это поле, если вы планируете счет доставки основанный на упаковке."
-
-#. module: delivery
-#: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add
-msgid "Delivery Costs"
-msgstr "Стоимость поставки"
-
 #. module: delivery
 #: field:delivery.grid.line,list_price:0
 msgid "Sale Price"
 msgstr "Цена продажи"
 
+#. module: delivery
+#: view:delivery.grid:0
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Cостояния"
+
 #. module: delivery
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
 msgstr "Ошибка: Неправильный штрих-код"
 
-#. module: delivery
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Расценки на доставку"
-
-#. module: delivery
-#: wizard_button:delivery.sale.order,init,end:0
-msgid "Cancel"
-msgstr "Отмена"
-
-#. module: delivery
-#: field:sale.order,carrier_id:0
-msgid "Delivery method"
-msgstr "Метод доставки"
-
-#. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Цена"
-
-#. module: delivery
-#: constraint:res.partner:0
-msgid "The VAT doesn't seem to be correct."
-msgstr "НДС выглядит неправильно"
-
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
 msgstr "Тип цены"
+
+#~ msgid "Generate Draft Invoices On Receptions"
+#~ msgstr "Генерировать черновики счетов при получении"
+
+#~ msgid "Notes"
+#~ msgstr "Примечания"
+
+#~ msgid "Cancel"
+#~ msgstr "Отмена"
+
+#~ msgid "The VAT doesn't seem to be correct."
+#~ msgstr "НДС выглядит неправильно"
+
+#~ msgid "Delivery line of grid"
+#~ msgstr "Разделяемая строка поставки"
+
+#~ msgid "Carrier and delivery grids"
+#~ msgstr "Разделение поставки и перевозчика"
+
+#~ msgid "Add Delivery Costs"
+#~ msgstr "Добавить стоимость доставки"
+
+#~ msgid "Packing to be invoiced"
+#~ msgstr "Фактурирование по упаковке"
+
+#~ msgid ""
+#~ "Complete this field if you plan to invoice the shipping based on packing."
+#~ msgstr ""
+#~ "Заполните это поле, если вы планируете счет доставки основанный на упаковке."
+
+#~ msgid ""
+#~ "Allows you to add delivery methods in sales orders and packing. You can "
+#~ "define your own carrier and delivery grids for prices. When creating "
+#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
+#~ msgstr ""
+#~ "Позволяет добавить методы доставки в заказы на продажу и упаковку. Вы можете "
+#~ "определить своего собственного перевозчика и выполнить разделение поставка "
+#~ "для определения стоимости. При создании счета-фактуры на основании упаковки, "
+#~ "Open ERP имеет возможность добавлять и вычислить строки доставки."
+
+#~ msgid "This delivery method will be used when invoicing from packing."
+#~ msgstr ""
+#~ "Этот метод доставки должен использоваться при фактурировании на основании "
+#~ "данных упаковки."
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
index a32dfaf942c..e836bbf5090 100644
--- a/addons/hr/i18n/pl.po
+++ b/addons/hr/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-24 12:13+0000\n"
+"PO-Revision-Date: 2010-10-25 18:28+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-10-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -357,7 +357,7 @@ msgstr "Kategoria nadrzędna"
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error ! You cannot create recursive Categories."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych kategorii."
 
 #. module: hr
 #: view:hr.department:0
@@ -376,7 +376,7 @@ msgstr "Kontakt do pracownika"
 #. module: hr
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Moja konsola"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -398,19 +398,19 @@ msgstr "Kategoria pracownika"
 #. module: hr
 #: field:hr.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Obraz"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract"
-msgstr ""
+msgstr "Umowa pracownika"
 
 #. module: hr
 #: help:hr.installer,hr_evaluation:0
 msgid ""
 "Lets you create and manage the periodic evaluation and performance review of "
 "employees."
-msgstr ""
+msgstr "Pozwala ci zarządzać okresowymi ocenami i osiągnięciami pracowników."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
@@ -420,12 +420,12 @@ msgstr ""
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
-msgstr ""
+msgstr "Jest związane z szefem departamentu"
 
 #. module: hr
 #: field:hr.installer,hr_recruitment:0
 msgid "Recruitment Process"
-msgstr ""
+msgstr "Proces rekrutacji"
 
 #. module: hr
 #: field:hr.employee,category_ids:0
@@ -436,7 +436,7 @@ msgstr "Kategoria"
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr ""
+msgstr "Konto bankowe pracownika dla płacy"
 
 #. module: hr
 #: field:hr.department,note:0
@@ -451,12 +451,12 @@ msgstr "Informacje kontaktowe"
 #. module: hr
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
 msgid "HR Manager Dashboard"
-msgstr ""
+msgstr "Konsola Dyrektora kadr"
 
 #. module: hr
 #: view:hr.employee:0
diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po
index f8e099d5c2f..8cae0019919 100644
--- a/addons/hr_holidays/i18n/pl.po
+++ b/addons/hr_holidays/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-24 13:12+0000\n"
+"PO-Revision-Date: 2010-10-25 18:31+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-10-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -355,12 +355,12 @@ msgstr "Pozostało dni urlopu"
 #: view:hr.holidays:0
 #: field:hr.holidays,state:0
 msgid "State"
-msgstr ""
+msgstr "Stan"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
 msgid "Total holidays by type"
-msgstr ""
+msgstr "Syma urlopów wg typów"
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
@@ -384,7 +384,7 @@ msgstr "Ogólne"
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -394,7 +394,7 @@ msgstr "Czerwony"
 #. module: hr_holidays
 #: view:hr.holidays.remaining.leaves.user:0
 msgid "Leaves by Type"
-msgstr ""
+msgstr "Nieobecności wg typów"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -416,17 +416,17 @@ msgstr "Liczba dni"
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
 msgid "Category Of employee"
-msgstr ""
+msgstr "Kategoria pracownika"
 
 #. module: hr_holidays
 #: view:board.board:0
 msgid "Remaining Leave by Type and User"
-msgstr ""
+msgstr "Urlop do wykorzystania wg Typu i Użytkowników"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Lipiec"
 
 #. module: hr_holidays
 #: constraint:ir.ui.view:0
@@ -439,11 +439,13 @@ msgid ""
 "If its True then its Allocation/Request have to be validated by second "
 "validator"
 msgstr ""
+"Jeśli to jest prawda, to Wniosek musi być zatwierdzony przez jeszcze jednego "
+"zatiwerdzającego"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Oczekuje na aprobatę"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
@@ -453,7 +455,7 @@ msgstr "Pracowników"
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Month "
-msgstr ""
+msgstr " Miesiąc "
 
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
@@ -462,11 +464,14 @@ msgid ""
 "synchronize each leave asked with a case in this category, to display it in "
 "the company shared calendar for example."
 msgstr ""
+"Jeśli połączysz ten typ nieobecności z kategorią w CRM, to uzyskasz "
+"synchronizację wniosków ze sprawami w danej kategorii, aby na przykład "
+"wyświetlać je we współdzielonym kalendarzu."
 
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Nadrzędny"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -474,21 +479,24 @@ msgid ""
 "This area is automaticly filled by the user who validate the leave with "
 "second level (If Leave type need second validation)"
 msgstr ""
+"Ta część jest automatycznie wypełniana przez użytkownika, który zatwierdza "
+"nieobecność na drugim poziomie (jeśli typ nieobecności wymaga drugiego "
+"zatwierdzania)"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Wrzesień"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Grudzień"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_remaining_leaves_empoloyee_all
 msgid "Remaining Leaves by User"
-msgstr ""
+msgstr "Pozostałe urlopy wg użytkowników"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -499,24 +507,24 @@ msgstr "Lawendowy"
 #: view:available.holidays.report:0
 #: field:available.holidays.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Miesiąc"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
 msgid "Leave Requests"
-msgstr ""
+msgstr "Wniosek urlopowy"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
 msgid "Allow to Override Limit"
-msgstr ""
+msgstr "Pozwala przekroczyć limit"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.employee:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
 msgid "Employee's Holidays"
-msgstr ""
+msgstr "Urlopy pracowników"
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
diff --git a/addons/hr_payroll/i18n/sv.po b/addons/hr_payroll/i18n/sv.po
index 3c2e881fd93..ad8d60e87c7 100644
--- a/addons/hr_payroll/i18n/sv.po
+++ b/addons/hr_payroll/i18n/sv.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-24 21:35+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-10-25 07:13+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@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-10-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
diff --git a/addons/hr_timesheet/i18n/it.po b/addons/hr_timesheet/i18n/it.po
index 0b2fe5c37c7..d9360d41fe0 100644
--- a/addons/hr_timesheet/i18n/it.po
+++ b/addons/hr_timesheet/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-24 23:10+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-10-25 07:15+0000\n"
+"Last-Translator: OpenERP Administrators <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-10-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index ebea0fb6217..f168537a53c 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-24 13:13+0000\n"
+"PO-Revision-Date: 2010-10-25 18:33+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-10-25 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -340,37 +340,37 @@ msgstr "Odnośnik do pozycji w planie zewnętrznym"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "August"
-msgstr ""
+msgstr "Sierpień"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
-msgstr ""
+msgstr "Raport zamówień produkcji"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "June"
-msgstr ""
+msgstr "Czerwiec"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
-msgstr ""
+msgstr "Produkcja produktu"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "October"
-msgstr ""
+msgstr "Październik"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procurement of stockable Product"
-msgstr ""
+msgstr "Zapotrzebowanie na produkt rejestrowany"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Default UOM"
-msgstr ""
+msgstr "Domyślna JM"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
@@ -385,7 +385,7 @@ msgstr "Ilość"
 #. module: mrp
 #: field:mrp.production.workcenter.line,hour:0
 msgid "Nbr of hours"
-msgstr ""
+msgstr "Liczba godzin"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -398,6 +398,8 @@ msgid ""
 "The system creates an order (production or purchased) depending on the sold "
 "quantity and the products parameters."
 msgstr ""
+"System utworzy zamówienie (produkcji lub zakupu) zależnie od sprzedanej "
+"ilości i parametrów produktu."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -409,12 +411,12 @@ msgstr ""
 #. module: mrp
 #: field:mrp.installer,mrp_repair:0
 msgid "Repairs"
-msgstr ""
+msgstr "Naprawy"
 
 #. module: mrp
 #: field:mrp.installer,stock_location:0
 msgid "Advanced Routes"
-msgstr ""
+msgstr "Zaawansowane marszruty"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
@@ -427,6 +429,8 @@ msgid ""
 "Enables warranty and repair management (and their impact on stocks and "
 "invoicing)."
 msgstr ""
+"Włącza zarządzanie gwarancjami i naprawą (i jego wpływ na zapasy i "
+"fakturowanie)."
 
 #. module: mrp
 #: field:mrp.production,date_planned_date:0
@@ -454,7 +458,7 @@ msgstr ""
 #. module: mrp
 #: view:board.board:0
 msgid "Stock Value Variation"
-msgstr ""
+msgstr "Odchylenia wartości zapasów"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
@@ -464,23 +468,23 @@ msgstr "Struktura zestawień materiałowych"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
-msgstr ""
+msgstr "Typ produktu jest serwis"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "of "
-msgstr ""
+msgstr "z "
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
-msgstr ""
+msgstr "Dekompozycja produkcji"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct1
 msgid "For Services."
-msgstr ""
+msgstr "Do usług."
 
 #. module: mrp
 #: field:mrp.bom.revision,date:0
diff --git a/addons/multi_company/i18n/ru.po b/addons/multi_company/i18n/ru.po
index acfed97ff47..42219bae639 100644
--- a/addons/multi_company/i18n/ru.po
+++ b/addons/multi_company/i18n/ru.po
@@ -7,46 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-12-08 11:46+0000\n"
-"PO-Revision-Date: 2010-08-03 08:13+0000\n"
-"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-25 16:09+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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-09-29 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: multi_company
-#: help:multi_company.default,object_id:0
-msgid "Object affect by this rules"
-msgstr "Объект затрагивает эти правила"
-
-#. module: multi_company
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
-#. module: multi_company
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Ошибка. ЕИМ по умолчанию и закупочная ЕИМ должны иметь одинаковую категорию."
-
-#. module: multi_company
-#: constraint:res.partner:0
-msgid "The VAT doesn't seem to be correct."
-msgstr "НДС выглядит неправильно"
-
-#. module: multi_company
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия"
-
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
 #: model:res.company,overdue_msg:multi_company.res_company_oerp_be
@@ -54,59 +24,41 @@ msgstr "Недопустимое имя модели в определении 
 #: model:res.company,overdue_msg:multi_company.res_company_oerp_in
 #: model:res.company,overdue_msg:multi_company.res_company_oerp_us
 msgid ""
-"Would your payment have been carried out after this mail was sent, please "
-"consider the present one as void. Do not hesitate to contact our accounting "
-"department"
+"\n"
+"Date: %(date)s\n"
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Please find in attachment a reminder of all your unpaid invoices, for a "
+"total amount due of:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
 msgstr ""
+"\n"
+"Дата: %(date)s\n"
+"\n"
+"Уважаемый / уважаемая %(partner_name)s,\n"
+"\n"
+"Пожалуйста, просмотрите в приложении напоминание о всех не оплаченных вами "
+"счетах.\n"
+"Всего на сумму: %(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Спасибо,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
 
 #. module: multi_company
-#: field:multi_company.default,company_dest_id:0
-msgid "Default Company"
-msgstr "Компания по умолчанию"
-
-#. module: multi_company
-#: field:multi_company.default,object_id:0
-msgid "Object"
-msgstr "Объект"
-
-#. module: multi_company
-#: model:ir.module.module,shortdesc:multi_company.module_meta_information
-#: view:multi_company.default:0
-msgid "Multi Company"
-msgstr "Концерн"
-
-#. module: multi_company
-#: model:ir.module.module,description:multi_company.module_meta_information
-msgid ""
-"This module add the possibility to easily manage \n"
-"    the default value for each object\n"
-"    "
-msgstr ""
-
-#. module: multi_company
-#: field:multi_company.default,company_id:0
-msgid "Main Company"
-msgstr "Головная компания"
-
-#. module: multi_company
-#: view:multi_company.default:0
-msgid "Condition"
-msgstr "Условие"
-
-#. module: multi_company
-#: help:multi_company.default,company_dest_id:0
-msgid "Company to store the current record"
-msgstr ""
-
-#. module: multi_company
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Некорректный формат XML структуры для просмотра."
-
-#. module: multi_company
-#: field:multi_company.default,name:0
-msgid "Name"
-msgstr "Имя"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия"
 
 #. module: multi_company
 #: constraint:product.template:0
@@ -119,77 +71,124 @@ msgid "Odoo Offers"
 msgstr "Предложения Odoo"
 
 #. module: multi_company
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Ошибка! Невозможно создать рекурсивную компанию."
-
-#. module: multi_company
-#: help:multi_company.default,name:0
-msgid "Name it to easily find a record"
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
-
-#. module: multi_company
-#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
-msgid "Multi company"
-msgstr "Концерн"
-
-#. module: multi_company
-#: model:ir.model,name:multi_company.model_multi_company_default
-msgid "multi_company.default"
-msgstr ""
-
-#. module: multi_company
-#: help:multi_company.default,company_id:0
-msgid "Company where the user is connected"
-msgstr "Компании, в составе которых находиться пользователь"
-
-#. module: multi_company
-#: model:ir.actions.act_window,name:multi_company.action_inventory_form
-msgid "Default Company per Object"
-msgstr "Компании по умолчанию для объекта"
-
-#. module: multi_company
-#: field:multi_company.default,expression:0
-msgid "Expression"
-msgstr "Выражение"
-
-#. module: multi_company
-#: model:product.template,name:multi_company.product_product_odoo1_product_template
-msgid "Odoo Offer"
-msgstr "Предложение Odoo"
-
-#. module: multi_company
-#: field:multi_company.default,sequence:0
-msgid "Sequence"
-msgstr "Последовательность"
+"Ошибка. ЕИМ по умолчанию и закупочная ЕИМ должны иметь одинаковую категорию."
 
 #. module: multi_company
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
 msgstr "Ошибка ! Невозможно создать рекурсивную категорию."
 
+#. module: multi_company
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Ошибка! Невозможно создать рекурсивную компанию."
+
+#. module: multi_company
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Некорректный формат XML структуры для просмотра."
+
+#. module: multi_company
+#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
+msgid "Multi-Companies"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.module.module,shortdesc:multi_company.module_meta_information
+#: view:multi_company.default:0
+msgid "Multi Company"
+msgstr "Концерн"
+
+#. module: multi_company
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Ошибка! Вы не можете создать рекурсивных связанных участников."
+
 #. module: multi_company
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
 msgstr "Ошибка: Неправильный штрих-код"
 
 #. module: multi_company
-#: help:multi_company.default,expression:0
-msgid "Expression, must be True to match"
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"Выбранной компании нет в разрешенных компаниях для этого пользователя"
 
 #. module: multi_company
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Ошибка ! Нельзя создать зацикленные меню."
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Returning"
+msgstr "Возвращаемое"
+
+#. module: multi_company
+#: model:ir.actions.act_window,name:multi_company.action_inventory_form
 #: model:ir.ui.menu,name:multi_company.menu_action_inventory_form
-msgid "Default company per Object"
-msgstr "Компания по умолчанию для объекта"
-
-#. module: multi_company
-#: code:addons/multi_company/multi_company.py:0
-#, python-format
-msgid " (copy)"
-msgstr " (копия)"
+msgid "Default Company per Object"
+msgstr "Компании по умолчанию для объекта"
 
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Matching"
 msgstr "Сопоставление"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Condition"
+msgstr "Условие"
+
+#. module: multi_company
+#: model:product.template,name:multi_company.product_product_odoo1_product_template
+msgid "Odoo Offer"
+msgstr "Предложение Odoo"
+
+#~ msgid "Object"
+#~ msgstr "Объект"
+
+#~ msgid "The VAT doesn't seem to be correct."
+#~ msgstr "НДС выглядит неправильно"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
+#~ msgid "Multi company"
+#~ msgstr "Концерн"
+
+#~ msgid "Main Company"
+#~ msgstr "Головная компания"
+
+#~ msgid "Name"
+#~ msgstr "Имя"
+
+#~ msgid "Sequence"
+#~ msgstr "Последовательность"
+
+#~ msgid "Expression"
+#~ msgstr "Выражение"
+
+#, python-format
+#~ msgid " (copy)"
+#~ msgstr " (копия)"
+
+#~ msgid "Object affect by this rules"
+#~ msgstr "Объект затрагивает эти правила"
+
+#~ msgid "Default Company"
+#~ msgstr "Компания по умолчанию"
+
+#~ msgid "Company where the user is connected"
+#~ msgstr "Компании, в составе которых находиться пользователь"
+
+#~ msgid "Default company per Object"
+#~ msgstr "Компания по умолчанию для объекта"
diff --git a/addons/point_of_sale/i18n/sv.po b/addons/point_of_sale/i18n/sv.po
index a116ef92915..ff722d6abfd 100644
--- a/addons/point_of_sale/i18n/sv.po
+++ b/addons/point_of_sale/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: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-24 21:48+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-10-25 07:16+0000\n"
+"Last-Translator: OpenERP Administrators <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-10-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index c054abadc46..2f6beee3ed3 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/i18n/ru.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-22 10:51+0000\n"
+"PO-Revision-Date: 2010-10-25 17:08+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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-10-23 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
 msgid "Schedulers"
-msgstr ""
+msgstr "Планировщики"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_make_procurement
 msgid "Make Procurements"
-msgstr ""
+msgstr "Сделать закупки"
 
 #. module: procurement
 #: help:procurement.order.compute.all,automatic:0
@@ -38,12 +38,12 @@ msgstr ""
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Group By..."
-msgstr ""
+msgstr "Объединять по..."
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Planification"
-msgstr ""
+msgstr "Планирование"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -86,7 +86,7 @@ msgstr "Компания"
 #. module: procurement
 #: field:procurement.order,product_uos_qty:0
 msgid "UoS Quantity"
-msgstr ""
+msgstr "Кол-во во второй ед. изм."
 
 #. module: procurement
 #: view:procurement.order:0
@@ -140,7 +140,7 @@ msgstr ""
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Minimum Stock Rules Search"
-msgstr ""
+msgstr "Искать правила минимальных запасов"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_min_qty:0
@@ -148,6 +148,9 @@ msgid ""
 "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
+"Когда виртуальные запасы становятся меньше минимального количества, OpenERP "
+"создает запрос на снабжение, чтобы довести виртуальные запасы до "
+"максимального количества."
 
 #. module: procurement
 #: view:procurement.order.compute.all:0
@@ -157,7 +160,7 @@ msgstr "Параметры планировщика"
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Движение ТМЦ"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -167,12 +170,12 @@ msgstr "Готово"
 #. module: procurement
 #: field:procurement.order.compute.all,automatic:0
 msgid "Automatic orderpoint"
-msgstr ""
+msgstr "Автоматическая точка заказа"
 
 #. module: procurement
 #: field:mrp.property,composition:0
 msgid "Properties composition"
-msgstr ""
+msgstr "Составление свойств"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -201,11 +204,13 @@ msgid ""
 "Reference of the document that created this Procurement.\n"
 "This is automatically completed by OpenERP."
 msgstr ""
+"Ссылка на документ, создавший этот запрос на снабжение.\n"
+"Выполнено OpenERP автоматически."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
 msgid "Minimum Inventory Rule"
-msgstr ""
+msgstr "Правило минимума ТМЦ"
 
 #. module: procurement
 #: field:procurement.order,priority:0
@@ -228,7 +233,7 @@ msgstr "Местоположение"
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Комплектовочный лист"
 
 #. module: procurement
 #: field:make.procurement,warehouse_id:0
@@ -250,7 +255,7 @@ msgstr "Продукция и местоположения"
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute
 msgid "Compute Procurement"
-msgstr ""
+msgstr "Вычислить снабжение"
 
 #. module: procurement
 #: model:ir.module.module,shortdesc:procurement.module_meta_information
@@ -289,6 +294,7 @@ msgstr "Количество"
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
+"Не достаточный запас и не определено правило минимальной точки заказа."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -322,6 +328,8 @@ msgid ""
 "If you encode manually a Procurement, you probably want to use a make to "
 "order method."
 msgstr ""
+"Если вы составляете запрос на снабжение вручную, вероятно вы хотите "
+"использовать изготовление на заказ."
 
 #. module: procurement
 #: view:res.company:0
@@ -331,7 +339,7 @@ msgstr "ПМР и Логистическое планирование"
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement
 msgid "Automatic Procurements"
-msgstr ""
+msgstr "Автоматическое снабжение"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_max_qty:0
@@ -363,12 +371,12 @@ msgstr "Исключения"
 #. module: procurement
 #: model:process.node,note:procurement.process_node_serviceonorder0
 msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "Выделение из заказа на производство или на закупку."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_mrp_property
 msgid "Property"
-msgstr ""
+msgstr "Параметр"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.act_make_procurement
@@ -379,7 +387,7 @@ msgstr "Заявка на снабжение"
 #. module: procurement
 #: view:procurement.orderpoint.compute:0
 msgid "Compute Stock"
-msgstr ""
+msgstr "Вычислить запасы"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -422,11 +430,14 @@ msgid ""
 "When the virtual stock goes belong the Max Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
+"Когда виртуальные запасы становятся меньше максимального количества, OpenERP "
+"создает запрос на снабжение, чтобы довести виртуальные запасы до "
+"максимального количества."
 
 #. module: procurement
 #: help:procurement.orderpoint.compute,automatic:0
 msgid "If the stock of a product is under 0, it will act like an orderpoint"
-msgstr ""
+msgstr "Если остатки ТМЦ меньше 0, это будет действовать как точка заказа"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -443,6 +454,11 @@ msgid ""
 "background, you may have to wait for a few minutes until it has finished "
 "computing."
 msgstr ""
+"Этот мастер позволяет вам обработать все заказы на снабжение, производство "
+"и/или закупку, которые будут обработана в соответствии с их настройками. По "
+"умолчанию, планировщик запускается каждую ночь. Вы можете использовать это "
+"меню для его принудительного запуска. Помните, что он работает в фоновом "
+"режиме, вы должны подождать несколько минут до окончания обработки."
 
 #. module: procurement
 #: view:procurement.order:0
@@ -458,7 +474,7 @@ msgstr "Черновик"
 #. module: procurement
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Ошибка ! Нельзя создать зацикленные меню."
 
 #. module: procurement
 #: constraint:ir.model:0
@@ -480,6 +496,9 @@ msgid ""
 "procurements. All procurements that are not between today and today+range "
 "are skipped for futur computation."
 msgstr ""
+"Это временные рамки, обрабатываемые планировщиком при расчете снабжения. Все "
+"снабжение, которое не находится между сегодня и сегодня+срок оставляется для "
+"будущих расчетов."
 
 #. module: procurement
 #: selection:procurement.order,priority:0
@@ -497,6 +516,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the orderpoint "
 "without removing it."
 msgstr ""
+"Если значение активного поля \"истина\", то это позволит вам скрыть точку "
+"заказа"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,active:0
@@ -506,7 +527,7 @@ msgstr "Активно"
 #. module: procurement
 #: model:process.node,name:procurement.process_node_procureproducts0
 msgid "Procure Products"
-msgstr ""
+msgstr "Снабжение товарами"
 
 #. module: procurement
 #: field:procurement.order,date_planned:0
@@ -522,17 +543,17 @@ msgstr "Исключение"
 #: code:addons/procurement/schedulers.py:0
 #, python-format
 msgid "Automatic OP: %s"
-msgstr ""
+msgstr "Авто точка зак.: %s"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_orderpoint_compute
 msgid "Automatic Order Point"
-msgstr ""
+msgstr "Автоматическая точка заказа"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,qty_multiple:0
 msgid "Qty Multiple"
-msgstr ""
+msgstr "Кратное кол-во"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
@@ -558,12 +579,12 @@ msgstr "Причина снабжения"
 #: code:addons/procurement/procurement.py:0
 #, python-format
 msgid "Qty Multiple must be greater than zero."
-msgstr ""
+msgstr "Кратное кол-во должно быть больше 0."
 
 #. module: procurement
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Order to Max"
-msgstr ""
+msgstr "Заказ по максимуму"
 
 #. module: procurement
 #: field:procurement.order,date_close:0
@@ -574,19 +595,19 @@ msgstr "Дата закрытия"
 #: code:addons/procurement/procurement.py:0
 #, python-format
 msgid "Procurement '%s' is in exception: not enough stock."
-msgstr ""
+msgstr "Снабжение '%s' - исключительная ситуация: не достаточный запас."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
 #, python-format
 msgid "Cannot delete Procurement Order(s) which are in %s State!"
-msgstr ""
+msgstr "Нельзя удалить заказ(ы) на снабжение в состоянии %s !"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
 #, python-format
 msgid "Data Insufficient !"
-msgstr ""
+msgstr "Недостаточно данных !"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_mrp_property_group
@@ -618,7 +639,7 @@ msgstr "Общая информация"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Run Procurement"
-msgstr ""
+msgstr "Запустить снабжение"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -628,7 +649,7 @@ msgstr "Готово"
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will by rounded up to this multiple."
-msgstr ""
+msgstr "Закупаемое количество будет округляться до кратного."
 
 #. module: procurement
 #: view:make.procurement:0
@@ -643,7 +664,7 @@ msgstr "Отмена"
 #. module: procurement
 #: field:stock.warehouse.orderpoint,logic:0
 msgid "Reordering Mode"
-msgstr ""
+msgstr "Режим изменения порядка"
 
 #. module: procurement
 #: field:procurement.order,origin:0
@@ -658,7 +679,7 @@ msgstr "Не срочно"
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute_all
 msgid "Compute all schedulers"
-msgstr ""
+msgstr "Вычисление всех планировщиков"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -677,7 +698,7 @@ msgstr "Детали"
 #: model:ir.actions.act_window,name:procurement.procurement_exceptions
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
 msgid "Procurement Exceptions"
-msgstr ""
+msgstr "Исключитель"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
@@ -710,7 +731,7 @@ msgstr "ТМЦ"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Temporary"
-msgstr ""
+msgstr "Временный"
 
 #. module: procurement
 #: field:mrp.property,description:0
@@ -726,7 +747,7 @@ msgstr "мин."
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Quantity Rules"
-msgstr ""
+msgstr "Правила количеств"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -766,7 +787,7 @@ msgstr "Резервирование"
 #. module: procurement
 #: model:process.node,note:procurement.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr ""
+msgstr "Способ снабжения зависит от вида ТМЦ."
 
 #. module: procurement
 #: view:make.procurement:0
@@ -774,6 +795,8 @@ msgid ""
 "This wizard will plan the procurement for this product. This procurement may "
 "generate task, production orders or purchase orders."
 msgstr ""
+"Этот мастер будет планировать снабжение этой продукцией. Процесс снабжения "
+"может генерировать задачи, заказы на производство, заказы на закупку."
 
 #. module: procurement
 #: field:mrp.property,name:0
@@ -789,7 +812,7 @@ msgstr "макс."
 #. module: procurement
 #: field:procurement.order,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "Вторая ед. изм."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -802,13 +825,14 @@ msgstr ""
 #: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
 #: view:procurement.order.compute.all:0
 msgid "Compute Schedulers"
-msgstr ""
+msgstr "Вычислить планировщики"
 
 #. module: procurement
 #: view:procurement.orderpoint.compute:0
 msgid ""
 "Wizard checks all the stock minimum rules and generate procurement order."
 msgstr ""
+"Мастер проверит все правила минимальных запасов и создаст заказ на снабжение."
 
 #. module: procurement
 #: field:procurement.order,product_uom:0
@@ -828,7 +852,7 @@ msgstr "Весьма срочно"
 #. module: procurement
 #: field:procurement.orderpoint.compute,automatic:0
 msgid "Automatic Orderpoint"
-msgstr ""
+msgstr "Авто точка заказа"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -838,13 +862,13 @@ msgstr "Детали снабжения"
 #. module: procurement
 #: constraint:ir.rule:0
 msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
+msgstr "Для объектов osv_memory правила не поддерживаются !"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:0
 #, python-format
 msgid "SCHEDULER"
-msgstr ""
+msgstr "ПЛАНИРОВЩИК"
 
 #~ msgid "Temporary Procurement Exceptions"
 #~ msgstr "Временные исключения снабжения"
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 5e7e427abab..d1923a96bf4 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -6,16 +6,603 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 11:26+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-25 19:07+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: product
+#: model:product.template,name:product.product_product_ram512_product_template
+msgid "DDR 512MB PC400"
+msgstr "DDR 512MB PC400"
+
+#. module: product
+#: field:product.packaging,rows:0
+msgid "Number of Layers"
+msgstr "Количество уровней"
+
+#. module: product
+#: code:addons/product/pricelist.py:0
+#: constraint:product.pricelist.item:0
+#, python-format
+msgid ""
+"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+"Item!"
+msgstr ""
+"Ошибка ! Нельзя определить Главный Каталог как Другой Каталог в объекте "
+"Каталог!"
+
+#. module: product
+#: help:product.pricelist.item,product_tmpl_id:0
+msgid ""
+"Set a template if this rule only apply to a template of product. Keep empty "
+"for all products"
+msgstr ""
+"Установите шаблон, если правило применяется только для шаблона продукции. "
+"Оставьте пустым для всей продукции."
+
+#. module: product
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия."
+
+#. module: product
+#: model:product.category,name:product.cat1
+msgid "Sellable"
+msgstr "Для продажи"
+
+#. module: product
+#: model:product.template,name:product.product_product_mb2_product_template
+msgid "Mainboard ASUStek A7V8X-X"
+msgstr "Материнская плата ASUStek A7V8X-X"
+
+#. module: product
+#: help:product.template,seller_qty:0
+msgid "This is minimum quantity to purchase from Main Supplier."
+msgstr "Это минимальное количество для закупки у основного поставщика."
+
+#. module: product
+#: model:product.uom,name:product.uom_day
+msgid "Day"
+msgstr "День"
+
+#. module: product
+#: view:product.product:0
+msgid "UoM"
+msgstr "Ед. изм."
+
+#. module: product
+#: model:product.template,name:product.product_product_pc2_product_template
+msgid "Basic+ PC (assembly on order)"
+msgstr ""
+
+#. module: product
+#: field:product.product,incoming_qty:0
+msgid "Incoming"
+msgstr "Входящие"
+
+#. module: product
+#: field:product.template,mes_type:0
+msgid "Measure Type"
+msgstr "Тип измерения"
+
+#. module: product
+#: help:res.partner,property_product_pricelist:0
+msgid ""
+"This pricelist will be used, instead of the default one, for sales to the "
+"current partner"
+msgstr ""
+"Для продаж текущему партнеру, вместо каталога по умолчанию, будет "
+"использоваться этот каталог"
+
+#. module: product
+#: constraint:product.supplierinfo:0
+msgid ""
+"Error: The default UOM and the Supplier Product UOM must be in the same "
+"category."
+msgstr ""
+"Ошибка: ед. изм. по умолчанию и ед. изм. поставщика продукции должны быть из "
+"одной категории."
+
+#. module: product
+#: field:product.template,seller_qty:0
+msgid "Supplier Quantity"
+msgstr ""
+
+#. module: product
+#: selection:product.template,mes_type:0
+msgid "Fixed"
+msgstr "Фиксированный"
+
+#. module: product
+#: code:addons/product/pricelist.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Внимание!"
+
+#. module: product
+#: model:ir.actions.report.xml,name:product.report_product_pricelist
+#: model:ir.model,name:product.model_product_pricelist
+#: field:product.product,price:0
+#: field:product.product,pricelist_id:0
+#: view:product.supplierinfo:0
+msgid "Pricelist"
+msgstr "Каталог"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Base Prices"
+msgstr "Базовае цены"
+
+#. module: product
+#: field:product.pricelist.item,name:0
+msgid "Rule Name"
+msgstr "Название правила"
+
+#. module: product
+#: field:product.product,code:0
+#: field:product.product,default_code:0
+msgid "Reference"
+msgstr "Ссылка"
+
+#. module: product
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Ошибка ! Невозможно создать рекурсивную категорию."
+
+#. module: product
+#: model:product.template,name:product.product_product_24_product_template
+msgid "Keyboard"
+msgstr "Клавиатура"
+
+#. module: product
+#: model:ir.model,name:product.model_res_partner
+msgid "Partner"
+msgstr "Партнер"
+
+#. module: product
+#: help:product.template,supply_method:0
+msgid ""
+"Produce will generate production order or tasks, according to the product "
+"type. Purchase will trigger purchase orders when requested."
+msgstr ""
+"Произвести - будет генерироваться заказ на производство или задача в "
+"зависимости от типа продукции. Закупить - будет инициировать заказ на "
+"закупку,"
+
+#. module: product
+#: selection:product.template,cost_method:0
+msgid "Average Price"
+msgstr "Средняя цена"
+
+#. module: product
+#: help:product.pricelist.item,name:0
+msgid "Explicit rule name for this pricelist line."
+msgstr "Название явного правила для позиции каталога."
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_uom_categ_form_action
+#: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
+msgid "Units of Measure Categories"
+msgstr "Категории единиц измерения"
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu1_product_template
+msgid "Processor AMD Athlon XP 1800+"
+msgstr "Процессор AMD Athlon XP 1800+"
+
+#. module: product
+#: model:product.template,name:product.product_product_20_product_template
+msgid "HDD on demand"
+msgstr "HDD по требованию"
+
+#. module: product
+#: field:product.price_list,price_list:0
+msgid "PriceList"
+msgstr "Прайс-лист"
+
+#. module: product
+#: field:product.supplierinfo,product_uom:0
+#: view:product.template:0
+msgid "UOM"
+msgstr "Ед. изм."
+
+#. module: product
+#: model:product.uom,name:product.product_uom_unit
+msgid "PCE"
+msgstr "шт."
+
+#. module: product
+#: view:product.template:0
+msgid "Miscelleanous"
+msgstr "Разное"
+
+#. module: product
+#: model:product.template,name:product.product_product_worker0_product_template
+msgid "Worker"
+msgstr "Работник"
+
+#. module: product
+#: help:product.template,sale_ok:0
+msgid ""
+"Determines if the product can be visible in the list of product within a "
+"selection from a sale order line."
+msgstr "Определяет видимость продукции при выборе позиции заказа на продажу."
+
+#. module: product
+#: model:product.pricelist.version,name:product.ver0
+msgid "Default Public Pricelist Version"
+msgstr "Версия открытого каталога по умолчанию"
+
+#. module: product
+#: selection:product.template,cost_method:0
+msgid "Standard Price"
+msgstr "Стандартная цена"
+
+#. module: product
+#: model:product.pricelist.type,name:product.pricelist_type_sale
+#: field:res.partner,property_product_pricelist:0
+msgid "Sale Pricelist"
+msgstr "Каталог продаж"
+
+#. module: product
+#: view:product.template:0
+#: field:product.template,type:0
+msgid "Product Type"
+msgstr "Тип ТМЦ"
+
+#. module: product
+#: view:product.uom:0
+msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:0
+#, python-format
+msgid "Products: "
+msgstr "ТМЦ: "
+
+#. module: product
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+"Ошибка. Единицы продажи и единицы измерения должны принадлежать к разным "
+"категориям."
+
+#. module: product
+#: field:product.category,parent_id:0
+msgid "Parent Category"
+msgstr "Категория предка"
+
+#. module: product
+#: help:product.product,outgoing_qty:0
+msgid ""
+"Quantities of products that are planned to leave in selected locations or "
+"all internal if none have been selected."
+msgstr ""
+"Количества продукции, которые планируется отправить в указанные места, или "
+"вся внутренняя, если ничего не выбранно."
+
+#. module: product
+#: help:product.template,procure_method:0
+msgid ""
+"'Make to Stock': When needed, take from the stock or wait until re-"
+"supplying. 'Make to Order': When needed, purchase or produce for the "
+"procurement request."
+msgstr ""
+"'Изготовить на склад': при необходимости, взять со склада или ждать "
+"поставки. 'Изготовить на заказ': при необходимости, закупить или произвести "
+"по запросу на снабжение."
+
+#. module: product
+#: model:process.node,note:product.process_node_supplier0
+msgid "Supplier name, price, product code, ..."
+msgstr "Название поставщика, каталог, код ТМЦ, ..."
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd3_product_template
+msgid "HDD Seagate 7200.8 160GB"
+msgstr "Жёсткий диск Seagate 7200.8 160GB"
+
+#. module: product
+#: field:product.product,ean13:0
+msgid "EAN13"
+msgstr "Штрих-код 13"
+
+#. module: product
+#: field:product.template,seller_id:0
+msgid "Main Supplier"
+msgstr "Основной поставщик"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_ul_form_action
+#: model:ir.model,name:product.model_product_packaging
+#: model:ir.ui.menu,name:product.menu_product_ul_form_action
+#: view:product.packaging:0
+#: view:product.product:0
+#: view:product.ul:0
+msgid "Packaging"
+msgstr "Упаковка"
+
+#. module: product
+#: view:product.product:0
+#: field:product.template,categ_id:0
+msgid "Category"
+msgstr "Категория"
+
+#. module: product
+#: help:product.pricelist.item,min_quantity:0
+msgid ""
+"The rule only applies if the partner buys/sells more than this quantity."
+msgstr ""
+"Правило применяется только в случае, если партнёр покупает или продает более "
+"этой величины."
+
+#. module: product
+#: model:product.template,name:product.product_product_woodmm0_product_template
+msgid "Wood 2mm"
+msgstr ""
+
+#. module: product
+#: field:product.price_list,qty1:0
+msgid "Quantity-1"
+msgstr "Количество-1"
+
+#. module: product
+#: help:product.packaging,ul_qty:0
+msgid "The number of packages by layer"
+msgstr "Количество упаковок на слой"
+
+#. module: product
+#: field:product.packaging,qty:0
+msgid "Quantity by Package"
+msgstr "Количество по пакету"
+
+#. module: product
+#: code:addons/product/pricelist.py:0
+#, python-format
+msgid ""
+"Could not resolve product category, ' \\n                                    "
+"'you have defined cyclic categories ' \\n                                    "
+"'of products!"
+msgstr ""
+"Не удается определить категорию ТМЦ, '\\n' вы зациклили категории ' \\n 'ТМЦ!"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,state:0
+msgid "Status"
+msgstr "Статус"
+
+#. module: product
+#: help:product.template,categ_id:0
+msgid "Select category for the current product"
+msgstr "Выберите категорию для ТМЦ"
+
+#. module: product
+#: field:product.product,outgoing_qty:0
+msgid "Outgoing"
+msgstr "Исходящее"
+
+#. module: product
+#: selection:product.uom,uom_type:0
+msgid "Reference UoM for this category"
+msgstr "Ссылка на ед. езм. для этой категории"
+
+#. module: product
+#: model:product.price.type,name:product.list_price
+msgid "Public Price"
+msgstr "Открытый каталог"
+
+#. module: product
+#: field:product.price_list,qty5:0
+msgid "Quantity-5"
+msgstr "Количество-5"
+
+#. module: product
+#: model:product.category,name:product.product_category_10
+msgid "IT components"
+msgstr "ИТ компоненты"
+
+#. module: product
+#: field:product.template,product_manager:0
+msgid "Product Manager"
+msgstr "Менеджер продукции"
+
+#. module: product
+#: field:product.supplierinfo,product_name:0
+msgid "Supplier Product Name"
+msgstr "Название ТМЦ поставщика"
+
+#. module: product
+#: model:product.template,name:product.product_product_pc3_product_template
+msgid "Medium PC"
+msgstr "Средний ПК"
+
+#. module: product
+#: view:product.pricelist:0
+msgid "Products Price Search"
+msgstr "Искать цену ТМЦ"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,description_sale:0
+msgid "Sale Description"
+msgstr "Описание продужи"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Storage Localisation"
+msgstr "Место хранения"
+
+#. module: product
+#: help:product.packaging,length:0
+msgid "The length of the package"
+msgstr "Длина пакета"
+
+#. module: product
+#: help:product.template,weight_net:0
+msgid "The net weight in Kg."
+msgstr "Вес нетто в килограммах."
+
+#. module: product
+#: help:product.template,state:0
+msgid "Tells the user if he can use the product or not."
+msgstr "Сообщите пользователю, может ли он пользоваться продукцией"
+
+#. module: product
+#: field:pricelist.partnerinfo,min_quantity:0
+#: field:product.supplierinfo,qty:0
+msgid "Quantity"
+msgstr "Количество"
+
+#. module: product
+#: field:product.packaging,height:0
+msgid "Height"
+msgstr "Высота"
+
+#. module: product
+#: help:product.pricelist.version,date_end:0
+msgid "Ending date for this pricelist version to be valid."
+msgstr "Конечная дата, до которой каталог действителен"
+
+#. module: product
+#: model:product.category,name:product.cat0
+msgid "All products"
+msgstr "Все ТМЦ"
+
+#. module: product
+#: model:ir.model,name:product.model_pricelist_partnerinfo
+msgid "pricelist.partnerinfo"
+msgstr ""
+
+#. module: product
+#: field:product.price_list,qty2:0
+msgid "Quantity-2"
+msgstr "Количество-2"
+
+#. module: product
+#: field:product.price_list,qty3:0
+msgid "Quantity-3"
+msgstr "Количество-3"
+
+#. module: product
+#: view:product.product:0
+msgid "Codes"
+msgstr "Коды"
+
+#. module: product
+#: field:product.price_list,qty4:0
+msgid "Quantity-4"
+msgstr "Количество-4"
+
+#. module: product
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Продажи и закупки"
+
+#. module: product
+#: model:product.uom.categ,name:product.uom_categ_wtime
+msgid "Working Time"
+msgstr "Время работы"
+
+#. module: product
+#: model:product.template,name:product.product_product_metalcleats0_product_template
+msgid "Metal Cleats"
+msgstr "Металлические зажимы"
+
+#. module: product
+#: model:ir.model,name:product.model_product_uom_categ
+msgid "Product uom categ"
+msgstr "Категория ед. изм. продукции"
+
+#. module: product
+#: model:product.ul,name:product.product_ul_box
+msgid "Box 20x20x40"
+msgstr "Ящик 20x20x40"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Price Computation"
+msgstr "Расчет цены"
+
+#. module: product
+#: field:product.template,purchase_ok:0
+msgid "Can be Purchased"
+msgstr "Можно закупать"
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu2_product_template
+msgid "High speed processor config"
+msgstr ""
+
+#. module: product
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
+msgstr ""
+"Один или несколько поставщиков могут быть связаны с ТМЦ. Вся информация в "
+"форме ТМЦ."
+
+#. module: product
+#: help:product.uom,category_id:0
+msgid ""
+"Quantity conversions may happen automatically between Units of Measure in "
+"the same category, according to their respective ratios."
+msgstr ""
+"Между единицами измерения одной категории, преобразования количеств могут "
+"происходить автоматически в соответствии с коэффициентами."
+
+#. module: product
+#: help:product.packaging,width:0
+msgid "The width of the package"
+msgstr "Ширина пакета"
+
+#. module: product
+#: field:product.product,virtual_available:0
+msgid "Virtual Stock"
+msgstr "Виртуальные запасы"
+
+#. module: product
+#: selection:product.category,type:0
+msgid "View"
+msgstr "Вид"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_template_action_tree
+msgid "Product Templates"
+msgstr "Шаблоны ТМЦ"
+
+#. module: product
+#: model:product.template,name:product.product_product_restaurantexpenses0_product_template
+msgid "Restaurant Expenses"
+msgstr "Расходы ресторана"
+
+#. module: product
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Ошибка: Неправильный штрих-код"
+
+#. module: product
+#: field:product.pricelist.item,min_quantity:0
+msgid "Min. Quantity"
+msgstr "Мин. кол-во"
+
+#. module: product
+#: model:ir.model,name:product.model_product_price_type
+msgid "Price Type"
+msgstr "Тип цены"
+
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Max. Margin"
@@ -27,24 +614,9 @@ msgid "Base Price"
 msgstr "Базовая цена"
 
 #. module: product
-#: help:product.template,standard_price:0
-msgid ""
-"The cost of the product for accounting stock valuation. It can serves as a "
-"base price for supplier price."
-msgstr ""
-
-#. module: product
-#: selection:product.template,type:0
-msgid "Service"
-msgstr "Услуга"
-
-#. module: product
-#: help:product.template,purchase_ok:0
-msgid ""
-"Determine if the product is visible in the list of products within a "
-"selection from a purchase order line."
-msgstr ""
-"Должно ли изделие быть видимым при выборе из списка изделий в форме заказа"
+#: model:product.template,name:product.product_product_fan2_product_template
+msgid "Silent fan"
+msgstr "Тихий вентилятор"
 
 #. module: product
 #: help:product.supplierinfo,name:0
@@ -52,99 +624,27 @@ msgid "Supplier of this product"
 msgstr "Поставщик этой продукции"
 
 #. module: product
-#: model:product.template,name:product.product_product_ram512_product_template
-msgid "DDR 512MB PC400"
-msgstr "DDR 512MB PC400"
-
-#. module: product
-#: model:product.template,name:product.product_product_0_product_template
-msgid "Onsite Senior Intervention"
-msgstr "Вмешательство руководства на месте"
-
-#. module: product
-#: help:product.supplierinfo,qty:0
+#: help:product.pricelist.version,active:0
 msgid ""
-"The minimal quantity to purchase for this supplier, expressed in the default "
-"unit of measure."
-msgstr ""
-"Минимальный размер закупки от этого поставщика, выраженный в стандартных "
-"единицах измерения."
-
-#. module: product
-#: field:product.template,weight_net:0
-msgid "Net weight"
-msgstr "Вес нетто"
-
-#. module: product
-#: help:product.product,incoming_qty:0
-msgid ""
-"Quantities of products that are planned to arrive in selected locations or "
-"all internal if none have been selected."
-msgstr ""
-"Объемы продукции, которые планируется достичь в выбранных местах или все "
-"внутренние, если никакие не были выбраны."
-
-#. module: product
-#: help:product.product,virtual_available:0
-msgid ""
-"Futur stock for this product according to the selected location or all "
-"internal if none have been selected. Computed as: Real Stock - Outgoing + "
-"Incoming."
+"When a version is duplicated it is set to non active, so that the dates do "
+"not overlaps with original version. You should change the dates and "
+"reactivate the pricelist"
 msgstr ""
 
 #. module: product
-#: field:product.packaging,width:0
-msgid "Width"
-msgstr "Ширина"
-
-#. module: product
-#: help:product.pricelist.item,product_tmpl_id:0
-msgid ""
-"Set a template if this rule only apply to a template of product. Keep empty "
-"for all products"
-msgstr ""
-"Установите шаблон, если правило применяется только для шаблона продукции. "
-"Оставьте пустым для всей продукции."
-
-#. module: product
-#: field:product.template,procure_method:0
-msgid "Procure Method"
-msgstr "Метод закупки"
-
-#. module: product
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
-#. module: product
-#: model:process.process,name:product.process_process_productprocess0
-msgid "Product Process"
+#: model:product.template,name:product.product_product_kitshelfofcm0_product_template
+msgid "KIT Shelf of 100cm"
 msgstr ""
 
 #. module: product
-#: help:product.price.type,field:0
-msgid "Associated field in the product form."
-msgstr "Связанные поля в форме изделия"
+#: field:product.supplierinfo,name:0
+msgid "Supplier"
+msgstr "Поставщик"
 
 #. module: product
-#: selection:product.template,cost_method:0
-msgid "Standard Price"
-msgstr "Стандартная цена"
-
-#. module: product
-#: help:product.packaging,height:0
-msgid "The height of the package"
-msgstr "Высота упаковки"
-
-#. module: product
-#: view:product.pricelist:0
-msgid "Products Price List"
-msgstr "Каталог продукции"
-
-#. module: product
-#: model:product.category,name:product.cat1
-msgid "Sellable"
-msgstr "Для продажи"
+#: model:product.template,name:product.product_product_sidepanel0_product_template
+msgid "Side Panel"
+msgstr "Боковая панель"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
@@ -157,53 +657,13 @@ msgid "Price Name"
 msgstr "Название цены"
 
 #. module: product
-#: field:product.product,price:0
-msgid "Customer Price"
-msgstr "Цена клиента"
-
-#. module: product
-#: field:product.template,company_id:0
-msgid "Company"
-msgstr "Компания"
-
-#. module: product
-#: field:product.template,rental:0
-msgid "Rentable Product"
-msgstr "Изделие для аренды"
-
-#. module: product
-#: field:product.product,lst_price:0
-msgid "List Price"
-msgstr "Цена по каталогу"
-
-#. module: product
-#: model:ir.actions.act_window,name:product.product_price_type_action
-#: model:ir.ui.menu,name:product.menu_product_price_type_action
-msgid "Prices Types"
-msgstr "Типы цен"
-
-#. module: product
-#: selection:product.template,type:0
-msgid "Stockable Product"
-msgstr "Складируемая продукция"
-
-#. module: product
-#: model:product.category,name:product.product_category_services
-msgid "Services"
-msgstr "Услуги"
-
-#. module: product
-#: help:product.template,list_price:0
+#: help:product.pricelist,active:0
 msgid ""
-"Base price for computing the customer price. Sometimes called the catalog "
-"price."
+"If the active field is set to true, it will allow you to hide the pricelist "
+"without removing it."
 msgstr ""
-"Базовая цена для расчёта цены продажи. Иногда называется справочой ценой."
-
-#. module: product
-#: field:pricelist.partnerinfo,min_quantity:0
-msgid "Quantity"
-msgstr "Количество"
+"если поле \"Активно\" установлено в \"истина\", то это позволит вам скрыть "
+"каталог без его удаления."
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
@@ -211,84 +671,24 @@ msgid "Processor AMD Athlon XP 2200+"
 msgstr "Процессор AMD Athlon XP 2200+"
 
 #. module: product
-#: help:product.price.type,name:0
-msgid "Name of this kind of price."
-msgstr "Наименование типа цены"
-
-#. module: product
-#: help:product.pricelist.version,date_start:0
-msgid "Starting date for this pricelist version to be valid."
-msgstr "Каталог действителен, начиная с даты"
-
-#. module: product
-#: field:product.product,incoming_qty:0
-msgid "Incoming"
-msgstr "Входящие"
-
-#. module: product
-#: selection:product.template,procure_method:0
-msgid "Make to Stock"
-msgstr "Изготовление про запас"
+#: model:ir.actions.act_window,name:product.action_product_price_list
+#: model:ir.model,name:product.model_product_price_list
+#: view:product.price_list:0
+#: report:product.pricelist:0
+#: field:product.pricelist.version,pricelist_id:0
+msgid "Price List"
+msgstr "Каталог"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
-msgstr "Вес"
+msgid "Suppliers"
+msgstr "Поставщики"
 
 #. module: product
-#: model:product.template,name:product.product_product_fan2_product_template
-msgid "Silent fan"
-msgstr "Тихий вентилятор"
-
-#. module: product
-#: help:product.template,supply_method:0
-msgid ""
-"Produce will generate production order or tasks, according to the product "
-"type. Purchase will trigger purchase orders when requested."
-msgstr ""
-
-#. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid "You can see the list of suppliers for that product."
-msgstr "Вы можете просмотреть список поставщиков этого изделия"
-
-#. module: product
-#: help:product.packaging,rows:0
-msgid "The number of layer on a palet or box"
-msgstr "Число слоёв на палете или в коробке"
-
-#. module: product
-#: model:product.pricelist.type,name:product.pricelist_type_sale
-#: field:res.partner,property_product_pricelist:0
-msgid "Sale Pricelist"
-msgstr "Каталог продаж"
-
-#. module: product
-#: field:product.pricelist.item,base_pricelist_id:0
-msgid "If Other Pricelist"
-msgstr "В другом каталоге"
-
-#. module: product
-#: model:ir.actions.act_window,name:product.product_normal_action
-#: model:ir.actions.act_window,name:product.product_normal_action_tree
-#: model:ir.ui.menu,name:product.menu_main_product
-#: model:ir.ui.menu,name:product.menu_products
 #: view:product.product:0
-msgid "Products"
-msgstr "ТМЦ"
-
-#. module: product
-#: help:product.pricelist.item,price_round:0
-msgid ""
-"Sets the price so that it is a multiple of this value.\n"
-"Rounding is applied after the discount and before the surcharge.\n"
-"To have prices that end in 9.99, set rounding 10, surcharge -0.01"
-msgstr ""
-"Устанавливает цену кратной данному значению.\n"
-"Округление применяется после скидки, но  перед надбавкой.\n"
-"Так, чтобы цена заканчивалась на 9,99, установите округление 10, надбавку -"
-"0,01."
+msgid "To Purchase"
+msgstr "Для закупки"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -296,169 +696,10 @@ msgid "New Price ="
 msgstr "Новая цена ="
 
 #. module: product
-#: field:product.product,virtual_available:0
-msgid "Virtual Stock"
-msgstr "Виртуальные запасы"
-
-#. module: product
-#: selection:product.template,mes_type:0
-msgid "Fixed"
-msgstr "Фиксированный"
-
-#. module: product
-#: model:ir.actions.act_window,name:product.product_uom_categ_form_action
-#: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
-msgid "Units of Measure Categories"
-msgstr "Категории единиц измерения"
-
-#. module: product
-#: help:product.pricelist.item,product_id:0
-msgid ""
-"Set a product if this rule only apply to one product. Keep empty for all "
-"products"
+#: help:product.pricelist.item,sequence:0
+msgid "Gives the sequence order when displaying a list of pricelist items."
 msgstr ""
-
-#. module: product
-#: model:ir.model,name:product.model_product_pricelist_type
-#: field:product.pricelist,type:0
-#: view:product.pricelist.type:0
-msgid "Pricelist Type"
-msgstr "Тип каталога"
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Base Prices"
-msgstr "Базовае цены"
-
-#. module: product
-#: model:ir.ui.menu,name:product.menu_price
-msgid "Prices Computations"
-msgstr "Вычисление цен"
-
-#. module: product
-#: field:product.pricelist.item,name:0
-msgid "Rule Name"
-msgstr "Название правила"
-
-#. module: product
-#: model:ir.ui.menu,name:product.menu_config_product
-msgid "Configuration"
-msgstr "Настройки"
-
-#. module: product
-#: field:product.packaging,rows:0
-msgid "Number of Layer"
-msgstr "Число слоёв"
-
-#. module: product
-#: constraint:product.category:0
-msgid "Error ! You can not create recursive categories."
-msgstr "Ошибка ! Невозможно создать рекурсивную категорию."
-
-#. module: product
-#: field:product.template,uom_id:0
-msgid "Default UoM"
-msgstr "Единица измерения по умолчанию"
-
-#. module: product
-#: field:product.template,produce_delay:0
-msgid "Manufacturing Lead Time"
-msgstr "Время производства"
-
-#. module: product
-#: field:product.supplierinfo,pricelist_ids:0
-msgid "Supplier Pricelist"
-msgstr "Каталог поставщика"
-
-#. module: product
-#: view:product.packaging:0
-#: view:product.product:0
-msgid "Pallet Dimension"
-msgstr ""
-
-#. module: product
-#: field:product.pricelist.item,base:0
-msgid "Based on"
-msgstr "На основе"
-
-#. module: product
-#: model:product.template,name:product.product_product_24_product_template
-msgid "Keyboard"
-msgstr "Клавиатура"
-
-#. module: product
-#: field:product.supplierinfo,name:0
-msgid "Partner"
-msgstr "Партнер"
-
-#. module: product
-#: field:product.template,sale_delay:0
-msgid "Customer Lead Time"
-msgstr ""
-
-#. module: product
-#: model:product.template,name:product.product_product_25_product_template
-msgid "Mouse"
-msgstr "Мышь"
-
-#. module: product
-#: help:product.template,cost_method:0
-msgid ""
-"Standard Price: the cost price is fixed and recomputed periodically (usually "
-"at the end of the year), Average Price: the cost price is recomputed at each "
-"reception of products."
-msgstr ""
-
-#. module: product
-#: field:product.pricelist,name:0
-msgid "Pricelist Name"
-msgstr "Название прайс-листа"
-
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Партнеры"
-
-#. module: product
-#: selection:product.template,cost_method:0
-msgid "Average Price"
-msgstr "Средняя цена"
-
-#. module: product
-#: model:process.node,note:product.process_node_product0
-msgid "Create new Product"
-msgstr "Создать ТМЦ"
-
-#. module: product
-#: help:product.pricelist.item,name:0
-msgid "Explicit rule name for this pricelist line."
-msgstr ""
-
-#. module: product
-#: view:product.pricelist.item:0
-msgid "Min. Margin"
-msgstr "Мин. маржа"
-
-#. module: product
-#: view:product.pricelist.item:0
-msgid "* ( 1 + "
-msgstr "* ( 1 + "
-
-#. module: product
-#: model:product.template,name:product.product_product_cpu1_product_template
-msgid "Processor AMD Athlon XP 1800+"
-msgstr "Процессор AMD Athlon XP 1800+"
-
-#. module: product
-#: selection:product.template,state:0
-msgid "In Production"
-msgstr "В производстве"
-
-#. module: product
-#: field:product.category,child_id:0
-msgid "Child Categories"
-msgstr "Подчиненные категории"
+"Дает порядок последовательности при выводе элементов списка каталога."
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
@@ -466,52 +707,52 @@ msgid "Accessories"
 msgstr "Дополнительные"
 
 #. module: product
-#: field:product.supplierinfo,sequence:0
-msgid "Priority"
-msgstr "Приоритет"
-
-#. module: product
-#: model:product.template,name:product.product_product_20_product_template
-msgid "HDD on demand"
+#: field:product.template,sale_delay:0
+msgid "Customer Lead Time"
 msgstr ""
 
 #. module: product
-#: field:product.uom,factor_inv:0
-#: field:product.uom,factor_inv_data:0
-msgid "Factor"
-msgstr "Множитель"
+#: model:process.transition,name:product.process_transition_supplierofproduct0
+msgid "Supplier of the product"
+msgstr "Поставщик ТМЦ"
 
 #. module: product
-#: wizard_button:product.price_list,init,price:0
+#: help:product.template,uos_id:0
+msgid ""
+"Used by companies that manage two units of measure: invoicing and inventory "
+"management. For example, in food industries, you will manage a stock of ham "
+"but invoice in Kg. Keep empty to use the default UOM."
+msgstr ""
+"Используется компаниями которые оперируют двумя единицами измерения: для "
+"счетов и для управления запасами. Например, в пищевой индустрии. Оставьте "
+"пустым для использования ед. изм. по умолчанию."
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Min. Margin"
+msgstr "Мин. маржа"
+
+#. module: product
+#: field:product.category,child_id:0
+msgid "Child Categories"
+msgstr "Подчиненные категории"
+
+#. module: product
+#: field:product.pricelist.version,date_end:0
+msgid "End Date"
+msgstr "Дата окончания"
+
+#. module: product
+#: view:product.price_list:0
 msgid "Print"
 msgstr "Распечатать"
 
 #. module: product
-#: model:process.node,name:product.process_node_supplier0
-msgid "Supplier Info"
-msgstr "Информация о поставщике"
-
-#. module: product
+#: view:product.product:0
 #: field:product.ul,type:0
 msgid "Type"
 msgstr "Тип"
 
-#. module: product
-#: wizard_field:product.price_list,init,price_list:0
-msgid "PriceList"
-msgstr "Прайс-лист"
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "UOM"
-msgstr "Ед. изм."
-
-#. module: product
-#: model:product.uom,name:product.product_uom_unit
-msgid "PCE"
-msgstr "шт."
-
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action2
 #: model:ir.ui.menu,name:product.menu_product_pricelist_action2
@@ -520,19 +761,478 @@ msgid "Pricelists"
 msgstr "Каталоги"
 
 #. module: product
-#: field:product.supplierinfo,product_name:0
-msgid "Partner Product Name"
-msgstr "Наименование изделия партнёра"
+#: field:product.product,partner_ref:0
+msgid "Customer ref"
+msgstr "Ссылка на клиента"
+
+#. module: product
+#: view:product.product:0
+msgid "Miscellaneous"
+msgstr "Прочее"
+
+#. module: product
+#: field:product.pricelist.type,key:0
+msgid "Key"
+msgstr "Ключ"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Rules Test Match"
+msgstr "Проверка правил"
+
+#. module: product
+#: help:product.pricelist.item,product_id:0
+msgid ""
+"Set a product if this rule only apply to one product. Keep empty for all "
+"products"
+msgstr ""
+"Выберите ТМЦ, если это правило применимо к одному товару. Оставьте пустым "
+"для всех ТМЦ"
+
+#. module: product
+#: model:product.template,name:product.product_product_kitchendesignproject0_product_template
+msgid "Kitchen Design Project"
+msgstr "Проект дизайна кухни"
+
+#. module: product
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильный XML для просмотра архитектуры!"
+
+#. module: product
+#: model:product.uom,name:product.uom_hour
+msgid "Hour"
+msgstr "Час"
+
+#. module: product
+#: selection:product.template,state:0
+msgid "In Development"
+msgstr "В разработке"
+
+#. module: product
+#: model:product.template,name:product.product_product_shelfofcm1_product_template
+msgid "Shelf of 200cm"
+msgstr "Полка 200см"
+
+#. module: product
+#: view:product.uom:0
+msgid "Ratio & Precision"
+msgstr "Коэффициент & Точность"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_gram
+msgid "g"
+msgstr "г"
+
+#. module: product
+#: model:product.category,name:product.product_category_11
+msgid "IT components kits"
+msgstr "ИТ набор компонентов"
+
+#. module: product
+#: selection:product.category,type:0
+#: selection:product.template,state:0
+msgid "Normal"
+msgstr "Обычный"
+
+#. module: product
+#: model:process.node,name:product.process_node_supplier0
+#: view:product.supplierinfo:0
+msgid "Supplier Information"
+msgstr "Информация поставщика"
+
+#. module: product
+#: field:product.price.type,currency_id:0
+#: report:product.pricelist:0
+#: field:product.pricelist,currency_id:0
+msgid "Currency"
+msgstr "Валюта"
+
+#. module: product
+#: model:product.template,name:product.product_product_ram_product_template
+msgid "DDR 256MB PC400"
+msgstr "DDR 256MB PC400"
+
+#. module: product
+#: view:product.category:0
+msgid "Product Categories"
+msgstr "Категории ТМЦ"
+
+#. module: product
+#: view:product.uom:0
+msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
+msgstr ""
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Miscelleanous"
-msgstr "Разное"
+msgid "Procurement & Locations"
+msgstr "Снабжение и местоположения"
+
+#. module: product
+#: field:product.packaging,weight:0
+msgid "Total Package Weight"
+msgstr "Итоговый вес пакета"
+
+#. module: product
+#: help:product.packaging,code:0
+msgid "The code of the transport unit."
+msgstr "Код транспортной единицы."
+
+#. module: product
+#: help:product.template,standard_price:0
+msgid ""
+"Product's cost for accounting stock valuation. It is the base price for the "
+"supplier price."
+msgstr "Учетная стоимость ТМЦ. Это базовая цена для цены поставщика."
+
+#. module: product
+#: view:product.price.type:0
+msgid "Products Price Type"
+msgstr "Тип цены продукции"
+
+#. module: product
+#: field:product.product,price_extra:0
+msgid "Variant Price Extra"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_fan_product_template
+msgid "Regular case fan 80mm"
+msgstr "Обычный корпусной вентилятор 80мм"
+
+#. module: product
+#: model:ir.model,name:product.model_product_supplierinfo
+msgid "Information about a product supplier"
+msgstr "Информация о поставщике продукции"
+
+#. module: product
+#: view:product.product:0
+msgid "Extended Filters..."
+msgstr "Расширенные фильтры..."
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,description_purchase:0
+msgid "Purchase Description"
+msgstr "Описание закупки"
+
+#. module: product
+#: constraint:product.pricelist.version:0
+msgid "You cannot have 2 pricelist versions that overlap!"
+msgstr "Нельзя иметь 2 перекрывающиеся версии каталога!"
+
+#. module: product
+#: help:product.supplierinfo,delay:0
+msgid ""
+"Lead time in days between the confirmation of the purchase order and the "
+"reception of the products in your warehouse. Used by the scheduler for "
+"automatic computation of the purchase order planning."
+msgstr ""
+"Запас по времени между подтверждением заказа на закупку и приходом ТМЦ на "
+"склад. Используется планировщиком для автоматического планирования заказа на "
+"закупку."
+
+#. module: product
+#: selection:product.template,type:0
+msgid "Stockable Product"
+msgstr "Складируемая продукция"
+
+#. module: product
+#: field:product.packaging,code:0
+msgid "Code"
+msgstr "Код"
+
+#. module: product
+#: view:product.supplierinfo:0
+msgid "Seq"
+msgstr "Последовательность"
+
+#. module: product
+#: view:product.price_list:0
+msgid "Calculate Product Price per unit base on pricelist version."
+msgstr "Вычислить цену  за единицу продукции основанную на версии каталога."
+
+#. module: product
+#: model:ir.model,name:product.model_product_ul
+msgid "Shipping Unit"
+msgstr "Единица поставки"
+
+#. module: product
+#: field:pricelist.partnerinfo,suppinfo_id:0
+msgid "Partner Information"
+msgstr "Информация партнера"
+
+#. module: product
+#: model:ir.model,name:product.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: product
+#: selection:product.ul,type:0
+#: model:product.uom.categ,name:product.product_uom_categ_unit
+msgid "Unit"
+msgstr "Ед."
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Information"
+msgstr "Информация"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Products Listprices Items"
+msgstr "Элкменты каталога продукции"
+
+#. module: product
+#: view:product.packaging:0
+msgid "Other Info"
+msgstr "Прочая информация"
+
+#. module: product
+#: field:product.pricelist.version,items_id:0
+msgid "Price List Items"
+msgstr "Элементы каталога"
+
+#. module: product
+#: selection:product.uom,uom_type:0
+msgid "Bigger than the reference UoM"
+msgstr "Больший чем ед. изм. ссылки"
+
+#. module: product
+#: model:ir.module.module,shortdesc:product.module_meta_information
+msgid "Products & Pricelists"
+msgstr "ТМЦ и каталоги"
+
+#. module: product
+#: view:product.product:0
+msgid "To Sell"
+msgstr "На продажу"
+
+#. module: product
+#: model:product.category,name:product.product_category_services0
+msgid "Marketable Services"
+msgstr "Платные услуги"
+
+#. module: product
+#: field:product.pricelist.item,price_surcharge:0
+msgid "Price Surcharge"
+msgstr "Надбавка к цене"
+
+#. module: product
+#: model:product.template,name:product.product_product_mb1_product_template
+msgid "Mainboard ASUStek A7N8X"
+msgstr "Материнская плата ASUStek A7N8X"
+
+#. module: product
+#: field:product.product,packaging:0
+msgid "Logistical Units"
+msgstr "Логистические единицы"
+
+#. module: product
+#: field:product.category,complete_name:0
+#: field:product.category,name:0
+#: field:product.pricelist.type,name:0
+#: field:product.pricelist.version,name:0
+#: view:product.product:0
+#: field:product.template,name:0
+#: field:product.ul,name:0
+#: field:product.uom,name:0
+#: field:product.uom.categ,name:0
+msgid "Name"
+msgstr "Название"
+
+#. module: product
+#: code:addons/product/pricelist.py:0
+#, python-format
+msgid ""
+"No active version for the selected pricelist !\n"
+"' \\n                                'Please create or activate one."
+msgstr ""
+"Нет активной версии для выбранного каталога!\n"
+"' \\n 'Пожалуйста, создайте или активируйте каталог."
+
+#. module: product
+#: view:product.product:0
+msgid "Stockable"
+msgstr "Хранимое"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_kgm
+msgid "kg"
+msgstr "кг"
+
+#. module: product
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr "Для объектов osv_memory правила не поддерживаются !"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_meter
+msgid "m"
+msgstr "м"
+
+#. module: product
+#: selection:product.template,state:0
+msgid "Obsolete"
+msgstr "Устаревший"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_km
+msgid "km"
+msgstr "км"
+
+#. module: product
+#: help:product.template,cost_method:0
+msgid ""
+"Standard Price: the cost price is fixed and recomputed periodically (usually "
+"at the end of the year), Average Price: the cost price is recomputed at each "
+"reception of products."
+msgstr ""
+"Стандартная цена: стоимость фиксирована и пересчитывается периодически "
+"(обычно в конце года). Средняя цена: стоимость пересчитывается при каждом "
+"приходе продукции."
+
+#. module: product
+#: help:product.category,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of product categories."
+msgstr "Дает порядок последовательности при выводе списка категорий ТМЦ."
+
+#. module: product
+#: field:product.uom,factor:0
+#: field:product.uom,factor_inv:0
+msgid "Ratio"
+msgstr "Коэффициент"
+
+#. module: product
+#: help:product.template,purchase_ok:0
+msgid ""
+"Determine if the product is visible in the list of products within a "
+"selection from a purchase order line."
+msgstr ""
+"Должно ли изделие быть видимым при выборе из списка изделий в форме заказа"
+
+#. module: product
+#: field:product.template,weight_net:0
+msgid "Net weight"
+msgstr "Вес нетто"
+
+#. module: product
+#: field:product.packaging,width:0
+msgid "Width"
+msgstr "Ширина"
+
+#. module: product
+#: help:product.price.type,field:0
+msgid "Associated field in the product form."
+msgstr "Связанные поля в форме изделия"
+
+#. module: product
+#: view:product.product:0
+msgid "Unit of Measure"
+msgstr "Ед. изм."
+
+#. module: product
+#: field:product.template,procure_method:0
+msgid "Procurement Method"
+msgstr "Метод снабжения"
+
+#. module: product
+#: report:product.pricelist:0
+msgid "Printing Date"
+msgstr "Дата печати"
+
+#. module: product
+#: field:product.template,uos_id:0
+msgid "Unit of Sale"
+msgstr "Единица продажи"
+
+#. module: product
+#: help:product.template,seller_delay:0
+msgid ""
+"This is the average delay in days between the purchase order confirmation "
+"and the reception of goods for this product and for the default supplier. It "
+"is used by the scheduler to order requests based on reordering delays."
+msgstr ""
+"Это средняя задержка в днях между подтверждением заказа на закупку и "
+"получением для этой продукции и для поставщика по умолчанию. Используется "
+"планировщиком для подачи запросов основанных на задержках при повторной "
+"подаче заказов."
+
+#. module: product
+#: help:product.template,seller_id:0
+msgid "Main Supplier who has highest priority in Supplier List."
+msgstr "Основной поставщик - имеет высший приоритет в списке поставщиков."
+
+#. module: product
+#: model:product.category,name:product.product_category_services
+#: view:product.product:0
+msgid "Services"
+msgstr "Услуги"
+
+#. module: product
+#: field:product.pricelist.item,base_pricelist_id:0
+msgid "If Other Pricelist"
+msgstr "В другом каталоге"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_normal_action
+#: model:ir.actions.act_window,name:product.product_normal_action_puchased
+#: model:ir.actions.act_window,name:product.product_normal_action_tree
+#: model:ir.ui.menu,name:product.menu_products
+#: view:product.product:0
+msgid "Products"
+msgstr "ТМЦ"
+
+#. module: product
+#: help:product.packaging,rows:0
+msgid "The number of layers on a pallet or box"
+msgstr "Количество слоев на поддоне или в коробке"
 
 #. module: product
 #: help:product.pricelist.item,base:0
 msgid "The mode for computing the price for this rule."
+msgstr "Режим для вычисления цены для этого правила."
+
+#. module: product
+#: view:product.packaging:0
+#: view:product.product:0
+msgid "Pallet Dimension"
+msgstr "Размер поддона"
+
+#. module: product
+#: code:addons/product/product.py:0
+#, python-format
+msgid " (copy)"
+msgstr " (копия)"
+
+#. module: product
+#: field:product.template,seller_ids:0
+msgid "Partners"
+msgstr "Партнеры"
+
+#. module: product
+#: help:product.template,sale_delay:0
+msgid ""
+"This is the average delay in days between the confirmation of the customer "
+"order and the delivery of the finished products. It's the time you promise "
+"to your customers."
+msgstr ""
+"Это средняя задержка в днях между подтверждением заказа и доставкой готовой "
+"продукции. Это срок, который вы обещаете вашему партнеру."
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Second UoM"
+msgstr "Вторая ед. езм."
+
+#. module: product
+#: model:product.template,name:product.product_product_woodlintelm0_product_template
+msgid "Wood Lintel 4m"
 msgstr ""
 
 #. module: product
@@ -544,12 +1244,7 @@ msgid "Units of Measure"
 msgstr "Единицы измерения"
 
 #. module: product
-#: field:product.product,partner_ref:0
-msgid "Customer ref"
-msgstr "Ссылка на клиента"
-
-#. module: product
-#: field:product.supplierinfo,qty:0
+#: field:product.supplierinfo,min_qty:0
 msgid "Minimal Quantity"
 msgstr "Минимальное количество"
 
@@ -559,53 +1254,24 @@ msgid "PC"
 msgstr "ПК"
 
 #. module: product
-#: help:product.template,seller_delay:0
+#: help:product.supplierinfo,product_code:0
 msgid ""
-"This is the average delay in days between the purchase order confirmation "
-"and the reception of goods for this product and for the default supplier. It "
-"is used by the scheduler to order requests based on reordering delays."
+"This supplier's product code will be used when printing a request for "
+"quotation. Keep empty to use the internal one."
 msgstr ""
+"Этот код продукции поставщика будет использован при печати запроса цен. "
+"Оставьте пустым для использования внутреннего кода."
 
 #. module: product
-#: field:product.template,seller_delay:0
-msgid "Supplier Lead Time"
-msgstr "Время поставки"
-
-#. module: product
-#: model:product.pricelist.version,name:product.ver0
-msgid "Default Public Pricelist Version"
-msgstr ""
-
-#. module: product
-#: field:product.pricelist.type,key:0
-msgid "Key"
-msgstr "Ключ"
+#: selection:product.template,procure_method:0
+msgid "Make to Stock"
+msgstr "Изготовление про запас"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
 msgid "Price List Version"
 msgstr "Версия каталога"
 
-#. module: product
-#: view:product.pricelist.item:0
-msgid "Rules Test Match"
-msgstr ""
-
-#. module: product
-#: help:res.partner,property_product_pricelist:0
-msgid ""
-"This pricelist will be used, instead of the default one,                     "
-"for sales to the current partner"
-msgstr ""
-"При продаже данному партнеру будет использован не каталог по умолчанию, а "
-"этот каталог."
-
-#. module: product
-#: model:ir.model,name:product.model_product_pricelist
-#: view:product.supplierinfo:0
-msgid "Pricelist"
-msgstr "Каталог"
-
 #. module: product
 #: selection:product.template,type:0
 msgid "Consumable"
@@ -621,163 +1287,26 @@ msgstr "Валюта"
 msgid "The gross weight in Kg."
 msgstr "Вес брутто в килограммах."
 
-#. module: product
-#: selection:product.ul,type:0
-msgid "Box"
-msgstr "Коробка"
-
-#. module: product
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
-#. module: product
-#: help:product.template,sale_ok:0
-msgid ""
-"Determine if the product can be visible in the list of product within a "
-"selection from a sale order line."
-msgstr ""
-"Указывается, если продукция должна быть видна в списке продукции на продажу."
-
-#. module: product
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-"Ошибка. Единицы продажи и единицы измерения должны принадлежать к разным "
-"категориям."
-
-#. module: product
-#: field:product.category,parent_id:0
-msgid "Parent Category"
-msgstr "Категория предка"
-
-#. module: product
-#: selection:product.template,state:0
-msgid "In Development"
-msgstr "В разработке"
-
-#. module: product
-#: help:product.pricelist.type,key:0
-msgid ""
-"Used in the code to select specific prices based on the context. Keep "
-"unchanged."
-msgstr ""
-
-#. module: product
-#: help:product.product,outgoing_qty:0
-msgid ""
-"Quantities of products that are planned to leave in selected locations or "
-"all internal if none have been selected."
-msgstr ""
-"Количества продукции, которые планируется отправить в указанные места, или "
-"вся внутренняя, если ничего не выбранно."
-
-#. module: product
-#: field:product.packaging,weight:0
-msgid "Total Package Weight"
-msgstr "Итоговый вес пакета"
-
-#. module: product
-#: help:product.template,procure_method:0
-msgid ""
-"'Make to Stock': When needed, take from the stock or wait until re-"
-"supplying. 'Make to Order': When needed, purchase or produce for the "
-"procurement request."
-msgstr ""
-
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement"
 msgstr "Снабжение"
 
-#. module: product
-#: model:ir.actions.act_window,name:product.product_category_action
-#: model:ir.ui.menu,name:product.menu_product_category_action
-msgid "Products by Category"
-msgstr "ТМЦ по категориям"
-
-#. module: product
-#: model:product.template,name:product.product_product_hdd1_product_template
-msgid "HDD Seagate 7200.8 80GB"
-msgstr "Жёсткий диск Seagate 7200.8 80GB"
-
-#. module: product
-#: help:product.pricelist.version,active:0
-msgid ""
-"When a version is duplicated it is set to non active, so that the dates do "
-"not overlaps with original version. You should change the dates and "
-"reactivate the pricelist"
-msgstr ""
-
-#. module: product
-#: model:product.template,name:product.product_product_hdd3_product_template
-msgid "HDD Seagate 7200.8 160GB"
-msgstr "Жёсткий диск Seagate 7200.8 160GB"
-
-#. module: product
-#: view:product.product:0
-msgid "Product Variant"
-msgstr "Вариант ТМЦ"
-
-#. module: product
-#: field:product.packaging,ul:0
-msgid "Type of Package"
-msgstr "Тип упаковки"
-
-#. module: product
-#: field:product.template,loc_rack:0
-msgid "Rack"
-msgstr "Стеллаж"
-
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
 msgstr "Категория единиц измерения"
 
 #. module: product
-#: selection:product.ul,type:0
-msgid "Pack"
-msgstr "Упаковка"
+#: field:product.template,loc_rack:0
+msgid "Rack"
+msgstr "Стеллаж"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13"
-msgstr "Штрих-код 13"
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-#: field:product.template,description_sale:0
-msgid "Sale Description"
-msgstr "Описание продужи"
-
-#. module: product
-#: field:product.template,uos_id:0
-msgid "Unit of Sale"
-msgstr "Единица продажи"
-
-#. module: product
-#: field:product.template,mes_type:0
-msgid "Measure Type"
-msgstr "Тип измерения"
-
-#. module: product
-#: model:product.uom.categ,name:product.product_uom_categ_kgm
-msgid "Weight"
-msgstr "Вес"
-
-#. module: product
-#: model:product.template,name:product.product_product_22_product_template
-msgid "Processor on demand"
-msgstr ""
-
-#. module: product
-#: help:product.supplierinfo,product_name:0
-msgid ""
-"Name of the product for this partner, will be used when printing a request "
-"for quotation. Keep empty to use the internal one."
-msgstr ""
+#: field:product.template,uom_po_id:0
+msgid "Purchase Unit of Measure"
+msgstr "Единицы измерения при закупке"
 
 #. module: product
 #: field:product.template,supply_method:0
@@ -785,68 +1314,28 @@ msgid "Supply method"
 msgstr "Метод поставки"
 
 #. module: product
-#: model:product.category,name:product.product_category_11
-msgid "IT components kits"
-msgstr ""
-
-#. module: product
-#: view:product.uom.categ:0
-msgid "Units of Measure categories"
-msgstr "Категории единиц измерения"
-
-#. module: product
-#: field:product.category,sequence:0
-#: field:product.packaging,sequence:0
-#: field:product.pricelist.item,sequence:0
-msgid "Sequence"
-msgstr "Последовательность"
-
-#. module: product
-#: view:product.supplierinfo:0
-msgid "Supplier Information"
-msgstr "Информация поставщика"
-
-#. module: product
-#: model:ir.actions.act_window,name:product.product_ul_form_action
-#: model:ir.model,name:product.model_product_packaging
-#: model:ir.ui.menu,name:product.menu_product_ul_form_action
-#: view:product.packaging:0
 #: view:product.product:0
-#: view:product.ul:0
-msgid "Packaging"
-msgstr "Упаковка"
-
-#. module: product
-#: field:product.price.type,currency_id:0
-#: field:product.pricelist,currency_id:0
-msgid "Currency"
-msgstr "Валюта"
+msgid "Group by..."
+msgstr "Объединять по..."
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
 msgid "Regular processor config"
 msgstr "Типовая конфигурация процессора"
 
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Descriptions"
-msgstr "Описания"
-
-#. module: product
-#: model:process.transition,name:product.process_transition_supplierofproduct0
-msgid "Suppliers of Product"
-msgstr "Поставщики изделия"
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
 msgstr "Дата начала"
 
 #. module: product
-#: view:res.partner:0
-msgid "Sales Properties"
-msgstr "Свойства продажи"
+#: help:product.template,produce_delay:0
+msgid ""
+"Average delay in days to produce this product. This is only for the "
+"production order and, if it is a multi-level bill of material, it's only for "
+"the level of this product. Different lead times will be summed for all "
+"levels and purchase orders."
+msgstr ""
 
 #. module: product
 #: help:product.product,qty_available:0
@@ -862,124 +1351,43 @@ msgstr ""
 msgid "Basic PC"
 msgstr "Базовый ПК"
 
-#. module: product
-#: field:product.template,loc_row:0
-msgid "Row"
-msgstr "Строка"
-
-#. module: product
-#: field:product.template,categ_id:0
-msgid "Category"
-msgstr "Категория"
-
-#. module: product
-#: help:product.pricelist.item,min_quantity:0
-msgid ""
-"The rule only applies if the partner buys/sells more than this quantity."
-msgstr ""
-"Правило применяется только в случае, если партнёр покупает или продает более "
-"этой величины."
-
-#. module: product
-#: model:product.template,name:product.product_product_ram_product_template
-msgid "DDR 256MB PC400"
-msgstr "DDR 256MB PC400"
-
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Real Stock"
 msgstr "Доступные запасы"
 
 #. module: product
-#: view:product.category:0
-msgid "Product Categories"
-msgstr "Категории ТМЦ"
-
-#. module: product
-#: help:product.uom,category_id:0
-msgid ""
-"Unit of Measure of a category can be converted between each others in the "
-"same category."
-msgstr ""
-"Единицы измерения могут быть приведены друг к другу в пределах одной "
-"категории."
+#: model:product.uom,name:product.product_uom_cm
+msgid "cm"
+msgstr "см"
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom
 msgid "Product Unit of Measure"
 msgstr "Ед. изм. продукции"
 
-#. module: product
-#: field:product.template,sale_ok:0
-msgid "Can be sold"
-msgstr "Можно продавать"
-
-#. module: product
-#: model:product.template,name:product.product_product_23_product_template
-msgid "Complete PC With Peripherals"
-msgstr "Комплектовать ПК периферией"
-
 #. module: product
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Ошибка. ед. изм. по умолчанию и закупочные ед. изм. должны иметь одинаковую "
+"категорию."
 
 #. module: product
-#: model:product.template,name:product.product_product_mb2_product_template
-msgid "Mainboard ASUStek A7V8X-X"
-msgstr "Материнская плата ASUStek A7V8X-X"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Ошибка ! Нельзя создать зацикленные меню."
 
 #. module: product
-#: field:product.uom,factor:0
-msgid "Rate"
-msgstr "Курс"
+#: view:product.uom:0
+msgid "Unit of Measure Properties"
+msgstr "Свойства единиц измерения"
 
 #. module: product
-#: view:product.pricelist.item:0
-msgid "Products Listprices Items"
-msgstr "Элкменты каталога продукции"
-
-#. module: product
-#: field:product.uom,rounding:0
-msgid "Rounding Precision"
-msgstr "Точность округления"
-
-#. module: product
-#: help:product.packaging,width:0
-msgid "The width of the package"
-msgstr "Ширина пакета"
-
-#. module: product
-#: field:product.packaging,qty:0
-msgid "Quantity by Package"
-msgstr "Количество по пакету"
-
-#. module: product
-#: help:product.template,uos_id:0
-msgid ""
-"Used by companies that manages two unit of measure: invoicing and inventory "
-"management. For example, in food industries, you will manage a stock of ham "
-"but invoice in Kg. Keep empty to use the default UOM."
-msgstr ""
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Procurement & Locations"
-msgstr "Снабжение и местоположения"
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-#: field:product.template,state:0
-msgid "Status"
-msgstr "Статус"
-
-#. module: product
-#: field:product.product,outgoing_qty:0
-msgid "Outgoing"
-msgstr "Исходящее"
+#: model:product.template,name:product.product_product_shelf1_product_template
+msgid "Rack 200cm"
+msgstr "Стойка 200 см"
 
 #. module: product
 #: selection:product.template,supply_method:0
@@ -987,36 +1395,9 @@ msgid "Buy"
 msgstr "Покупка"
 
 #. module: product
-#: model:ir.model,name:product.model_product_pricelist_version
-#: view:product.pricelist:0
-#: view:product.pricelist.version:0
-msgid "Pricelist Version"
-msgstr "Версия каталога"
-
-#. module: product
-#: field:product.pricelist.item,price_round:0
-msgid "Price Rounding"
-msgstr "Округление цены"
-
-#. module: product
-#: model:product.price.type,name:product.list_price
-msgid "Public Price"
-msgstr ""
-
-#. module: product
-#: field:product.pricelist.item,price_max_margin:0
-msgid "Max. Price Margin"
-msgstr "Максимальная маржа цены"
-
-#. module: product
-#: view:res.partner:0
-msgid "Sales & Purchases"
-msgstr "Продажи и закупки"
-
-#. module: product
-#: model:product.category,name:product.product_category_10
-msgid "IT components"
-msgstr ""
+#: view:product.uom.categ:0
+msgid "Units of Measure categories"
+msgstr "Категории единиц измерения"
 
 #. module: product
 #: help:product.packaging,weight_ul:0
@@ -1024,40 +1405,10 @@ msgid "The weight of the empty UL"
 msgstr ""
 
 #. module: product
-#: help:product.packaging,code:0
-msgid "The code of the transport unit."
-msgstr "Код транспортной единицы."
-
-#. module: product
-#: field:product.template,uom_po_id:0
-msgid "Purchase UoM"
+#: selection:product.uom,uom_type:0
+msgid "Smaller than the reference UoM"
 msgstr ""
 
-#. module: product
-#: view:product.price.type:0
-msgid "Products Price Type"
-msgstr "Тип цены продукции"
-
-#. module: product
-#: field:product.template,product_manager:0
-msgid "Product Manager"
-msgstr "Менеджер продукции"
-
-#. module: product
-#: field:product.product,price_extra:0
-msgid "Variant Price Extra"
-msgstr ""
-
-#. module: product
-#: model:product.template,name:product.product_product_fan_product_template
-msgid "Regular case fan 80mm"
-msgstr ""
-
-#. module: product
-#: model:ir.model,name:product.model_product_supplierinfo
-msgid "Information about a product supplier"
-msgstr "Информация о поставщике продукции"
-
 #. module: product
 #: field:product.price.type,active:0
 #: field:product.pricelist,active:0
@@ -1065,90 +1416,22 @@ msgstr "Информация о поставщике продукции"
 #: field:product.product,active:0
 #: field:product.uom,active:0
 msgid "Active"
-msgstr "Активен"
+msgstr "Активно"
 
 #. module: product
 #: field:product.product,price_margin:0
 msgid "Variant Price Margin"
 msgstr "Маржа цены варианта"
 
-#. module: product
-#: wizard_view:product.price_list,init:0
-msgid "Price list"
-msgstr "Прайс"
-
-#. module: product
-#: model:product.template,name:product.product_product_pc3_product_template
-msgid "Medium PC"
-msgstr "Средний ПК"
-
-#. module: product
-#: model:ir.model,name:product.model_pricelist_partnerinfo
-msgid "pricelist.partnerinfo"
-msgstr ""
-
-#. module: product
-#: model:product.price.type,name:product.standard_price
-#: field:product.template,standard_price:0
-msgid "Cost Price"
-msgstr "Себестоимость"
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-#: field:product.template,description_purchase:0
-msgid "Purchase Description"
-msgstr "Описание закупки"
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Second UoM"
-msgstr ""
-
-#. module: product
-#: model:product.category,name:product.product_category_4
-msgid "Dello Computer"
-msgstr ""
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Storage Localisation"
-msgstr ""
-
-#. module: product
-#: help:product.packaging,length:0
-msgid "The length of the package"
-msgstr "Длина пакета"
-
-#. module: product
-#: field:product.pricelist.item,price_min_margin:0
-msgid "Min. Price Margin"
-msgstr "Минимальная маржа цены"
-
 #. module: product
 #: help:product.packaging,ean:0
 msgid "The EAN code of the package unit."
 msgstr "Штрих-код EAN упаковки"
 
 #. module: product
-#: field:product.template,weight:0
-msgid "Gross weight"
-msgstr "Вес брутто"
-
-#. module: product
-#: help:product.product,packaging:0
-msgid ""
-"Gives the different ways to package the same product. This has no impact on "
-"the packing order and is mainly used if you use the EDI module."
-msgstr ""
-
-#. module: product
-#: model:ir.model,name:product.model_product_category
-#: field:product.pricelist.item,categ_id:0
-msgid "Product Category"
-msgstr "Категория ТМЦ"
+#: field:product.packaging,weight_ul:0
+msgid "Empty Package Weight"
+msgstr "Вес пустого пакета"
 
 #. module: product
 #: field:product.price.type,field:0
@@ -1157,107 +1440,36 @@ msgstr "Поле продукции"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_type_action
-#: model:ir.ui.menu,name:product.menu_product_pricelist_type_action
 msgid "Pricelists Types"
 msgstr "Тпипы каталогов"
 
 #. module: product
-#: help:product.template,state:0
-msgid "Tells the user if he can use the product or not."
-msgstr "Сообщите пользователю, может ли он пользоваться продукцией"
-
-#. module: product
-#: field:product.supplierinfo,product_code:0
-msgid "Partner Product Code"
-msgstr ""
-
-#. module: product
-#: model:product.category,name:product.product_category_3
-msgid "Computer Stuff"
-msgstr ""
-
-#. module: product
-#: field:product.packaging,code:0
-#: field:product.product,code:0
-#: field:product.product,default_code:0
-msgid "Code"
-msgstr "Код"
-
-#. module: product
-#: help:product.uom,factor_inv:0
+#: help:product.uom,factor:0
 msgid ""
-"The coefficient for the formula:\n"
-"coeff (base unit) = 1 (this unit). Factor = 1 / Rate."
+"How many times this UoM is smaller than the reference UoM in this category:\n"
+"1 * (reference unit) = ratio * (this unit)"
 msgstr ""
 
-#. module: product
-#: view:product.supplierinfo:0
-msgid "Seq"
-msgstr "Последовательность"
-
-#. module: product
-#: model:product.category,name:product.product_category_8
-msgid "Phone Help"
-msgstr "Телефон помощи"
-
-#. module: product
-#: selection:product.template,mes_type:0
-msgid "Variable"
-msgstr "Переменный"
-
 #. module: product
 #: help:product.template,uom_id:0
 msgid "Default Unit of Measure used for all stock operation."
 msgstr ""
+"Единица измерения по умолчанию, используемая для всех операций с ТМЦ."
 
 #. module: product
-#: model:ir.model,name:product.model_product_template
-#: field:product.pricelist.item,product_tmpl_id:0
-#: field:product.product,product_tmpl_id:0
-#: view:product.template:0
-msgid "Product Template"
-msgstr "Шаблон ТМЦ"
-
-#. module: product
-#: model:ir.model,name:product.model_product_ul
-msgid "Shipping Unit"
-msgstr "Единица поставки"
-
-#. module: product
-#: help:product.uom,rounding:0
-msgid ""
-"The computed quantity will be a multiple of this value. Use 1.0 for products "
-"that can not be split."
-msgstr ""
-"Расчетная величина будет кратна этому значению. Используйте 1.0 для "
-"продуктов, которые не могут быть разделены."
-
-#. module: product
-#: field:product.packaging,height:0
-msgid "Height"
-msgstr "Высота"
+#: model:product.category,name:product.product_category_misc0
+msgid "Misc"
+msgstr "Прочее"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc4_product_template
 msgid "Customizable PC"
-msgstr ""
+msgstr "Настраиваемый ПК"
 
 #. module: product
-#: help:product.pricelist.version,date_end:0
-msgid "Ending date for this pricelist version to be valid."
-msgstr "Конечная дата, до которой каталог действителен"
-
-#. module: product
-#: field:pricelist.partnerinfo,suppinfo_id:0
-msgid "Partner Information"
-msgstr "Информация партнера"
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-#: field:product.template,type:0
-msgid "Product Type"
-msgstr "Тип ТМЦ"
+#: field:pricelist.partnerinfo,price:0
+msgid "Unit Price"
+msgstr "Цена за ед."
 
 #. module: product
 #: model:product.category,name:product.product_category_7
@@ -1265,68 +1477,20 @@ msgstr "Тип ТМЦ"
 msgid "Onsite Intervention"
 msgstr "Вмешательство на месте"
 
-#. module: product
-#: model:product.category,name:product.cat0
-msgid "All products"
-msgstr "Все ТМЦ"
-
-#. module: product
-#: wizard_button:product.price_list,init,end:0
-msgid "Cancel"
-msgstr "Отмена"
-
-#. module: product
-#: help:product.packaging,qty:0
-msgid "The total number of products you can put by palet or box."
-msgstr ""
-
-#. module: product
-#: model:ir.model,name:product.model_product_pricelist_item
-msgid "Pricelist item"
-msgstr "Элемент каталога"
-
-#. module: product
-#: model:ir.actions.wizard,name:product.report_wizard_price
-#: field:product.pricelist.version,pricelist_id:0
-msgid "Price List"
-msgstr "Каталог"
-
 #. module: product
 #: model:product.pricelist,name:product.list0
 msgid "Public Pricelist"
+msgstr "Открытый каталог"
+
+#. module: product
+#: model:product.category,name:product.product_category_marketableproduct0
+msgid "Marketable Products"
 msgstr ""
 
 #. module: product
-#: model:product.template,name:product.product_product_21_product_template
-msgid "RAM on demand"
-msgstr ""
-
-#. module: product
-#: selection:product.ul,type:0
-#: model:product.uom.categ,name:product.product_uom_categ_unit
-msgid "Unit"
-msgstr "Ед."
-
-#. module: product
-#: model:product.template,name:product.product_product_hdd2_product_template
-msgid "HDD Seagate 7200.8 120GB"
-msgstr "Жесткий диск Seagate 7200.8 120GB"
-
-#. module: product
-#: wizard_field:product.price_list,init,qty2:0
-msgid "Quantity-2"
-msgstr "Количество-2"
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Information"
-msgstr "Информация"
-
-#. module: product
-#: view:product.product:0
-msgid "Codes"
-msgstr "Коды"
+#: field:product.supplierinfo,product_code:0
+msgid "Supplier Product Code"
+msgstr "Код ТМЦ поставщика"
 
 #. module: product
 #: constraint:ir.model:0
@@ -1337,85 +1501,30 @@ msgstr ""
 "символов !"
 
 #. module: product
-#: wizard_field:product.price_list,init,qty4:0
-msgid "Quantity-4"
-msgstr "Количество-4"
-
-#. module: product
-#: wizard_field:product.price_list,init,qty5:0
-msgid "Quantity-5"
-msgstr "Количество-5"
-
-#. module: product
-#: view:product.packaging:0
 #: view:product.product:0
-msgid "Other Info"
-msgstr "Прочая информация"
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Delays"
-msgstr "Задержки"
-
-#. module: product
-#: field:product.pricelist.version,items_id:0
-msgid "Price List Items"
-msgstr "Элементы каталога"
-
-#. module: product
-#: help:product.supplierinfo,product_code:0
-msgid ""
-"Code of the product for this partner, will be used when printing a request "
-"for quotation. Keep empty to use the internal one."
-msgstr ""
-
-#. module: product
-#: selection:product.template,state:0
-msgid "Obsolete"
-msgstr "Устаревший"
+msgid "Default UOM"
+msgstr "Ед. изм. по умолчанию"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pallet"
-msgstr ""
+msgstr "Поддон"
 
 #. module: product
-#: field:pricelist.partnerinfo,price:0
-msgid "Unit Price"
-msgstr "Цена за ед."
+#: field:product.packaging,ul_qty:0
+msgid "Package by layer"
+msgstr "Упаковка по слоям"
 
 #. module: product
 #: field:product.template,warranty:0
 msgid "Warranty (months)"
 msgstr "Гарантия (мес.)"
 
-#. module: product
-#: field:product.packaging,ul_qty:0
-msgid "Package by layer"
-msgstr ""
-
-#. module: product
-#: help:product.template,type:0
-msgid ""
-"Will change the way procurements are processed. Consumables are stockable "
-"products with infinite stock, or for use when you have no inventory "
-"management in the system."
-msgstr ""
-
-#. module: product
-#: model:process.node,note:product.process_node_supplier0
-msgid "Product suppliers, with their product name, price, etc."
-msgstr "Поставщики изделия, с названиями и ценами"
-
-#. module: product
-#: model:ir.model,name:product.model_product_price_type
-msgid "Price type"
-msgstr "Тип цены"
-
 #. module: product
 #: model:ir.model,name:product.model_product_product
+#: model:ir.ui.menu,name:product.prod_config_main
 #: model:process.node,name:product.process_node_product0
+#: model:process.process,name:product.process_process_productprocess0
 #: field:product.packaging,product_id:0
 #: field:product.pricelist.item,product_id:0
 #: view:product.product:0
@@ -1424,61 +1533,6 @@ msgstr "Тип цены"
 msgid "Product"
 msgstr "Товарно-материальные ценности"
 
-#. module: product
-#: field:product.template,volume:0
-msgid "Volume"
-msgstr "Объем"
-
-#. module: product
-#: field:pricelist.partnerinfo,name:0
-#: field:product.packaging,name:0
-#: view:product.product:0
-#: view:product.template:0
-#: field:product.template,description:0
-msgid "Description"
-msgstr "Описание"
-
-#. module: product
-#: field:product.packaging,ean:0
-msgid "EAN"
-msgstr ""
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Product Description"
-msgstr "Описание продукции"
-
-#. module: product
-#: view:product.pricelist.item:0
-msgid " ) + "
-msgstr " ) + "
-
-#. module: product
-#: help:product.template,sale_delay:0
-msgid ""
-"This is the average time between the confirmation of the customer order and "
-"the delivery of the finished products. It's the time you promise to your "
-"customers."
-msgstr ""
-"Среднее время между подтверждением заказа и доставкой товара. Это время вы "
-"сообщаете заказчикам."
-
-#. module: product
-#: model:ir.model,name:product.model_product_uom_categ
-msgid "Product uom categ"
-msgstr "Категория ед. изм. продукции"
-
-#. module: product
-#: wizard_field:product.price_list,init,qty3:0
-msgid "Quantity-3"
-msgstr "Количество-3"
-
-#. module: product
-#: model:product.ul,name:product.product_ul_box
-msgid "Box 20x20x40"
-msgstr ""
-
 #. module: product
 #: selection:product.template,supply_method:0
 msgid "Produce"
@@ -1489,45 +1543,16 @@ msgstr "Прозвести"
 msgid "Make to Order"
 msgstr "Изготовление на заказ"
 
-#. module: product
-#: field:product.pricelist.item,price_surcharge:0
-msgid "Price Surcharge"
-msgstr "Надбавка к цене"
-
-#. module: product
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: product
-#: view:product.pricelist.item:0
-msgid "Rounding Method"
-msgstr "Метод округления"
-
 #. module: product
 #: field:product.product,variants:0
 msgid "Variants"
 msgstr "Варианты"
 
 #. module: product
-#: view:product.pricelist.item:0
-msgid "Price Computation"
-msgstr "Расчет цены"
-
-#. module: product
-#: model:product.template,name:product.product_product_mb1_product_template
-msgid "Mainboard ASUStek A7N8X"
-msgstr "Материнская плата ASUStek A7N8X"
-
-#. module: product
-#: field:product.template,loc_case:0
-msgid "Case"
-msgstr ""
-
-#. module: product
-#: field:product.pricelist.version,date_end:0
-msgid "End Date"
-msgstr "Дата окончания"
+#: model:ir.actions.act_window,name:product.product_category_action
+#: model:ir.ui.menu,name:product.menu_products_category
+msgid "Products by Category"
+msgstr "ТМЦ по категориям"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
@@ -1535,49 +1560,590 @@ msgstr "Дата окончания"
 msgid "Products Categories"
 msgstr "Категории ТМЦ"
 
-#. module: product
-#: field:product.product,packaging:0
-msgid "Logistical Units"
-msgstr ""
-
-#. module: product
-#: field:product.category,complete_name:0
-#: field:product.category,name:0
-#: field:product.pricelist.type,name:0
-#: field:product.pricelist.version,name:0
-#: field:product.template,name:0
-#: field:product.ul,name:0
-#: field:product.uom,name:0
-#: field:product.uom.categ,name:0
-msgid "Name"
-msgstr "Название"
-
-#. module: product
-#: help:product.template,uos_coeff:0
-msgid ""
-"Coefficient to convert UOM to UOS\n"
-" uom = uos * coeff"
-msgstr ""
-
-#. module: product
-#: field:product.template,purchase_ok:0
-msgid "Can be Purchased"
-msgstr "Можно закупать"
-
 #. module: product
 #: field:product.template,uos_coeff:0
 msgid "UOM -> UOS Coeff"
 msgstr ""
 
 #. module: product
-#: model:product.template,name:product.product_product_cpu2_product_template
-msgid "High speed processor config"
+#: help:product.supplierinfo,sequence:0
+msgid "Assigns the priority to the list of product supplier."
+msgstr "Назначает приоритет в списке поставщиков ТМЦ."
+
+#. module: product
+#: field:product.template,uom_id:0
+msgid "Default Unit Of Measure"
+msgstr "Единица измерения по умолчанию"
+
+#. module: product
+#: model:product.template,name:product.product_product_tow1_product_template
+msgid "ATX Mid-size Tower"
+msgstr "Среднеразмерный ATX корпус"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Rounding Method"
+msgstr "Метод округления"
+
+#. module: product
+#: model:ir.actions.report.xml,name:product.report_product_label
+msgid "Products Labels"
+msgstr "Этикетки изделия"
+
+#. module: product
+#: model:product.ul,name:product.product_ul_big_box
+msgid "Box 30x40x60"
+msgstr "Коробка 30x40x60"
+
+#. module: product
+#: selection:product.template,type:0
+msgid "Service"
+msgstr "Услуга"
+
+#. module: product
+#: help:product.packaging,height:0
+msgid "The height of the package"
+msgstr "Высота упаковки"
+
+#. module: product
+#: view:product.pricelist:0
+msgid "Products Price List"
+msgstr "Каталог продукции"
+
+#. module: product
+#: field:product.pricelist,company_id:0
+#: field:product.pricelist.item,company_id:0
+#: field:product.pricelist.version,company_id:0
+#: field:product.supplierinfo,company_id:0
+#: field:product.template,company_id:0
+msgid "Company"
+msgstr "Компания"
+
+#. module: product
+#: field:product.product,lst_price:0
+msgid "List Price"
+msgstr "Цена по каталогу"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_price_type_action
+msgid "Prices Types"
+msgstr "Типы цен"
+
+#. module: product
+#: help:product.template,list_price:0
+msgid ""
+"Base price for computing the customer price. Sometimes called the catalog "
+"price."
+msgstr ""
+"Базовая цена для расчёта цены продажи. Иногда называется справочой ценой."
+
+#. module: product
+#: code:addons/product/pricelist.py:0
+#, python-format
+msgid "Partner section of the product form"
+msgstr "Раздел партнера в форме ввода ТМЦ"
+
+#. module: product
+#: help:product.price.type,name:0
+msgid "Name of this kind of price."
+msgstr "Наименование типа цены"
+
+#. module: product
+#: help:product.packaging,qty:0
+msgid "The total number of products you can put by pallet or box."
+msgstr ""
+"Общее количество ТМЦ, которое вы модете разместить на поддоне или в коробке."
+
+#. module: product
+#: help:product.pricelist.version,date_start:0
+msgid "Starting date for this pricelist version to be valid."
+msgstr "Каталог действителен, начиная с даты"
+
+#. module: product
+#: help:product.template,uom_po_id:0
+msgid ""
+"Default Unit of Measure used for purchase orders. It must be in the same "
+"category than the default unit of measure."
+msgstr ""
+"Единицы измерения по умолчанию для заказов на закупку. Должны быть той же "
+"категории, что и единицы измерения по умолчанию."
+
+#. module: product
+#: model:product.template,description:product.product_product_cpu1_product_template
+msgid "This product is configured with example of push/pull flows"
 msgstr ""
 
 #. module: product
-#: model:product.template,name:product.product_product_pc2_product_template
-msgid "Basic+ PC (assembly on order)"
+#: field:product.packaging,length:0
+msgid "Length"
+msgstr "Длина"
+
+#. module: product
+#: model:product.uom.categ,name:product.uom_categ_length
+msgid "Length / Distance"
+msgstr "Длинна / Расстояние"
+
+#. module: product
+#: model:product.template,name:product.product_product_0_product_template
+msgid "Onsite Senior Intervention"
+msgstr "Вмешательство руководства на месте"
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_type
+#: field:product.pricelist,type:0
+#: view:product.pricelist.type:0
+msgid "Pricelist Type"
+msgstr "Тип каталога"
+
+#. module: product
+#: model:product.category,name:product.product_category_otherproducts0
+msgid "Other Products"
+msgstr "Другие ТМЦ"
+
+#. module: product
+#: view:product.product:0
+msgid "Characteristics"
+msgstr "Характеристики"
+
+#. module: product
+#: field:product.template,sale_ok:0
+msgid "Can be Sold"
+msgstr "Может быть продан"
+
+#. module: product
+#: field:product.template,produce_delay:0
+msgid "Manufacturing Lead Time"
+msgstr "Время производства"
+
+#. module: product
+#: field:product.supplierinfo,pricelist_ids:0
+msgid "Supplier Pricelist"
+msgstr "Каталог поставщика"
+
+#. module: product
+#: field:product.pricelist.item,base:0
+msgid "Based on"
+msgstr "На основе"
+
+#. module: product
+#: model:product.category,name:product.product_category_rawmaterial0
+msgid "Raw Materials"
+msgstr "Сырье"
+
+#. module: product
+#: help:product.product,virtual_available:0
+msgid ""
+"Future stock for this product according to the selected locations or all "
+"internal if none have been selected. Computed as: Real Stock - Outgoing + "
+"Incoming."
 msgstr ""
+"Будущие запасы этих ТМЦ в соответствии с выбранным местом хранения (или "
+"всеми внутренними если ничего не было выбрано). Вычисленные как: "
+"Действительные запасы - Исходящие + Входящие."
+
+#. module: product
+#: field:product.pricelist,name:0
+msgid "Pricelist Name"
+msgstr "Название прайс-листа"
+
+#. module: product
+#: help:product.supplierinfo,product_uom:0
+msgid "Supplier Product UoM."
+msgstr "Ед. изм. ТМЦ поставщика."
+
+#. module: product
+#: field:product.uom,rounding:0
+msgid "Rounding Precision"
+msgstr "Точность округления"
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_version
+#: view:product.pricelist:0
+#: view:product.pricelist.version:0
+msgid "Pricelist Version"
+msgstr "Версия каталога"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "* ( 1 + "
+msgstr "* ( 1 + "
+
+#. module: product
+#: help:product.packaging,weight:0
+msgid "The weight of a full package, pallet or box."
+msgstr "Вес полной упаковки, коробки или поддона."
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd2_product_template
+msgid "HDD Seagate 7200.8 120GB"
+msgstr "Жесткий диск Seagate 7200.8 120GB"
+
+#. module: product
+#: model:product.template,name:product.product_product_employee0_product_template
+msgid "Employee"
+msgstr "Сотрудник"
+
+#. module: product
+#: model:product.template,name:product.product_product_shelfofcm0_product_template
+msgid "Shelf of 100cm"
+msgstr "Полка 100см"
+
+#. module: product
+#: model:ir.model,name:product.model_product_category
+#: field:product.pricelist.item,categ_id:0
+msgid "Product Category"
+msgstr "Категория ТМЦ"
+
+#. module: product
+#: report:product.pricelist:0
+msgid "Price List Name"
+msgstr "Название каталога"
+
+#. module: product
+#: field:product.supplierinfo,delay:0
+msgid "Delivery Lead Time"
+msgstr "Время выполнения доставки"
+
+#. module: product
+#: help:product.uom,active:0
+msgid ""
+"By unchecking the active field you can disable a unit of measure without "
+"deleting it."
+msgstr ""
+"Сняв отметку с активного поля \"Активно\", вы можете запретить единицу "
+"измерения без ее удаления."
+
+#. module: product
+#: field:product.template,seller_delay:0
+msgid "Supplier Lead Time"
+msgstr "Время поставки"
+
+#. module: product
+#: help:product.product,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the product "
+"without removing it."
+msgstr ""
+"если поле \"Активно\" установлено в \"истина\", то это позволит вам скрыть "
+"ТМЦ без ее удаления."
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Box"
+msgstr "Коробка"
+
+#. module: product
+#: model:product.template,name:product.product_product_rearpanelarm1_product_template
+msgid "Rear Panel SHE200"
+msgstr "Задняя панель SHE200"
+
+#. module: product
+#: help:product.pricelist.type,key:0
+msgid ""
+"Used in the code to select specific prices based on the context. Keep "
+"unchanged."
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd1_product_template
+msgid "HDD Seagate 7200.8 80GB"
+msgstr "Жёсткий диск Seagate 7200.8 80GB"
+
+#. module: product
+#: help:product.supplierinfo,qty:0
+msgid "This is a quantity which is converted into Default Uom."
+msgstr "Это количество, которое конвертируется в ед. езм. по умолчанию."
+
+#. module: product
+#: field:product.packaging,ul:0
+msgid "Type of Package"
+msgstr "Тип упаковки"
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Pack"
+msgstr "Упаковка"
+
+#. module: product
+#: model:product.category,name:product.product_category_4
+msgid "Dello Computer"
+msgstr ""
+
+#. module: product
+#: model:product.uom.categ,name:product.product_uom_categ_kgm
+msgid "Weight"
+msgstr "Вес"
+
+#. module: product
+#: model:product.template,name:product.product_product_22_product_template
+msgid "Processor on demand"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_25_product_template
+msgid "Mouse"
+msgstr "Мышь"
+
+#. module: product
+#: field:product.uom,uom_type:0
+msgid "UoM Type"
+msgstr "Тип ед. изм."
+
+#. module: product
+#: help:product.template,product_manager:0
+msgid "This is use as task responsible"
+msgstr ""
+
+#. module: product
+#: help:product.uom,rounding:0
+msgid ""
+"The computed quantity will be a multiple of this value. Use 1.0 for a UoM "
+"that cannot be further split, such as a piece."
+msgstr ""
+"Вычисленное количество будет кратно этому значению. Используйте 1.0 для ед. "
+"изм. которые не могут быть разделены, например штуки."
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Descriptions"
+msgstr "Описания"
+
+#. module: product
+#: field:product.template,loc_row:0
+msgid "Row"
+msgstr "Строка"
+
+#. module: product
+#: model:product.template,name:product.product_product_rearpanelarm0_product_template
+msgid "Rear Panel SHE100"
+msgstr "Задняя панель SHE200"
+
+#. module: product
+#: model:product.template,name:product.product_product_23_product_template
+msgid "Complete PC With Peripherals"
+msgstr "Комплектовать ПК периферией"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Weigths"
+msgstr "Вес"
+
+#. module: product
+#: model:product.template,name:product.product_product_hotelexpenses0_product_template
+msgid "Hotel Expenses"
+msgstr "Расходы отеля"
+
+#. module: product
+#: help:product.uom,factor_inv:0
+msgid ""
+"How many times this UoM is bigger than the reference UoM in this category:\n"
+"1 * (this unit) = ratio * (reference unit)"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_shelf0_product_template
+msgid "Rack 100cm"
+msgstr "Стойка 100см"
+
+#. module: product
+#: help:product.packaging,sequence:0
+msgid "Gives the sequence order when displaying a list of packaging."
+msgstr "Дает порядок последовательности при выводе списка упаковок."
+
+#. module: product
+#: field:product.pricelist.item,price_round:0
+msgid "Price Rounding"
+msgstr "Округление цены"
+
+#. module: product
+#: field:product.pricelist.item,price_max_margin:0
+msgid "Max. Price Margin"
+msgstr "Максимальная маржа цены"
+
+#. module: product
+#: help:product.supplierinfo,product_name:0
+msgid ""
+"This supplier's product name will be used when printing a request for "
+"quotation. Keep empty to use the internal one."
+msgstr ""
+"Название продукции, используемое поставщиком, будет выводиться при печати "
+"запроса цен. Оставьте пустым для использования внутреннего названия."
+
+#. module: product
+#: help:product.supplierinfo,min_qty:0
+msgid ""
+"The minimal quantity to purchase to this supplier, expressed in the default "
+"unit of measure."
+msgstr ""
+"Минимальное количество продукции закупаемой у этого поставщика, в единицах "
+"измерения по умолчанию."
+
+#. module: product
+#: selection:product.template,mes_type:0
+msgid "Variable"
+msgstr "Переменный"
+
+#. module: product
+#: field:product.template,rental:0
+msgid "Can be Rent"
+msgstr "Может быть аренда"
+
+#. module: product
+#: model:product.price.type,name:product.standard_price
+#: field:product.template,standard_price:0
+msgid "Cost Price"
+msgstr "Себестоимость"
+
+#. module: product
+#: field:product.pricelist.item,price_min_margin:0
+msgid "Min. Price Margin"
+msgstr "Минимальная маржа цены"
+
+#. module: product
+#: field:product.template,weight:0
+msgid "Gross weight"
+msgstr "Вес брутто"
+
+#. module: product
+#: model:product.template,name:product.product_product_assemblysection0_product_template
+msgid "Assembly Section"
+msgstr "Зона сборки"
+
+#. module: product
+#: model:product.category,name:product.product_category_3
+msgid "Computer Stuff"
+msgstr "Компьютерные компоненты"
+
+#. module: product
+#: model:product.category,name:product.product_category_8
+msgid "Phone Help"
+msgstr "Телефон помощи"
+
+#. module: product
+#: help:product.pricelist.item,price_round:0
+msgid ""
+"Sets the price so that it is a multiple of this value.\n"
+"Rounding is applied after the discount and before the surcharge.\n"
+"To have prices that end in 9.99, set rounding 10, surcharge -0.01"
+msgstr ""
+"Устанавливает цену кратной данному значению.\n"
+"Округление применяется после скидки, но  перед надбавкой.\n"
+"Так, чтобы цена заканчивалась на 9,99, установите округление 10, надбавку -"
+"0,01."
+
+#. module: product
+#: view:product.price_list:0
+msgid "Close"
+msgstr "Закрыть"
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_item
+msgid "Pricelist item"
+msgstr "Элемент каталога"
+
+#. module: product
+#: model:product.template,name:product.product_product_21_product_template
+msgid "RAM on demand"
+msgstr "ОЗУ по требованию"
+
+#. module: product
+#: view:res.partner:0
+msgid "Sales Properties"
+msgstr "Свойства продажи"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_ton
+msgid "tonne"
+msgstr "тонна"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Delays"
+msgstr "Задержки"
+
+#. module: product
+#: model:process.node,note:product.process_node_product0
+msgid "Creation of the product"
+msgstr "Создание ТМЦ"
+
+#. module: product
+#: help:product.template,type:0
+msgid ""
+"Will change the way procurements are processed. Consumables are stockable "
+"products with infinite stock, or for use when you have no inventory "
+"management in the system."
+msgstr ""
+
+#. module: product
+#: field:pricelist.partnerinfo,name:0
+#: field:product.packaging,name:0
+#: report:product.pricelist:0
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,description:0
+msgid "Description"
+msgstr "Описание"
+
+#. module: product
+#: field:product.packaging,ean:0
+msgid "EAN"
+msgstr ""
+
+#. module: product
+#: view:product.template:0
+msgid "Product Description"
+msgstr "Описание продукции"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid " ) + "
+msgstr " ) + "
+
+#. module: product
+#: help:product.product,incoming_qty:0
+msgid ""
+"Quantities of products that are planned to arrive in selected locations or "
+"all internal if none have been selected."
+msgstr ""
+"Объемы продукции, которые планируется достичь в выбранных местах или все "
+"внутренние, если никакие не были выбраны."
+
+#. module: product
+#: field:product.template,volume:0
+msgid "Volume"
+msgstr "Объем"
+
+#. module: product
+#: field:product.template,loc_case:0
+msgid "Case"
+msgstr "Вопрос"
+
+#. module: product
+#: view:product.product:0
+msgid "Product Variant"
+msgstr "Вариант ТМЦ"
+
+#. module: product
+#: model:product.category,name:product.product_category_shelves0
+msgid "Shelves"
+msgstr "Полки"
+
+#. module: product
+#: code:addons/product/pricelist.py:0
+#, python-format
+msgid "Other Pricelist"
+msgstr "Другой прайс"
+
+#. module: product
+#: model:ir.model,name:product.model_product_template
+#: field:product.pricelist.item,product_tmpl_id:0
+#: field:product.product,product_tmpl_id:0
+#: view:product.template:0
+msgid "Product Template"
+msgstr "Шаблон ТМЦ"
 
 #. module: product
 #: field:product.template,cost_method:0
@@ -1588,18 +2154,7 @@ msgstr "Метод ценообразования"
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Palletization"
-msgstr ""
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Prices & Suppliers"
-msgstr "Цены и поставщики"
-
-#. module: product
-#: help:product.packaging,weight:0
-msgid "The weight of a full of products palet or box."
-msgstr ""
+msgstr "Укладка на паллеты"
 
 #. module: product
 #: selection:product.template,state:0
@@ -1607,32 +2162,12 @@ msgid "End of Lifecycle"
 msgstr "Конец жизненного цикла"
 
 #. module: product
-#: model:ir.module.module,shortdesc:product.module_meta_information
-msgid "Products & Pricelists"
-msgstr "ТМЦ и каталоги"
-
-#. module: product
-#: help:product.uom,factor:0
+#: help:product.product,packaging:0
 msgid ""
-"The coefficient for the formula:\n"
-"1 (base unit) = coeff (this unit). Rate = 1 / Factor."
+"Gives the different ways to package the same product. This has no impact on "
+"the picking order and is mainly used if you use the EDI module."
 msgstr ""
 
-#. module: product
-#: help:product.template,weight_net:0
-msgid "The net weight in Kg."
-msgstr "Вес нетто в килограммах."
-
-#. module: product
-#: model:product.template,name:product.product_product_tow1_product_template
-msgid "ATX Mid-size Tower"
-msgstr "Среднеразмерный ATX корпус"
-
-#. module: product
-#: field:product.supplierinfo,delay:0
-msgid "Delivery Delay"
-msgstr "Задержка доставки"
-
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action
 #: model:ir.ui.menu,name:product.menu_product_pricelist_action
@@ -1641,9 +2176,12 @@ msgid "Pricelist Versions"
 msgstr "Версии каталогов"
 
 #. module: product
-#: field:product.packaging,weight_ul:0
-msgid "Empty Package Weight"
-msgstr "Вес пустого пакета"
+#: field:product.category,sequence:0
+#: field:product.packaging,sequence:0
+#: field:product.pricelist.item,sequence:0
+#: field:product.supplierinfo,sequence:0
+msgid "Sequence"
+msgstr "Последовательность"
 
 #. module: product
 #: field:product.template,list_price:0
@@ -1651,23 +2189,9 @@ msgid "Sale Price"
 msgstr "Цена продажи"
 
 #. module: product
-#: help:product.template,produce_delay:0
-msgid ""
-"Average time to produce this product. This is only for the production order "
-"and, if it is a multi-level bill of material, it's only for the level of "
-"this product. Different delays will be summed for all levels and purchase "
-"orders."
-msgstr ""
-
-#. module: product
-#: wizard_field:product.price_list,init,qty1:0
-msgid "Quantity-1"
-msgstr "Количество-1"
-
-#. module: product
-#: field:product.packaging,length:0
-msgid "Length"
-msgstr "Длина"
+#: field:product.category,type:0
+msgid "Category Type"
+msgstr "Тип категории"
 
 #. module: product
 #: model:product.category,name:product.cat2
@@ -1675,31 +2199,21 @@ msgid "Private"
 msgstr ""
 
 #. module: product
-#: help:product.supplierinfo,delay:0
+#: help:product.template,uos_coeff:0
 msgid ""
-"Delay in days between the confirmation of the purchase order and the "
-"reception of the products in your warehouse. Used by the scheduler for "
-"automatic computation of the purchase order planning."
-msgstr ""
-"Задержка в днях между подтверждением заказа и поступлением изделия на склад. "
-"Используется планировщиком для автоматического планирования заказов."
-
-#. module: product
-#: help:product.template,uom_po_id:0
-msgid ""
-"Default Unit of Measure used for purchase orders. It must in the same "
-"category than the default unit of measure."
+"Coefficient to convert UOM to UOS\n"
+" uos = uom * coeff"
 msgstr ""
 
 #. module: product
-#: constraint:product.product:0
-msgid "Error: Invalid ean code"
-msgstr "Ошибка: Неправильный штрих-код"
+#: field:product.pricelist.item,price_discount:0
+msgid "Price Discount"
+msgstr "Скидка с цены"
 
 #. module: product
-#: field:product.pricelist.item,min_quantity:0
-msgid "Min. Quantity"
-msgstr "Мин. кол-во"
+#: help:product.template,volume:0
+msgid "The volume in m3."
+msgstr "Объём в метрах куб."
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
@@ -1708,27 +2222,124 @@ msgid ""
 "and his childs. Keep empty for all products"
 msgstr ""
 
-#. module: product
-#: model:ir.actions.report.xml,name:product.report_product_label
-msgid "Products Labels"
-msgstr "Этикетки изделия"
+#~ msgid ""
+#~ "Determine if the product can be visible in the list of product within a "
+#~ "selection from a sale order line."
+#~ msgstr ""
+#~ "Указывается, если продукция должна быть видна в списке продукции на продажу."
 
-#. module: product
-#: help:product.template,volume:0
-msgid "The volume in m3."
-msgstr "Объём в метрах куб."
+#~ msgid ""
+#~ "The minimal quantity to purchase for this supplier, expressed in the default "
+#~ "unit of measure."
+#~ msgstr ""
+#~ "Минимальный размер закупки от этого поставщика, выраженный в стандартных "
+#~ "единицах измерения."
 
-#. module: product
-#: model:product.ul,name:product.product_ul_big_box
-msgid "Box 30x40x60"
-msgstr ""
+#~ msgid "Procure Method"
+#~ msgstr "Метод закупки"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_kgm
-msgid "KGM"
-msgstr ""
+#~ msgid "Customer Price"
+#~ msgstr "Цена клиента"
 
-#. module: product
-#: field:product.pricelist.item,price_discount:0
-msgid "Price Discount"
-msgstr "Скидка с цены"
+#~ msgid "Configuration"
+#~ msgstr "Настройки"
+
+#~ msgid "In Production"
+#~ msgstr "В производстве"
+
+#~ msgid "Priority"
+#~ msgstr "Приоритет"
+
+#~ msgid "Factor"
+#~ msgstr "Множитель"
+
+#~ msgid ""
+#~ "This pricelist will be used, instead of the default one,                     "
+#~ "for sales to the current partner"
+#~ msgstr ""
+#~ "При продаже данному партнеру будет использован не каталог по умолчанию, а "
+#~ "этот каталог."
+
+#~ msgid "Can be sold"
+#~ msgstr "Можно продавать"
+
+#~ msgid "Rate"
+#~ msgstr "Курс"
+
+#~ msgid "Price list"
+#~ msgstr "Прайс"
+
+#~ msgid "Price type"
+#~ msgstr "Тип цены"
+
+#~ msgid ""
+#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
+#~ "that can not be split."
+#~ msgstr ""
+#~ "Расчетная величина будет кратна этому значению. Используйте 1.0 для "
+#~ "продуктов, которые не могут быть разделены."
+
+#~ msgid "Cancel"
+#~ msgstr "Отмена"
+
+#~ msgid "Prices & Suppliers"
+#~ msgstr "Цены и поставщики"
+
+#~ msgid "Delivery Delay"
+#~ msgstr "Задержка доставки"
+
+#~ msgid "Number of Layer"
+#~ msgstr "Число слоёв"
+
+#~ msgid "The number of layer on a palet or box"
+#~ msgstr "Число слоёв на палете или в коробке"
+
+#~ msgid "Supplier Info"
+#~ msgstr "Информация о поставщике"
+
+#~ msgid "Rentable Product"
+#~ msgstr "Изделие для аренды"
+
+#~ msgid "You can see the list of suppliers for that product."
+#~ msgstr "Вы можете просмотреть список поставщиков этого изделия"
+
+#~ msgid "Default UoM"
+#~ msgstr "Единица измерения по умолчанию"
+
+#~ msgid "Prices Computations"
+#~ msgstr "Вычисление цен"
+
+#~ msgid "Suppliers of Product"
+#~ msgstr "Поставщики изделия"
+
+#~ msgid ""
+#~ "Unit of Measure of a category can be converted between each others in the "
+#~ "same category."
+#~ msgstr ""
+#~ "Единицы измерения могут быть приведены друг к другу в пределах одной "
+#~ "категории."
+
+#~ msgid ""
+#~ "This is the average time between the confirmation of the customer order and "
+#~ "the delivery of the finished products. It's the time you promise to your "
+#~ "customers."
+#~ msgstr ""
+#~ "Среднее время между подтверждением заказа и доставкой товара. Это время вы "
+#~ "сообщаете заказчикам."
+
+#~ msgid "Product suppliers, with their product name, price, etc."
+#~ msgstr "Поставщики изделия, с названиями и ценами"
+
+#~ msgid ""
+#~ "Delay in days between the confirmation of the purchase order and the "
+#~ "reception of the products in your warehouse. Used by the scheduler for "
+#~ "automatic computation of the purchase order planning."
+#~ msgstr ""
+#~ "Задержка в днях между подтверждением заказа и поступлением изделия на склад. "
+#~ "Используется планировщиком для автоматического планирования заказов."
+
+#~ msgid "Partner Product Name"
+#~ msgstr "Наименование изделия партнёра"
+
+#~ msgid "Create new Product"
+#~ msgstr "Создать ТМЦ"
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index 36024f72900..5fb2e4bb73e 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-24 15:52+0000\n"
+"PO-Revision-Date: 2010-10-25 17:14+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-10-25 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -179,7 +179,7 @@ msgstr "С уважением,"
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Чистый итог:"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -295,7 +295,7 @@ msgstr "Подтверждено"
 #. module: purchase
 #: model:process.node,name:purchase.process_node_productrecept0
 msgid "Product Receipt"
-msgstr ""
+msgstr "Получение ТМЦ"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
@@ -570,7 +570,7 @@ msgstr "Запрос цен, предложенный системой."
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
 msgid "Packing Invoice"
-msgstr ""
+msgstr "Счет на упаковку"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
diff --git a/addons/purchase_analytic_plans/i18n/ru.po b/addons/purchase_analytic_plans/i18n/ru.po
index 80364d09207..58bccbcb450 100644
--- a/addons/purchase_analytic_plans/i18n/ru.po
+++ b/addons/purchase_analytic_plans/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-24 15:20+0000\n"
+"PO-Revision-Date: 2010-10-25 07:14+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-10-25 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 0cb51bbb046..3cd78b357d0 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-24 17:27+0000\n"
+"PO-Revision-Date: 2010-10-25 07:16+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-10-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale_analytic_plans/i18n/ru.po b/addons/sale_analytic_plans/i18n/ru.po
index 0d1c8d81760..bb879b36db9 100644
--- a/addons/sale_analytic_plans/i18n/ru.po
+++ b/addons/sale_analytic_plans/i18n/ru.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 14:34+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-25 17:14+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@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-09-29 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
@@ -21,6 +21,14 @@ msgstr ""
 msgid "Analytic Distribution"
 msgstr "Аналитическое распределение"
 
+#. module: sale_analytic_plans
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Название объекта должно начинаться с x_  и не должно содержать специальных "
+"символов !"
+
 #. module: sale_analytic_plans
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
@@ -30,3 +38,8 @@ msgstr "Неправильный XML для просмотра архитект
 #: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
 msgid "Sales Analytic Distribution Management"
 msgstr ""
+
+#. module: sale_analytic_plans
+#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
+msgid "Sale Order Line"
+msgstr "Позиция заказа"
diff --git a/addons/sale_mrp/i18n/ru.po b/addons/sale_mrp/i18n/ru.po
new file mode 100644
index 00000000000..9707875b254
--- /dev/null
+++ b/addons/sale_mrp/i18n/ru.po
@@ -0,0 +1,61 @@
+# Russian 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: 2010-10-18 17:47+0000\n"
+"PO-Revision-Date: 2010-10-25 14:22+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"Language-Team: Russian <ru@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-10-26 04:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sale order."
+msgstr ""
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sale order."
+msgstr ""
+
+#. module: sale_mrp
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильный XML для просмотра архитектуры!"
+
+#. module: sale_mrp
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Название объекта должно начинаться с x_  и не должно содержать специальных "
+"символов !"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sale Name"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Производственный заказ"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sale Reference"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
+msgid "Sales and MRP Management"
+msgstr ""
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index ad29f1a3d1f..eef65412222 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-24 15:35+0000\n"
+"PO-Revision-Date: 2010-10-25 07:16+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-10-25 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/wiki_faq/i18n/ru.po b/addons/wiki_faq/i18n/ru.po
new file mode 100644
index 00000000000..c09bb83408c
--- /dev/null
+++ b/addons/wiki_faq/i18n/ru.po
@@ -0,0 +1,27 @@
+# Russian 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: 2010-10-18 17:47+0000\n"
+"PO-Revision-Date: 2010-10-25 13:55+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"Language-Team: Russian <ru@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-10-26 04:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: wiki_faq
+#: model:ir.module.module,description:wiki_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Этот модуль предоставляет шаблон ЧаВо\n"
+"    "

From b9558753abb0e06ade8cf76f367d1b856a60fc95 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 26 Oct 2010 11:07:35 +0530
Subject: [PATCH 108/114] [MOD]: Usability Improvment in view

bzr revid: dbr@tinyerp.com-20101026053735-kaf6uhvk0hk8zhd3
---
 addons/event/report/report_event_registration_view.xml | 10 +++++-----
 addons/membership/membership_view.xml                  |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index d8cc84a0547..f744ce3a62f 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -88,6 +88,11 @@
                     </field>
                     </group>
                     <newline/>
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                        <field name="type" widget="selection"/>
+                        <field name="date"/>
+                    </group>
+                    <newline/>
 
                     <group expand="1" string="Group By..." colspan="4" col="12">
                         <filter string="Responsible" name="user_id" icon="terp-personal" context="{'group_by': 'user_id'}"/>
@@ -109,11 +114,6 @@
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/>
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                        <field name="type" widget="selection"/>
-                        <field name="date"/>
-                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index e3c0bb9a1e2..82bc6b8f88a 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -20,15 +20,15 @@
                    <field name="name"/>
                    <field name="categ_id" widget="selection" operator="child_of"/>
                    <newline/>
+                   <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                       <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
+                   </group>
+                   <newline/>
                    <group  expand='0' string='Group by...' groups="base.group_extended">
                        <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
                        <separator orientation="vertical"/>
                        <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}" />
                    </group>
-                   <newline/>
-                   <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                       <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
-                   </group>
                 </search>
             </field>
         </record>

From 229d07da53b2527ff9e290be0edce2dbc1bb2e47 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 26 Oct 2010 11:10:53 +0530
Subject: [PATCH 109/114] [MOD/IMP] sale,crm : Usability Improvement in Icon

bzr revid: amp@tinyerp.com-20101026054053-zxm51pur2q1lnuzy
---
 addons/crm/report/crm_phonecall_report_view.xml | 2 +-
 addons/sale/sale_view.xml                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index a8e269b77ee..5cb8a74b95b 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -64,7 +64,7 @@
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Phone calls made in last month"/>
                         <separator orientation="vertical" />
-                        <filter icon="terp-check"
+                        <filter icon="terp-gtk-go-back-rtl"
                             string="Todo"
                             domain="[('state','in',('draft','open'))]"
                             help="Phone calls which are in draft and open state"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b9eabcaa02e..f6452309b65 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -449,12 +449,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Uninvoiced Lines">
-                    <filter icon="terp-check" string="To Do"
+                    <filter icon="terp-gtk-go-back-rtl" string="To Do"
                         domain="[('state','=','confirmed')]"
                         name="sale order"
                         help="Confirmed sale order lines, not yet delivered"
                         />
-                    <filter icon="terp-check" string="Done"
+                    <filter icon="terp-dialog-close" string="Done"
                         domain="[('state','=','done')]"
                         name="sale_order_done"
                         help="Sale order lines done"

From 57b4215a3ce89e67d6e9dac70d668347be8b901a Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 26 Oct 2010 12:53:27 +0530
Subject: [PATCH 110/114] [IMP] Icons Improved

bzr revid: vir@tinyerp.com-20101026072327-9vuwkykjcsxyyfsp
---
 addons/sale/sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f6452309b65..b63c3f17d04 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -424,7 +424,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1" help="Sale Order Lines ready to be invoiced"/>
+                    <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1" help="Sale Order Lines ready to be invoiced"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
@@ -435,7 +435,7 @@
                     <newline/>
                     <group expand="context.get('report',False)" string="Group By..." colspan="9" col="8">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
+                        <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'salesman_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>

From 315e838c4827a9164e281c580bfdd1af37ff0c4f Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 26 Oct 2010 14:03:37 +0530
Subject: [PATCH 111/114] [MOD/IMP] event,document,membership,sale : Usability
 Improvent In Icon

bzr revid: amp@tinyerp.com-20101026083337-6uswxzxwtyzv206d
---
 addons/document/document_view.xml                      | 2 +-
 addons/event/report/report_event_registration_view.xml | 2 +-
 addons/membership/report/report_membership_view.xml    | 2 +-
 addons/sale/report/sale_report_view.xml                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index e5719705ebe..544ad1694be 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -162,7 +162,7 @@
             <field name="arch" type="xml">
                 <search string="Search Document Directory">
                     <filter string="Static" domain="[('type','=','directory')]"/>
-                    <filter string="Resources" domain="[('type','=','ressource')]"/>
+                    <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/>
                     <separator orientation="vertical"/>
                     <field name="name" />
                     <field name="user_id" />
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index f744ce3a62f..7b489775f25 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -100,7 +100,7 @@
                         <filter string="Sale Team"  icon="terp-personal" context="{'group_by': 'section_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id', 'max_reg_event_visible':0}"/>
-                        <filter string="Product"  icon="terp-product" context="{'group_by': 'product_id'}"/>
+                        <filter string="Product"  icon="terp-accessories-archiver" context="{'group_by': 'product_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" help="Events States"/>
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 61e0d9ddd8b..b14d3dcb88c 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -55,7 +55,7 @@
                         <filter string="Associated Partner" icon="terp-partner" name="associate_member_id"
                             domain="[]" context="{'group_by':'associate_member_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Membership Product" icon="terp-product" name="product"
+                        <filter string="Membership Product" icon="terp-accessories-archiver" name="product"
                             domain="[]" context="{'group_by':'membership_id'}"/>
                         <filter string="Current Membership State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'membership_state'}"/>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index c4cc59f7b9a..6b4ea96c3a7 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -71,7 +71,7 @@
                         string="Sales"
                         domain="[('state','not in',('draft','done','cancel'))]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-sale"
+                    <filter icon="terp-accessories-archiver"
                         string="Picked"
                         domain="[('shipped','=',True)]"/>
                     <separator orientation="vertical"/>

From 94ddb28efaef9e11206c5b87bd967edfa4edf2ff Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 26 Oct 2010 14:23:32 +0530
Subject: [PATCH 112/114] [IMP] Icons Improved

bzr revid: vir@tinyerp.com-20101026085332-barbc2js12wiyx3w
---
 addons/auction/auction_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 36a1b60096c..6213cc07f9a 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -28,7 +28,7 @@
             <form string="Artists">
                 <separator string="Author/Artist" colspan="4"/>
                 <group colspan="4" col="6">
-                    <field name="name" colspan="4" string="Name"/>
+                    <field name="name" colspan="4" string="Name" select="1"/>
                     <newline/>
                     <field name="pseudo"/>
                     <field name="birth_death_dates"/>
@@ -436,7 +436,7 @@
                      string="Draft"  help="New Object"
                      name="draft"
                      domain="[('state','=', 'draft')]"/>
-                 <filter icon="terp-dolar_ok!"
+                 <filter icon="terp-dolar"
                      string="Sold"  help="Buy object"
                      domain="[('state','=','sold')]"/>
                  <separator orientation="vertical"/>

From 0f428905d82bf9e7a4f5b80e121558e436624211 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Tue, 26 Oct 2010 11:45:09 +0200
Subject: [PATCH 113/114] [FIX] Fixed yaml custom tags refactoring from
 base_module_record.

Serialization for those tags have probably not been used yet.

bzr revid: jth@openerp.com-20101026094509-s34a7et489f7qy3y
---
 bin/tools/yaml_tag.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/tools/yaml_tag.py b/bin/tools/yaml_tag.py
index 648fd56206e..e12aecdcd96 100644
--- a/bin/tools/yaml_tag.py
+++ b/bin/tools/yaml_tag.py
@@ -4,7 +4,7 @@ import logging
 class YamlTag(object):
     """
     Superclass for constructors of custom tags defined in yaml file.
-    __str__ are overriden in subclass and used for serialization in module recorder.
+    __str__ is overriden in subclass and used for serialization in module recorder.
     """
     def __init__(self, **kwargs):
         self.__dict__.update(kwargs)
@@ -89,14 +89,14 @@ class Eval(YamlTag):
         self.expression = expression
         super(Eval, self).__init__()
     def __str__(self):
-        return 'eval(%s)' % (str(self.expr,))
+        return '!eval %s' % str(self.expression)
     
 class Ref(YamlTag):
     def __init__(self, expr="False", *args, **kwargs):
         self.expr = expr
         super(Ref, self).__init__(*args, **kwargs)
     def __str__(self):
-        return 'ref(%s)' % (str(self.expr,))
+        return 'ref(%s)' % repr(self.expr)
     
 class IrSet(YamlTag):
     def __init__(self):

From 9ec0865f7c8ce62032212bcee73dc1b1f39c2b04 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Tue, 26 Oct 2010 11:50:44 +0200
Subject: [PATCH 114/114] [FIX] ir.model.data is writable only by admin user,
 readable by all.

bzr revid: jth@openerp.com-20101026095044-apiq6ts1609gn62t
---
 bin/tools/yaml_import.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 8aaf34f7bf6..90fedbd0330 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -303,7 +303,7 @@ class YamlInterpreter(object):
         else:
             self.validate_xml_id(record.id)
             if self.isnoupdate(record) and self.mode != 'init':
-                id = self.pool.get('ir.model.data')._update_dummy(self.cr, self.uid, record.model, self.module, record.id)
+                id = self.pool.get('ir.model.data')._update_dummy(self.cr, 1, record.model, self.module, record.id)
                 # check if the resource already existed at the last update
                 if id:
                     self.id_map[record] = int(id)
@@ -316,7 +316,7 @@ class YamlInterpreter(object):
             self.logger.debug("RECORD_DICT %s" % record_dict)
             #context = self.get_context(record, self.eval_context)
             context = record.context #TOFIX: record.context like {'withoutemployee':True} should pass from self.eval_context. example: test_project.yml in project module
-            id = self.pool.get('ir.model.data')._update(self.cr, self.uid, record.model, \
+            id = self.pool.get('ir.model.data')._update(self.cr, 1, record.model, \
                     self.module, record_dict, record.id, noupdate=self.isnoupdate(record), mode=self.mode, context=context)
             self.id_map[record.id] = int(id)
             if config.get('import_partial'):
@@ -569,7 +569,7 @@ class YamlInterpreter(object):
 
         self._set_group_values(node, values)
         
-        pid = self.pool.get('ir.model.data')._update(self.cr, self.uid, \
+        pid = self.pool.get('ir.model.data')._update(self.cr, 1, \
                 'ir.ui.menu', self.module, values, node.id, mode=self.mode, \
                 noupdate=self.isnoupdate(node), res_id=res and res[0] or False)
 
@@ -580,7 +580,7 @@ class YamlInterpreter(object):
             action_type = node.type or 'act_window'
             action_id = self.get_id(node.action)
             action = "ir.actions.%s,%d" % (action_type, action_id)
-            self.pool.get('ir.model.data').ir_set(self.cr, self.uid, 'action', \
+            self.pool.get('ir.model.data').ir_set(self.cr, 1, 'action', \
                     'tree_but_open', 'Menuitem', [('ir.ui.menu', int(parent_id))], action, True, True, xml_id=node.id)
 
     def process_act_window(self, node):
@@ -614,7 +614,7 @@ class YamlInterpreter(object):
 
         if node.target:
             values['target'] = node.target
-        id = self.pool.get('ir.model.data')._update(self.cr, self.uid, \
+        id = self.pool.get('ir.model.data')._update(self.cr, 1, \
                 'ir.actions.act_window', self.module, values, node.id, mode=self.mode)
         self.id_map[node.id] = int(id)
 
@@ -622,7 +622,7 @@ class YamlInterpreter(object):
             keyword = 'client_action_relate'
             value = 'ir.actions.act_window,%s' % id
             replace = node.replace or True
-            self.pool.get('ir.model.data').ir_set(self.cr, self.uid, 'action', keyword, \
+            self.pool.get('ir.model.data').ir_set(self.cr, 1, 'action', keyword, \
                     node.id, [node.src_model], value, replace=replace, noupdate=self.isnoupdate(node), isobject=True, xml_id=node.id)
         # TODO add remove ir.model.data
 
@@ -635,7 +635,7 @@ class YamlInterpreter(object):
                 ids = [self.get_id(node.id)]
             if len(ids):
                 self.pool.get(node.model).unlink(self.cr, self.uid, ids)
-                self.pool.get('ir.model.data')._unlink(self.cr, self.uid, node.model, ids)
+                self.pool.get('ir.model.data')._unlink(self.cr, 1, node.model, ids)
         else:
             self.logger.log(logging.TEST, "Record not deleted.")
     
@@ -644,7 +644,7 @@ class YamlInterpreter(object):
 
         res = {'name': node.name, 'url': node.url, 'target': node.target}
 
-        id = self.pool.get('ir.model.data')._update(self.cr, self.uid, \
+        id = self.pool.get('ir.model.data')._update(self.cr, 1, \
                 "ir.actions.url", self.module, res, node.id, mode=self.mode)
         self.id_map[node.id] = int(id)
         # ir_set
@@ -652,7 +652,7 @@ class YamlInterpreter(object):
             keyword = node.keyword or 'client_action_multi'
             value = 'ir.actions.url,%s' % id
             replace = node.replace or True
-            self.pool.get('ir.model.data').ir_set(self.cr, self.uid, 'action', \
+            self.pool.get('ir.model.data').ir_set(self.cr, 1, 'action', \
                     keyword, node.url, ["ir.actions.url"], value, replace=replace, \
                     noupdate=self.isnoupdate(node), isobject=True, xml_id=node.id)
     
@@ -667,7 +667,7 @@ class YamlInterpreter(object):
             else:
                 value = expression
             res[fieldname] = value
-        self.pool.get('ir.model.data').ir_set(self.cr, self.uid, res['key'], res['key2'], \
+        self.pool.get('ir.model.data').ir_set(self.cr, 1, res['key'], res['key2'], \
                 res['name'], res['models'], res['value'], replace=res.get('replace',True), \
                 isobject=res.get('isobject', False), meta=res.get('meta',None))
 
@@ -692,7 +692,7 @@ class YamlInterpreter(object):
 
         self._set_group_values(node, values)
 
-        id = self.pool.get('ir.model.data')._update(self.cr, self.uid, "ir.actions.report.xml", \
+        id = self.pool.get('ir.model.data')._update(self.cr, 1, "ir.actions.report.xml", \
                 self.module, values, xml_id, noupdate=self.isnoupdate(node), mode=self.mode)
         self.id_map[xml_id] = int(id)
 
@@ -700,7 +700,7 @@ class YamlInterpreter(object):
             keyword = node.keyword or 'client_print_multi'
             value = 'ir.actions.report.xml,%s' % id
             replace = node.replace or True
-            self.pool.get('ir.model.data').ir_set(self.cr, self.uid, 'action', \
+            self.pool.get('ir.model.data').ir_set(self.cr, 1, 'action', \
                     keyword, values['name'], [values['model']], value, replace=replace, isobject=True, xml_id=xml_id)
             
     def process_none(self):