From a424fafcc04385da296808a2c7b4ed5e9c84adbf Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 22 Jul 2010 15:48:06 +0530
Subject: [PATCH 01/13] [ADD] mrp : help added on menu items

bzr revid: vir@tinyerp.com-20100722101806-fz3nmj6ctcpf1igq
---
 addons/mrp/mrp_view.xml                         | 6 ++++++
 addons/mrp/report/mrp_production_order_view.xml | 3 +--
 addons/mrp/report/mrp_report_view.xml           | 2 ++
 addons/mrp_operations/mrp_operations_view.xml   | 2 ++
 addons/procurement/procurement_view.xml         | 4 +++-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9d645a17095..470f7c73a03 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -204,6 +204,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_workcenter_tree_view"/>
             <field name="search_view_id" ref="view_mrp_workcenter_search"/>
+            <field name="help">Work Centers are units of manufacture consisting of one or several people and/or machines that can be considered as a unit for the purposes of forecasting capacity and planning.</field>
         </record>
 
         <!--
@@ -278,6 +279,7 @@
             <field name="res_model">mrp.routing</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_routing_tree_view"/>
+            <field name="help">Routings define the assembly operations to be done in work centers for manufacturing a certain product. They are usually attached to bills of materials which will define the assembly of products required for manufacture or for finished products.</field>
         </record>
  <!--       <menuitem name="Routings" id="menu_mrp_routing_and_workcenters" parent="mrp.menu_mrp_bom" groups="base.group_extended"
                   sequence="100" />-->
@@ -398,6 +400,7 @@
             <field name="view_type">form</field>
             <field name="domain">[('bom_id','=',False)]</field>
             <field name="search_view_id" ref="view_mrp_bom_filter"/>
+            <field name="help">Master Bills of Materials are documents that describe the list of raw materials used to make a finished product. You can generate documents for a product manufacturing (defining each manufacturing step) or you could define a single multi-level bill of materials.</field>
         </record>
         <record id="mrp_bom_form_action2" model="ir.actions.act_window">
             <field name="name">Bill of Material Components</field>
@@ -405,6 +408,7 @@
             <field name="res_model">mrp.bom</field>
             <field name="view_type">form</field>
             <field name="domain">[('bom_id','!=',False)]</field>
+            <field name="help">Bills of materials Components are components and sub-product used to create master bills of materials.</field>
         </record>
 
         <!-- BOM menus -->
@@ -762,6 +766,7 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
             <field name="context">{'search_default_Current':1}</field>
+            <field name="help">Manufacturing Orders describe the operations that need to be carried out and the raw materials usage for each stage of production. You use specifications (bills of materials) to work out the raw material requirements and the manufacturing orders needed for the finished products. Once the bills of materials have been defined, Open ERP becomes capable of automatically deciding on the manufacturing route depending on the needs of the company.</field>
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" sequence="1"/>
 
@@ -772,6 +777,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar,graph</field>
             <field name="domain">[('state','in',('ready','confirmed','in_production'))]</field>
+            <field name="help">Manufacturing Orders describe the operations that need to be carried out and the raw materials usage for each stage of production. You use specifications (bills of materials or BoM) to work out the raw material requirements and the manufacturing orders needed for the finished products. Once the bills of materials have been defined, Open ERP becomes capable of automatically deciding on the manufacturing route depending on the needs of the company.</field>
         </record>
 
         <record id="mrp_production_action2" model="ir.actions.act_window">
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 8172c61e84f..18dc07e4b78 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -109,8 +109,7 @@
             <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_mrp_production_order_tree"/>
             <field name="search_view_id" ref="view_report_mrp_production_order_filter"/>
-          <field name="context">{'search_default_Product': 1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]}</field>
-
+            <field name="context">{'search_default_Product': 1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]}</field>
         </record>
 
        	<record model="ir.actions.act_window.view" id="action_report_mrp_production_order_tree">
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index cf66f93f0e4..5f28f2ce6f4 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -49,6 +49,7 @@
             <field name="res_model">report.workcenter.load</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
+            <field name="help">Work Center Load is a projection of load in a work center given a period. The load is express in hour and cycle (for machines).</field>
         </record>
         <menuitem id="next_id_77" name="Reporting"
             parent="base.menu_mrp_root" sequence="49"/>
@@ -100,6 +101,7 @@
             <field name="res_model">report.mrp.inout</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
+            <field name="help">Weekly Stock Value Variation enables you to track stock value evolution as a result of manufacturing activities (consumption of raw materials, production of finished goods, added accounting value of stock by the creation of value following the transformation of products).</field>
         </record>
         <menuitem action="action_report_in_out_picking_tree" id="menu_report_in_out_picking" parent="next_id_77"/>
 
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 5c626b24814..bff88946ead 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -194,6 +194,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,gantt,calendar,graph</field>
         <field name="search_view_id" ref="view_mrp_production_workcenter_form_view_filter"/>
+        <field name="help">Work Orders are manufacturing operations required to produce or assemble products. The different work orders will have different impacts on the costs of manufacture and planning depending on the available workload.</field>
     </record>
 
     <record model="ir.actions.act_window" id="mrp_production_wc_action_planning">
@@ -203,6 +204,7 @@
         <field name="view_type">form</field>
         <field name="domain">[('production_state','in',('ready','confirmed','in_production'))]</field>
         <field name="view_mode">tree,form,graph,calendar</field>
+        <field name="help">To manufacture or assemble products, as well as using raw materials and finished product you must also handle manufacturing operations. Manufacturing operations are often called work orders. The different operations will have different impacts on the costs of manufacture and planning depending on the available workload.</field>
     </record>
 
 
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index fff13e36330..6d4a191807b 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -70,7 +70,7 @@
                     	<group colspan="4"  groups="base.group_extended">
                     		<separator colspan="4" string="Properties" />
                         	<field colspan="4" name="property_ids" nolabel="1"/>
-	                 </group>                        
+	                 </group>
                     </page>
                     <page string="Notes">
                         <separator colspan="4" string="Note" />
@@ -119,6 +119,7 @@
             <field name="context">{'search_default_current':1}</field>
             <field name="search_view_id" ref="view_procurement_filter"/>
             <field name="context">{'search_default_Current':1}</field>
+            <field name="help">The procurement order will schedule a proposal for automatic procurement for the product concerned. This procurement will start a task, a purchase order form for the supplier or a production depending on the product configuration.</field>
         </record>
 
         <record id="procurement_action3" model="ir.actions.act_window">
@@ -139,6 +140,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception')]</field>
+            <field name="help"> For each customer order line or raw materials in a manufacturing order, there is a procurement form . In normal system use, procurement orders are automatically generated by Open ERP. But if there are configuration problems, the system can remain blocked by a procurement without generating a corresponding document. It is a procurement exception. Some problems are link to timing and will be correct automatically by the system. If there is no procurement rule, the exception must be corrected manually.</field>
         </record>
 
         <record id="procurement_action4" model="ir.actions.act_window">

From 6e93201b13e80c45c55e67b821f4288155ae8be8 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 22 Jul 2010 16:30:56 +0530
Subject: [PATCH 02/13] [IMP]: crm, crm_claim, crm_fundraising, crm_helpdesk:
 Improvement for log messages

bzr revid: rpa@tinyerp.com-20100722110056-udb2qy6gtwbr5whe
---
 addons/crm/crm.py                         |  7 +++++++
 addons/crm/crm_lead.py                    |  6 +++---
 addons/crm/crm_meeting.py                 | 16 +++++++++++++++-
 addons/crm/crm_opportunity.py             | 10 +++++-----
 addons/crm_claim/crm_claim.py             |  2 +-
 addons/crm_fundraising/crm_fundraising.py |  2 +-
 addons/crm_helpdesk/crm_helpdesk.py       |  2 +-
 7 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 4b1aad7cce9..478cd7b2986 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -301,6 +301,13 @@ class crm_case(object):
         self.write(cr, uid, ids, {'state': 'cancel',
                                   'active': True})
         self._action(cr, uid, cases, 'cancel')
+        for case in cases:
+            message = "The " + self._description + " '" + case.name + "' has been Cancelled."
+            #TODO: Need to differentiate lead and opportunity
+#            if hasattr(case, 'type'):
+#                #TO CHECK: hasattr gives warning for other crm objects that don't have field 'type'
+#                message = "The " + (case.type or 'Case').title() + " '" + case.name + "' has been Cancelled."
+            self.log(cr, uid, case.id, message)
         return True
 
     def case_pending(self, cr, uid, ids, *args):
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 2a469d88baa..9cb5f31d67e 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -198,8 +198,8 @@ class crm_lead(osv.osv, crm_case):
             self.write(cr, uid, ids, value)
 
         for (id, name) in self.name_get(cr, uid, ids):
-            type = self.browse(cr, uid, id).type
-            message = (_('The ') + type.title() or 'Lead') + " '" + name + "' "+ _("has been written as Open.")
+            type = self.browse(cr, uid, id).type or 'Lead'
+            message = (_('The ') + type.title()) + " '" + name + "' "+ _("has been Opened.")
             self.log(cr, uid, id, message)
         return res
 
@@ -216,7 +216,7 @@ class crm_lead(osv.osv, crm_case):
         for (id, name) in self.name_get(cr, uid, ids):
             lead = self.browse(cr, uid, id)
             if lead.type == 'lead':
-                message = _('The Lead') + " '" + name + "' "+ _("has been written as Closed.")
+                message = _('The Lead') + " '" + name + "' "+ _("has been Closed.")
                 self.log(cr, uid, id, message)
         return res
 
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 79a2c992cdf..798f746f9e3 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -122,7 +122,21 @@ class crm_meeting(osv.osv, crm_case):
                     }
 
         return value
-    
+
+    def case_open(self, cr, uid, ids, *args):
+        """Confirms meeting
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Meeting Ids
+        @param *args: Tuple Value for additional Params
+        """
+        res = super(crm_meeting, self).case_open(cr, uid, ids, args)
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _('The Meeting') + " '" + name + "' "+ _("has been Confirmed.")
+            self.log(cr, uid, id, message)
+        return res
+
 crm_meeting()
 
 class calendar_attendee(osv.osv):
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index a1ca912e20f..c058732a3dd 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -36,8 +36,6 @@ AVAILABLE_STATES = [
 
 class crm_opportunity(osv.osv):
     """ Opportunity Cases """
-    _name = "crm.lead"
-    _description = "Opportunity"
     _order = "priority,date_action,id desc"
     _inherit = 'crm.lead'
     _columns = {
@@ -72,8 +70,10 @@ class crm_opportunity(osv.osv):
 
         self.write(cr, uid, ids, value)
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('The Opportunity') + " '" + name + "' "+ _("has been written as Won.")
-            self.log(cr, uid, id, message)
+            opp = self.browse(cr, uid, id)
+            if opp.type == 'opportunity':
+                message = _('The Opportunity') + " '" + name + "' "+ _("has been Won.")
+                self.log(cr, uid, id, message)
         return res
 
     def case_mark_lost(self, cr, uid, ids, *args):
@@ -95,7 +95,7 @@ class crm_opportunity(osv.osv):
         for (id, name) in self.name_get(cr, uid, ids):
             opp = self.browse(cr, uid, id)
             if opp.type == 'opportunity':
-                message = _('The Opportunity') + " '" + name + "' "+ _("has been written as Lost.")
+                message = _('The Opportunity') + " '" + name + "' "+ _("has been Lost.")
                 self.log(cr, uid, id, message)
         return res
 
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index b453ebfc4aa..76a6073b58c 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -28,7 +28,7 @@ class crm_claim(osv.osv, crm.crm_case):
     Crm claim
     """
     _name = "crm.claim"
-    _description = "Claim Cases"
+    _description = "Claim"
     _order = "id desc"
     _inherit = ['mailgate.thread']
     _columns = {
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 99b8fc06dae..81e16a47ac3 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -26,7 +26,7 @@ class crm_fundraising(osv.osv, crm.crm_case):
     """ Fund Raising Cases """
 
     _name = "crm.fundraising"
-    _description = "Fund Raising Cases"
+    _description = "Fund Raising"
     _order = "id desc"
     _inherit = ['mailgate.thread']
     _columns = {
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 2894a429865..d4a1e9d59fc 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -27,7 +27,7 @@ class crm_helpdesk(osv.osv, crm.crm_case):
     """ Helpdesk Cases """
 
     _name = "crm.helpdesk"
-    _description = "Helpdesk Cases"
+    _description = "Helpdesk"
     _order = "id desc"
     _inherit = ['mailgate.thread']
     _columns = {

From 0ffd63135c87f76c866aaaaf04a2c365fedba9a9 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 22 Jul 2010 17:43:42 +0530
Subject: [PATCH 03/13] [FIX]: improvement in hr_payroll and account recurring
 wizard

bzr revid: mga@tinyerp.com-20100722121342-4kx7jv06zonmv5g2
---
 .../account/wizard/account_use_model_view.xml |  3 ++-
 addons/hr_payroll/__init__.py                 |  3 +--
 addons/hr_payroll/__openerp__.py              |  8 +++----
 addons/hr_payroll/hr_payroll.py               | 21 -------------------
 addons/hr_payroll/hr_payroll_wizard.xml       | 11 ----------
 5 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 71f026237ac..560030be2f5 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -10,7 +10,8 @@
             <form string="Create Entries From Models">
                 <group height="240" width="510">
                     <separator string="This wizard will create recurring accounting entries" colspan="4"/>
-                    <field name="model"/>
+                    <label string="Select recurring to create a manualy recurring accounting entries" width="400"/>
+                    <field name="model" colspan="4" nolabel="1"/>
                     <separator colspan="4"/>
                     <group colspan="4" col="2">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
diff --git a/addons/hr_payroll/__init__.py b/addons/hr_payroll/__init__.py
index ee49b4e7794..c66b5ab7948 100644
--- a/addons/hr_payroll/__init__.py
+++ b/addons/hr_payroll/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 ##############################################################################
 #
@@ -25,4 +24,4 @@ import hr_payroll
 import report
 import wizard
 
-# 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/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 3efa777885c..7575dcf9ad6 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -53,13 +53,11 @@
         'wizard/hr_payroll_create_analytic.xml',
         'wizard/hr_payroll_employees_detail.xml',
         'wizard/hr_payroll_year_salary.xml',
-
     ],
     'test': [
-             'test/payslip.yml',
-             'test/payment_advice.yml',
-             'test/payroll_register.yml',
- 
+         'test/payslip.yml',
+         'test/payment_advice.yml',
+         'test/payroll_register.yml',
     ],
     'demo_xml': [
         'hr_payroll_demo.xml'
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 753d3d6d017..22e5061023f 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -1145,27 +1145,6 @@ class hr_payslip_line(osv.osv):
     _name = 'hr.payslip.line'
     _description = 'Payslip Line'
 
-#    def _calculate(self, cr, uid, ids, field_names, arg, context):
-#        res = {}
-#        obj = {}
-#        for line in self.browse(cr, uid, ids, context):
-#            obj['basic'] = line.slip_id.basic
-#            amount = 0.0
-#
-#            if line.amount_type == 'per' and line.base:
-#                print 'XXXXXXXXXXXXXXXX : ', obj
-#                amount = line.amount * eval(line.base, obj)
-#            elif line.amount_type in ('fix', 'func'):
-#                amount = line.amount
-
-#            cd = line.category_id.code.lower()
-#            obj[cd] = amount
-#            print 'XXXXXXXXXXXXXXXXXX : ', cd
-#
-#            res[line.id] = amount
-#        print 'XXXXXXXXXXXX : ', obj
-#        return res
-
     def onchange_category(self, cr, uid, ids, category_id):
         seq = 0
         res = {
diff --git a/addons/hr_payroll/hr_payroll_wizard.xml b/addons/hr_payroll/hr_payroll_wizard.xml
index fe0264257e3..71267ddb742 100644
--- a/addons/hr_payroll/hr_payroll_wizard.xml
+++ b/addons/hr_payroll/hr_payroll_wizard.xml
@@ -25,16 +25,5 @@
             parent="menu_hr_payroll_reporting" 
             name="Employee Salary Statement"
             type="wizard"/>
-
-<!--        <wizard id="wizard_payroll_analysis"-->
-<!--            menu="False" -->
-<!--            model="account.analytic.account" -->
-<!--            name="payroll.analysis" -->
-<!--            string="Create Analytic Structure"/>-->
-<!--        <menuitem  id="menu_wizard_payroll_analysis" -->
-<!--            action="wizard_payroll_analysis" -->
-<!--            parent="payroll_configure" -->
-<!--            name="Create Analytic Structure"-->
-<!--            type="wizard"/>-->
     </data>
 </openerp>

From 55547da7d892e51e9d6daa256b9cfe66e6277647 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 22 Jul 2010 18:25:18 +0530
Subject: [PATCH 04/13] [MOD] procurement : removed unused reference of product

bzr revid: vir@tinyerp.com-20100722125518-4rnfgc5aasj03v61
---
 addons/procurement/procurement_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 6d4a191807b..dd8e260f56c 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -263,12 +263,12 @@
             res_model="stock.warehouse.orderpoint"
             src_model="procurement.order"/>
 
-        <act_window
-            domain="[('id', '=', product_id)]"
-            id="act_product_product_2_stock_warehouse_orderpoint"
-            name="Product"
-            res_model="product.product"
-            src_model="procurement.order"/>
+<!--        <act_window-->
+<!--            domain="[('id', '=', product_id)]"-->
+<!--            id="act_product_product_2_stock_warehouse_orderpoint"-->
+<!--            name="Product"-->
+<!--            res_model="product.product"-->
+<!--            src_model="procurement.order"/>-->
 
     </data>
 </openerp>

From cfa44ec1ca46cc39913b4a438d0d03dded8b1ef3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 22 Jul 2010 18:40:51 +0530
Subject: [PATCH 05/13] [Fix] stock: Fix picking report

bzr revid: sbh@tinyerp.com-20100722131051-lnxu6etyp5r4zzpy
---
 addons/stock/report/picking.rml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 677cdfbcfc0..96af61ca205 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -150,10 +150,10 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">[[ picking.sale_id and picking.sale_id.partner_shipping_id and 'Shipping Address :' or removeParentNode('para') ]] </para>
-          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
-          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]] </para>
-          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.zip) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.city) or '' ]] [[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or '' ]] </para>
+          <para style="terp_tblheader_Details">[[ picking.address_id and 'Shipping Address :' or removeParentNode('para') ]] </para>
+          <para style="terp_default_9">[[ (  picking.address_id and picking.address_id.title) or '' ]] [[ (picking.address_id and picking.address_id.name) or '' ]] </para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street) or '' ]] </para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.zip) or '' ]] [[ (picking.address_id and picking.address_id.city) or '' ]] [[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or '' ]] </para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
         </td>
       </tr>
@@ -241,7 +241,7 @@
       <font color="white"> </font>
     </para>
     <section>
-      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') ]]</para>
+      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') or  removeParentNode('section')  ]]</para>
       <blockTable colWidths="257.0,58.0,61.0,46.0,26.0,74.0" style="Move_Line_Contect_Assign_State">
         <tr>
           <td>
@@ -267,10 +267,11 @@
       <para style="terp_default_2">
         <font color="white"> </font>
       </para>
-    </section>
-    <para style="terp_default_5cm_Above_Space">[[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('para') ]]</para>
+  
+    <para style="terp_default_5cm_Above_Space">[[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('s') ]]</para>
     <para style="terp_default_Bold_9">Non Assigned Products: [[ ( move_lines.state == 'assigned' or move_lines.state == 'done' or move_lines.state == 'confirmed' ) and removeParentNode('para') ]]</para>
     <para style="terp_default_1cm_above_space">[[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('para') ]]</para>
+  </section>    
     <section>
       <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') ]]</para>
       <blockTable colWidths="257.0,57.0,62.0,46.0,26.0,74.0" style="Move_Line_Content_Other_State">

From f5e6520012e86b47485ddd4982a14d49f37dbb2f Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 22 Jul 2010 18:58:40 +0530
Subject: [PATCH 06/13] [Fix] when stock module is installed, help of
 standard_price field of product does not visible.Its fixed

bzr revid: vir@tinyerp.com-20100722132840-sxuvli9pb1cvpodg
---
 addons/stock/product_view.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index ee19895b58d..10b7606533f 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -62,9 +62,8 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="standard_price" position="replace">
-                    <label string="Cost Price" align="1.0"/>
-                    <group col="2" colspan="1">
-                        <field name="standard_price" readonly="True" nolabel="1"/>
+                    <group col="4" colspan="2">
+                        <field name="standard_price" readonly="True"/>
                         <button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute"/>
                     </group>
                 </field>

From 2aaa5efc7f3b635e02bf1d893930c857176193a7 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 22 Jul 2010 19:20:24 +0530
Subject: [PATCH 07/13] [IMP]: sale: Improvement in log messages, removed
 unuseful messages

bzr revid: rpa@tinyerp.com-20100722135024-w88wr85q8zqg6la1
---
 addons/sale/sale.py | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index b726b05a19f..9b0f555fc80 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -561,13 +561,12 @@ class sale_order(osv.osv):
                     wf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_cancel', cr)
             sale_order_line_obj.write(cr, uid, [l.id for l in  sale.order_line],
                     {'state': 'cancel'})
+            message = _('Sale order') + " '" + sale.name + _(" is cancelled")
+            self.log(cr, uid, sale.id, message)
         self.write(cr, uid, ids, {'state': 'cancel'})
-        message = _('Sale order') + " '" + sale.name + "' "+ _("created on")+" '" +sale.create_date + _(" is cancelled")
-        self.log(cr, uid, id, message)
         return True
 
     def action_wait(self, cr, uid, ids, *args):
-        product=[]
         product_obj = self.pool.get('product.product')
         for o in self.browse(cr, uid, ids):
             if (o.order_policy == 'manual'):
@@ -575,11 +574,8 @@ class sale_order(osv.osv):
             else:
                 self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': time.strftime('%Y-%m-%d')})
             self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line])
-            for line in o.order_line:
-                product.append(line.product_id.default_code)
-        params = ', '.join(map(lambda x : str(x),product))
-        message = _('Sale order ') + " '" + o.name + "' "+ _("created on")+" '" +o.create_date + "' "+_("for")+" '" +params  + "' "+_("is confirmed")
-        self.log(cr, uid, id, message)
+            message = _('Quotation') + " '" + o.name + "' "+ _("is converted to Sale order")
+            self.log(cr, uid, o.id, message)
         return True
 
     def procurement_lines_get(self, cr, uid, ids, *args):
@@ -951,9 +947,6 @@ class sale_order_line(osv.osv):
     def button_confirm(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        for (id,name) in self.name_get(cr, uid, ids):
-            message = _('Sale order line') + " '" + name + "' "+ _("is confirmed")
-            self.log(cr, uid, id, message)
         return self.write(cr, uid, ids, {'state': 'confirmed'})
 
     def button_done(self, cr, uid, ids, context=None):
@@ -963,8 +956,6 @@ class sale_order_line(osv.osv):
         res = self.write(cr, uid, ids, {'state': 'done'})
         for line in self.browse(cr, uid, ids, context=context):
             wf_service.trg_write(uid, 'sale.order', line.order_id.id, cr)
-        message = _('Sale order line') + " '" + line.name + "' "+_("is done")
-        self.log(cr, uid, id, message)
         return res
 
     def uos_change(self, cr, uid, ids, product_uos, product_uos_qty=0, product_id=None):

From 4054773cc71ad9fda46b578cf7362877537be12e Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 22 Jul 2010 19:27:27 +0530
Subject: [PATCH 08/13] [Fix] purchase : Fix the problem of id

bzr revid: sbh@tinyerp.com-20100722135727-rnsetg63hq77m9fi
---
 addons/purchase/purchase.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index dfdf85080fe..acb8280757f 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -305,13 +305,13 @@ class purchase_order(osv.osv):
     def inv_line_create(self, cr, uid, a, ol):
         return (0, False, {
             'name': ol.name,
-            'account_id': a,
+            'account_id': a.id,
             'price_unit': ol.price_unit or 0.0,
             'quantity': ol.product_qty,
             'product_id': ol.product_id.id or False,
             'uos_id': ol.product_uom.id or False,
             'invoice_line_tax_id': [(6, 0, [x.id for x in ol.taxes_id])],
-            'account_analytic_id': ol.account_analytic_id.id,
+            'account_analytic_id': ol.account_analytic_id.id or False,
         })
 
     def action_cancel_draft(self, cr, uid, ids, *args):

From b90f099c53c0f8634fcf7df99e48a016213d2df9 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 22 Jul 2010 18:19:44 +0200
Subject: [PATCH 09/13] fix

bzr revid: fp@tinyerp.com-20100722161944-gcowxb2nieeqtvwd
---
 addons/account/account_menuitem.xml           | 13 ++-
 .../wizard/account_balance_report_view.xml    | 96 +++++++++----------
 .../wizard/account_central_journal_view.xml   | 50 +++++-----
 .../wizard/account_general_journal_view.xml   | 50 +++++-----
 .../account_general_ledger_report_view.xml    |  2 +-
 .../account/wizard/account_pl_report_view.xml |  5 -
 .../wizard/account_print_journal_view.xml     |  2 +-
 addons/account_coda/wizard/coda_import.py     | 31 +++---
 addons/base_calendar/base_calendar.py         |  1 -
 9 files changed, 130 insertions(+), 120 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index e0ac10abb50..93cdbbf9904 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -16,7 +16,6 @@
         <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5"/>
         <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/>
             <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
-            <menuitem id="menu_generic_report" name="Management Reports" parent="menu_finance_reporting"/>
             <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
             <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13"/>
@@ -34,7 +33,6 @@
 <!--        <menuitem id="menu_finance_reporting11" name="Reporting" parent="account.menu_finance"  sequence="80"/>-->
         <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
 <!--        <menuitem id="menu_finance_legal_statement1" name="Legal Statements" parent="account.menu_finance_reporting" sequence="200"/>-->
-<!--        <menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/>-->
 
         <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4"
             groups="group_account_user"/>
@@ -46,6 +44,17 @@
         <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing"/>
 
        <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
+
+       <menuitem 
+            parent="account.menu_finance_legal_statement" 
+            id="final_accounting_reports"
+            name="Accounting Reports"/>
+
+       <menuitem 
+            parent="account.menu_finance_legal_statement" 
+            id="menu_journals_report"
+            name="Journals"/>
+
     </data>
 </openerp>
 
diff --git a/addons/account/wizard/account_balance_report_view.xml b/addons/account/wizard/account_balance_report_view.xml
index 77c615611d3..7011dadef7d 100644
--- a/addons/account/wizard/account_balance_report_view.xml
+++ b/addons/account/wizard/account_balance_report_view.xml
@@ -7,41 +7,41 @@
              <field name="model">account.balance.report</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-              	<form string="Select period">
-              		<group width="650" height="200">
-				    <field name="company_id" groups="base.group_multi_company"/>
-				    <field name="display_account" required = "True"/>
-				    <newline/>
-				    <field name="fiscalyear"/>
-				    <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
-				    <newline/>
-				    <separator string="Filters" colspan="4"/>
-				    <field name="state" required="True"/>
-				    <newline/>
-				    <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
-				        <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
-				            <separator string="Date Filter" colspan="4"/>
-				            <field name="date_from"/>
-				            <field name="date_to"/>
-				        </group>
-				        <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
-				            <separator string="Filter on Periods" colspan="4"/>
-				            <field name="periods" colspan="4" nolabel="1"/>
-				        </group>
-				    </group>
-				    <newline/>
-     				<group colspan="4" col="6">
-                       	<separator colspan="4"/>
-                       	<newline/>
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="check_state" string="Print" type="object" icon="gtk-print" default_focus="1"/>
- 					</group>
- 					</group>
-				</form>
+                  <form string="Select period">
+                      <group width="650" height="200">
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="display_account" required = "True"/>
+                    <newline/>
+                    <field name="fiscalyear"/>
+                    <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
+                    <newline/>
+                    <separator string="Filters" colspan="4"/>
+                    <field name="state" required="True"/>
+                    <newline/>
+                    <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
+                        <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
+                            <separator string="Date Filter" colspan="4"/>
+                            <field name="date_from"/>
+                            <field name="date_to"/>
+                        </group>
+                        <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
+                            <separator string="Filter on Periods" colspan="4"/>
+                            <field name="periods" colspan="4" nolabel="1"/>
+                        </group>
+                    </group>
+                    <newline/>
+                     <group colspan="4" col="6">
+                           <separator colspan="4"/>
+                           <newline/>
+                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                           <button name="check_state" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+                     </group>
+                     </group>
+                </form>
              </field>
- 		</record>
+         </record>
 
- 		<record id="action_account_balance_report" model="ir.actions.act_window">
+         <record id="action_account_balance_report" model="ir.actions.act_window">
              <field name="name">Account Balance</field>
              <field name="res_model">account.balance.report</field>
              <field name="type">ir.actions.act_window</field>
@@ -51,7 +51,7 @@
              <field name="target">new</field>
        </record>
 
-		<record model="ir.values" id="action_account_balance_report_values">
+        <record model="ir.values" id="action_account_balance_report_values">
             <field name="model_id" ref="account.model_account_account" />
             <field name="object" eval="1" />
             <field name="name">Account Balance</field>
@@ -59,19 +59,19 @@
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_balance_report'))" />
             <field name="key">action</field>
             <field name="model">account.account</field>
-		</record>
+        </record>
 
-		<record id="account_balance_report_account_view" model="ir.ui.view">
+        <record id="account_balance_report_account_view" model="ir.ui.view">
             <field name="name">Account Balance</field>
              <field name="model">account.balance.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-		        <form string="Select Chart">
-		        	<field name="Account_list"/>
-		        	<separator colspan="4"/>
-	            <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-		            <button name="next_view" string="Next" type="object" icon="gtk-go-forward" default_focus="1"/>
-		        </form>
+                <form string="Select Chart">
+                    <field name="Account_list"/>
+                    <separator colspan="4"/>
+                <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button name="next_view" string="Next" type="object" icon="gtk-go-forward" default_focus="1"/>
+                </form>
             </field>
         </record>
 
@@ -86,11 +86,11 @@
              <field name="target">new</field>
        </record>
 
- 	   <menuitem icon="STOCK_PRINT"
- 	   		name="Account Balance"
- 	   		action="action_account_balance_account_report"
- 			id="menu_account_balance_report"
- 			parent="account.menu_generic_report"/>
+      <menuitem icon="STOCK_PRINT"
+         name="Account Balance"
+         action="action_account_balance_account_report"
+         id="menu_account_balance_report"
+         parent="account.final_accounting_reports"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account/wizard/account_central_journal_view.xml b/addons/account/wizard/account_central_journal_view.xml
index 6a9526c415e..9c9d687785c 100644
--- a/addons/account/wizard/account_central_journal_view.xml
+++ b/addons/account/wizard/account_central_journal_view.xml
@@ -2,27 +2,27 @@
 <openerp>
     <data>
 
-		<record id="view_account_central_journal" model="ir.ui.view">
+        <record id="view_account_central_journal" model="ir.ui.view">
             <field name="name">Account central Journal</field>
             <field name="model">account.central.journal</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Print Central Journal">
-				<group height="370" width="400">
-				    <group>
-					    <separator string="Journals"/><newline/>
-					    <field name="journal_id" nolabel="1"/><newline/>
-					    <separator string="Periods"/><newline/>
-					    <field name="period_id" nolabel="1"/><newline/>
-					</group>
-					<newline/>
-				    <group>
-			    		<separator colspan="4"/>
-	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
-					</group>
-				</group>
-			</form>
+            <form string="Print Central Journal">
+                <group height="370" width="400">
+                    <group>
+                        <separator string="Journals"/><newline/>
+                        <field name="journal_id" nolabel="1"/><newline/>
+                        <separator string="Periods"/><newline/>
+                        <field name="period_id" nolabel="1"/><newline/>
+                    </group>
+                    <newline/>
+                    <group>
+                        <separator colspan="4"/>
+                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                        <button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+                    </group>
+                </group>
+            </form>
             </field>
         </record>
 
@@ -35,12 +35,12 @@
             <field name="target">new</field>
         </record>
 
-		<menuitem
-	        name="Central Journals"
-	        parent="account.menu_generic_report"
-	        action="action_account_central_journal"
-	        id="menu_account_central_journal"
-	        icon="STOCK_PRINT"/>
+        <menuitem
+            name="Central Journals"
+            parent="account.menu_journals_report"
+            action="action_account_central_journal"
+            id="menu_account_central_journal"
+            icon="STOCK_PRINT"/>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_general_journal_view.xml b/addons/account/wizard/account_general_journal_view.xml
index a3a54843396..711e3a85329 100644
--- a/addons/account/wizard/account_general_journal_view.xml
+++ b/addons/account/wizard/account_general_journal_view.xml
@@ -2,27 +2,27 @@
 <openerp>
     <data>
 
-		<record id="view_account_general_journal" model="ir.ui.view">
+        <record id="view_account_general_journal" model="ir.ui.view">
             <field name="name">Account Genral Journal</field>
             <field name="model">account.general.journal</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Print General Journal">
-				<group height="380" width="400">
-				    <group>
-					    <separator string="Journals"/><newline/>
-					    <field name="journal_id" nolabel="1"/><newline/>
-					    <separator string="Periods"/><newline/>
-					    <field name="period_id" nolabel="1"/><newline/>
-					</group>
-					<newline/>
-				    <group>
-			    		<separator colspan="4"/>
-	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
-					</group>
-				</group>
-			</form>
+            <form string="Print General Journal">
+                <group height="380" width="400">
+                    <group>
+                        <separator string="Journals"/><newline/>
+                        <field name="journal_id" nolabel="1"/><newline/>
+                        <separator string="Periods"/><newline/>
+                        <field name="period_id" nolabel="1"/><newline/>
+                    </group>
+                    <newline/>
+                    <group>
+                        <separator colspan="4"/>
+                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                        <button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+                    </group>
+                </group>
+            </form>
             </field>
         </record>
 
@@ -35,12 +35,12 @@
             <field name="target">new</field>
         </record>
 
-		<menuitem
-	        name="General Journals"
-	        parent="account.menu_generic_report"
-	        action="action_account_general_journal"
-	        id="menu_account_general_journal"
-	        icon="STOCK_PRINT"/>
+        <menuitem
+            name="General Journals"
+            parent="account.menu_journals_report"
+            action="action_account_general_journal"
+            id="menu_account_general_journal"
+            icon="STOCK_PRINT"/>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_general_ledger_report_view.xml b/addons/account/wizard/account_general_ledger_report_view.xml
index b06c24d501d..67526d51788 100644
--- a/addons/account/wizard/account_general_ledger_report_view.xml
+++ b/addons/account/wizard/account_general_ledger_report_view.xml
@@ -96,7 +96,7 @@
         <menuitem
         	icon="STOCK_PRINT"
 	        name="General Ledger"
-	        parent="account.menu_generic_report"
+	        parent="account.final_accounting_reports"
 	        action="action_account_general_ledger_menu"
 	        id="menu_general_ledger"
 	       />
diff --git a/addons/account/wizard/account_pl_report_view.xml b/addons/account/wizard/account_pl_report_view.xml
index 47ad83a235e..219d41d312f 100644
--- a/addons/account/wizard/account_pl_report_view.xml
+++ b/addons/account/wizard/account_pl_report_view.xml
@@ -76,11 +76,6 @@
              <field name="target">new</field>
        </record>
        
-       <menuitem 
-            parent="account.menu_finance_legal_statement" 
-            id="final_accounting_reports"
-            name="Accounting Reports"/>
-
         <menuitem icon="STOCK_PRINT"
                 name="Profit And Loss"
                 action="action_pl_balance_account_report"
diff --git a/addons/account/wizard/account_print_journal_view.xml b/addons/account/wizard/account_print_journal_view.xml
index 1a4ad43724b..31cbe322bd3 100644
--- a/addons/account/wizard/account_print_journal_view.xml
+++ b/addons/account/wizard/account_print_journal_view.xml
@@ -61,7 +61,7 @@
 
         <menuitem
             name="Journals"
-            parent="account.menu_generic_report"
+            parent="account.menu_journals_report"
             action="action_account_print_journal"
             id="menu_account_print_journal"
             icon="STOCK_PRINT"/>
diff --git a/addons/account_coda/wizard/coda_import.py b/addons/account_coda/wizard/coda_import.py
index 9f0b413ee1d..39aa7b645cb 100644
--- a/addons/account_coda/wizard/coda_import.py
+++ b/addons/account_coda/wizard/coda_import.py
@@ -234,22 +234,29 @@ def _coda_parsing(self, cr, uid, data, context):
                     if rec_id:
                         reconcile_id = pool.get('account.bank.statement.reconcile').create(cr, uid, {
                             'line_ids': [(6, 0, rec_id)]
-                            }, context=context)
+                        }, context=context)
+                        mv = pool.get('account.move.line').browse(cr, uid, rec_id[0], context=context)
+                        if mv.partner_id:
+                            line['partner_id'] = mv.partner_id.id
+                            if line['amount'] < 0 :
+                                line['account_id'] = mv.partner_id.property_account_payable.id
+                            else :
+                                line['account_id'] = mv.partner_id.property_account_receivable.id
                 str_not1 = ''
                 if line.has_key('contry_name') and line.has_key('cntry_number'):
                     str_not1="Partner name:%s \n Partner Account Number:%s \n Communication:%s \n Value Date:%s \n Entry Date:%s \n"%(line["contry_name"],line["cntry_number"],line["free_comm"]+line['extra_note'],line["val_date"][0],line["entry_date"][0])
                 id=pool.get('account.bank.statement.line').create(cr,uid,{
-                           'name':line['name'],
-                           'date': line['date'],
-                           'type':line['amount']>0 and 'customer' or 'supplier',
-                           'amount': line['amount'],
-                           'partner_id':line['partner_id'] or 0,
-                           'account_id':line['account_id'],
-                           'statement_id': bk_st_id,
-                           'reconcile_id': reconcile_id,
-                           'note':str_not1,
-                           'ref':line['ref'],
-                           })
+                   'name':line['name'],
+                   'date': line['date'],
+                   'type':line['amount']>0 and 'customer' or 'supplier',
+                   'amount': line['amount'],
+                   'partner_id':line['partner_id'] or 0,
+                   'account_id':line['account_id'],
+                   'statement_id': bk_st_id,
+                   'reconcile_id': reconcile_id,
+                   'note':str_not1,
+                   'ref':line['ref'],
+                })
 
             str_not= "\n \n Account Number: %s \n Account Holder Name: %s " %(statement["acc_number"],statement["acc_holder"])
             std_log += "\nStatement : %s , Date  : %s, Starting Balance :  %.2f , Ending Balance : %.2f \n"\
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index a8cdba58975..674dc143334 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1147,7 +1147,6 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         'active': fields.boolean('Active', help="If the active field is set to \
 true, it will allow you to hide the event alarm information without removing it.")
     }
-
     _defaults = {
             'state': 'tentative',
             'class': 'public',

From 3bda1bf02e0aeeaa18807e485f148e01fe72c6a1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 22 Jul 2010 19:48:22 +0200
Subject: [PATCH 10/13] typo

bzr revid: fp@tinyerp.com-20100722174822-nww02qcppb14dpkj
---
 addons/hr/hr_department_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 6e268f06afe..1b96956394f 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -85,7 +85,7 @@
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Departements Informations" groups="base.group_extended">
+                    <page string="Departments" groups="base.group_extended">
                         <field name="context_department_id" completion="1" widget="selection" string="Department"/>
                         <separator string="Managers" colspan="4"/>
                         <field name="parent_id" nolabel="1" colspan="4"/>

From ab47dac347fb11dabdf982f87e7789621442004a Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Fri, 23 Jul 2010 05:08:05 +0100
Subject: [PATCH 11/13] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100723040805-7ra7ztvxyy7zw62j
---
 addons/account/i18n/et.po              | 817 +++++++++++++++--------
 addons/account/i18n/nl_BE.po           | 871 +++++++++++++------------
 addons/account/i18n/zh_CN.po           |  22 +-
 addons/analytic/i18n/et.po             | 266 ++++++++
 addons/product_manufacturer/i18n/fr.po | 105 +++
 5 files changed, 1403 insertions(+), 678 deletions(-)
 create mode 100644 addons/analytic/i18n/et.po
 create mode 100644 addons/product_manufacturer/i18n/fr.po

diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index 015b3382131..de29b97400e 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* account
+#	* account
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-25 18:22+0000\n"
+"PO-Revision-Date: 2010-07-22 20:15+0000\n"
 "Last-Translator: lyyser <logard.1961@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-06-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-07-23 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -92,7 +92,8 @@ msgid "Unreconciled entries"
 msgstr "Võrdlemata kirjed"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Baaskood"
@@ -124,7 +125,8 @@ msgid "Residual"
 msgstr "Jääk"
 
 #. module: account
-#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -185,8 +187,8 @@ msgid "Move line select"
 msgstr "Liiguta valitud rida"
 
 #. module: account
-#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0
+#: rml:account.tax.code.entries:0
 msgid "Entry label"
 msgstr "Kirje silt"
 
@@ -201,12 +203,14 @@ msgid "Period Sum"
 msgstr "Perioodi summa"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Arvuta kood (kui tüüp=kood)"
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Raamatupidamiskande rida"
 
@@ -223,10 +227,12 @@ msgstr "Perioodilised kirjed"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
-#: field:account.invoice.tax,amount:0 field:account.move,amount:0
-#: field:account.tax,amount:0 field:account.tax.template,amount:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.reconcile.line,amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: field:account.move,amount:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
 msgid "Amount"
 msgstr "Kogus"
 
@@ -262,7 +268,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -271,19 +278,20 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0 selection:account.tax.template,type:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Fikseeritud"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
 msgid "Overdue Payments"
 msgstr "Tasumata Maksed"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
 #: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
 #: wizard_view:account.analytic.account.cost_ledger.report,init:0
 #: wizard_view:account.analytic.account.inverted.balance.report,init:0
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -292,7 +300,8 @@ msgid "Select period"
 msgstr "Vali periood"
 
 #. module: account
-#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0
+#: field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Päritolu"
 
@@ -322,10 +331,12 @@ msgid "Delta Debit"
 msgstr "Delta deebet"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice,amount_tax:0
+#: model:account.account.type,name:account.account_type_tax
+#: rml:account.invoice:0
+#: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr "Maksud"
+msgstr "Maks"
 
 #. module: account
 #: rml:account.general.journal:0
@@ -335,18 +346,22 @@ msgstr "Deebet tehing"
 #. module: account
 #: field:account.analytic.line,account_id:0
 #: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
 #: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
 msgstr "Analüütiline konto"
 
 #. module: account
-#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Maks alamliikidele"
 
 #. module: account
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Päeviku nimi"
@@ -414,8 +429,11 @@ msgid "Contra"
 msgstr "Vastu"
 
 #. module: account
-#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
-#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
+#: field:account.analytic.account,state:0
+#: field:account.bank.statement,state:0
+#: field:account.invoice,state:0
+#: view:account.move:0
+#: view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Olek"
@@ -427,7 +445,8 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Maksmata tarnija hüvitised"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Eriline arvutamine"
 
@@ -449,8 +468,10 @@ msgid "Disc.(%)"
 msgstr "Allah. (%)"
 
 #. module: account
-#: rml:account.general.ledger:0 field:account.model,ref:0
-#: field:account.move,ref:0 rml:account.overdue:0
+#: rml:account.general.ledger:0
+#: field:account.model,ref:0
+#: field:account.move,ref:0
+#: rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Viide"
@@ -641,9 +662,13 @@ msgid "Sub-Total :"
 msgstr "Vahesumma:"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0
+#: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
 #: model:ir.ui.menu,name:account.next_id_41
+#, python-format
 msgid "Analytic Entries"
 msgstr "Analüütilised kirjed"
 
@@ -658,6 +683,7 @@ msgid "Associated Partner"
 msgstr "Seotud partner"
 
 #. module: account
+#: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
 msgstr "Lisainfo"
@@ -673,7 +699,8 @@ msgid "Select the Period for Analysis"
 msgstr "Vali periood analüüsi jaoks"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -705,7 +732,8 @@ msgid "Field Name"
 msgstr "Välja nimi"
 
 #. module: account
-#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0
+#: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Logi vanemana"
 
@@ -715,7 +743,8 @@ msgid "End of Year Entries Journal"
 msgstr "Aastalõpu kirjete päevik"
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Purchase Properties"
 msgstr "Ostu omadused"
 
@@ -735,9 +764,12 @@ msgid "Move Lines Created."
 msgstr "Liiguta loodud read."
 
 #. module: account
-#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
-#: field:account.move,state:0 field:account.move.line,state:0
-#: field:account.period,state:0 field:account.subscription,state:0
+#: field:account.fiscalyear,state:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: field:account.subscription,state:0
 msgid "Status"
 msgstr "Olek"
 
@@ -890,8 +922,10 @@ msgstr "Vali kontoplaan"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
-#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Kogus"
@@ -934,13 +968,16 @@ msgstr "Analüütiline arve"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0 rml:account.general.journal:0
+#: view:account.fiscalyear:0
+#: rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0 field:account.move,period_id:0
+#: field:account.journal.period,period_id:0
+#: field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0
+#: view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -962,7 +999,8 @@ msgid "Net Total:"
 msgstr "Netosumma:"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1084,7 +1122,8 @@ msgid "Fiscal Position Templates"
 msgstr "Finantspositsioonide mallid"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Ühiku hind"
 
@@ -1237,7 +1276,8 @@ msgid "Not reconciled transactions"
 msgstr "Võrdlemata tehingud"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1259,7 +1299,8 @@ msgid "Write-Off account"
 msgstr "Mahakandmiste konto"
 
 #. module: account
-#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0
+#: field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Mudel"
 
@@ -1285,9 +1326,11 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0
+#: field:account.journal,view_id:0
 msgid "View"
 msgstr "Vaade"
 
@@ -1356,7 +1399,8 @@ msgstr "Konto tüübid"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1372,7 +1416,8 @@ msgid "Journal"
 msgstr "Päevik"
 
 #. module: account
-#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0
+#: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Alamkontod"
 
@@ -1398,7 +1443,8 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Hoia tühjana, et kasutada tulude kontot"
 
@@ -1407,6 +1453,9 @@ msgstr "Hoia tühjana, et kasutada tulude kontot"
 #: field:account.bank.statement.reconcile,line_new_ids:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
 msgid "Write-Off"
 msgstr "Mahakandmine"
 
@@ -1525,7 +1574,8 @@ msgid "Account n°"
 msgstr "Konto nr."
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Jäta tühjaks kasutamaks kulu kontot"
 
@@ -1535,7 +1585,8 @@ msgid "Account to reconcile"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 field:account.model.line,partner_id:0
+#: rml:account.invoice:0
+#: field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Partneri viide"
@@ -1547,12 +1598,14 @@ msgid "Receivable and Payable Accounts"
 msgstr "Nõuete ja võlgade kontod"
 
 #. module: account
-#: view:account.subscription:0 field:account.subscription,lines_id:0
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Tellimuse read"
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1716,7 +1769,8 @@ msgid "Period length (days)"
 msgstr "Perioodi pikkus (päeva)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Protsent"
@@ -1727,7 +1781,8 @@ msgid "Charts"
 msgstr "Plaanid"
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1801,9 +1856,11 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
-#: field:account.journal,type:0 field:account.move,type:0
-#: field:account.move.reconcile,type:0 xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0
+#: field:account.invoice,type:0
+#: field:account.journal,type:0
+#: field:account.move,type:0
+#: field:account.move.reconcile,type:0
 msgid "Type"
 msgstr "Tüüp"
 
@@ -1951,7 +2008,8 @@ msgid "Journal-Period Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -1966,7 +2024,8 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2039,8 +2098,10 @@ msgstr "Endine"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
-#: field:account.journal,currency:0 field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,currency_id:0
+#: field:account.journal,currency:0
+#: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Valuuta"
@@ -2078,7 +2139,8 @@ msgid "Analytic Entry"
 msgstr "Analüütiline kirje"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2130,7 +2192,8 @@ msgid "Detail"
 msgstr "Detail"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Konsolideerimine"
 
@@ -2193,9 +2256,13 @@ msgid "Date Invoiced"
 msgstr "Arveldamise kuupäev"
 
 #. module: account
-#: help:account.balance.account.balance.report,init,periods:0
+#: help:account.account.balance.report,checktype,periods:0
+#: help:account.general.ledger.report,checktype,periods:0
+#: help:account.partner.balance.report,init,periods:0
+#: help:account.third_party_ledger.report,init,periods:0
+#: help:account.vat.declaration,init,periods:0
 msgid "All periods if empty"
-msgstr "Kõik perioodid kui tühi"
+msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
@@ -2218,17 +2285,22 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0
+#: rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0 field:account.move,date:0
+#: rml:account.journal.period.print:0
+#: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
+#: field:account.subscription.line,date:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Date"
 msgstr "Kuupäev"
 
@@ -2244,7 +2316,8 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: field:account.tax,type:0 field:account.tax.template,type:0
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Maksutüüp"
 
@@ -2254,7 +2327,8 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0
+#: field:account.journal,user_id:0
 msgid "User"
 msgstr "Kasutaja"
 
@@ -2340,15 +2414,18 @@ msgid "Date End"
 msgstr "Lõppkuupäev"
 
 #. module: account
-#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0
+#: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
 msgstr "Kirje read"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr ""
 
@@ -2437,9 +2514,11 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0
+#: wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0
+#: view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2458,7 +2537,8 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0
+#: view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Loobu"
 
@@ -2468,8 +2548,10 @@ msgid "Acc. Type Name"
 msgstr "Konto tüübi nimi"
 
 #. module: account
-#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2483,7 +2565,8 @@ msgid "Litigation"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0 wizard_view:account.move.validate,init:0
+#: view:account.move.line:0
+#: wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Info"
@@ -2526,6 +2609,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
 #: model:ir.ui.menu,name:account.next_id_40
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
@@ -2593,7 +2678,8 @@ msgid "Price"
 msgstr "Hind"
 
 #. module: account
-#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr ""
@@ -2628,6 +2714,7 @@ msgid "Invoice Number"
 msgstr "Arve number"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: field:account.period,date_stop:0
 msgid "End of Period"
 msgstr "Perioodi lõpp"
@@ -2660,13 +2747,17 @@ msgid "Invoice Reference"
 msgstr ""
 
 #. module: account
-#: field:account.account,name:0 field:account.account.template,name:0
+#: field:account.account,name:0
+#: field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0 field:account.config.wizard,name:0
-#: field:account.model.line,name:0 field:account.move,name:0
-#: field:account.move.line,name:0 field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0
+#: field:account.config.wizard,name:0
+#: field:account.model.line,name:0
+#: field:account.move,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Nimi"
@@ -2706,7 +2797,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0 view:account.journal.view:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2799,11 +2891,14 @@ msgid "Full Account Name"
 msgstr "Täielik konto nimi"
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2824,7 +2919,9 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0 view:product.template:0 view:res.partner:0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
 msgid "Accounting"
 msgstr "Raamatupidamine"
 
@@ -2857,9 +2954,11 @@ msgstr "Kirje read"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 #: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
 #: model:ir.ui.menu,name:account.next_id_20
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
 msgid "Reconciliation"
 msgstr ""
 
@@ -2869,8 +2968,10 @@ msgid "Centralisation"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
-#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax,tax_code_id:0
+#: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Maksukood"
@@ -2910,12 +3011,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Situation"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 xsl:account.transfer:0
+#: rml:account.invoice:0
 msgid "Document"
 msgstr "Dokument"
 
@@ -2953,7 +3055,8 @@ msgid "Cancel selected invoices"
 msgstr "Tühista valitud arved"
 
 #. module: account
-#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -2962,6 +3065,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Entry Label"
 msgstr ""
 
@@ -2976,23 +3081,28 @@ msgid "("
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Sea mustandiks"
 
 #. module: account
-#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Võlad"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.tax,base:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Baas"
 
@@ -3002,7 +3112,8 @@ msgid "Model Name"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Others"
 msgstr "Muud"
 
@@ -3012,13 +3123,15 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:account.move:0
+#: view:account.invoice:0
+#: view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Valideeri"
 
 #. module: account
-#: view:account.model:0 field:account.model,legend:0
+#: view:account.model:0
+#: field:account.model,legend:0
 msgid "Legend"
 msgstr ""
 
@@ -3033,14 +3146,17 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0 rml:account.account.balance:0
+#: view:account.account:0
+#: rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0
+#: field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3061,9 +3177,12 @@ msgid "By Date and Period"
 msgstr "Kuupäeva ja perioodi järgi"
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0 view:account.invoice.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0
+#: view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Märkused"
@@ -3076,7 +3195,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3101,15 +3221,21 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0 rml:account.account.balance:0
-#: field:account.account.template,code:0 field:account.account.type,code:0
+#: field:account.account,code:0
+#: rml:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
-#: rml:account.general.journal:0 field:account.journal,code:0
-#: rml:account.partner.balance:0 field:account.period,code:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0
+#: field:account.fiscalyear,code:0
+#: rml:account.general.journal:0
+#: field:account.journal,code:0
+#: rml:account.partner.balance:0
+#: field:account.period,code:0
 msgid "Code"
 msgstr "Kood"
 
@@ -3119,7 +3245,8 @@ msgid "Financial Management"
 msgstr "Finantshaldus"
 
 #. module: account
-#: selection:account.account.type,close_method:0 selection:account.tax,type:0
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr ""
@@ -3131,6 +3258,7 @@ msgid "Generate Fiscal Year Opening Entries"
 msgstr "Genereeri majandusaasta avatud kirjetega"
 
 #. module: account
+#: view:account.move.reconcile:0
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
 msgstr ""
@@ -3146,7 +3274,8 @@ msgid "Additionnal Information"
 msgstr "Lisainfo"
 
 #. module: account
-#: field:account.tax,name:0 field:account.tax.template,name:0
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Maksu Nimi"
@@ -3223,7 +3352,8 @@ msgid "Partner Balance"
 msgstr "Partneri bilanss"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3236,7 +3366,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3273,7 +3404,8 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:wizard.company.setup:0
+#: view:account.invoice:0
+#: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr ""
@@ -3289,7 +3421,8 @@ msgid "Invoice line"
 msgstr ""
 
 #. module: account
-#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Otsetee"
 
@@ -3314,13 +3447,15 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Ülem maksukonto"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0 view:account.account.type:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3356,7 +3491,8 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3432,7 +3568,8 @@ msgid "Journal code"
 msgstr "Päeviku kood"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0
+#: view:account.model:0
 msgid "Create entries"
 msgstr "Loo sissekanded"
 
@@ -3469,7 +3606,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
 msgstr "Kirje Nimi"
@@ -3488,11 +3624,14 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0
+#: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Järjekord"
@@ -3558,7 +3697,8 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0 rml:account.overdue:0
+#: field:account.move.line,date_maturity:0
+#: rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Tähtaja kuupäev"
 
@@ -3578,7 +3718,8 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0
+#: field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Alguskuupäev"
@@ -3616,7 +3757,8 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: field:account.account,note:0 field:account.account.template,note:0
+#: field:account.account,note:0
+#: field:account.account.template,note:0
 msgid "Note"
 msgstr ""
 
@@ -3640,7 +3782,8 @@ msgid "Entry Sequence"
 msgstr "Kirje järjekord"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Suletud"
 
@@ -3761,9 +3904,12 @@ msgid "Code/Date"
 msgstr "Kood/Kuupäev"
 
 #. module: account
-#: field:account.account,active:0 field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0 field:account.journal,active:0
-#: field:account.journal.period,active:0 field:account.payment.term,active:0
+#: field:account.account,active:0
+#: field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Aktiivne"
@@ -3815,15 +3961,20 @@ msgid "Secondary Currency"
 msgstr "Teine Valuuta"
 
 #. module: account
-#: field:account.account,credit:0 rml:account.account.balance:0
+#: field:account.account,credit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.journal.period.print:0
-#: field:account.model.line,credit:0 field:account.move.line,credit:0
-#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3854,7 +4005,8 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr ""
 
@@ -3946,15 +4098,18 @@ msgid "Journal Column"
 msgstr ""
 
 #. module: account
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Valmis"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0 view:account.fiscalyear:0
+#: field:account.config.wizard,period:0
+#: view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -3967,7 +4122,8 @@ msgid "Periods"
 msgstr "Perioodid"
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -3994,7 +4150,8 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Vaikimisi Maksud"
 
@@ -4048,7 +4205,8 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Konto nimi"
 
@@ -4139,7 +4297,8 @@ msgid "Import file from your bank statement"
 msgstr "Impordi fail oma pangabilansist"
 
 #. module: account
-#: field:account.account,type:0 field:account.account.template,type:0
+#: field:account.account,type:0
+#: field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Sisemine tüüp"
 
@@ -4165,12 +4324,14 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Krediidi Märkused"
 
 #. module: account
-#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0
+#: field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Lõppkuupäev"
 
@@ -4191,7 +4352,8 @@ msgid "Day of the Month"
 msgstr "Päev kuus"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Read"
 
@@ -4209,7 +4371,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Maksudeklaratsioon"
 
@@ -4269,12 +4432,14 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0 view:account.period:0
+#: view:account.fiscalyear:0
+#: view:account.period:0
 msgid "States"
 msgstr "Olekud"
 
@@ -4288,7 +4453,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
 msgid "Receivables & Payables"
-msgstr "Nõuded ja võlad"
+msgstr ""
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -4310,7 +4475,8 @@ msgstr "Alguskuupäev"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0
+#: field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Kokku"
 
@@ -4427,9 +4593,11 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0 field:account.journal,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4524,9 +4692,12 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0 field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0
+#: field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0
+#: field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -4603,7 +4774,8 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Nõuded"
@@ -4630,7 +4802,8 @@ msgstr "KM:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Kokku:"
@@ -4641,7 +4814,8 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4657,7 +4831,8 @@ msgid "Account Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0 selection:account.bank.statement,state:0
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Kinnita"
 
@@ -4672,7 +4847,8 @@ msgid "Parent Account Template"
 msgstr "Ülemkonto mall"
 
 #. module: account
-#: help:account.tax,domain:0 help:account.tax.template,domain:0
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4690,7 +4866,8 @@ msgid "Analytic account"
 msgstr "Analüütiline konto"
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Tarnija arve"
 
@@ -4700,16 +4877,22 @@ msgid "Valid"
 msgstr "Kehtiv"
 
 #. module: account
-#: field:account.account,debit:0 rml:account.account.balance:0
+#: field:account.account,debit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 field:account.model.line,debit:0
-#: field:account.move.line,debit:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.central.journal:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Deebet"
@@ -4730,6 +4913,7 @@ msgid "Invoice Lines"
 msgstr "Arve read"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: field:account.period,date_start:0
 msgid "Start of Period"
 msgstr "Perioodi algus"
@@ -4771,7 +4955,8 @@ msgid "Reporting"
 msgstr "Aruandlus"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -4799,10 +4984,11 @@ msgstr "Grupeeri arve read"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
 msgid "Configuration"
-msgstr "Seadistus"
+msgstr "Seadistused"
 
 #. module: account
-#: view:account.analytic.line:0 view:account.invoice:0
+#: view:account.analytic.line:0
+#: view:account.invoice:0
 msgid "Total amount"
 msgstr "Kogusumma"
 
@@ -4852,12 +5038,14 @@ msgid "Paid invoice"
 msgstr "Makstud arve"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Maksu definitsioon"
 
 #. module: account
-#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0
+#: field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Maksu Grupp"
 
@@ -4898,7 +5086,8 @@ msgid "With movements"
 msgstr "Liikumistega"
 
 #. module: account
-#: field:account.tax,domain:0 field:account.tax.template,domain:0
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domeen"
 
@@ -4923,7 +5112,9 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
+#: view:account.invoice:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -4940,7 +5131,8 @@ msgid "Payable Accounts"
 msgstr "Võlgade kontod"
 
 #. module: account
-#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Arve rida"
 
@@ -4991,7 +5183,8 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 field:account.invoice,payment_ids:0
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Maksed"
@@ -5037,9 +5230,12 @@ msgstr "Vali päevik ja makse kuupäev"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.move,state:0
-#: selection:account.move.line,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.move,state:0
+#: selection:account.move.line,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Mustand"
@@ -5066,7 +5262,8 @@ msgid "Are you sure ?"
 msgstr "Oled sa kindel?"
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -5102,16 +5299,20 @@ msgid "Supplier Invoice Process"
 msgstr "Tarnija arve protsess"
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Optional Information"
 msgstr "Valikuline info"
 
@@ -5127,7 +5328,8 @@ msgid "Receivable and Payable"
 msgstr "Nõuded ja võlad"
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.general.journal:0
+#: rml:account.account.balance:0
+#: rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5150,7 +5352,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Arvuta"
@@ -5184,7 +5387,6 @@ msgstr "Perioodide arv"
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5194,7 +5396,8 @@ msgid "End of period"
 msgstr "Perioodi lõpp"
 
 #. module: account
-#: view:account.move:0 model:ir.model,name:account.model_account_move
+#: view:account.move:0
+#: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Konto kirje"
 
@@ -5205,7 +5408,8 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0 rml:account.account.balance:0
+#: field:account.account,balance:0
+#: rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5213,9 +5417,12 @@ msgstr ""
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0 field:account.move.line,balance:0
-#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0 rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0
+#: field:account.move.line,balance:0
+#: rml:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Bilanss"
@@ -5259,8 +5466,11 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.journal:0 view:account.move:0 view:account.move.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "General Information"
 msgstr "Üldine info"
 
@@ -5299,7 +5509,8 @@ msgid "List of Accounts"
 msgstr "Kontode nimekiri"
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5364,7 +5575,6 @@ msgstr "Majandusaasta mida sulgeda"
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
 #: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -5392,11 +5602,15 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
-#: field:account.invoice,name:0 field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0
+#: rml:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0 field:account.payment.term,note:0
-#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
+#: rml:account.overdue:0
+#: field:account.payment.term,note:0
+#: field:account.tax.code,info:0
+#: field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Kirjeldus"
 
@@ -5440,7 +5654,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5522,7 +5737,8 @@ msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Cash"
 msgstr "Kassa"
 
@@ -5562,7 +5778,8 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Jäta tühjaks kõigi avatud majandusaastate joks"
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Tarnija tagasimakse"
 
@@ -5610,8 +5827,10 @@ msgstr ""
 "Seda kontot kasutatakse käesoleva kategooria lao väljundväärtuse hindamiseks"
 
 #. module: account
-#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5645,8 +5864,10 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Majandusaasta nimi nagu kuvatakse ekraanil."
 
 #. module: account
-#: field:account.invoice,payment_term:0 view:account.payment.term:0
-#: field:account.payment.term,name:0 view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5704,7 +5925,8 @@ msgstr "Jah"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid "Check this if the user is allowed to reconcile entries in this account."
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
@@ -5715,21 +5937,22 @@ msgstr "Arvuta kirje kuupäevad"
 #. module: account
 #: view:board.board:0
 msgid "Analytic accounts to close"
-msgstr "Analüütilised kontod sulgeda"
+msgstr ""
 
 #. module: account
 #: view:board.board:0
 msgid "Draft invoices"
-msgstr "Arvete mustandid"
+msgstr ""
 
 #. 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 "Raamatupdamise töölaud"
+msgstr ""
 
 #. module: account
-#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.act_my_account
 msgid "Accounts to invoice"
 msgstr ""
 
@@ -5737,7 +5960,7 @@ msgstr ""
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
 msgid "Costs to invoice"
-msgstr "Kulud arveldamiseks"
+msgstr ""
 
 #. module: account
 #: view:board.board:0
@@ -5747,69 +5970,69 @@ msgstr ""
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Board for accountant"
-msgstr "Töölaud raamatupidajale"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_income
 msgid "Income Accounts"
-msgstr "Tulude kontod"
+msgstr ""
 
 #. module: account
 #: view:board.board:0
 msgid "My indicators"
-msgstr "Minu näiturid"
+msgstr ""
 
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr "Raamatupidamise töölaud"
+msgstr ""
 
 #. module: account
 #: view:board.board:0
 msgid "Aged income"
-msgstr "Aegunud tulu"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,show_columns:0
 msgid "Show Debit/Credit Information"
-msgstr "Näita Deebet/Kreedit informatsiooni"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "All accounts"
-msgstr "Kõik kontod"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,period_manner:0
 msgid "Entries Selection Based on"
-msgstr "Kirjete valik põhineb"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "Notification"
-msgstr "Teavitus"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Financial Period"
-msgstr "Finantsperiood"
+msgstr ""
 
 #. 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 "Kontojääk"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period(s)"
-msgstr "Vali periood(id)"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Percentage"
-msgstr "Protsent"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
@@ -5819,12 +6042,12 @@ msgstr ""
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Fiscal Year(s)(Maximum Three Years)"
-msgstr "Vali finantsaasta(d) (maksimum kolm aastat)"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,select_account:0
 msgid "Select Reference Account(for  % comparision)"
-msgstr "Valige võrdluskonto (% võrdluseks)"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_balance_report
@@ -5867,7 +6090,7 @@ msgstr ""
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Total :"
-msgstr ""
+msgstr "Kokku :"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
@@ -5875,7 +6098,7 @@ msgid "Show Comparision in %"
 msgstr "Näita võrdlus protsentides %"
 
 #. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
+#: wizard_view:account.analytic.account.balance.report,init:0
 msgid "Select Period"
 msgstr "Vali periood"
 
@@ -5887,17 +6110,17 @@ msgstr "Aruande valikud"
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Don't Compare"
-msgstr "Ära Võrdle"
+msgstr "Ära võrdle"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,account_choice:0
 msgid "Show Accounts"
-msgstr "Näita Kontosid"
+msgstr "Näita kontosid"
 
 #. 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. Teie valisite rohkem kui kolm aastat igal juhul"
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
@@ -5908,7 +6131,7 @@ msgstr ""
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr ""
+msgstr "Aasta :"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -5933,12 +6156,12 @@ msgstr ""
 #. module: account
 #: help:account.balance.account.balance.report,init,select_account:0
 msgid "Keep empty for comparision to its parent"
-msgstr ""
+msgstr "Jätke tühjaks, et võrrelda selle vanemaga"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Creation Date"
-msgstr "Loomise Kuupäev"
+msgstr "Loomise kuupäev"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -5950,9 +6173,9 @@ msgstr ""
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid ""
-"You may have selected the compare options with more than 1 year with credit/"
-"debit columns and % option.This can lead contents to be printed out of the "
-"paper.Please try again."
+"You may have selected the compare options with more than 1 year with "
+"credit/debit columns and % option.This can lead contents to be printed out "
+"of the paper.Please try again."
 msgstr ""
 
 #. module: account
@@ -5971,12 +6194,12 @@ msgid "Month Range"
 msgstr "Kuu vahemik"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
 msgstr "Viimase 15 päeva jooksul loodud arved"
 
 #. module: account
-#: model:ir.model,name:account.model_report_invoice_created
+#: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Viimase 15 päeva jooksul loodud arvete aruanne"
 
@@ -5991,12 +6214,12 @@ msgid "Accounts by type"
 msgstr "Kontod tüübi järgi"
 
 #. module: account
-#: model:ir.model,name:account.model_report_aged_receivable
+#: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
 msgstr "Aegunud nõuded kuni tänaseni"
 
 #. module: account
-#: model:ir.model,name:account.model_report_account_receivable
+#: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
 msgstr "Laekumiskontod"
 
@@ -6006,25 +6229,25 @@ msgid "Range"
 msgstr "Vahemik"
 
 #. module: account
-#: model:ir.module.module,description:account.module_meta_information
+#: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
 msgstr "Moodul, mis lisab uusi aruandeid konto mooduli põhjal."
 
 #. module: account
-#: model:ir.module.module,shortdesc:account.module_meta_information
+#: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
 msgstr "Konto aruandlus - Aruandlus"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_account_receivable_graph
-#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+#: 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 "Bilanss kontotüübi järgi"
 
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr "Nädal"
+msgstr ""
 
 #. module: account
 #: field:report.invoice.created,create_date:0
@@ -6032,7 +6255,7 @@ msgid "Create Date"
 msgstr "Loomise kuupäev"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
 msgstr "Aegunud nõuded"
@@ -6041,3 +6264,75 @@ msgstr "Aegunud nõuded"
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
 msgstr "Maksuvaba summa"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Ettevaatust !"
+
+#, python-format
+#~ msgid "You must first select a partner !"
+#~ msgstr "Sa pead esmalt valima partneri !"
+
+#, python-format
+#~ msgid "End of Fiscal Year Entry"
+#~ msgstr "Majandusaasta lõpp"
+
+#, python-format
+#~ msgid "This period is already closed !"
+#~ msgstr "See periood on juba suletud !"
+
+#, python-format
+#~ msgid "Closing of fiscal year cancelled, please check the box !"
+#~ msgstr "Majandusaasta sulgemine tühistatud, palun märgi kastike !"
+
+#, python-format
+#~ msgid "Taxes missing !"
+#~ msgstr "Maks puudub !"
+
+#, python-format
+#~ msgid "Integrity Error !"
+#~ msgstr "Terviklikkuse viga !"
+
+#, python-format
+#~ msgid "You can not use an inactive account!"
+#~ msgstr "Sa ei saa kasutada mitteaktiivset kontot!"
+
+#, python-format
+#~ msgid "Bank Journal "
+#~ msgstr "Panga päevik "
+
+#, python-format
+#~ msgid "Account move line \"%s\" is not valid"
+#~ msgstr "Konto liigutuskirje \"%s\" ei ole õige"
+
+#, python-format
+#~ msgid "You can not add/modify entries in a closed journal."
+#~ msgstr "Teie ei saa lisada/muuta suletud päeviku kirjeid."
+
+#, python-format
+#~ msgid ""
+#~ "Specified Journal does not have any account move entries in draft state for "
+#~ "this period"
+#~ msgstr ""
+#~ "Valitud päevik ei sisalda konto liigutuskirjeid mustandolekus sellel "
+#~ "perioodil"
+
+#, python-format
+#~ msgid "You have to provide an account for the write off entry !"
+#~ msgstr "Te peate valima konto mahakandmise kirje jaoks !"
+
+#, python-format
+#~ msgid "No analytic journal !"
+#~ msgstr "Puudub analüütiline päevik !"
+
+#, python-format
+#~ msgid "You can not use this general account in this journal !"
+#~ msgstr "Te ei saa kasutada üldist kontot selles päevikus !"
+
+#, python-format
+#~ msgid "The opening journal must not have any entry in the new fiscal year !"
+#~ msgstr "Avatav päevik ei tohi sisaldama kirjeid uues finantsaastas !"
+
+#, python-format
+#~ msgid "The account entries lines are not in valid state."
+#~ msgstr "Konto kirjete read ei ole õiges olekus."
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index b9458e35ada..c620cea1669 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-20 11:57+0000\n"
+"PO-Revision-Date: 2010-07-22 16:28+0000\n"
 "Last-Translator: Niels Huylebroeck <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-07-21 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-07-23 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -101,28 +101,28 @@ msgstr "Basiscode"
 #. module: account
 #: view:account.account:0
 msgid "Account Statistics"
-msgstr ""
+msgstr "Rekeningstatistieken"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_vat_declaration
 #: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
 msgid "Print Taxes Report"
-msgstr ""
+msgstr "Btw-aangifte afdrukken"
 
 #. module: account
 #: field:account.account,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Hoofd"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr ""
+msgstr "Boekstuk"
 
 #. module: account
 #: field:account.invoice,residual:0
 msgid "Residual"
-msgstr ""
+msgstr "Rest"
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -130,13 +130,13 @@ msgstr ""
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr ""
+msgstr "Teken basisbedrag"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
 #: model:ir.ui.menu,name:account.menu_unreconcile_select
 msgid "Unreconcile entries"
-msgstr ""
+msgstr "Afpunten boekingen ongedaan maken"
 
 #. module: account
 #: constraint:account.period:0
@@ -151,17 +151,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_move_line_form
 #: model:ir.ui.menu,name:account.menu_action_move_line_form
 msgid "Entries"
-msgstr ""
+msgstr "Boekingen"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr ""
+msgstr "Debetcentralisering"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
 msgid "Confirm draft invoices"
-msgstr ""
+msgstr "Conceptfacturen bevestigen"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -170,59 +170,63 @@ msgid ""
 "positive, it gives the day of the next month. Set 0 for net days (otherwise "
 "it's based on the beginning of the month)."
 msgstr ""
+"Dag van de maand, -1 instellen voor laatste datum huidige maand. Indien \r\n"
+"positief, eerste dag van volgende maand. 0 instellen voor nettodagen (andere "
+"\r\n"
+"gebaseerd op begin van de maand)."
 
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr ""
+msgstr "Totaal credit"
 
 #. module: account
 #: field:account.config.wizard,charts:0
 msgid "Charts of Account"
-msgstr ""
+msgstr "Boekhoudplannen"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_move_line_select
 msgid "Move line select"
-msgstr ""
+msgstr "Lijnselectie verplaatsen"
 
 #. module: account
 #: rml:account.journal.period.print:0
 #: rml:account.tax.code.entries:0
 msgid "Entry label"
-msgstr ""
+msgstr "Omschrijving boeking"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr ""
+msgstr "Rekeningmodelboekingen"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
 msgid "Period Sum"
-msgstr ""
+msgstr "Periodesom"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
-msgstr ""
+msgstr "Berekeningscode (als type=code)"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "Lijn boeking op rekening"
 
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
 msgid "Aged Trial Balance"
-msgstr ""
+msgstr "Ageingbalans"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurrent Entries"
-msgstr ""
+msgstr "Standaardboekingen"
 
 #. module: account
 #: field:account.analytic.line,amount:0
@@ -234,29 +238,29 @@ msgstr ""
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Bedrag"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
 #: model:ir.actions.wizard,name:account.wizard_third_party_ledger
 #: model:ir.ui.menu,name:account.menu_third_party_ledger
 msgid "Partner Ledger"
-msgstr ""
+msgstr "Relatieplan"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr ""
+msgstr "Leveranciers-btw"
 
 #. module: account
 #: view:account.move:0
 msgid "Total Debit"
-msgstr ""
+msgstr "Totaal debet"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Accounting Entries-"
-msgstr ""
+msgstr "Journaalposten-"
 
 #. module: account
 #: help:account.journal,view_id:0
@@ -266,6 +270,10 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
+"Geeft de weergave wanneer mutaties in het dagboek worden geschreven of "
+"doorgebladerd. De weergave verteld Open ERP welke velden er zichtbaar, "
+"verplicht of alleen lezen moeten zijn en in welke volgorde. U kunt uw eigen "
+"weergave aanmaken voor een snellere codering in elk dagboek."
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -276,18 +284,24 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
+"Als u betalingsvoorwaarden gebruikt, wordt de vervaldatum automatisch \r\n"
+"berekend als u een boeking doet. Als u de betalingsvoorwaarde en de \r\n"
+"vervaldatum niet invult, gaat het systeem uit van contante betaling. De \r\n"
+"betalingsvoorwaarde kan ook meerdere vervaldatums bepalen, vb. 50% nu en 50% "
+"\r\n"
+"binnen een maand."
 
 #. module: account
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Fixed"
-msgstr ""
+msgstr "Vast"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_overdue
 #: view:res.company:0
 msgid "Overdue Payments"
-msgstr ""
+msgstr "Achterstallige betalingen"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -297,38 +311,38 @@ msgstr ""
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 #: wizard_view:account.vat.declaration,init:0
 msgid "Select period"
-msgstr ""
+msgstr "Periode kiezen"
 
 #. module: account
 #: field:account.invoice,origin:0
 #: field:account.invoice.line,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Oorsprong"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr ""
+msgstr "Naam beweging"
 
 #. module: account
 #: xsl:account.transfer:0
 msgid "Reference"
-msgstr ""
+msgstr "Referentie"
 
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Subscription Compute"
-msgstr ""
+msgstr "Abonnementen berekenen"
 
 #. module: account
 #: rml:account.central.journal:0
 msgid "Account Num."
-msgstr ""
+msgstr "Rekeningnr."
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Debit"
-msgstr ""
+msgstr "Delta debet"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
@@ -341,7 +355,7 @@ msgstr "Belasting"
 #. module: account
 #: rml:account.general.journal:0
 msgid "Debit Trans."
-msgstr ""
+msgstr "Debettrans."
 
 #. module: account
 #: field:account.analytic.line,account_id:0
@@ -351,25 +365,25 @@ msgstr ""
 #: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analytische rekening"
 
 #. module: account
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr ""
+msgstr "Btw op onderliggende records"
 
 #. module: account
 #: rml:account.central.journal:0
 #: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr ""
+msgstr "Journaalnaam"
 
 #. module: account
 #: view:account.payment.term:0
 msgid "Description on invoices"
-msgstr ""
+msgstr "Omschrijving op facturen"
 
 #. module: account
 #: constraint:account.analytic.account:0
@@ -379,24 +393,24 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.reconcile,total_entry:0
 msgid "Total entries"
-msgstr ""
+msgstr "Totaal boekingen"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr ""
+msgstr "Bronrekening"
 
 #. module: account
 #: field:account.journal,update_posted:0
 msgid "Allow Cancelling Entries"
-msgstr ""
+msgstr "Annuleren posten toelaten"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentorderreconcilation0
 msgid "Payment Reconcilation"
-msgstr ""
+msgstr "Afpunten betalingen"
 
 #. module: account
 #: model:account.journal,name:account.expenses_journal
@@ -406,27 +420,27 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
 msgid "All Analytic Entries"
-msgstr ""
+msgstr "Alle analytische boekingen"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Date:"
-msgstr ""
+msgstr "Datum"
 
 #. module: account
 #: selection:account.account.type,sign:0
 msgid "Negative"
-msgstr ""
+msgstr "Negatief"
 
 #. module: account
 #: rml:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "Naam (rekening/relatie)"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Contra"
-msgstr ""
+msgstr "Tegenover"
 
 #. module: account
 #: field:account.analytic.account,state:0
@@ -436,36 +450,37 @@ msgstr ""
 #: view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: account
 #: 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 ""
+msgstr "Openstaande leveranciersterugbetalingen"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Special Computation"
-msgstr ""
+msgstr "Speciale berekening"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement with/without reconciliation from draft statement"
 msgstr ""
+"Bevestig uittreksel met/zonder afpunting op basis van voorlopig uittreksel"
 
 #. module: account
 #: wizard_view:account.move.bank.reconcile,init:0
 #: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree
 msgid "Bank reconciliation"
-msgstr ""
+msgstr "Afstemming banksaldo"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Korting(%)"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -474,12 +489,12 @@ msgstr ""
 #: rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
-msgstr ""
+msgstr "Ref"
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
 msgid "Tax Use In"
-msgstr ""
+msgstr "Btw-type"
 
 #. module: account
 #: help:account.tax.template,include_base_amount:0
@@ -487,81 +502,84 @@ msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
 msgstr ""
+"Geef aan of het btw-bedrag moet worden opgenomen in het basisbedrag voordat "
+"\r\n"
+"de volgende btw wordt berekend."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodical Processing"
-msgstr ""
+msgstr "Periodieke verwerking"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr ""
+msgstr "Statistieken analyt. boekingen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr ""
+msgstr "Sjablonen btw-codes"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Supplier invoice"
-msgstr ""
+msgstr "Leverancierfactuur"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "Reconcile Paid"
-msgstr ""
+msgstr "Betaald afpunten"
 
 #. module: account
 #: wizard_field:account.chart,init,target_move:0
 msgid "Target Moves"
-msgstr ""
+msgstr "Doelbewegingen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
 msgid "Tax Templates"
-msgstr ""
+msgstr "Btw-sjablonen"
 
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr ""
+msgstr "Betaald/afgepunt"
 
 #. module: account
 #: field:account.account.type,close_method:0
 msgid "Deferral Method"
-msgstr ""
+msgstr "Overdrachtsmethode"
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr ""
+msgstr "Opnemen in basisbedrag"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr ""
+msgstr "Code basis terugbetaling"
 
 #. module: account
 #: view:account.invoice.line:0
 msgid "Line"
-msgstr ""
+msgstr "Lijn"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 msgid "J.C. or Move name"
-msgstr ""
+msgstr "Naam beweging"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 #: selection:account.tax.template,applicable_type:0
 msgid "True"
-msgstr ""
+msgstr "Waar"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -569,6 +587,8 @@ msgid ""
 "Number of days to add before computation of the day of month.If Date=15/01, "
 "Number of Days=22, Day of Month=-1, then the due date is 28/02."
 msgstr ""
+"Aantal dagen toe te voegen voor berekening van dag van de maand. Als datum "
+"=15/01, aantal dagen =22, dag van de maand =-1, dan is de vervaldatum 28/02."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax
@@ -578,23 +598,23 @@ msgstr ""
 #. module: account
 #: rml:account.central.journal:0
 msgid "Printing Date"
-msgstr ""
+msgstr "Afdrukdatum"
 
 #. module: account
 #: rml:account.general.ledger:0
 msgid "Mvt"
-msgstr ""
+msgstr "Bew."
 
 #. 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 "Ageingbalans relaties"
 
 #. module: account
 #: view:account.journal:0
 msgid "Entry Controls"
-msgstr ""
+msgstr "Controle boekingen"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -602,64 +622,65 @@ msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones"
 msgstr ""
+"Volgorde wordt gebruikt om de resources te sorteren van laag naar hoog"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 #: wizard_view:account.analytic.line,init:0
 msgid "(Keep empty to open the current situation)"
-msgstr ""
+msgstr "(leeg om de huidige situatie te openen)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Fiscal Position Accounts Mapping"
-msgstr ""
+msgstr "Rekeningkoppeling fiscale positie"
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Contact"
 
 #. module: account
 #: selection:account.model.line,date:0
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr ""
+msgstr "Betalingsvoorwaarde relatie"
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Account Entry Reconcile"
-msgstr ""
+msgstr "Afstemmen rekeningboeking"
 
 #. module: account
 #: wizard_button:account.move.bank.reconcile,init,open:0
 msgid "Open for bank reconciliation"
-msgstr ""
+msgstr "Open voor afstemming banksaldo"
 
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Korting (%)"
 
 #. module: account
 #: 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 "Afschrijvingsbedrag"
 
 #. module: account
 #: help:account.fiscalyear,company_id:0
 msgid "Keep empty if the fiscal year belongs to several companies."
-msgstr ""
+msgstr "Leeg laten als het fiscaal jaar voor meerdere firma's geldt."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Analytische boekhouding"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Sub-Total :"
-msgstr ""
+msgstr "Subtotaal:"
 
 #. module: account
 #: field:account.analytic.account,line_ids:0
@@ -670,28 +691,28 @@ msgstr ""
 #: model:ir.ui.menu,name:account.next_id_41
 #, python-format
 msgid "Analytic Entries"
-msgstr ""
+msgstr "Analytische boekingen"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "month"
-msgstr ""
+msgstr "Maand"
 
 #. module: account
 #: field:account.analytic.account,partner_id:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Gekoppelde relatie"
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
-msgstr ""
+msgstr "Extra informatie"
 
 #. module: account
 #: selection:account.invoice,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Terugbetaling klant"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -704,64 +725,64 @@ msgstr ""
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr ""
+msgstr "Teken btw-bedrag"
 
 #. module: account
 #: help:res.partner,credit:0
 msgid "Total amount this customer owes you."
-msgstr ""
+msgstr "Totaalbedrag dat de klant is verschuldigd."
 
 #. 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
 msgid "Analytic Invoice"
-msgstr ""
+msgstr "Analytische factuur"
 
 #. module: account
 #: field:account.journal.column,field:0
 msgid "Field Name"
-msgstr ""
+msgstr "Veldnaam"
 
 #. module: account
 #: field:account.tax.code,sign:0
 #: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
-msgstr ""
+msgstr "Teken voor hoofdcode"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr ""
+msgstr "Journaal eindejaarsboekingen"
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "Aankoopeigenschappen"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
 msgid "Can be draft or validated"
-msgstr ""
+msgstr "Concept of gevalideerd"
 
 #. module: account
 #: wizard_button:account.invoice.pay,init,reconcile:0
 msgid "Partial Payment"
-msgstr ""
+msgstr "Deelbetaling"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
 msgid "Move Lines Created."
-msgstr ""
+msgstr "Gemaakte lijnen verplaatsen"
 
 #. module: account
 #: field:account.fiscalyear,state:0
@@ -771,23 +792,23 @@ msgstr ""
 #: field:account.period,state:0
 #: field:account.subscription,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Period to"
-msgstr ""
+msgstr "Periode tot"
 
 #. module: account
 #: field:account.account.type,partner_account:0
 msgid "Partner account"
-msgstr ""
+msgstr "Relatierekening"
 
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Generate entries before:"
-msgstr ""
+msgstr "Genereren boekingen voor:"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -795,7 +816,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
 #: model:ir.actions.wizard,name:account.account_analytic_account_cost_ledger_report
 msgid "Cost Ledger"
-msgstr ""
+msgstr "Kostenstaat"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -803,18 +824,18 @@ msgstr ""
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "(Keep empty for all open fiscal years)"
-msgstr ""
+msgstr "(Leeg voor alle geopende boekjaren)"
 
 #. module: account
 #: field:account.invoice,move_lines:0
 msgid "Move Lines"
-msgstr ""
+msgstr "Mutatielijnen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
 msgid "Account cost and revenue by journal"
-msgstr ""
+msgstr "Winst- en verliesrekeningen per journaal"
 
 #. module: account
 #: help:account.account.template,user_type:0
@@ -822,83 +843,85 @@ msgid ""
 "These types are defined according to your country. The type contain more "
 "information about the account and it's specificities."
 msgstr ""
+"Deze types hangen af van uw land. Het type bevat meer info over de rekening "
+"en diens kenmerken."
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "6"
-msgstr ""
+msgstr "6"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_30
 msgid "Bank Reconciliation"
-msgstr ""
+msgstr "Afpunten banksaldo"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
 msgid "Templates for Accounts"
-msgstr ""
+msgstr "Rekeningmodellen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
 #: model:ir.model,name:account.model_account_analytic_account
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr ""
+msgstr "Analytische rekeningen"
 
 #. module: account
 #: wizard_view:account.print.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_print_journal
 #: model:ir.ui.menu,name:account.menu_print_journal
 msgid "Print Journal"
-msgstr ""
+msgstr "Journaal afdrukken"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr ""
+msgstr "account.bank.accounts.wizard"
 
 #. module: account
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "Aanmaakdatum"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,cancel_invoice:0
 msgid "Cancel Invoice"
-msgstr ""
+msgstr "Factuur annuleren"
 
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr ""
+msgstr "Verplicht"
 
 #. module: account
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr ""
+msgstr "Kostenrekening"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,journal_id:0
 msgid "Write-Off Journal"
-msgstr ""
+msgstr "Afschrijvingsjournaal"
 
 #. module: account
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr ""
+msgstr "Bedrag valuta"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
 msgid "Expense Category Account"
-msgstr ""
+msgstr "Kostencategorierekening"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy2_id:0
 msgid "New Fiscal Year"
-msgstr ""
+msgstr "Nieuw boekjaar"
 
 #. module: account
 #: help:account.tax,tax_group:0
@@ -906,16 +929,18 @@ msgid ""
 "If a default tax is given in the partner it only overrides taxes from "
 "accounts (or products) in the same group."
 msgstr ""
+"Als de standaard-btw voor de relatie is gedefinieerd, overschrijft deze "
+"alleen de btw ingesteld op rekeningen (of producten) in dezelfde groep."
 
 #. module: account
 #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr ""
+msgstr "Te openen boekjaar"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Select Chart of Accounts"
-msgstr ""
+msgstr "Boekhoudplan kiezen"
 
 #. module: account
 #: field:account.analytic.account,quantity:0
@@ -928,7 +953,7 @@ msgstr ""
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Hoeveelheid"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_to:0
@@ -936,33 +961,33 @@ msgstr ""
 #: wizard_field:account.partner.balance.report,init,date2:0
 #: wizard_field:account.third_party_ledger.report,init,date2:0
 msgid "End date"
-msgstr ""
+msgstr "Einddatum"
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr ""
+msgstr "Basisbedrag"
 
 #. module: account
 #: help:account.journal,user_id:0
 msgid "The user responsible for this journal"
-msgstr ""
+msgstr "Gebruiker die voor het journaal verantwoordelijk is"
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
 msgid "Default Debit Account"
-msgstr ""
+msgstr "Standaard debetrekening"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Entries by Statements"
-msgstr ""
+msgstr "Boekingen per uittreksel"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 msgid "analytic Invoice"
-msgstr ""
+msgstr "Analytische factuur"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,period_id:0
@@ -981,22 +1006,22 @@ msgstr ""
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
-msgstr ""
+msgstr "Periode"
 
 #. module: account
 #: rml:account.partner.balance:0
 msgid "Grand total"
-msgstr ""
+msgstr "Eindtotaal"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
 msgid "Financial Accounting"
-msgstr ""
+msgstr "Financiële boekhouding"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Nettototaal:"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -1010,68 +1035,68 @@ msgstr ""
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "Fiscale positie"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
 #: field:account.move.line,product_uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "Eenh."
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,page_split:0
 msgid "One Partner Per Page"
-msgstr ""
+msgstr "Een relatie per bladzijde"
 
 #. module: account
 #: field:account.account,child_parent_ids:0
 #: field:account.account.template,child_parent_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Afhankel."
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Fiscal Position Taxes Mapping"
-msgstr ""
+msgstr "Btw-koppeling fiscale positie"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2_new
 msgid "New Supplier Invoice"
-msgstr ""
+msgstr "Nieuwe leveranciersfactuur"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,amount:0
 msgid "Amount paid"
-msgstr ""
+msgstr "Betaald bedrag"
 
 #. module: account
 #: selection:account.invoice,type:0
 #: model:process.transition,name:account.process_transition_customerinvoice0
 #: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Klantenfactuur"
 
 #. module: account
 #: wizard_view:account.open_closed_fiscalyear,init:0
 msgid "Choose Fiscal Year"
-msgstr ""
+msgstr "Boekjaar kiezen"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
 msgid "Main Sequence"
-msgstr ""
+msgstr "Hoofdvolgorde"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.account_analytic_journal_print
 msgid "Print Analytic Journals"
-msgstr ""
+msgstr "Analytische journalen afdrukken"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Voucher Nb"
-msgstr ""
+msgstr "Boekingsnr."
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -1079,125 +1104,127 @@ msgid ""
 "The sequence field is used to order the payment term lines from the lowest "
 "sequences to the higher ones"
 msgstr ""
+"Volgorde wordt gebruikt om de betalingsvoorwaarden te sorteren van laag naar "
+"hoog."
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_new:0
 msgid "Total write-off"
-msgstr ""
+msgstr "Totaal afgeschreven"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "Code voor prijzen inclusief btw berekenen"
 
 #. module: account
 #: view:account.invoice.tax:0
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax codes"
-msgstr ""
+msgstr "Btw-codes"
 
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr ""
+msgstr "Boekhoudplansjabloon"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
-msgstr ""
+msgstr "Inkomstencategorierekening"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_form
 msgid "New Analytic Account"
-msgstr ""
+msgstr "Nieuwe analytische rekening"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Position Templates"
-msgstr ""
+msgstr "Sjablonen fiscale posities"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Eenheidsprijs"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Period from :"
-msgstr ""
+msgstr "Periode van:"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "wizard.multi.charts.accounts"
 
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Journal de vente"
-msgstr ""
+msgstr "Verkoopdagboek"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr ""
+msgstr "Het bedrag uitgedrukt in een optionele andere munt."
 
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr ""
+msgstr "Sjabloon fiscale posities"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
 msgid "Terms"
-msgstr ""
+msgstr "Voorwaarden"
 
 #. module: account
 #: rml:account.vat.declaration:0
 msgid "Tax Report"
-msgstr ""
+msgstr "Belasting-aangifte"
 
 #. module: account
 #: wizard_button:account.analytic.account.chart,init,open:0
 #: wizard_button:account.chart,init,open:0
 msgid "Open Charts"
-msgstr ""
+msgstr "Open boekhoudplannen"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close.state,init:0
 msgid "Are you sure you want to close the fiscal year ?"
-msgstr ""
+msgstr "Bent u zeker dat u het boekjaar wilt afsluiten?"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Bank Receipt"
-msgstr ""
+msgstr "Bankontvangst"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank account"
-msgstr ""
+msgstr "Bankrekening"
 
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
 msgid "Tax Template List"
-msgstr ""
+msgstr "Lijst btw-sjablonen"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Invoice import"
-msgstr ""
+msgstr "Import facturen"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
 msgid "Standard entry"
-msgstr ""
+msgstr "Standaardboeking"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -1208,122 +1235,130 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
+"Hiermee kiest u hoe de koers voor uitgaande transacties wordt berekend. In "
+"\r\n"
+"de meeste landen is \"gemiddeld\" de wettelijke manier, maar slechts weinig "
+"\r\n"
+"softwaresystemen kunnen dit. Als u dus importeert uit een ander \r\n"
+"softwarepakket, dient u wellicht de koers op datum te gebruiken. Inkomende "
+"\r\n"
+"transacties gebeuren altijd volgens de dagkoers."
 
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr ""
+msgstr "Firmamunt"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Fiscal Position Template Account Mapping"
-msgstr ""
+msgstr "Rekeningkoppeling sjabloon fiscale positie"
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
 msgid "Parent Analytic Account"
-msgstr ""
+msgstr "Primaire analytische rekening"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile,init_partial,addendum:0
 msgid "Reconcile With Write-Off"
-msgstr ""
+msgstr "Afpunten met afschrijving"
 
 #. module: account
 #: field:account.move.line,tax_amount:0
 msgid "Tax/Base Amount"
-msgstr ""
+msgstr "Btw-/basisbedrag"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,code_digits:0
 msgid "No. of Digits to use for account code"
-msgstr ""
+msgstr "Aantal cijfers voor de rekeningcode"
 
 #. module: account
 #: field:account.bank.statement,balance_end_real:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "Eindbalans"
 
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr ""
+msgstr "Aankoopbtw"
 
 #. module: account
 #: field:account.payment.term.line,name:0
 msgid "Line Name"
-msgstr ""
+msgstr "Lijnnaam"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 msgid "Fixed Amount"
-msgstr ""
+msgstr "Vast bedrag"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Credit"
-msgstr ""
+msgstr "Analytisch credit"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
 #: wizard_button:account.move.line.reconcile,init_partial,partial:0
 msgid "Partial Reconcile"
-msgstr ""
+msgstr "Gedeeltelijke afpunting"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr ""
+msgstr "Niet-afgepunte transacties"
 
 #. module: account
 #: view:account.fiscal.position:0
 #: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
-msgstr ""
+msgstr "Btw-koppeling"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Continue"
-msgstr ""
+msgstr "Doorgaan"
 
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Value"
-msgstr ""
+msgstr "Waarde"
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0
 #: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "Afschrijvingsrekening"
 
 #. module: account
 #: field:account.model.line,model_id:0
 #: field:account.subscription,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
 msgid "Close a Fiscal Year"
-msgstr ""
+msgstr "Boekjaar afsluiten"
 
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
-msgstr ""
+msgstr "Centralisatiesaldo"
 
 #. module: account
 #: view:wizard.company.setup:0
 msgid "Message"
-msgstr ""
+msgstr "Boodschap"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Select invoices you want to pay and manages advances"
-msgstr ""
+msgstr "Kies de facturen die u wilt betalen en verwerk voorschotten"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1332,7 +1367,7 @@ msgstr ""
 #: selection:account.analytic.account,type:0
 #: field:account.journal,view_id:0
 msgid "View"
-msgstr ""
+msgstr "Weergave"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
@@ -1340,24 +1375,24 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "All"
-msgstr ""
+msgstr "Alles"
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic lines"
-msgstr ""
+msgstr "Analytische lijnen"
 
 #. module: account
 #: help:account.tax,type:0
 msgid "The computation method for the tax amount."
-msgstr ""
+msgstr "De berekeningsmethode voor het btw-bedrag."
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Validated accounting entries."
-msgstr ""
+msgstr "Gevalideerde boekingen"
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
@@ -1366,32 +1401,34 @@ 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 ""
+"Als u afgepunte transacties ongedaan maakt, moet u alle gekoppelde acties "
+"nakijken, want deze worden niet uitgeschakeld"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr ""
+msgstr "Elektronisch bestand"
 
 #. module: account
 #: view:res.partner:0
 msgid "Customer Credit"
-msgstr ""
+msgstr "Klantencredit"
 
 #. module: account
 #: field:account.invoice,tax_line:0
 msgid "Tax Lines"
-msgstr ""
+msgstr "Btw-lijnen"
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr ""
+msgstr "Volgorden"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_type_form
 #: model:ir.ui.menu,name:account.menu_action_account_type_form
 msgid "Account Types"
-msgstr ""
+msgstr "Rekeningsoorten"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,journal_id:0
@@ -1413,40 +1450,40 @@ msgstr ""
 #: wizard_field:populate_statement_from_inv,init,journal_id:0
 #: field:report.hr.timesheet.invoice.journal,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Journaal"
 
 #. module: account
 #: field:account.account,child_id:0
 #: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
-msgstr ""
+msgstr "Afhankelijke rekeningen"
 
 #. module: account
 #: field:account.account,check_history:0
 msgid "Display History"
-msgstr ""
+msgstr "Historiek tonen"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,date1:0
 msgid "        Start date"
-msgstr ""
+msgstr "        Begindatum"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,display_account:0
 #: wizard_field:account.general.ledger.report,checktype,display_account:0
 msgid "Display accounts "
-msgstr ""
+msgstr "Rekeningen tonen "
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile_line
 msgid "Statement reconcile line"
-msgstr ""
+msgstr "Lijn afschriften afpunten"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the income account"
-msgstr ""
+msgstr "Leeg laten voor opbrengstenrekening"
 
 #. module: account
 #: view:account.bank.statement.reconcile:0
@@ -1457,7 +1494,7 @@ msgstr ""
 #: code:addons/account/wizard/wizard_reconcile.py:0
 #, python-format
 msgid "Write-Off"
-msgstr ""
+msgstr "Afschrijving"
 
 #. module: account
 #: help:account.invoice,partner_bank:0
@@ -1465,97 +1502,99 @@ msgid ""
 "The partner bank account to pay\n"
 "Keep empty to use the default"
 msgstr ""
+"De bankrekening van de relatie voor betaling.\n"
+"Laat leeg voor de standaardwaarde."
 
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr ""
+msgstr "Totaal te betalen"
 
 #. module: account
 #: wizard_button:account.fiscalyear.close.state,init,close:0
 msgid "Close states"
-msgstr ""
+msgstr "Status gesloten"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_company_setup
 msgid "wizard.company.setup"
-msgstr ""
+msgstr "wizard.company.setup"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
 msgid "account.analytic.line.extended"
-msgstr ""
+msgstr "account.analytic.line.extended"
 
 #. module: account
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr ""
+msgstr "Terugbetalingsjournaal"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income
 msgid "Income"
-msgstr ""
+msgstr "Inkomsten"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
 msgid "Supplier"
-msgstr ""
+msgstr "Leverancier"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr ""
+msgstr "Btw-bedrag"
 
 #. module: account
 #: selection:account.account.type,sign:0
 msgid "Positive"
-msgstr ""
+msgstr "Positief"
 
 #. module: account
 #: wizard_view:account.general.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_general_journal
 #: model:ir.ui.menu,name:account.menu_general_journal
 msgid "Print General Journal"
-msgstr ""
+msgstr "Algemeen dagboek afdrukken"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
 msgid "Chart of Accounts Templates"
-msgstr ""
+msgstr "Sjablonen boekhoudplan"
 
 #. module: account
 #: field:account.invoice,move_id:0
 msgid "Invoice Movement"
-msgstr ""
+msgstr "Factuurbeweging"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_wizard
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "Boekhoudplan maken op basis van sjabloon"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Statements"
-msgstr ""
+msgstr "Wettelijke staten"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
 #: field:account.tax.code.template,parent_id:0
 msgid "Parent Code"
-msgstr ""
+msgstr "Hoofdcode"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile.select,init,open:0
 msgid "Open for reconciliation"
-msgstr ""
+msgstr "Open voor afstemming"
 
 #. module: account
 #: model:account.journal,name:account.bilan_journal
@@ -1566,42 +1605,42 @@ msgstr ""
 #: selection:account.tax,tax_group:0
 #: selection:account.tax.template,tax_group:0
 msgid "VAT"
-msgstr ""
+msgstr "BTW"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Account n°"
-msgstr ""
+msgstr "Rekeningnr."
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr ""
+msgstr "Leeg laten voor kostenrekening"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,account_ids:0
 msgid "Account to reconcile"
-msgstr ""
+msgstr "Af te stemmen rekening"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Relatieref."
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
 #: selection:account.third_party_ledger.report,init,result_selection:0
 msgid "Receivable and Payable Accounts"
-msgstr ""
+msgstr "Te ontvangen en te betalen"
 
 #. module: account
 #: view:account.subscription:0
 #: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
-msgstr ""
+msgstr "Abonnementslijnen"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1609,43 +1648,43 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
-msgstr ""
+msgstr "Aankoop"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total quantity"
-msgstr ""
+msgstr "Totale hvh"
 
 #. module: account
 #: field:account.invoice,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "Vervaldatum"
 
 #. module: account
 #: wizard_view:account.period.close,init:0
 #: wizard_button:account.period.close,init,close:0
 msgid "Close Period"
-msgstr ""
+msgstr "Periode afsluiten"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Due"
-msgstr ""
+msgstr "Vervallen"
 
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Third party"
-msgstr ""
+msgstr "Derde"
 
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
-msgstr ""
+msgstr "Toegelaten rekeningtypen (leeg indien geen controle)"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
 msgid "Starting Balance"
-msgstr ""
+msgstr "Beginbalans"
 
 #. module: account
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,journal:0
@@ -1653,29 +1692,29 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
 msgid "Journals"
-msgstr ""
+msgstr "Journalen"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Max Qty:"
-msgstr ""
+msgstr "Max. hvh"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,refund:0
 msgid "Refund Invoice"
-msgstr ""
+msgstr "Factuur terugbetalen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_tree
 #: model:ir.actions.wizard,name:account.wizard_period_close
 #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
 msgid "Close a Period"
-msgstr ""
+msgstr "Periode afsluiten"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal
 msgid "Costs & Revenues"
-msgstr ""
+msgstr "Winst en verlies"
 
 #. module: account
 #: constraint:account.account:0
@@ -1690,90 +1729,90 @@ msgstr ""
 #. module: account
 #: view:account.config.wizard:0
 msgid "Skip"
-msgstr ""
+msgstr "Overslaan"
 
 #. module: account
 #: field:account.invoice,period_id:0
 msgid "Force Period"
-msgstr ""
+msgstr "Periode afdwingen"
 
 #. module: account
 #: help:account.account.type,sequence:0
 msgid "Gives the sequence order when displaying a list of account types."
-msgstr ""
+msgstr "Toont de volgorde bij het weergeven van een lijst met rekeningtypes."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Re-Open"
-msgstr ""
+msgstr "Heropenen"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
 msgid "Are you sure you want to create entries?"
-msgstr ""
+msgstr "Bent u zeker dat u de boeking wilt uitvoeren?"
 
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Include in base amount"
-msgstr ""
+msgstr "Opnemen in basisbedrag"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Credit"
-msgstr ""
+msgstr "Delta credit"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
 #: model:ir.actions.wizard,name:account.wizard_unreconcile
 msgid "Unreconcile Entries"
-msgstr ""
+msgstr "Afpunten boekingen ongedaan maken"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Pre-generated invoice from control"
-msgstr ""
+msgstr "Vooraf gemaakte factuur uit controle"
 
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 msgid "Cost Legder for period"
-msgstr ""
+msgstr "Kostenplaats voor periode"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree2
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree2
 msgid "New Statement"
-msgstr ""
+msgstr "Nieuw uittreksel"
 
 #. module: account
 #: wizard_field:account.analytic.account.chart,init,from_date:0
 #: wizard_field:account.analytic.line,init,from_date:0
 msgid "From"
-msgstr ""
+msgstr "Van"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Reconciliation of entries from invoice(s) and payment(s)"
-msgstr ""
+msgstr "Afpunting of boekingen uit factuur en betaling"
 
 #. module: account
 #: wizard_view:account.central.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_central_journal
 #: model:ir.ui.menu,name:account.menu_central_journal
 msgid "Print Central Journal"
-msgstr ""
+msgstr "Centralisatiedagboek afdrukken"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,period_length:0
 msgid "Period length (days)"
-msgstr ""
+msgstr "Lengte periode (dagen)"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
-msgstr ""
+msgstr "Procent"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
@@ -1786,46 +1825,46 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
-msgstr ""
+msgstr "Verkoop"
 
 #. module: account
 #: wizard_button:account.account.balance.report,account_selection,checktype:0
 #: wizard_button:account.general.ledger.report,account_selection,checktype:0
 msgid "Next"
-msgstr ""
+msgstr "Volgende"
 
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
 "The fiscal position will determine taxes and the accounts used for the the "
 "partner."
-msgstr ""
+msgstr "Fiscale positie bepaalt btw en rekeningen voor de relatie."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 msgid "Date or Code"
-msgstr ""
+msgstr "Datum of code"
 
 #. module: account
 #: field:account.analytic.account,user_id:0
 msgid "Account Manager"
-msgstr ""
+msgstr "Account Manager"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "to :"
-msgstr ""
+msgstr "tot:"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,debit:0
 #: wizard_field:account.move.line.reconcile,init_partial,debit:0
 msgid "Debit amount"
-msgstr ""
+msgstr "Debetbedrag"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "year"
-msgstr ""
+msgstr "Jaar"
 
 #. module: account
 #: wizard_button:account.account.balance.report,checktype,report:0
@@ -1842,12 +1881,12 @@ msgstr ""
 #: wizard_button:account.print.journal.report,init,print:0
 #: wizard_button:account.third_party_ledger.report,init,checkreport:0
 msgid "Print"
-msgstr ""
+msgstr "Afdrukken"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_from:0
 msgid "Start date"
-msgstr ""
+msgstr "Begindatum"
 
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
@@ -1862,34 +1901,34 @@ msgstr ""
 #: field:account.move,type:0
 #: field:account.move.reconcile,type:0
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Allowed (empty for no control)"
-msgstr ""
+msgstr "Toegelaten rekeningen (leeg indien geen controle)"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Nettobedrag"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr ""
+msgstr "Btw-rekening facturen"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Analytic Lines"
-msgstr ""
+msgstr "Analytische lijnen"
 
 #. module: account
 #: wizard_view:account.invoice.pay,init:0
 #: model:ir.actions.wizard,name:account.wizard_invoice_pay
 msgid "Pay invoice"
-msgstr ""
+msgstr "Factuur betalen"
 
 #. module: account
 #: constraint:account.invoice:0
@@ -1900,12 +1939,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree5
 #: model:ir.ui.menu,name:account.menu_invoice_draft
 msgid "Draft Customer Invoices"
-msgstr ""
+msgstr "Voorlopige facturen klanten"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr ""
+msgstr "Rekeningabonnementlijn"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -1913,105 +1952,105 @@ msgstr ""
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "No Filter"
-msgstr ""
+msgstr "Geen filter"
 
 #. module: account
 #: field:account.payment.term.line,days:0
 msgid "Number of Days"
-msgstr ""
+msgstr "Aantal dagen"
 
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr ""
+msgstr "Relatiereferentie van factuur"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,sortbydate:0
 msgid "Sort by:"
-msgstr ""
+msgstr "Sorteren op:"
 
 #. module: account
 #: field:account.move,to_check:0
 msgid "To Be Verified"
-msgstr ""
+msgstr "Te controleren"
 
 #. module: account
 #: help:res.partner,debit:0
 msgid "Total amount you have to pay to this supplier."
-msgstr ""
+msgstr "Totaalbedrag te betalen voor deze leverancier."
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "7"
-msgstr ""
+msgstr "7"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
 msgid "Transfers"
-msgstr ""
+msgstr "Overdrachten"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Li."
-msgstr ""
+msgstr "Li."
 
 #. module: account
 #: wizard_view:account.chart,init:0
 msgid "Account charts"
-msgstr ""
+msgstr "Boekhoudplannen"
 
 #. module: account
 #: help:account.tax,name:0
 msgid "This name will be displayed on reports"
-msgstr ""
+msgstr "Deze naam wordt op de rapporten getoond."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Printing date"
-msgstr ""
+msgstr "Afdrukdatum"
 
 #. module: account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Ongeldige XML voor weergave!"
 
 #. module: account
 #: wizard_field:account.partner.balance.report,init,date1:0
 msgid "          Start date"
-msgstr ""
+msgstr "          Begindatum"
 
 #. module: account
 #: wizard_view:account.analytic.account.journal.report,init:0
 msgid "Analytic Journal Report"
-msgstr ""
+msgstr "Analytisch journaalrapport"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr ""
+msgstr "Terugbetaling klant"
 
 #. module: account
 #: rml:account.vat.declaration:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "Btw-bedrag"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr ""
+msgstr "J.C. / Naam beweging"
 
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr ""
+msgstr "Journaal- Periodenaam"
 
 #. module: account
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr ""
+msgstr "Naam btw-vak"
 
 #. module: account
 #: help:account.journal,entry_posted:0
@@ -2020,6 +2059,9 @@ msgid ""
 "'draft' state and instead goes directly to the 'posted state' without any "
 "manual validation."
 msgstr ""
+"Schakel dit vakje in als u voor nieuwe rekeningbewegingen de status\r\n"
+"'voorlopig' wilt overslaan en onmiddellijk wilt boeken zonder manuele\r\n"
+"validering."
 
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
@@ -2031,7 +2073,7 @@ msgstr ""
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
 #: field:wizard.company.setup,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Relatie"
 
 #. module: account
 #: help:account.invoice,number:0
@@ -2039,58 +2081,60 @@ msgid ""
 "Unique number of the invoice, computed automatically when the invoice is "
 "created."
 msgstr ""
+"Uniek factuurnummer dat automatisch wordt berekend bij het aanmaken van de "
+"factuur."
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Voorlopige factuur"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_expense
 msgid "Expense"
-msgstr ""
+msgstr "Uitgave"
 
 #. module: account
 #: field:account.journal,invoice_sequence_id:0
 msgid "Invoice Sequence"
-msgstr ""
+msgstr "Factuurnummering"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
 msgid "Options"
-msgstr ""
+msgstr "Opties"
 
 #. module: account
 #: model:process.process,name:account.process_process_invoiceprocess0
 msgid "Customer Invoice Process"
-msgstr ""
+msgstr "Verkoopfactuurprocedure"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Opmerking fiscale positie:"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
 msgid "Opening Entries Period"
-msgstr ""
+msgstr "Periode openingsboekingen"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_validate_account_moves
 #: 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 "Rekeningbewegingen valideren"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "days"
-msgstr ""
+msgstr "dagen"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
 msgid "Past"
-msgstr ""
+msgstr "Vorige"
 
 #. module: account
 #: field:account.analytic.account,company_currency_id:0
@@ -2104,45 +2148,45 @@ msgstr ""
 #: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid invoices"
-msgstr ""
+msgstr "Onbetaalde facturen"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_paymentreconcile0
 msgid "Payment Reconcile"
-msgstr ""
+msgstr "Afpunten betalingen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
 msgid "Statements reconciliation"
-msgstr ""
+msgstr "Afschriften afpunten"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
 #: model:ir.ui.menu,name:account.menu_action_subscription_form_new
 msgid "New Subscription"
-msgstr ""
+msgstr "Nieuw abonnement"
 
 #. module: account
 #: view:account.payment.term:0
 msgid "Computation"
-msgstr ""
+msgstr "Berekening"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr ""
+msgstr "Analytische boeking"
 
 #. module: account
 #: view:res.company:0
 #: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
-msgstr ""
+msgstr "Boodschap vervallen facturen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_tree
@@ -2153,54 +2197,54 @@ msgstr ""
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Value Amount"
-msgstr ""
+msgstr "Waarde bedrag"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr ""
+msgstr "Afgepunte boekingen"
 
 #. module: account
 #: field:account.invoice,address_contact_id:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Adres contactpersoon"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create 3 Months Periods"
-msgstr ""
+msgstr "Trimestriële perioden maken"
 
 #. module: account
 #: view:account.invoice:0
 msgid "(keep empty to use the current period)"
-msgstr ""
+msgstr "(leeg voor de huidige periode)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree8
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree8
 msgid "Draft Supplier Invoices"
-msgstr ""
+msgstr "Voorlopige facturen leveranciers"
 
 #. module: account
 #: wizard_field:account.invoice.refund,init,period:0
 msgid "Force period"
-msgstr ""
+msgstr "Periode afdwingen"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Detail"
-msgstr ""
+msgstr "Detail"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 msgid "Consolidation"
-msgstr ""
+msgstr "Consolidatie"
 
 #. module: account
 #: field:account.chart.template,account_root_id:0
 msgid "Root Account"
-msgstr ""
+msgstr "Rootrekening"
 
 #. module: account
 #: rml:account.overdue:0
@@ -2209,11 +2253,16 @@ msgid ""
 "stay unpaid. Please, take appropriate measures in order to carry out this "
 "payment in the next 8 days."
 msgstr ""
+"Mogen wij u erop attent maken, behoudens vergissing van onze kant, dat de "
+"\r\n"
+"volgende facturen nog niet zijn betaald. Gelieve het nodige te doen om de "
+"\r\n"
+"betaling ervan binnen de 8 dagen uit te voeren."
 
 #. module: account
 #: rml:account.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "Btw:"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,account_selection,Account_list:0
@@ -2222,7 +2271,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
-msgstr ""
+msgstr "Boekhoudplan"
 
 #. module: account
 #: model:account.journal,name:account.check_journal
@@ -2233,27 +2282,27 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_generate_subscription
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Create subscription entries"
-msgstr ""
+msgstr "Abonnementsboekingen maken"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,journal_id:0
 msgid "Opening Entries Journal"
-msgstr ""
+msgstr "Openingsjournaal"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Create a Fiscal Year"
-msgstr ""
+msgstr "Boekjaar maken"
 
 #. module: account
 #: field:product.template,taxes_id:0
 msgid "Customer Taxes"
-msgstr ""
+msgstr "Klant-btw"
 
 #. module: account
 #: field:account.invoice,date_invoice:0
 msgid "Date Invoiced"
-msgstr ""
+msgstr "Datum gefactureerd"
 
 #. module: account
 #: help:account.account.balance.report,checktype,periods:0
@@ -2262,7 +2311,7 @@ msgstr ""
 #: help:account.third_party_ledger.report,init,periods:0
 #: help:account.vat.declaration,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Alle periodes indien blanco"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
@@ -2272,17 +2321,17 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "2"
-msgstr ""
+msgstr "2"
 
 #. module: account
 #: wizard_view:account.chart,init:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
-msgstr ""
+msgstr "(Als u geen boekjaar kiest, worden alle boekjaren genomen)"
 
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
 msgid "The account basis of the tax declaration."
-msgstr ""
+msgstr "De rekeningbasis van de btw-aangifte."
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2302,77 +2351,77 @@ msgstr ""
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: account
 #: field:account.invoice,reference_type:0
 msgid "Reference Type"
-msgstr ""
+msgstr "Referentietype"
 
 #. module: account
 #: wizard_button:account.move.line.unreconcile,init,unrec:0
 #: wizard_button:account.reconcile.unreconcile,init,unrec:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "Afpunten ongedaan maken"
 
 #. module: account
 #: field:account.tax,type:0
 #: field:account.tax.template,type:0
 msgid "Tax Type"
-msgstr ""
+msgstr "Btw-type"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_statemententries0
 msgid "Statement Entries"
-msgstr ""
+msgstr "Uittrekselboekingen"
 
 #. module: account
 #: field:account.analytic.line,user_id:0
 #: field:account.journal,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Gebruiker"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_template_form
 msgid "Account Templates"
-msgstr ""
+msgstr "Rekeningsjablonen"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr ""
+msgstr "Sjablonen boekhoudplan"
 
 #. module: account
 #: model:account.journal,name:account.refund_sales_journal
 msgid "Journal d'extourne"
-msgstr ""
+msgstr "Betalingsdagboek"
 
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Voucher No"
-msgstr ""
+msgstr "Stuknr."
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic reconciliation"
-msgstr ""
+msgstr "Automatisch afpunten"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Import Invoice"
-msgstr ""
+msgstr "Facturen importeren"
 
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 msgid "and Journals"
-msgstr ""
+msgstr "en journalen"
 
 #. module: account
 #: view:account.tax:0
 msgid "Account Tax"
-msgstr ""
+msgstr "Btw rekening"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -2382,7 +2431,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.accounts.wizard,acc_no:0
 msgid "Account No."
-msgstr ""
+msgstr "Rekeningnr."
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -2390,11 +2439,13 @@ msgid ""
 "Set if the tax computation is based on the computation of child taxes rather "
 "than on the total amount."
 msgstr ""
+"Geef aan of de btw-berekening is gebaseerd op de berekening van de "
+"onderliggende btw in plaats van op het totaal bedrag."
 
 #. module: account
 #: rml:account.central.journal:0
 msgid "Journal Code"
-msgstr ""
+msgstr "Journaalcode"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -2402,16 +2453,18 @@ msgid ""
 "If not applicable (computed through a Python code), the tax won't appear on "
 "the invoice."
 msgstr ""
+"Indien niet van toepassing (Python-code) verschijnt de btw niet op de "
+"factuur."
 
 #. module: account
 #: field:account.model,lines_id:0
 msgid "Model Entries"
-msgstr ""
+msgstr "Modelboekingen"
 
 #. module: account
 #: field:account.analytic.account,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Einddatum"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2421,23 +2474,23 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
-msgstr ""
+msgstr "Boekingslijnen"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
-msgstr ""
+msgstr "Van toepassing zijnde code (als type=code)"
 
 #. module: account
 #: wizard_button:account.move.journal,init,open:0
 msgid "Open Journal"
-msgstr ""
+msgstr "Journaal openen"
 
 #. 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
@@ -2445,47 +2498,47 @@ msgstr ""
 #: model:ir.ui.menu,name:account.account_entries_analytic_entries
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
 msgid "Entries Encoding by Line"
-msgstr ""
+msgstr "Boekingen ingeven per lijn"
 
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
 msgid "List of all the taxes that have to be installed by the wizard"
-msgstr ""
+msgstr "Lijst met alle btw-codes te installeren door wizard"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Period from"
-msgstr ""
+msgstr "Periode van"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr ""
+msgstr "Rekeninguittreksel"
 
 #. module: account
 #: wizard_view:account.invoice.pay,addendum:0
 #: wizard_view:account.move.line.reconcile,addendum:0
 msgid "Information addendum"
-msgstr ""
+msgstr "Addenduminfo"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Entries Reconcile"
-msgstr ""
+msgstr "Boekingen afpunten"
 
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_amount:0
 msgid "The amount in the currency of the journal"
-msgstr ""
+msgstr "Liggend"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
 msgid "Landscape Mode"
-msgstr ""
+msgstr "Maak factuur volgens analytische rekeningen"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -2540,12 +2593,12 @@ msgstr ""
 #: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #. module: account
 #: field:account.account.type,name:0
 msgid "Acc. Type Name"
-msgstr ""
+msgstr "Rekeningsoortnaam"
 
 #. module: account
 #: help:account.tax,base_code_id:0
@@ -2557,55 +2610,55 @@ msgstr ""
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the VAT declaration."
-msgstr ""
+msgstr "Gebruik deze code voor de btw-aangifte"
 
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "Litigation"
-msgstr ""
+msgstr "Betwist"
 
 #. module: account
 #: view:account.move.line:0
 #: wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
-msgstr ""
+msgstr "Informatie"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_tax_report
 msgid "Taxes Reports"
-msgstr ""
+msgstr "Btw-aangiften"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr ""
+msgstr "Te betalen"
 
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Import Invoices in Statement"
-msgstr ""
+msgstr "Facturen importeren in uittreksel"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Other Info"
-msgstr ""
+msgstr "Andere info"
 
 #. module: account
 #: field:account.journal,default_credit_account_id:0
 msgid "Default Credit Account"
-msgstr ""
+msgstr "Standaard creditrekening"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
 msgid "Payment Order"
-msgstr ""
+msgstr "Betalingsopdracht"
 
 #. module: account
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
-msgstr ""
+msgstr "Schakel deze optie in als de gebruiker deze rekening mag afpunten."
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2615,12 +2668,12 @@ msgstr ""
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic"
-msgstr ""
+msgstr "Analytisch"
 
 #. module: account
 #: model:process.node,name:account.process_node_invoiceinvoice0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Factuur maken"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_equity
@@ -2630,17 +2683,17 @@ msgstr ""
 #. module: account
 #: field:wizard.company.setup,overdue_msg:0
 msgid "Overdue Payment Message"
-msgstr ""
+msgstr "Boodschap vervallen facturen"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr ""
+msgstr "Sjablonen btw-codes"
 
 #. module: account
 #: rml:account.partner.balance:0
 msgid "In dispute"
-msgstr ""
+msgstr "Geschillen"
 
 #. module: account
 #: help:account.account.template,type:0
@@ -2651,43 +2704,49 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for deprecated "
 "accounts."
 msgstr ""
+"Dit type dient om bepaalde eigenschappen binnen OpenERP te onderscheiden:\r\n"
+"weergave bevat geen boekingen; consolidatierekeningen zijn rekeningen die\r\n"
+"onderliggende rekeningen kunnen hebben voor het consolideren van meerdere\r\n"
+"firma's; te betalen/te ontvangen zijn centralisatierekeningen (voor "
+"debet/creditberekeningen),\r\n"
+"gesloten dient voor niet meer gebruikte rekeningen."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
 msgid "End of Year Treatments"
-msgstr ""
+msgstr "Verwerkingen einde jaar"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_generic_report
 msgid "Generic Reports"
-msgstr ""
+msgstr "Generieke rapporten"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,power:0
 msgid "Power"
-msgstr ""
+msgstr "Kracht"
 
 #. module: account
 #: wizard_view:account.analytic.line,init:0
 msgid "Account Analytic Lines Analysis"
-msgstr ""
+msgstr "Analyse analytische lijnen"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Price"
-msgstr ""
+msgstr "Prijs"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
-msgstr ""
+msgstr "‎-"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "asgfas"
-msgstr ""
+msgstr "asgfas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -2696,50 +2755,50 @@ msgstr ""
 #: model:ir.ui.menu,name:account.account_analytic_def_chart
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 msgid "Analytic Chart of Accounts"
-msgstr ""
+msgstr "Analytisch boekhoudplan"
 
 #. module: account
 #: wizard_view:account.analytic.line,init:0
 msgid "View Account Analytic Lines"
-msgstr ""
+msgstr "Analytische rekeninglijnen bekijken"
 
 #. module: account
 #: wizard_view:account.move.validate,init:0
 msgid "Select Period and Journal for Validation"
-msgstr ""
+msgstr "Periode en journaal voor validatie kiezen"
 
 #. module: account
 #: field:account.invoice,number:0
 msgid "Invoice Number"
-msgstr ""
+msgstr "Factuurnummer"
 
 #. module: account
 #: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: field:account.period,date_stop:0
 msgid "End of Period"
-msgstr ""
+msgstr "Einde periode"
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,go,finish:0
 msgid "O_k"
-msgstr ""
+msgstr "O_k"
 
 #. module: account
 #: field:account.invoice,amount_untaxed:0
 msgid "Untaxed"
-msgstr ""
+msgstr "Onbelast"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
 #: model:ir.actions.wizard,name:account.account_analytic_account_inverted_balance_report
 msgid "Inverted Analytic Balance"
-msgstr ""
+msgstr "Omgekeerde analytische Balans"
 
 #. module: account
 #: field:account.tax,applicable_type:0
 #: field:account.tax.template,applicable_type:0
 msgid "Applicable Type"
-msgstr ""
+msgstr "Van toepassing zijnde type"
 
 #. module: account
 #: field:account.invoice,reference:0
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index bd0f62f6fa8..154f39fc421 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -13,7 +13,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-07-22 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-07-23 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -215,7 +215,7 @@ msgstr "明细"
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
 msgid "Aged Trial Balance"
-msgstr "账龄试算平衡表"
+msgstr "旧的试算表"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -239,7 +239,7 @@ msgstr "金额"
 #: model:ir.actions.wizard,name:account.wizard_third_party_ledger
 #: model:ir.ui.menu,name:account.menu_third_party_ledger
 msgid "Partner Ledger"
-msgstr "业务伙伴总帐"
+msgstr "业务伙伴分类账"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -460,7 +460,7 @@ msgstr "从草稿确认, 与对/ 不对账"
 #: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree
 msgid "Bank reconciliation"
-msgstr "银行对账"
+msgstr "银行对帐单"
 
 #. module: account
 #: rml:account.invoice:0
@@ -680,7 +680,7 @@ msgstr "月"
 #. module: account
 #: field:account.analytic.account,partner_id:0
 msgid "Associated Partner"
-msgstr "相关业务伙伴"
+msgstr "相关的业务伙伴"
 
 #. module: account
 #: view:account.invoice:0
@@ -795,7 +795,7 @@ msgstr "之前生成的记录:"
 #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
 #: model:ir.actions.wizard,name:account.account_analytic_account_cost_ledger_report
 msgid "Cost Ledger"
-msgstr "成本分类帐"
+msgstr "成本分类账"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -888,7 +888,7 @@ msgstr "补差额集合"
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr "货币金额"
+msgstr "另一货币金额"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
@@ -1897,7 +1897,7 @@ msgstr "支付发票"
 #. module: account
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr "错误：无效的Bvr号（错误的检验和）"
+msgstr "错误：无效的Bvr号(校验错误)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree5
@@ -4212,7 +4212,7 @@ msgstr "这序列提供记录集合列表的显示顺序"
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
-msgstr "类型控制"
+msgstr "控制类型"
 
 #. module: account
 #: field:account.analytic.account,name:0
@@ -5182,7 +5182,7 @@ msgstr "从手动转为草稿"
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_43
 msgid "This Month"
-msgstr "本月"
+msgstr "这月"
 
 #. module: account
 #: field:account.account.type,sign:0
@@ -5209,7 +5209,7 @@ msgstr "在确认对帐单产生的会计分录"
 #. module: account
 #: wizard_view:account_use_models,create:0
 msgid "Use Model"
-msgstr "使用模型"
+msgstr "使用模式"
 
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,end:0
diff --git a/addons/analytic/i18n/et.po b/addons/analytic/i18n/et.po
new file mode 100644
index 00000000000..9b745ea87e3
--- /dev/null
+++ b/addons/analytic/i18n/et.po
@@ -0,0 +1,266 @@
+# Estonian 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-06-18 10:59+0000\n"
+"PO-Revision-Date: 2010-07-22 20:10+0000\n"
+"Last-Translator: lyyser <logard.1961@gmail.com>\n"
+"Language-Team: Estonian <et@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-07-23 04:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "Alamkontod"
+
+#. 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 ""
+
+#. module: analytic
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr "Konto nimi"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr ""
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+"    "
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "Riik/Osariik"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "Konto haldur"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Mustand"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Suletud"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Deebet"
+
+#. 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 ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr "Konto tüüp"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "Mall"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr "Ootel"
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "Kirjeldus"
+
+#. 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 ""
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "Ettevõte"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "Kasutaja"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Ülem analüütiline konto"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "Kuupäev"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "Vaade"
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "Krediit"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Kogus"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "Kontakt"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "Katkestatud"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "Balanss"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "Alguskuupäev"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "Kvantiteet"
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr "Lõppkuupäev"
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr "Konto kood"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "Normaalne"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr "Täielik konto nimi"
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr "Analüütiline konto"
+
+#. module: analytic
+#: field:account.analytic.account,company_currency_id:0
+msgid "Currency"
+msgstr "Rahaühik"
+
+#. module: analytic
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Associated Partner"
+msgstr "Seotud partner"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr "Ava"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr "Analüütilised kirjed"
diff --git a/addons/product_manufacturer/i18n/fr.po b/addons/product_manufacturer/i18n/fr.po
new file mode 100644
index 00000000000..20ab19206f6
--- /dev/null
+++ b/addons/product_manufacturer/i18n/fr.po
@@ -0,0 +1,105 @@
+# French translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-25 13:27+0000\n"
+"PO-Revision-Date: 2010-07-22 09:16+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-23 04:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_electronic
+#: model:ir.module.module,description:product_electronic.module_meta_information
+msgid "A module that add manufacturers and attributes on the product form"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.product,manufacturer_pref:0
+msgid "Manufacturer product code"
+msgstr ""
+
+#. module: product_electronic
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.electronic.attribute:0
+msgid "Product Template Name"
+msgstr ""
+
+#. module: product_electronic
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: product_electronic
+#: model:ir.model,name:product_electronic.model_product_electronic_attribute
+msgid "Product attributes"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Manufacturing data"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Product reference"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.electronic.attribute,name:0
+msgid "Attribute"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.electronic.attribute,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.electronic.attribute,value:0
+msgid "Value"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Manufacturing Data"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Product name"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.product:0
+#: field:product.product,attribute_ids:0
+msgid "Attributes"
+msgstr ""
+
+#. module: product_electronic
+#: model:ir.module.module,shortdesc:product_electronic.module_meta_information
+msgid "Products Attributes & Manufacturers"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.product,manufacturer_pname:0
+msgid "Manufacturer product name"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.product,manufacturer:0
+msgid "Manufacturer"
+msgstr ""

From 153301f957e1d96584930d16e742ade40dc4db06 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 23 Jul 2010 10:14:39 +0530
Subject: [PATCH 12/13] [FIX]: fix a prolem of demo data appear after loading a
 correct chart of account

bzr revid: mga@tinyerp.com-20100723044439-2311zm8udkdcpjlp
---
 addons/account/demo/account_minimal.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index e18dab2d332..d0a2eb78404 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -385,18 +385,18 @@
         Product income and expense accounts, default parameters
         -->
 
-        <record id="property_account_expense_prd" model="ir.property">
-            <field name="name">property_account_expense</field>
-            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_expense')]"/>
-            <field eval="'account.account,'+str(ref('account.a_expense'))" name="value"/>
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        <record id="property_account_income_prd" model="ir.property">
-            <field name="name">property_account_income</field>
-            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_income')]"/>
-            <field eval="'account.account,'+str(ref('account.a_sale'))" name="value"/>
-            <field name="company_id" ref="base.main_company"/>
-        </record>
+<!--        <record id="property_account_expense_prd" model="ir.property">-->
+<!--            <field name="name">property_account_expense</field>-->
+<!--            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_expense')]"/>-->
+<!--            <field eval="'account.account,'+str(ref('account.a_expense'))" name="value"/>-->
+<!--            <field name="company_id" ref="base.main_company"/>-->
+<!--        </record>-->
+<!--        <record id="property_account_income_prd" model="ir.property">-->
+<!--            <field name="name">property_account_income</field>-->
+<!--            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_income')]"/>-->
+<!--            <field eval="'account.account,'+str(ref('account.a_sale'))" name="value"/>-->
+<!--            <field name="company_id" ref="base.main_company"/>-->
+<!--        </record>-->
         <record id="property_account_expense_categ" model="ir.property">
             <field name="name">property_account_expense_categ</field>
             <field name="fields_id" search="[('model','=','product.category'),('name','=','property_account_expense_categ')]"/>

From c1d8a6434c8c60ca3954ee96ca182c1ac07d47da Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 23 Jul 2010 10:50:36 +0530
Subject: [PATCH 13/13] [IMP]: iprovement in accounting journal sequence
 creating process

bzr revid: mga@tinyerp.com-20100723052036-fgdbmf1hk7ptncdl
---
 addons/account/account.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 9aadf24b7dd..1178712362e 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -656,9 +656,18 @@ class account_journal(osv.osv):
         @param context: context arguments, like lang, time zone
         @return: return a result
         """
+
+        journal_type = ('sale', 'sale_refund', 'purchase', 'purchase_refund')
+        journal_seq = {
+            'sale':'seq_out_invoice',
+            'purchase':'seq_in_invoice',
+            'purchase_refund':'seq_out_refund',
+            'sale_refund':'seq_in_refund'
+        }
         
         seq_pool = self.pool.get('ir.sequence')
         seq_typ_pool = self.pool.get('ir.sequence.type')
+        date_pool = self.pool.get('ir.model.data')
         
         result = True
         
@@ -685,10 +694,13 @@ class account_journal(osv.osv):
             res.update({
                 'sequence_id':seq_id
             })
-        
-        if not journal.invoice_sequence_id:
+
+        if journal.type in journal_type and not journal.invoice_sequence_id:
+            res_ids = date_pool.search(cr, uid, [('model','=','ir.sequence'), ('name','=',journal_seq.get(journal.type, 'sale'))])
+            inv_seq_id = date_pool.browse(cr, uid, res_ids[0]).res_id
+            inv_seq_id
             res.update({
-                'invoice_sequence_id':seq_id
+                'invoice_sequence_id':inv_seq_id
             })
         
         result = self.write(cr, uid, [journal.id], res)